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

Commit 7435bbc7 authored by dshivangi's avatar dshivangi Committed by Shivangi Dubey
Browse files

Refine fold setting 

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
Merged-In: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
parent 60afc125

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/display/StayAwakeOnFoldPreferenceController.java→src/com/android/settings/display/FoldLockBehaviorPreferenceController.java



+95
−0




























Original line number
Diff line number
Diff line








@@ -16,55 +16,71 @@





























package com.android.settings.display;





























import static android.provider.Settings.System.FOLD_LOCK_BEHAVIOR;



























import static com.android.settings.display.FoldLockBehaviorSettings.SETTING_VALUES;













import static com.android.settings.display.FoldLockBehaviorSettings.SETTING_VALUE_SELECTIVE_STAY_AWAKE;













import static com.android.settings.display.FoldLockBehaviorSettings.SETTING_VALUE_SLEEP_ON_FOLD;













import static com.android.settings.display.FoldLockBehaviorSettings.SETTING_VALUE_STAY_AWAKE_ON_FOLD;





























import android.content.Context;















import android.content.res.Resources;













import android.os.UserHandle;















import android.provider.Settings;





























import androidx.preference.Preference;





























import com.android.settings.R;













import com.android.settings.core.TogglePreferenceController;













import com.android.settings.core.BasePreferenceController;



























import java.util.HashMap;













import java.util.Map;































/**













 * A preference controller for the "Stay unlocked on fold" setting.













 * A preference controller for the @link android.provider.Settings.System#FOLD_LOCK_BEHAVIOR













 * setting.















 *















 * This preference controller allows users to control whether or not the device













 * stays awake when it is folded. When this setting is enabled, the device will













 * stay awake even if the device is folded.













 *













 * @link android.provider.Settings.System#STAY_AWAKE_ON_FOLD













 * stays awake when it is folded.















 */













public class StayAwakeOnFoldPreferenceController extends TogglePreferenceController {













public class FoldLockBehaviorPreferenceController extends BasePreferenceController {































    private final Resources mResources;





























    public StayAwakeOnFoldPreferenceController(Context context, String key) {













    private static Map<String, String> KEY_TO_TEXT = new HashMap<>();



























    public FoldLockBehaviorPreferenceController(Context context, String key) {















        this(context, key, context.getResources());















    }





























    public StayAwakeOnFoldPreferenceController(Context context, String key, Resources resources) {













    public FoldLockBehaviorPreferenceController(Context context, String key, Resources resources) {















        super(context, key);















        mResources = resources;













        KEY_TO_TEXT.put(SETTING_VALUE_STAY_AWAKE_ON_FOLD,













                resourceToString(R.string.stay_awake_on_fold_title));













        KEY_TO_TEXT.put(SETTING_VALUE_SELECTIVE_STAY_AWAKE,













                resourceToString(R.string.selective_stay_awake_title));













        KEY_TO_TEXT.put(SETTING_VALUE_SLEEP_ON_FOLD,













                resourceToString(R.string.sleep_on_fold_title));















    }































    @Override















    public int getAvailabilityStatus() {













        return mResources.getBoolean(R.bool.config_stay_awake_on_fold) ? AVAILABLE













                : UNSUPPORTED_ON_DEVICE;













        return mResources.getBoolean(com.android.internal.R.bool.config_fold_lock_behavior)













                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;















    }































    @Override













    public boolean isChecked() {













        return Settings.System.getInt(













                mContext.getContentResolver(),













                Settings.System.STAY_AWAKE_ON_FOLD,













                0) == 1;













    public void updateState(Preference preference) {













        String summary = KEY_TO_TEXT.get(getFoldSettingValue());













        preference.setSummary(summary);















    }





























    @Override













    public boolean setChecked(boolean isChecked) {













        final int stayUnlockedOnFold = isChecked ? 1 : 0;



























        return Settings.System.putInt(mContext.getContentResolver(),













                Settings.System.STAY_AWAKE_ON_FOLD, stayUnlockedOnFold);













    private String getFoldSettingValue() {













        String foldSettingValue = Settings.System.getStringForUser(mContext.getContentResolver(),













                FOLD_LOCK_BEHAVIOR, UserHandle.USER_CURRENT);













        return (foldSettingValue != null && SETTING_VALUES.contains(foldSettingValue))













                ? foldSettingValue : SETTING_VALUE_SELECTIVE_STAY_AWAKE;















    }































    @Override









@@ -72,4 +88,8 @@ public class StayAwakeOnFoldPreferenceController extends TogglePreferenceControl













        return R.string.menu_key_display;















    }





























    private String resourceToString(int resource) {













        return mContext.getText(resource).toString();













    }





























}