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:
@@ -545,6 +545,9 @@
|
||||
<!-- Whether to show Smooth Display feature in Settings Options -->
|
||||
<bool name="config_show_smooth_display">false</bool>
|
||||
|
||||
<!-- Whether to show Stay awake on fold feature in Settings Options -->
|
||||
<bool name="config_stay_awake_on_fold">false</bool>
|
||||
|
||||
<!-- Whether to show emergency settings in top-level Settings -->
|
||||
<bool name="config_show_emergency_settings">true</bool>
|
||||
|
||||
|
@@ -2378,6 +2378,10 @@
|
||||
<string name="display_white_balance_title">Display white balance</string>
|
||||
<!-- Display settings screen, display white balance settings summary [CHAR LIMIT=NONE] -->
|
||||
<string name="display_white_balance_summary"></string>
|
||||
<!-- Display settings screen, setting name to enable staying awake on fold [CHAR LIMIT=30] -->
|
||||
<string name="stay_awake_on_fold_title">Stay unlocked on fold</string>
|
||||
<!-- Display settings screen, setting summary to enable staying awake on fold [CHAR LIMIT=NONE] -->
|
||||
<string name="stay_awake_on_fold_summary">Keep front display unlocked when folded until screen timeout</string>
|
||||
<!-- Display settings screen, peak refresh rate settings title [CHAR LIMIT=30] -->
|
||||
<string name="peak_refresh_rate_title">Smooth Display</string>
|
||||
<!-- Display settings screen, peak refresh rate settings summary [CHAR LIMIT=NONE] -->
|
||||
@@ -7061,6 +7065,9 @@
|
||||
<string name="keywords_app_pinning">screen pinning</string>
|
||||
<string name="keywords_profile_challenge">work challenge, work, profile</string>
|
||||
<string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string>
|
||||
<string name="keywords_stay_awake_on_lock">
|
||||
awake, sleep, do not lock, stay unlocked on fold, folding, closing, fold, close, screen off
|
||||
</string>
|
||||
<string name="keywords_gesture">gestures</string>
|
||||
<string name="keywords_wallet">wallet</string>
|
||||
<string name="keywords_payment_settings">pay, tap, payments</string>
|
||||
|
@@ -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