am 52df60d8: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps." into mnc-dev

* commit '52df60d83dc48818aacbe1721e6aaa9be39e8451':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW and WRITE_SETTINGS permission to an explicit toggle to be enabled through Settings via Apps -> Advanced Apps.
This commit is contained in:
Billy Lau
2015-07-14 18:37:09 +00:00
committed by Android Git Automerger
14 changed files with 1146 additions and 230 deletions

View File

@@ -42,6 +42,26 @@
android:title="@string/default_apps_title"
settings:keywords="@string/keywords_default_apps" />
<PreferenceScreen
android:key="system_alert_window"
android:title="@string/system_alert_window_settings"
android:fragment="com.android.settings.applications.ManageApplications"
settings:keywords="@string/keywords_system_alert_window">
<extra
android:name="classname"
android:value="com.android.settings.Settings$OverlaySettingsActivity" />
</PreferenceScreen>
<PreferenceScreen
android:key="write_settings_apps"
android:title="@string/write_settings"
android:fragment="com.android.settings.applications.ManageApplications"
settings:keywords="@string/keywords_write_settings">
<extra
android:name="classname"
android:value="com.android.settings.Settings$WriteSettingsActivity" />
</PreferenceScreen>
<PreferenceScreen
android:key="high_power_apps"
android:title="@string/high_power_apps"

View File

@@ -15,19 +15,16 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/usage_access">
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<SwitchPreference
android:key="usage_switch"
android:title="@string/permit_usage_access" />
android:key="app_ops_settings_switch" />
<Preference
android:key="app_usage_preference"
android:title="@string/app_usage_preference" />
android:key="app_ops_settings_preference" />
<Preference
android:summary="@string/usage_access_description"
android:key="app_ops_settings_description"
android:selectable="false" />
</PreferenceScreen>