Fix legal info back button

Make it its own SettingsPreferenceFragment.

whitespace--

Bug: 20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f

2 files changed, 73 insertions, 53 deletions

diff --git a/res/xml/about_legal.xml b/res/xml/about_legal.xml
new file mode 100644
index 0000000..48e81f4
--- /dev/null
+++ b/res/xml/about_legal.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/legal_information">
+
+    <!-- Note: The titles given here probably won't be used.  Instead, we programmatically
+       fill the title with the label of the activity with the corresponding action.
+       If there is not an activity for an action, the item will be removed from the
+       list. -->
+
+    <!-- Copyright information -->
+    <PreferenceScreen
+        android:key="copyright"
+        android:title="@string/copyright_title">
+        <intent android:action="android.settings.COPYRIGHT" />
+    </PreferenceScreen>
+
+    <!-- License information -->
+    <PreferenceScreen
+        android:key="license"
+        android:title="@string/license_title">
+        <intent android:action="android.settings.LICENSE" />
+    </PreferenceScreen>
+
+    <!-- Terms and conditions -->
+    <PreferenceScreen
+        android:key="terms"
+        android:title="@string/terms_title">
+        <intent android:action="android.settings.TERMS" />
+    </PreferenceScreen>
+
+    <!-- System WebView License information -->
+    <PreferenceScreen
+        android:key="webview_license"
+        android:title="@string/webview_license_title">
+        <intent android:action="android.settings.WEBVIEW_LICENSE" />
+    </PreferenceScreen>
+
+    <Preference
+        android:key="wallpaper_attributions"
+        android:title="@string/wallpaper_attributions"
+        android:summary="@string/wallpaper_attributions_values"
+        />
+
+</PreferenceScreen>
+
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 46992a4..c3a3d52 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
 
         <!-- System update settings - launches activity -->
         <PreferenceScreen android:key="system_update_settings"
-                android:title="@string/system_update_settings_list_item_title" 
+                android:title="@string/system_update_settings_list_item_title"
                 android:summary="@string/system_update_settings_list_item_summary">
             <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
         </PreferenceScreen>
@@ -34,7 +34,7 @@
 
         <!-- Device status - launches activity -->
         <PreferenceScreen android:key="status_info"
-                android:title="@string/device_status" 
+                android:title="@string/device_status"
                 android:summary="@string/device_status_summary">
             <intent android:action="android.intent.action.MAIN"
                     android:targetPackage="com.android.settings"
@@ -44,48 +44,8 @@
         <!-- Legal Information -->
         <PreferenceScreen
                 android:key="container"
-                android:title="@string/legal_information">
-                    
-            <!-- Note: The titles given here probably won't be used.  Instead, we programmatically
-                       fill the title with the label of the activity with the corresponding action.
-                       If there is not an activity for an action, the item will be removed from the
-                       list. -->
-
-            <!-- Copyright information -->
-            <PreferenceScreen
-                    android:key="copyright"
-                    android:title="@string/copyright_title">
-                <intent android:action="android.settings.COPYRIGHT" />
-            </PreferenceScreen>
-
-            <!-- License information -->
-            <PreferenceScreen
-                    android:key="license"
-                    android:title="@string/license_title">
-                <intent android:action="android.settings.LICENSE" />
-            </PreferenceScreen>
-
-            <!-- Terms and conditions -->
-            <PreferenceScreen
-                    android:key="terms"
-                    android:title="@string/terms_title">
-                <intent android:action="android.settings.TERMS" />
-            </PreferenceScreen>
-
-            <!-- System WebView License information -->
-            <PreferenceScreen
-                    android:key="webview_license"
-                    android:title="@string/webview_license_title">
-                <intent android:action="android.settings.WEBVIEW_LICENSE" />
-            </PreferenceScreen>
-
-            <Preference
-                    android:key="wallpaper_attributions"
-                    android:title="@string/wallpaper_attributions"
-                    android:summary="@string/wallpaper_attributions_values"
-                    />
-
-        </PreferenceScreen>
+                android:title="@string/legal_information"
+                android:fragment="com.android.settings.LegalSettings" />
 
         <PreferenceScreen
                 android:key="regulatory_info"
@@ -99,13 +59,13 @@
         </PreferenceScreen>
 
         <!-- Device hardware model -->
-        <Preference android:key="device_model" 
+        <Preference android:key="device_model"
                 style="?android:preferenceInformationStyle"
                 android:title="@string/model_number"
                 android:summary="@string/device_info_default"/>
-                
+
         <!-- Device firmware version -->
-        <Preference android:key="firmware_version" 
+        <Preference android:key="firmware_version"
                 style="?android:preferenceInformationStyle"
                 android:title="@string/firmware_version"
                 android:summary="@string/device_info_default"/>
@@ -117,19 +77,19 @@
                 android:summary="@string/device_info_default"/>
 
         <!-- Device Baseband version -->
-        <Preference android:key="baseband_version" 
+        <Preference android:key="baseband_version"
                 style="?android:preferenceInformationStyle"
                 android:title="@string/baseband_version"
                 android:summary="@string/device_info_default"/>
-        
+
         <!-- Device Kernel version -->
-        <Preference android:key="kernel_version" 
+        <Preference android:key="kernel_version"
                 style="?android:preferenceInformationStyle"
                 android:title="@string/kernel_version"
                 android:summary="@string/device_info_default"/>
 
         <!-- Detailed build version -->
-        <Preference android:key="build_number" 
+        <Preference android:key="build_number"
                 style="?android:preferenceInformationStyle"
                 android:title="@string/build_number"
                 android:summary="@string/device_info_default"/>