Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2dae39a authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

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

parents b2f161ab 7e097474

res/xml/app_notification_settings.xml

+10 −4
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ 
-->



<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:key="app_notification_settings">

        android:key="app_notification_settings"

        settings:keywords="@string/keywords_date_and_time">



    <!-- Importance -->

    <!-- Block -->
@@ -24,13 +26,16 @@ 
            android:key="block"

            android:title="@string/app_notification_block_title"

            android:summary="@string/app_notification_block_summary"

            android:order="2" />

            android:order="2"

            settings:useAdditionalSummary="true"

            settings:restrictedSwitchSummary="@string/enabled_by_admin" />

    <!-- Silent -->

    <com.android.settingslib.RestrictedSwitchPreference

            android:key="silent"

            android:title="@string/show_silently"

            android:summary="@string/show_silently_summary"

            android:order="3" />

            android:order="3"

            settings:useAdditionalSummary="true" />

    <!-- Slider -->

    <com.android.settings.notification.ImportanceSeekBarPreference

            android:key="importance"
@@ -48,6 +53,7 @@ 
            android:key="bypass_dnd"

            android:title="@string/app_notification_override_dnd_title"

            android:summary="@string/app_notification_override_dnd_summary"

            android:order="6" />

            android:order="6"

            settings:useAdditionalSummary="true" />



</PreferenceScreen>

res/xml/date_time_prefs.xml

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
        android:title="@string/date_time_auto"

        android:summaryOn="@string/date_time_auto_summaryOn"

        android:summaryOff="@string/date_time_auto_summaryOff"

        settings:useAdditionalSummary="true"

        settings:restrictedSwitchSummary="@string/enabled_by_admin"

        />



    <SwitchPreference android:key="auto_zone"