Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69107bc4 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10770143 from 26e14e09 to udc-qpr1-release 

Change-Id: I580691c84eceef0d50b62ae6668f01e774f71ed4
parents e481c638 26e14e09

res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -548,9 +548,6 @@ 
    <!-- 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>

res/values/strings.xml

+16 −5
Original line number Diff line number Diff line
@@ -80,6 +80,19 @@ 
    <!-- Description for the button that makes interface elements larger. [CHAR_LIMIT=NONE] -->

    <string name="font_size_make_larger_desc">Make larger</string>









    <!-- Title for stay awake on fold radio button. [CHAR_LIMIT=NONE] -->









    <string name="stay_awake_on_fold_title">Always</string>









    <!-- Summary for stay awake on fold radio button. [CHAR_LIMIT=NONE] -->









    <string name="stay_awake_on_fold_summary">Front display turns on when you fold your device</string>









    <!-- Title for selective stay awake radio button. [CHAR_LIMIT=NONE] -->









    <string name="selective_stay_awake_title">Only games, videos, and more</string>









    <!-- Summary for selective stay awake radio button. [CHAR_LIMIT=NONE] -->









    <string name="selective_stay_awake_summary">Front display turns on for apps that stop your screen going idle</string>









    <!-- Title for sleep on fold radio button. [CHAR_LIMIT=NONE] -->









    <string name="sleep_on_fold_title">Never</string>









    <!-- Summary for sleep on fold radio button. [CHAR_LIMIT=NONE] -->









    <string name="sleep_on_fold_summary">Front display locks when you fold your device</string>

















    <!-- Auto rotate switchbar title. [CHAR_LIMIT=NONE] -->









    <string name="auto_rotate_settings_primary_switch_title">Use auto-rotate</string>
















@@ -2379,10 +2392,8 @@







    <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, setting option name to change Fold setting -->









    <string name="fold_lock_behavior_title">Continue using apps on fold</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] -->








@@ -7056,7 +7067,7 @@







    <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">









    <string name="keywords_fold_lock_behavior">









        awake, sleep, do not lock, stay unlocked on fold, folding, closing, fold, close, screen off









    </string>









    <string name="keywords_gesture">gestures</string>

























res/xml/display_settings.xml



+6
−6






























Original line number
Diff line number
Diff line







@@ -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"
































res/xml/fold_lock_behavior_settings.xml
0 → 100644



+18
−0






























Original line number
Diff line number
Diff line









<?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"/>
























src/com/android/settings/applications/appcompat/UserAspectRatioManager.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -51,10 +51,10 @@ public class UserAspectRatioManager {







            new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER);



















    // TODO(b/288142656): Enable user aspect ratio settings by default









    private static final boolean DEFAULT_VALUE_ENABLE_USER_ASPECT_RATIO_SETTINGS = false;









    private static final boolean DEFAULT_VALUE_ENABLE_USER_ASPECT_RATIO_SETTINGS = true;









    @VisibleForTesting









    static final String KEY_ENABLE_USER_ASPECT_RATIO_SETTINGS =









            "enable_app_compat_user_aspect_ratio_settings";









            "enable_app_compat_aspect_ratio_user_settings";









    static final String KEY_ENABLE_USER_ASPECT_RATIO_FULLSCREEN =









            "enable_app_compat_user_aspect_ratio_fullscreen";









    private static final boolean DEFAULT_VALUE_ENABLE_USER_ASPECT_RATIO_FULLSCREEN = true;