Merge "Implement an "Advance" button on Privacy page."
This commit is contained in:
committed by
Android (Google) Code Review
commit
9881395ccf
@@ -19,7 +19,8 @@
|
|||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||||
android:key="privacy_dashboard_page"
|
android:key="privacy_dashboard_page"
|
||||||
android:title="@string/privacy_dashboard_title">
|
android:title="@string/privacy_dashboard_title"
|
||||||
|
settings:initialExpandedChildrenCount="3">
|
||||||
|
|
||||||
<!-- App permissions -->
|
<!-- App permissions -->
|
||||||
<Preference
|
<Preference
|
||||||
@@ -30,13 +31,6 @@
|
|||||||
<intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
|
<intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
|
||||||
</Preference>
|
</Preference>
|
||||||
|
|
||||||
<!-- On lock screen notifications -->
|
|
||||||
<com.android.settings.RestrictedListPreference
|
|
||||||
android:key="privacy_lock_screen_notifications"
|
|
||||||
android:title="@string/lock_screen_notifications_title"
|
|
||||||
android:summary="@string/summary_placeholder"
|
|
||||||
settings:searchable="false"/>
|
|
||||||
|
|
||||||
<!-- Show passwords -->
|
<!-- Show passwords -->
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
android:key="show_password"
|
android:key="show_password"
|
||||||
@@ -44,6 +38,13 @@
|
|||||||
android:summary="@string/show_password_summary"
|
android:summary="@string/show_password_summary"
|
||||||
settings:controller="com.android.settings.security.ShowPasswordPreferenceController"/>
|
settings:controller="com.android.settings.security.ShowPasswordPreferenceController"/>
|
||||||
|
|
||||||
|
<!-- On lock screen notifications -->
|
||||||
|
<com.android.settings.RestrictedListPreference
|
||||||
|
android:key="privacy_lock_screen_notifications"
|
||||||
|
android:title="@string/lock_screen_notifications_title"
|
||||||
|
android:summary="@string/summary_placeholder"
|
||||||
|
settings:searchable="false"/>
|
||||||
|
|
||||||
<!-- Privacy Service -->
|
<!-- Privacy Service -->
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="privacy_services"/>
|
android:key="privacy_services"/>
|
||||||
|
Reference in New Issue
Block a user