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

Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24314953

Change-Id: Iaf6c0514a406267de5924672b1e879a4dce3ce4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shivangi Dubey
2023-09-06 15:06:39 +00:00
committed by Automerger Merge Worker
parent c8bd304d95 26e14e09bf
commit 00a78fca41
10 changed files with 427 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/xml/display_settings.xml
View File

@@ -48,12 +48,12 @@
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:fragment="com.android.settings.display.FoldLockBehaviorSettings"
android:key="fold_lock_behavior"
android:title="@string/fold_lock_behavior_title"
settings:controller="com.android.settings.display.FoldLockBehaviorPreferenceController"
settings:keywords="@string/keywords_fold_lock_behavior" />
<com.android.settingslib.RestrictedPreference
android:key="screen_timeout"

18
res/xml/fold_lock_behavior_settings.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2023 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/fold_lock_behavior_title"/>