From ba0e2c8688f9a99d3e0c9e1b1b8211fc2a687fc3 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 9 Jun 2015 16:01:28 -0400
Subject: [PATCH] Advanced apps updates (2/2)

Change the title of the screen, add a category to break things up

Bug: 21372377
Change-Id: I03c2060937f540235755e4b74c5634543e526d25
---
 res/values/strings.xml                          |  3 +++
 res/xml/advanced_apps.xml                       | 17 ++++++++++-------
 .../applications/ManageApplications.java        |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7a1940407b9..83f61bd2566 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6504,6 +6504,9 @@
     <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
     <string name="advanced_apps">Advanced</string>
 
+    <!-- Title for application configuration settings [CHAR LIMIT=30] -->
+    <string name="configure_apps">Configure apps</string>
+
    <!-- Warning toast shown when data usage screen can't find specified app -->
    <string name="unknown_app">Unknown app</string>
 
diff --git a/res/xml/advanced_apps.xml b/res/xml/advanced_apps.xml
index b38900b9adc..ccdcbf096c6 100644
--- a/res/xml/advanced_apps.xml
+++ b/res/xml/advanced_apps.xml
@@ -20,10 +20,9 @@
     android:key="applications_settings">
 
     <PreferenceScreen
-        android:key="default_apps"
-        android:fragment="com.android.settings.applications.ManageDefaultApps"
-        android:title="@string/default_apps_title"
-        settings:keywords="@string/keywords_default_apps" />
+        android:key="manage_perms"
+        android:title="@string/app_permissions"
+        settings:keywords="@string/keywords_app_permissions" />
 
     <PreferenceScreen
             android:key="domain_urls"
@@ -34,10 +33,14 @@
                 android:value="com.android.settings.Settings$DomainsURLsAppListActivity" />
     </PreferenceScreen>
 
+    <PreferenceCategory
+        android:title="@string/advanced_apps" />
+
     <PreferenceScreen
-        android:key="manage_perms"
-        android:title="@string/app_permissions"
-        settings:keywords="@string/keywords_app_permissions" />
+        android:key="default_apps"
+        android:fragment="com.android.settings.applications.ManageDefaultApps"
+        android:title="@string/default_apps_title"
+        settings:keywords="@string/keywords_default_apps" />
 
     <PreferenceScreen
         android:key="high_power_apps"
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index e18e9b659b1..267c2b188f1 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -514,7 +514,7 @@ public class ManageApplications extends InstrumentedFragment
                 return true;
             case R.id.advanced:
                 ((SettingsActivity) getActivity()).startPreferencePanel(
-                        AdvancedAppSettings.class.getName(), null, R.string.advanced_apps,
+                        AdvancedAppSettings.class.getName(), null, R.string.configure_apps,
                         null, this, ADVANCED_SETTINGS);
                 return true;
             default: