Bug 1216257 - Move restore tabs pref from to "Advanced". r=sebastian

--HG--
extra : commitid : ELTMgv2y6Z6
extra : rebase_source : e1dd9c805e8d6add514d60c5e8b252e58c565c96

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

@@ -24,13 +24,6 @@
                android:value="preferences_locale" />
     </PreferenceScreen>
 
-    <ListPreference android:key="android.not_a_preference.restoreSession3"
-                    android:title="@string/pref_restore"
-                    android:defaultValue="quit"
-                    android:entries="@array/pref_restore_entries"
-                    android:entryValues="@array/pref_restore_values"
-                    android:persistent="true" />
-
     <CheckBoxPreference android:key="browser.image_blocking.enabled"
                         android:title="@string/pref_tap_to_load_images_title"
                         android:summary="@string/pref_tap_to_load_images_summary2"

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

@@ -31,13 +31,6 @@
                android:value="preferences_locale" />
     </PreferenceScreen>
 
-    <ListPreference android:key="android.not_a_preference.restoreSession3"
-                    android:title="@string/pref_restore"
-                    android:defaultValue="quit"
-                    android:entries="@array/pref_restore_entries"
-                    android:entryValues="@array/pref_restore_values"
-                    android:persistent="true" />
-
     <CheckBoxPreference android:key="browser.image_blocking.enabled"
                         android:title="@string/pref_tap_to_load_images_title"
                         android:summary="@string/pref_tap_to_load_images_summary2"

mobile/android/base/resources/xml/preferences_advanced.xml

@@ -8,20 +8,27 @@
                   android:title="@string/pref_category_advanced"
                   android:enabled="false">
 
-       <CheckBoxPreference android:key="devtools.remote.usb.enabled"
-                           android:title="@string/pref_developer_remotedebugging_usb" />
+    <ListPreference android:key="android.not_a_preference.restoreSession3"
+                    android:title="@string/pref_restore"
+                    android:defaultValue="quit"
+                    android:entries="@array/pref_restore_entries"
+                    android:entryValues="@array/pref_restore_values"
+                    android:persistent="true" />
 
-       <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.remote_debugging.link"
-                                                               android:title="@string/pref_learn_more"
-                                                               android:persistent="false"
-                                                               url="https://developer.mozilla.org/docs/Tools/Remote_Debugging/Debugging_Firefox_for_Android_with_WebIDE" />
+    <CheckBoxPreference android:key="devtools.remote.usb.enabled"
+                        android:title="@string/pref_developer_remotedebugging_usb" />
 
-       <CheckBoxPreference android:key="devtools.remote.wifi.enabled"
-                           android:title="@string/pref_developer_remotedebugging_wifi" />
+    <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.remote_debugging.link"
+                                                            android:title="@string/pref_learn_more"
+                                                            android:persistent="false"
+                                                            url="https://developer.mozilla.org/docs/Tools/Remote_Debugging/Debugging_Firefox_for_Android_with_WebIDE" />
 
-       <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.remote_debugging.link"
-                                                               android:title="@string/pref_learn_more"
-                                                               android:persistent="false"
-                                                               url="https://developer.mozilla.org/docs/Tools/Remote_Debugging/Debugging_Firefox_for_Android_with_WebIDE" />
+    <CheckBoxPreference android:key="devtools.remote.wifi.enabled"
+                        android:title="@string/pref_developer_remotedebugging_wifi" />
+
+    <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.remote_debugging.link"
+                                                            android:title="@string/pref_learn_more"
+                                                            android:persistent="false"
+                                                            url="https://developer.mozilla.org/docs/Tools/Remote_Debugging/Debugging_Firefox_for_Android_with_WebIDE" />
 
 </PreferenceScreen>

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

@@ -31,13 +31,6 @@
         </intent>
     </PreferenceScreen>
 
-    <ListPreference android:key="android.not_a_preference.restoreSession3"
-                    android:title="@string/pref_restore"
-                    android:defaultValue="quit"
-                    android:entries="@array/pref_restore_entries"
-                    android:entryValues="@array/pref_restore_values"
-                    android:persistent="true" />
-
     <CheckBoxPreference android:key="browser.image_blocking.enabled"
                         android:title="@string/pref_tap_to_load_images_title"
                         android:summary="@string/pref_tap_to_load_images_summary2"