Bug 1216257 - Move full-screen browsing pref to "General". r=sebastian
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Fri, 23 Oct 2015 13:22:06 -0400
changeset 271106 9f452774df93aab94e145801acea3733440d826f
parent 271105 bb0185d08c37ee7311eca0cb3cb7fd9bea9fdb6e
child 271107 7b3d106493724deccb95693d6ae4dc0e003eb120
push id67553
push usercbook@mozilla.com
push dateWed, 04 Nov 2015 11:31:24 +0000
treeherdermozilla-inbound@8868503916ba [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssebastian
bugs1216257
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1216257 - Move full-screen browsing pref to "General". r=sebastian
mobile/android/base/resources/xml-v11/preferences_general.xml
mobile/android/base/resources/xml-v11/preferences_general_tablet.xml
mobile/android/base/resources/xml/preferences_accessibility.xml
mobile/android/base/resources/xml/preferences_general.xml
--- a/mobile/android/base/resources/xml-v11/preferences_general.xml
+++ b/mobile/android/base/resources/xml-v11/preferences_general.xml
@@ -25,16 +25,20 @@
     </PreferenceScreen>
 
     <ListPreference android:key="browser.chrome.titlebarMode"
                     android:title="@string/pref_titlebar_mode"
                     android:entries="@array/pref_titlebar_mode_entries"
                     android:entryValues="@array/pref_titlebar_mode_values"
                     android:persistent="false" />
 
+    <CheckBoxPreference android:key="browser.chrome.dynamictoolbar"
+                        android:title="@string/pref_scroll_title_bar2"
+                        android:summary="@string/pref_scroll_title_bar_summary" />
+
     <CheckBoxPreference android:key="android.not_a_preference.tab_queue"
                         android:title="@string/pref_tab_queue_title"
                         android:summary="@string/pref_tab_queue_summary"
                         android:defaultValue="false" />
 
     <CheckBoxPreference android:key="android.not_a_preference.openExternalURLsPrivately"
                         android:title="@string/pref_open_external_urls_privately_title"
                         android:summary="@string/pref_open_external_urls_privately_summary"
--- a/mobile/android/base/resources/xml-v11/preferences_general_tablet.xml
+++ b/mobile/android/base/resources/xml-v11/preferences_general_tablet.xml
@@ -26,16 +26,20 @@
 
     <PreferenceScreen android:title="@string/pref_category_language"
                       android:summary="@string/pref_category_language_summary"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
         <extra android:name="resource"
                android:value="preferences_locale" />
     </PreferenceScreen>
 
+    <CheckBoxPreference android:key="browser.chrome.dynamictoolbar"
+                        android:title="@string/pref_scroll_title_bar2"
+                        android:summary="@string/pref_scroll_title_bar_summary" />
+
     <CheckBoxPreference android:key="android.not_a_preference.tab_queue"
                         android:title="@string/pref_tab_queue_title"
                         android:summary="@string/pref_tab_queue_summary"
                         android:defaultValue="false" />
 
     <CheckBoxPreference android:key="android.not_a_preference.openExternalURLsPrivately"
                         android:title="@string/pref_open_external_urls_privately_title"
                         android:summary="@string/pref_open_external_urls_privately_summary"
--- a/mobile/android/base/resources/xml/preferences_accessibility.xml
+++ b/mobile/android/base/resources/xml/preferences_accessibility.xml
@@ -9,20 +9,16 @@
 
     <org.mozilla.gecko.preferences.FontSizePreference
                     android:key="font.size.inflation.minTwips"
                     android:title="@string/pref_text_size"
                     android:positiveButtonText="@string/pref_font_size_set"
                     android:negativeButtonText="@string/button_cancel"
                     android:persistent="false" />
 
-    <CheckBoxPreference android:key="browser.chrome.dynamictoolbar"
-                        android:title="@string/pref_scroll_title_bar2"
-                        android:summary="@string/pref_scroll_title_bar_summary" />
-
     <CheckBoxPreference android:key="media.autoplay.enabled"
                         android:title="@string/pref_media_autoplay_enabled"
                         android:summary="@string/pref_media_autoplay_enabled_summary" />
 
     <CheckBoxPreference android:key="browser.ui.zoom.force-user-scalable"
                         android:title="@string/pref_zoom_force_enabled"
                         android:summary="@string/pref_zoom_force_enabled_summary" />
 
--- a/mobile/android/base/resources/xml/preferences_general.xml
+++ b/mobile/android/base/resources/xml/preferences_general.xml
@@ -32,16 +32,20 @@
     </PreferenceScreen>
 
     <ListPreference android:key="browser.chrome.titlebarMode"
                     android:title="@string/pref_titlebar_mode"
                     android:entries="@array/pref_titlebar_mode_entries"
                     android:entryValues="@array/pref_titlebar_mode_values"
                     android:persistent="false" />
 
+    <CheckBoxPreference android:key="browser.chrome.dynamictoolbar"
+                        android:title="@string/pref_scroll_title_bar2"
+                        android:summary="@string/pref_scroll_title_bar_summary" />
+
     <CheckBoxPreference android:key="android.not_a_preference.tab_queue"
                         android:title="@string/pref_tab_queue_title"
                         android:summary="@string/pref_tab_queue_summary"
                         android:defaultValue="false" />
 
     <CheckBoxPreference android:key="android.not_a_preference.openExternalURLsPrivately"
                         android:title="@string/pref_open_external_urls_privately_title"
                         android:summary="@string/pref_open_external_urls_privately_summary"