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

Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev

Browse Source 
am: 04ad8c905a

Change-Id: I2c87041fb5575dfd621f4a9539653342c75d544f
This commit is contained in:
Jason Chiu
2019-07-26 18:44:26 -07:00
committed by android-build-merger
parent 32a9b548e3 04ad8c905a
commit 3ed75c8478
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/display_settings.xml
View File

@@ -119,12 +119,11 @@
android:fragment="com.android.settings.dream.DreamSettings" android:fragment="com.android.settings.dream.DreamSettings"
settings:searchable="false" /> settings:searchable="false" />
<com.android.settingslib.RestrictedPreference <Preference
android:key="lockscreen_from_display_settings" android:key="lockscreen_from_display_settings"
android:title="@string/lockscreen_settings_title" android:title="@string/lockscreen_settings_title"
android:fragment="com.android.settings.security.LockscreenDashboardFragment" android:fragment="com.android.settings.security.LockscreenDashboardFragment"
settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController" settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController" />
settings:userRestriction="no_ambient_display" />
<SwitchPreference <SwitchPreference
android:key="camera_gesture" android:key="camera_gesture"

5
res/xml/security_lockscreen_settings.xml
View File

@@ -53,11 +53,12 @@
android:title="@string/ambient_display_category_triggers" android:title="@string/ambient_display_category_triggers"
android:order="1000"> android:order="1000">
<SwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="ambient_display_always_on" android:key="ambient_display_always_on"
android:title="@string/doze_always_on_title" android:title="@string/doze_always_on_title"
android:summary="@string/doze_always_on_summary" 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 <Preference
android:key="ambient_display_tap" android:key="ambient_display_tap"