diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index b433d3ad4dcf..b5dc9f9fb64e 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -103,9 +103,8 @@ - - - + + - + diff --git a/mobile/android/base/preferences/GeckoPreferenceFragment.java b/mobile/android/base/preferences/GeckoPreferenceFragment.java index 494aa6b71991..34480e9fc36d 100644 --- a/mobile/android/base/preferences/GeckoPreferenceFragment.java +++ b/mobile/android/base/preferences/GeckoPreferenceFragment.java @@ -191,7 +191,7 @@ public class GeckoPreferenceFragment extends PreferenceFragment { boolean isMultiPane = Versions.feature11Plus && ((PreferenceActivity) activity).isMultiPane(); - resid = isMultiPane ? R.xml.preferences_customize_tablet : R.xml.preferences; + resid = isMultiPane ? R.xml.preferences_general_tablet : R.xml.preferences; } return resid; diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java index b8973a267e8b..994d2a8017d4 100644 --- a/mobile/android/base/preferences/GeckoPreferences.java +++ b/mobile/android/base/preferences/GeckoPreferences.java @@ -78,7 +78,6 @@ import android.widget.ListAdapter; import android.widget.ListView; import android.widget.Toast; import org.json.JSONObject; - import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -154,7 +153,6 @@ OnSharedPreferenceChangeListener public static final String PREFS_RESTORE_SESSION = NON_PREF_PREFIX + "restoreSession3"; public static final String PREFS_SUGGESTED_SITES = NON_PREF_PREFIX + "home_suggested_sites"; public static final String PREFS_TAB_QUEUE = NON_PREF_PREFIX + "tab_queue"; - public static final String PREFS_CUSTOMIZE_SCREEN = NON_PREF_PREFIX + "customize_screen"; public static final String PREFS_TAB_QUEUE_LAST_SITE = NON_PREF_PREFIX + "last_site"; public static final String PREFS_TAB_QUEUE_LAST_TIME = NON_PREF_PREFIX + "last_time"; @@ -247,8 +245,8 @@ OnSharedPreferenceChangeListener title = R.string.pref_category_language; } else if (res == R.xml.preferences_vendor) { title = R.string.pref_category_vendor; - } else if (res == R.xml.preferences_customize) { - title = R.string.pref_category_customize; + } else if (res == R.xml.preferences_general) { + title = R.string.pref_category_general; } else if (res == R.xml.preferences_search) { title = R.string.pref_category_search; } @@ -344,7 +342,7 @@ OnSharedPreferenceChangeListener // This is the default header, because it's the first one. // I know, this is an affront to all human decency. And yet. - updateTitle(getString(R.string.pref_header_customize)); + updateTitle(getString(R.string.pref_header_general)); } if (onIsMultiPane()) { @@ -472,7 +470,7 @@ OnSharedPreferenceChangeListener if (!onIsMultiPane()) { fragmentArgs.putString(INTENT_EXTRA_RESOURCES, "preferences"); } else { - fragmentArgs.putString(INTENT_EXTRA_RESOURCES, "preferences_customize_tablet"); + fragmentArgs.putString(INTENT_EXTRA_RESOURCES, "preferences_general_tablet"); } } @@ -703,9 +701,6 @@ OnSharedPreferenceChangeListener } else if (pref instanceof PanelsPreferenceCategory) { mPanelsPreferenceCategory = (PanelsPreferenceCategory) pref; } - if(TabQueueHelper.TAB_QUEUE_ENABLED && PREFS_CUSTOMIZE_SCREEN.equals(key)) { - pref.setSummary(getString(R.string.pref_category_customize_alt_summary)); - } if (getResources().getString(R.string.pref_category_input_options).equals(key)) { if (!InputOptionsUtils.supportsVoiceRecognizer(getApplicationContext(), getResources().getString(R.string.voicesearch_prompt)) && !InputOptionsUtils.supportsQrCodeReader(getApplicationContext())) { diff --git a/mobile/android/base/resources/xml-v11/preference_headers.xml b/mobile/android/base/resources/xml-v11/preference_headers.xml index 87f28b07a874..86f82c5f132e 100644 --- a/mobile/android/base/resources/xml-v11/preference_headers.xml +++ b/mobile/android/base/resources/xml-v11/preference_headers.xml @@ -3,16 +3,16 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -
+ android:title="@string/pref_header_general"> + android:value="preferences_general_tablet"/>
- + android:value="preferences_general"/> - + - diff --git a/mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml b/mobile/android/base/resources/xml-v11/preferences_general_tablet.xml similarity index 92% rename from mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml rename to mobile/android/base/resources/xml-v11/preferences_general_tablet.xml index 02ad5988751b..d81112a35b91 100644 --- a/mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml +++ b/mobile/android/base/resources/xml-v11/preferences_general_tablet.xml @@ -3,20 +3,20 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + Changes to preferences should be mirrored to preferences_general.xml. --> - diff --git a/mobile/android/base/resources/xml/preferences.xml b/mobile/android/base/resources/xml/preferences.xml index bc6ab806558c..6278bf366389 100644 --- a/mobile/android/base/resources/xml/preferences.xml +++ b/mobile/android/base/resources/xml/preferences.xml @@ -16,15 +16,15 @@ android:summary="@string/pref_sync_summary" android:persistent="false" /> - + + android:value="preferences_general" /> diff --git a/mobile/android/base/resources/xml/preferences_customize.xml b/mobile/android/base/resources/xml/preferences_general.xml similarity index 98% rename from mobile/android/base/resources/xml/preferences_customize.xml rename to mobile/android/base/resources/xml/preferences_general.xml index 63d38528afc3..3aae87f43f73 100644 --- a/mobile/android/base/resources/xml/preferences_customize.xml +++ b/mobile/android/base/resources/xml/preferences_general.xml @@ -8,7 +8,7 @@ android:enabled="false"> &settings_title; &pref_category_input_options; &pref_category_advanced; - &pref_category_customize; - &pref_category_customize_summary; - &pref_category_customize_alt_summary; + &pref_category_general; + &pref_category_general_summary; &pref_category_search3; &pref_category_search_summary; @@ -189,7 +188,7 @@ &home_homepage_title; &home_homepage_use_current_tab; - &pref_header_customize; + &pref_header_general; &pref_header_display; &pref_header_privacy_short; &pref_header_language;