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

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

Merge "Add preference summary when disabled by admin."

parents 1b4e746a ba1a68b8

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -3824,8 +3824,6 @@ 
    <string name="accessibility_feature_state_on">On</string>

    <!-- Summary for the disabled state of an accessibility feature. [CHAR LIMIT=10] -->

    <string name="accessibility_feature_state_off">Off</string>

    <!-- Summary when an accessibility feature or ime is not permitted. [CHAR LIMIT=40] -->

    <string name="accessibility_feature_or_input_method_not_allowed">Not allowed by your organization</string>









    <!-- Title for the preference category containing the video caption preview. [CHAR LIMIT=35] -->









    <string name="captioning_preview_title">Preview</string>
































res/xml/privacy_settings.xml



+2
−0






























Original line number
Diff line number
Diff line







@@ -56,6 +56,7 @@







        android:key="network_reset"









        android:title="@string/reset_network_title"









        settings:keywords="@string/keywords_network_reset"









        settings:useAdminDisabledSummary="true"









        android:fragment="com.android.settings.ResetNetwork" />



















    <!-- Factory reset -->








@@ -64,6 +65,7 @@







        android:title="@string/master_clear_title"









        settings:keywords="@string/keywords_factory_data_reset"









        settings:userRestriction="no_factory_reset"









        settings:useAdminDisabledSummary="true"









        android:fragment="com.android.settings.MasterClear" />



















</PreferenceScreen>
























res/xml/sound_settings.xml



+3
−1






























Original line number
Diff line number
Diff line







@@ -62,6 +62,7 @@







        <com.android.settingslib.RestrictedPreference









                android:key="zen_mode"









                android:title="@string/zen_mode_settings_title"









                settings:useAdminDisabledSummary="true"









                settings:keywords="@string/keywords_sounds_and_notifications_interruptions"









                android:fragment="com.android.settings.notification.ZenModeSettings" />


















@@ -91,7 +92,8 @@

















        <com.android.settingslib.RestrictedPreference









                android:key="cell_broadcast_settings"









                android:title="@string/cell_broadcast_settings" >









                android:title="@string/cell_broadcast_settings"









                settings:useAdminDisabledSummary="true">









                <intent









                        android:action="android.intent.action.MAIN"









                        android:targetPackage="com.android.cellbroadcastreceiver"
































res/xml/user_details_settings.xml



+2
−1






























Original line number
Diff line number
Diff line







@@ -23,6 +23,7 @@







            android:persistent="false" />









    <com.android.settingslib.RestrictedPreference









            android:key="remove_user"









            android:title="@string/user_remove_user" />









            android:title="@string/user_remove_user"









            settings:useAdminDisabledSummary="true" />



















</PreferenceScreen>








 No newline at end of file
























res/xml/wireless_settings.xml



+4
−2






























Original line number
Diff line number
Diff line







@@ -44,12 +44,14 @@







    <com.android.settingslib.RestrictedPreference









        android:fragment="com.android.settings.TetherSettings"









        android:key="tether_settings"









        android:title="@string/tether_settings_title_all" />









        android:title="@string/tether_settings_title_all"









        settings:useAdminDisabledSummary="true" />



















    <com.android.settingslib.RestrictedPreference









        android:fragment="com.android.settings.vpn2.VpnSettings"









        android:key="vpn_settings"









        android:title="@string/vpn_settings_title" />









        android:title="@string/vpn_settings_title"









        settings:useAdminDisabledSummary="true" />



















    <PreferenceScreen









        android:key="mobile_network_settings"