Merge "Improve multi user settings screen" into rvc-dev

This commit is contained in:
András Klöczl
2020-05-05 17:27:42 +00:00
committed by Android (Google) Code Review
16 changed files with 1478 additions and 523 deletions

View File

@@ -17,12 +17,17 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto">
<com.android.settingslib.RestrictedPreference
android:key="switch_user"
android:icon="@drawable/ic_swap" />
<SwitchPreference
android:key="enable_calling"
android:icon="@drawable/ic_phone"
android:title="@string/user_enable_calling_sms" />
<com.android.settingslib.RestrictedPreference
android:key="remove_user"
android:title="@string/user_remove_user"
android:icon="@drawable/ic_delete"
settings:userRestriction="no_remove_user"
settings:useAdminDisabledSummary="true" />

View File

@@ -27,10 +27,15 @@
settings:searchable="false">
</PreferenceCategory>
<com.android.settingslib.RestrictedPreference
android:key="guest_add"
android:title="@string/guest_new_guest"
android:order="15"/>
<com.android.settingslib.RestrictedPreference
android:key="user_add"
android:title="@string/user_add_user_or_profile_menu"
android:icon="@drawable/ic_add_24dp"
android:icon="@drawable/ic_add_40dp"
android:order="20"/>
<com.android.settingslib.RestrictedSwitchPreference