Bug 1216257 - Move "Search" category to top level r=sebastian

--HG--
extra : commitid : FZYNXvhwc7C
extra : rebase_source : 0bfa19d370538ee565b29603f5d8f22838c4e741

mobile/android/base/locales/en-US/android_strings.dtd

@@ -203,6 +203,7 @@
 
 <!-- Localization note: These are shown in the left sidebar on tablets -->
 <!ENTITY pref_header_general "General">
+<!ENTITY pref_header_search "Search">
 <!ENTITY pref_header_display "Display">
 <!ENTITY pref_header_privacy_short "Privacy">
 <!ENTITY pref_header_help "Help">

mobile/android/base/resources/xml-v11/preference_headers.xml

@@ -15,6 +15,13 @@
                android:value="preferences_general_tablet"/>
     </header>
 
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+            android:title="@string/pref_header_search"
+            android:id="@+id/pref_header_search">
+        <extra android:name="resource"
+               android:value="preferences_search"/>
+    </header>
+
     <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
             android:title="@string/pref_header_display"
             android:id="@+id/pref_header_display">

mobile/android/base/resources/xml-v11/preferences.xml

@@ -24,6 +24,14 @@
                android:value="preferences_general"/>
     </PreferenceScreen>
 
+    <PreferenceScreen android:title="@string/pref_category_search"
+                      android:summary="@string/pref_category_search_summary"
+                      android:key="android.not_a_preference.search_screen"
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
+        <extra android:name="resource"
+               android:value="preferences_search"/>
+    </PreferenceScreen>
+
     <PreferenceScreen android:title="@string/pref_category_display"
                       android:summary="@string/pref_category_display_summary"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"

mobile/android/base/resources/xml-v11/preferences_general.xml

@@ -17,13 +17,6 @@
                    android:value="preferences_home" />
     </PreferenceScreen>
 
-     <PreferenceScreen android:title="@string/pref_category_search"
-                       android:summary="@string/pref_category_search_summary"
-                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
-         <extra android:name="resource"
-                android:value="preferences_search"/>
-     </PreferenceScreen>
-
     <ListPreference android:key="android.not_a_preference.restoreSession3"
                     android:title="@string/pref_restore"
                     android:defaultValue="quit"

mobile/android/base/resources/xml-v11/preferences_general_tablet.xml

@@ -24,13 +24,6 @@
                    android:value="preferences_home" />
     </PreferenceScreen>
 
-    <PreferenceScreen android:title="@string/pref_category_search"
-                      android:summary="@string/pref_category_search_summary"
-                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
-        <extra android:name="resource"
-               android:value="preferences_search"/>
-    </PreferenceScreen>
-
     <ListPreference android:key="android.not_a_preference.restoreSession3"
                     android:title="@string/pref_restore"
                     android:defaultValue="quit"

mobile/android/base/resources/xml/preference_headers.xml

@@ -7,6 +7,9 @@
      even for a version-limited build. -->
 
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
+            android:id="@+id/pref_header_search">
+    </header>
     <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
             android:id="@+id/pref_header_language">
     </header>

mobile/android/base/resources/xml/preferences.xml

@@ -28,6 +28,18 @@
         </intent>
     </PreferenceScreen>
 
+    <PreferenceScreen android:title="@string/pref_category_search"
+                      android:summary="@string/pref_category_search_summary"
+                      android:key="android.not_a_preference.search_screen">
+        <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_search" />
+        </intent>
+    </PreferenceScreen>
+
     <PreferenceScreen android:title="@string/pref_category_display"
                       android:summary="@string/pref_category_display_summary" >
         <intent android:action="android.intent.action.VIEW"

mobile/android/base/resources/xml/preferences_general.xml

@@ -20,18 +20,6 @@
         </intent>
     </PreferenceScreen>
 
-    <PreferenceScreen android:title="@string/pref_category_search"
-                      android:summary="@string/pref_category_search_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_search" />
-        </intent>
-    </PreferenceScreen>
-
     <ListPreference android:key="android.not_a_preference.restoreSession3"
                     android:title="@string/pref_restore"
                     android:defaultValue="quit"

mobile/android/base/strings.xml.in

@@ -189,6 +189,7 @@
   <string name="home_homepage_use_current_tab">&home_homepage_use_current_tab;</string>
 
   <string name="pref_header_general">&pref_header_general;</string>
+  <string name="pref_header_search">&pref_header_search;</string>
   <string name="pref_header_display">&pref_header_display;</string>
   <string name="pref_header_privacy_short">&pref_header_privacy_short;</string>
   <string name="pref_header_language">&pref_header_language;</string>