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

Merge "Fix summaries of some restricted switch preferences." into nyc-dev

Browse Source 
am: c2dae39

* commit 'c2dae39ab4ab2531c9a8afff39fd99425e2a6bdd':
  Fix summaries of some restricted switch preferences.

Change-Id: Ie84937b155d8c5382bbb697c3f70fccaf28b897e
This commit is contained in:
Sudheer Shanka
2016-04-20 18:16:26 +00:00
committed by android-build-merger
parent c80d630559 c2dae39ab4
commit 14aa458510
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/xml/app_notification_settings.xml
View File

@@ -15,8 +15,10 @@
--> -->
<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/app_notifications_title" android:title="@string/app_notifications_title"
android:key="app_notification_settings"> android:key="app_notification_settings"
settings:keywords="@string/keywords_date_and_time">
<!-- Importance --> <!-- Importance -->
<!-- Block --> <!-- Block -->
@@ -24,13 +26,16 @@
android:key="block" android:key="block"
android:title="@string/app_notification_block_title" android:title="@string/app_notification_block_title"
android:summary="@string/app_notification_block_summary" android:summary="@string/app_notification_block_summary"
android:order="2" /> android:order="2"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
<!-- Silent --> <!-- Silent -->
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="silent" android:key="silent"
android:title="@string/show_silently" android:title="@string/show_silently"
android:summary="@string/show_silently_summary" android:summary="@string/show_silently_summary"
android:order="3" /> android:order="3"
settings:useAdditionalSummary="true" />
<!-- Slider --> <!-- Slider -->
<com.android.settings.notification.ImportanceSeekBarPreference <com.android.settings.notification.ImportanceSeekBarPreference
android:key="importance" android:key="importance"
@@ -48,6 +53,7 @@
android:key="bypass_dnd" android:key="bypass_dnd"
android:title="@string/app_notification_override_dnd_title" android:title="@string/app_notification_override_dnd_title"
android:summary="@string/app_notification_override_dnd_summary" android:summary="@string/app_notification_override_dnd_summary"
android:order="6" /> android:order="6"
settings:useAdditionalSummary="true" />
</PreferenceScreen> </PreferenceScreen>

4
res/xml/date_time_prefs.xml
View File

@@ -15,7 +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" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/date_and_time" android:title="@string/date_and_time"
settings:keywords="@string/keywords_date_and_time"> settings:keywords="@string/keywords_date_and_time">
@@ -23,6 +23,8 @@
android:title="@string/date_time_auto" android:title="@string/date_time_auto"
android:summaryOn="@string/date_time_auto_summaryOn" android:summaryOn="@string/date_time_auto_summaryOn"
android:summaryOff="@string/date_time_auto_summaryOff" android:summaryOff="@string/date_time_auto_summaryOff"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin"
/> />
<SwitchPreference android:key="auto_zone" <SwitchPreference android:key="auto_zone"