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

Merge "Add additional summaries for some restricted switch preferences." into nyc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2016-04-14 21:05:24 +00:00
committed by Android (Google) Code Review
parent 29d59dd21f 415bd9ece1
commit cdb089c96d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/security_settings_misc.xml
View File

@@ -15,6 +15,7 @@
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/security_settings_title"> android:title="@string/security_settings_title">
<PreferenceCategory android:key="sim_lock" <PreferenceCategory android:key="sim_lock"
@@ -54,7 +55,8 @@
<com.android.settingslib.RestrictedSwitchPreference android:key="toggle_install_applications" <com.android.settingslib.RestrictedSwitchPreference android:key="toggle_install_applications"
android:title="@string/install_applications" android:title="@string/install_applications"
android:summaryOff="@string/install_unknown_applications" android:summaryOff="@string/install_unknown_applications"
android:summaryOn="@string/install_unknown_applications" /> android:summaryOn="@string/install_unknown_applications"
settings:useAdditionalSummary="true" />
</PreferenceCategory> </PreferenceCategory>

3
res/xml/user_settings.xml
View File

@@ -34,7 +34,8 @@
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="add_users_when_locked" android:key="add_users_when_locked"
android:title="@string/user_add_on_lockscreen_menu" android:title="@string/user_add_on_lockscreen_menu"
android:summary="@string/user_add_on_lockscreen_menu_summary" /> android:summary="@string/user_add_on_lockscreen_menu_summary"
settings:useAdditionalSummary="true" />
</PreferenceCategory> </PreferenceCategory>
<Preference <Preference
android:key="emergency_info" android:key="emergency_info"