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

Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: 7b58b02285 am: 6e771fdf55 am: 539843c31a

Browse Source 
Change-Id: I72dc5f0d5d0764903de89bbff745b5466090db78
This commit is contained in:
TreeHugger Robot
2020-05-08 03:45:47 +00:00
committed by Automerger Merge Worker
parent a16583dae5 539843c31a
commit 77573ddec7
16 changed files with 1469 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/xml/user_details_settings.xml
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" />

7
res/xml/user_settings.xml
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