Bug 1258971 - Pre: Replace preferrences_general(_tablet).xml with v11 version. r=grisha
authorSebastian Kaspari <s.kaspari@gmail.com>
Thu, 31 Mar 2016 14:05:03 +0200
changeset 291346 f06df39f560f722c2d98376b3be769c7a97aead0
parent 291345 0d60f0d8b5e04ef009a7ec87ecba1e311bb23c5b
child 291347 a73c2c9f6872dab1423744a4aa905a826dcd3f49
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgrisha
bugs1258971
milestone48.0a1
Bug 1258971 - Pre: Replace preferrences_general(_tablet).xml with v11 version. r=grisha xml/preferences_general.xml isn't used anymore. Replace it with the xml-v11 version and then remove it from the xml-v11 folder. MozReview-Commit-ID: G6OHnSZ3cKc
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_general.xml
mobile/android/base/resources/xml/preferences_general_tablet.xml
deleted file mode 100644
--- a/mobile/android/base/resources/xml-v11/preferences_general.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - 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 should be mirrored to preferences_general_tablet.xml. -->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:gecko="http://schemas.android.com/apk/res-auto"
-                  android:enabled="false">
-
-    <PreferenceScreen android:key="android.not_a_preference.general_home"
-                      android:title="@string/pref_category_home"
-                      android:summary="@string/pref_category_home_summary"
-                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
-            <extra android:name="resource"
-                   android:value="preferences_home" />
-    </PreferenceScreen>
-
-    <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" />
-
-</PreferenceScreen>
-
deleted file mode 100644
--- a/mobile/android/base/resources/xml-v11/preferences_general_tablet.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - 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/. -->
-
-<!-- Tablet only: The contents under the "General" header for tablets,
-     See xml-v11/preferences.xml for single-pane v11+ phone layout.
-     Changes to preferences should be mirrored to preferences_general.xml. -->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:title="@string/pref_category_general"
-                  android:enabled="false">
-
-    <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
-                                                  android:title="@string/pref_sync"
-                                                  android:persistent="false" />
-
-    <PreferenceScreen android:key="android.not_a_preference.general_home"
-                      android:title="@string/pref_category_home"
-                      android:summary="@string/pref_category_home_summary"
-                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
-            <extra android:name="resource"
-                   android:value="preferences_home" />
-    </PreferenceScreen>
-
-    <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" />
-
-</PreferenceScreen>
-
--- a/mobile/android/base/resources/xml/preferences_general.xml
+++ b/mobile/android/base/resources/xml/preferences_general.xml
@@ -1,38 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - 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 should be mirrored to preferences_general_tablet.xml. -->
+
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:gecko="http://schemas.android.com/apk/res-auto"
                   android:enabled="false">
 
-    <PreferenceScreen
-                      android:key="android.not_a_preference.general_home"
+    <PreferenceScreen android:key="android.not_a_preference.general_home"
                       android:title="@string/pref_category_home"
-                      android:summary="@string/pref_category_home_summary" >
-        <intent android:action="android.intent.action.VIEW"
-                android:targetPackage="@string/android_package_name"
-                android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
-            <extra
-                android:name="resource"
-                android:value="preferences_home" />
-        </intent>
+                      android:summary="@string/pref_category_home_summary"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+            <extra android:name="resource"
+                   android:value="preferences_home" />
     </PreferenceScreen>
 
     <PreferenceScreen android:title="@string/pref_category_language"
-                      android:summary="@string/pref_category_language_summary" >
-        <intent android:action="android.intent.action.VIEW"
-                android:targetPackage="@string/android_package_name"
-                android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
-            <extra
-                    android:name="resource"
-                    android:value="preferences_locale" />
-        </intent>
+                      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"
--- a/mobile/android/base/resources/xml/preferences_general_tablet.xml
+++ b/mobile/android/base/resources/xml/preferences_general_tablet.xml
@@ -1,10 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - 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/. -->
 
-<!-- Stub to preserve IDs. -->
+<!-- Tablet only: The contents under the "General" header for tablets,
+     See xml-v11/preferences.xml for single-pane v11+ phone layout.
+     Changes to preferences should be mirrored to preferences_general.xml. -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:enabled="false" />
+                  android:title="@string/pref_category_general"
+                  android:enabled="false">
+
+    <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
+                                                  android:title="@string/pref_sync"
+                                                  android:persistent="false" />
+
+    <PreferenceScreen android:key="android.not_a_preference.general_home"
+                      android:title="@string/pref_category_home"
+                      android:summary="@string/pref_category_home_summary"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+            <extra android:name="resource"
+                   android:value="preferences_home" />
+    </PreferenceScreen>
 
+    <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" />
+
+</PreferenceScreen>
+