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

Commit 409e4bc4 authored by Jason Chiu's avatar Jason Chiu Committed by android-build-merger
Browse files

Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display... 

Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev am: 04ad8c90
am: f7423fd7

Change-Id: Ic35bc76eee1107a64ca83252738cb54adc939b92
parents dc0a2a61 f7423fd7

res/xml/display_settings.xml

+2 −3
Original line number Diff line number Diff line
@@ -119,12 +119,11 @@ 
        android:fragment="com.android.settings.dream.DreamSettings"

        settings:searchable="false" />



    <com.android.settingslib.RestrictedPreference

    <Preference

        android:key="lockscreen_from_display_settings"

        android:title="@string/lockscreen_settings_title"

        android:fragment="com.android.settings.security.LockscreenDashboardFragment"

        settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController"

        settings:userRestriction="no_ambient_display" />

        settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController" />



    <SwitchPreference

        android:key="camera_gesture"

res/xml/security_lockscreen_settings.xml

+3 −2
Original line number Diff line number Diff line
@@ -53,11 +53,12 @@ 
        android:title="@string/ambient_display_category_triggers"

        android:order="1000">



        <SwitchPreference

        <com.android.settingslib.RestrictedSwitchPreference

            android:key="ambient_display_always_on"

            android:title="@string/doze_always_on_title"

            android:summary="@string/doze_always_on_summary"

            settings:controller="com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController" />

            settings:controller="com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController"

            settings:userRestriction="no_ambient_display" />



        <Preference

            android:key="ambient_display_tap"