From 5518a38f1661db15d260b315cf65ef93b0527fbb Mon Sep 17 00:00:00 2001 From: Solovyev_S Date: Mon, 1 Jul 2013 11:31:06 +0400 Subject: [PATCH] fixable message removed --- .../res/values-ru/text_strings.xml | 1 - android-app-core/res/values/text_strings.xml | 1 - .../calculator/CalculatorPreferences.java | 1 - .../CalculatorOnscreenStartActivity.java | 23 ------------------- 4 files changed, 26 deletions(-) diff --git a/android-app-core/res/values-ru/text_strings.xml b/android-app-core/res/values-ru/text_strings.xml index 4c84dfb5..51d936ee 100644 --- a/android-app-core/res/values-ru/text_strings.xml +++ b/android-app-core/res/values-ru/text_strings.xml @@ -345,7 +345,6 @@ Вы можете удалить вторую иконку Калькулятора++ из списка приложений из настроек или нажав следующую кнопку - Удалить иконку Это изменение может потребовать перезагрузки 2D график diff --git a/android-app-core/res/values/text_strings.xml b/android-app-core/res/values/text_strings.xml index 8e4ea348..3cc0c871 100644 --- a/android-app-core/res/values/text_strings.xml +++ b/android-app-core/res/values/text_strings.xml @@ -336,7 +336,6 @@ You can remove second icon in applications\' list from application settings or by pressing next button - Remove icon This change may require reboot 2D plot diff --git a/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java b/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java index fdbfa1b5..1ced9d0d 100644 --- a/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java +++ b/android-app-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferences.java @@ -58,7 +58,6 @@ public final class CalculatorPreferences { public static class OnscreenCalculator { public static final Preference startOnBoot = BooleanPreference.of("onscreen_start_on_boot", false); public static final Preference showAppIcon = BooleanPreference.of("onscreen_show_app_icon", true); - public static final Preference removeIconDialogShown = BooleanPreference.of("onscreen_remove_icon_dialog_shown", false); } public static class Calculations { diff --git a/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenStartActivity.java b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenStartActivity.java index d68360f7..beb3e87a 100644 --- a/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenStartActivity.java +++ b/android-app-onscreen/src/main/java/org/solovyev/android/calculator/onscreen/CalculatorOnscreenStartActivity.java @@ -46,31 +46,8 @@ public class CalculatorOnscreenStartActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (Android.isComponentEnabled(this, CalculatorOnscreenStartActivity.class)) { - final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - - if (!CalculatorPreferences.OnscreenCalculator.removeIconDialogShown.getPreference(prefs)) { - FixableMessagesDialog.showDialog(Arrays.asList(new FixableMessage(getString(R.string.cpp_onscreen_remove_icon_message), MessageType.warning, new RemoveIconFixableError(this))), this, false); - CalculatorPreferences.OnscreenCalculator.removeIconDialogShown.putPreference(prefs, true); - } - } - CalculatorOnscreenService.showOnscreenView(this); this.finish(); } - - public static class RemoveIconFixableError extends AbstractFixableError { - - public RemoveIconFixableError(@Nonnull Context context) { - super(context.getString(R.string.cpp_onscreen_remove_icon_button_text)); - } - - @Override - public void fix() { - final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(App.getApplication()); - CalculatorPreferences.OnscreenCalculator.showAppIcon.putPreference(prefs, false); - } - } - }