TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate preferences

Browse Source
This commit is contained in:
serso
2016-02-29 17:45:47 +01:00
parent 8b36232e07
commit 1ac6b6dfb0
6 changed files with 60 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/res/values/preferences.xml
View File

@@ -21,12 +21,6 @@
-->
<resources>
<string name="p_calc_color_display_key" translatable="false">org.solovyev.android.calculator.CalculatorModel_color_display</string>
<string name="p_calc_color_display" translatable="false">true</string>
<string name="p_calc_haptic_feedback_key" translatable="false">org.solovyev.android.calculator.CalculatorModel_haptic_feedback</string>
<string name="p_calc_haptic_feedback" translatable="false">false</string>
<string name="p_calc_use_back_button_as_prev_key" translatable="false">
org.solovyev.android.calculator.CalculatorActivity_use_back_button_as_prev
</string>
@@ -38,12 +32,6 @@
<string name="p_calc_history" translatable="false">org.solovyev.android.calculator.CalculatorModel_history</string>
<string name="p_calc_theme_key" translatable="false">org.solovyev.android.calculator.CalculatorActivity_calc_theme</string>
<string name="p_calc_theme" translatable="false">default_theme</string>
<string name="p_calc_layout_key" translatable="false">org.solovyev.android.calculator.CalculatorActivity_calc_layout</string>
<string name="p_calc_layout" translatable="false">main_calculator</string>
<string name="p_calc_ad_free" translatable="false">false</string>
</resources>

9
app/src/main/res/xml/preferences_appearance.xml
View File

@@ -31,8 +31,7 @@
m:materialColor="@color/material_text_selector" />
<android.preference.CheckBoxPreference
a:defaultValue="true"
a:key="@string/p_calc_color_display_key"
a:key="gui.highlightText"
a:summary="@string/c_calc_color_display_summary"
a:title="@string/c_calc_color_display_title" />
@@ -50,13 +49,13 @@
<ListPreference
a:entries="@array/p_theme_names"
a:entryValues="@array/p_theme_values"
a:key="@string/p_calc_theme_key"
a:key="gui.theme"
a:title="@string/cpp_theme" />
<ListPreference
a:entries="@array/p_layout_names"
a:entryValues="@array/p_layout_values"
a:key="@string/p_calc_layout_key"
a:key="gui.layout"
a:summary="@string/c_calc_layout_summary"
a:title="@string/c_calc_layout" />
@@ -73,7 +72,7 @@
a:title="@string/c_show_equals_button_title" />
<android.preference.CheckBoxPreference
a:key="preventScreenFromFading"
a:key="gui.keepScreenOn"
a:title="@string/cpp_prefs_keep_screen_on" />
</PreferenceScreen>