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

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

Merge "Add padlocks to preferences that can be disabled by policy."

parents 4cd2b33d 682a9168

res/xml/privacy_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
        android:selectable="false" />



    <!-- Network reset -->

    <PreferenceScreen

    <com.android.settingslib.RestrictedPreference

        android:key="network_reset"

        android:title="@string/reset_network_title"

        settings:keywords="@string/keywords_network_reset"

res/xml/sound_settings.xml

+3 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
                android:summaryOff="@string/master_mono_off" />



        <!-- Interruptions -->

        <PreferenceScreen

        <com.android.settingslib.RestrictedPreference

                android:key="zen_mode"

                android:title="@string/zen_mode_settings_title"

                settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
@@ -89,14 +89,14 @@ 
                android:persistent="false"

                android:ringtoneType="alarm" />



        <PreferenceScreen

        <com.android.settingslib.RestrictedPreference

                android:key="cell_broadcast_settings"

                android:title="@string/cell_broadcast_settings" >

                <intent

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

                        android:targetPackage="com.android.cellbroadcastreceiver"

                        android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />

        </PreferenceScreen>

        </com.android.settingslib.RestrictedPreference>



        <!-- Other sounds -->

        <Preference

res/xml/user_details_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
            android:key="enable_calling"

            android:title="@string/user_enable_calling_sms"

            android:persistent="false" />

    <Preference

    <com.android.settingslib.RestrictedPreference

            android:key="remove_user"

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

res/xml/user_settings.xml

+4 −2
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ 
    <PreferenceCategory

            android:key="lock_screen_settings"

            android:title="@string/user_lockscreen_settings">

        <SwitchPreference android:key="add_users_when_locked"  android:title="@string/user_add_on_lockscreen_menu"

        <com.android.settingslib.RestrictedSwitchPreference

                android:key="add_users_when_locked"

                android:title="@string/user_add_on_lockscreen_menu"

                android:summary="@string/user_add_on_lockscreen_menu_summary" />

    </PreferenceCategory>

</PreferenceScreen>

res/xml/wireless_settings.xml

+3 −3
Original line number Diff line number Diff line
@@ -36,17 +36,17 @@ 
        settings:keywords="@string/keywords_wifi_calling"

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



    <PreferenceScreen

    <com.android.settingslib.RestrictedPreference

        android:fragment="com.android.settings.nfc.AndroidBeam"

        android:key="android_beam_settings"

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



    <PreferenceScreen

    <com.android.settingslib.RestrictedPreference

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

        android:key="tether_settings"

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



    <PreferenceScreen

    <com.android.settingslib.RestrictedPreference

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

        android:key="vpn_settings"

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