dc485887cc
Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting. Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v) *Always - Front display turns on when you fold your device [Currently available setting] *Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default] *Never - Front display locks when you fold your device [New option for user] Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest *Manual Flash the build with these changes Manually select options one by one Observe the behavior Fixes: 294194379 Change-Id: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
184 lines
8.2 KiB
XML
184 lines
8.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2016 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"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:key="display_settings_screen"
|
|
android:title="@string/display_settings"
|
|
settings:keywords="@string/keywords_display">
|
|
|
|
<PreferenceCategory
|
|
android:title="@string/category_name_brightness">
|
|
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="brightness"
|
|
android:title="@string/brightness"
|
|
settings:keywords="@string/keywords_display_brightness_level"
|
|
settings:useAdminDisabledSummary="true"
|
|
settings:userRestriction="no_config_brightness"/>
|
|
|
|
<com.android.settingslib.PrimarySwitchPreference
|
|
android:key="auto_brightness_entry"
|
|
android:title="@string/auto_brightness_title"
|
|
android:fragment="com.android.settings.display.AutoBrightnessSettings"
|
|
settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:title="@string/category_name_lock_display">
|
|
|
|
<Preference
|
|
android:key="lockscreen_from_display_settings"
|
|
android:title="@string/lockscreen_settings_title"
|
|
android:fragment="com.android.settings.security.LockscreenDashboardFragment"
|
|
settings:keywords="@string/keywords_ambient_display_screen"
|
|
settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController"/>
|
|
|
|
<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"
|
|
android:title="@string/screen_timeout"
|
|
android:summary="@string/summary_placeholder"
|
|
android:fragment="com.android.settings.display.ScreenTimeoutSettings"
|
|
settings:controller="com.android.settings.display.ScreenTimeoutPreferenceController"/>
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:title="@string/category_name_appearance">
|
|
|
|
<com.android.settings.display.darkmode.DarkModePreference
|
|
android:key="dark_ui_mode"
|
|
android:title="@string/dark_ui_mode"
|
|
android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
|
|
android:widgetLayout="@null"
|
|
settings:widgetLayout="@null"
|
|
settings:controller="com.android.settings.display.DarkUIPreferenceController"
|
|
settings:keywords="@string/keywords_dark_ui_mode"/>
|
|
|
|
<Preference
|
|
android:fragment="com.android.settings.accessibility.TextReadingPreferenceFragment"
|
|
android:key="text_reading_options"
|
|
android:persistent="false"
|
|
android:title="@string/accessibility_text_reading_options_title"
|
|
settings:controller="com.android.settings.accessibility.TextReadingFragmentForDisplaySettingsController"/>
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:title="@string/category_name_color">
|
|
|
|
<com.android.settingslib.PrimarySwitchPreference
|
|
android:key="night_display"
|
|
android:title="@string/night_display_title"
|
|
android:fragment="com.android.settings.display.NightDisplaySettings"
|
|
settings:controller="com.android.settings.display.NightDisplayPreferenceController"
|
|
settings:keywords="@string/keywords_display_night_display"/>
|
|
|
|
<Preference
|
|
android:key="color_mode"
|
|
android:title="@string/color_mode_title"
|
|
android:fragment="com.android.settings.display.ColorModePreferenceFragment"
|
|
settings:controller="com.android.settings.display.ColorModePreferenceController"
|
|
settings:keywords="@string/keywords_color_mode"/>
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:title="@string/category_name_display_controls">
|
|
|
|
<!--
|
|
Standard auto-rotation preference that will be shown when device state based
|
|
auto-rotation settings are NOT available.
|
|
-->
|
|
<SwitchPreference
|
|
android:key="auto_rotate"
|
|
android:title="@string/accelerometer_title"
|
|
settings:keywords="@string/keywords_auto_rotate"
|
|
settings:controller="com.android.settings.display.AutoRotatePreferenceController"/>
|
|
|
|
<!--
|
|
Auto-rotation preference that will be shown when device state based auto-rotation
|
|
settings are available.
|
|
-->
|
|
<Preference
|
|
android:key="device_state_auto_rotate"
|
|
android:title="@string/accelerometer_title"
|
|
android:fragment="com.android.settings.display.DeviceStateAutoRotateDetailsFragment"
|
|
settings:keywords="@string/keywords_auto_rotate"
|
|
settings:controller="com.android.settings.display.DeviceStateAutoRotateOverviewController"/>
|
|
|
|
<Preference
|
|
android:key="screen_resolution"
|
|
android:title="@string/screen_resolution_title"
|
|
android:fragment="com.android.settings.display.ScreenResolutionFragment"
|
|
settings:keywords="@string/keywords_screen_resolution"
|
|
settings:controller="com.android.settings.display.ScreenResolutionController"/>
|
|
|
|
<SwitchPreference
|
|
android:key="display_white_balance"
|
|
android:title="@string/display_white_balance_title"
|
|
android:summary="@string/display_white_balance_summary"
|
|
settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController"/>
|
|
|
|
<SwitchPreference
|
|
android:key="peak_refresh_rate"
|
|
android:title="@string/peak_refresh_rate_title"
|
|
android:summary="@string/peak_refresh_rate_summary"
|
|
settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController"/>
|
|
|
|
<SwitchPreference
|
|
android:key="show_operator_name"
|
|
android:title="@string/show_operator_name_title"
|
|
android:summary="@string/show_operator_name_summary"/>
|
|
|
|
<Preference
|
|
android:key="screensaver"
|
|
android:title="@string/screensaver_settings_title"
|
|
android:fragment="com.android.settings.dream.DreamSettings"
|
|
settings:keywords="@string/keywords_screensaver"
|
|
settings:controller="com.android.settings.display.ScreenSaverPreferenceController"/>
|
|
|
|
<SwitchPreference
|
|
android:key="camera_gesture"
|
|
android:title="@string/camera_gesture_title"
|
|
android:summary="@string/camera_gesture_desc"/>
|
|
|
|
<SwitchPreference
|
|
android:key="lift_to_wake"
|
|
android:title="@string/lift_to_wake_title"/>
|
|
|
|
<SwitchPreference
|
|
android:key="tap_to_wake"
|
|
android:title="@string/tap_to_wake"
|
|
android:summary="@string/tap_to_wake_summary"/>
|
|
|
|
<ListPreference
|
|
android:key="theme"
|
|
android:title="@string/device_theme"
|
|
android:summary="@string/summary_placeholder"/>
|
|
|
|
<Preference
|
|
android:key="vr_display_pref"
|
|
android:title="@string/display_vr_pref_title"
|
|
android:fragment="com.android.settings.display.VrDisplayPreferencePicker"/>
|
|
</PreferenceCategory>
|
|
</PreferenceScreen>
|