summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-06-09 16:01:28 -0400
committerJason Monk <jmonk@google.com>2015-06-09 16:01:28 -0400
commitba0e2c8688f9a99d3e0c9e1b1b8211fc2a687fc3 (patch)
tree72c87165368272f206ae2a3f1e782f2bff86b9b8
parent4ab327b05fe36d2841a89e3d9ba34d7df4027a91 (diff)
downloadpackages_apps_Settings-ba0e2c8688f9a99d3e0c9e1b1b8211fc2a687fc3.zip
packages_apps_Settings-ba0e2c8688f9a99d3e0c9e1b1b8211fc2a687fc3.tar.gz
packages_apps_Settings-ba0e2c8688f9a99d3e0c9e1b1b8211fc2a687fc3.tar.bz2
Advanced apps updates (2/2)
Change the title of the screen, add a category to break things up Bug: 21372377 Change-Id: I03c2060937f540235755e4b74c5634543e526d25
-rw-r--r--res/values/strings.xml3
-rw-r--r--res/xml/advanced_apps.xml17
-rw-r--r--src/com/android/settings/applications/ManageApplications.java2
3 files changed, 14 insertions, 8 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7a19404..83f61bd 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 b38900b..ccdcbf0 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 e18e9b6..267c2b1 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: