Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7e2
am: 32d914ea56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23832963 Change-Id: I340d008ea78939a614e8b33f83c212421d4388d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -48,6 +48,13 @@
|
||||
settings:keywords="@string/keywords_ambient_display_screen"
|
||||
settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="stay_awake_on_fold"
|
||||
android:title="@string/stay_awake_on_fold_title"
|
||||
android:summary="@string/stay_awake_on_fold_summary"
|
||||
settings:keywords="@string/keywords_stay_awake_on_lock"
|
||||
settings:controller="com.android.settings.display.StayAwakeOnFoldPreferenceController"/>
|
||||
|
||||
<com.android.settingslib.RestrictedPreference
|
||||
android:key="screen_timeout"
|
||||
android:title="@string/screen_timeout"
|
||||
|
Reference in New Issue
Block a user