PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Advanced apps updates (2/2)" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-06-10 12:59:32 +00:00
committed by Android (Google) Code Review
parent 6f9b6e08a8 ba0e2c8688
commit cc0f3b75b2
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -6509,6 +6509,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>

17
res/xml/advanced_apps.xml
View File

@@ -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"

2
src/com/android/settings/applications/ManageApplications.java
View File

@@ -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: