Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc0f3b75 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

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

parents 6f9b6e08 ba0e2c86

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

res/xml/advanced_apps.xml

+10 −7
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/applications/ManageApplications.java

+1 −1
Original line number Diff line number Diff line
@@ -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: