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
This commit is contained in:
committed by
Shivangi Dubey
parent
b675bb6d3a
commit
dc485887cc
@@ -0,0 +1,95 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
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.BasePreferenceController;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 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.
|
||||
*/
|
||||
public class FoldLockBehaviorPreferenceController extends BasePreferenceController {
|
||||
|
||||
private final Resources mResources;
|
||||
|
||||
private static Map<String, String> KEY_TO_TEXT = new HashMap<>();
|
||||
|
||||
public FoldLockBehaviorPreferenceController(Context context, String key) {
|
||||
this(context, key, context.getResources());
|
||||
}
|
||||
|
||||
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(com.android.internal.R.bool.config_fold_lock_behavior)
|
||||
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
String summary = KEY_TO_TEXT.get(getFoldSettingValue());
|
||||
preference.setSummary(summary);
|
||||
}
|
||||
|
||||
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
|
||||
public int getSliceHighlightMenuRes() {
|
||||
return R.string.menu_key_display;
|
||||
}
|
||||
|
||||
private String resourceToString(int resource) {
|
||||
return mContext.getText(resource).toString();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user