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

Refine fold setting

Browse Source 
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
This commit is contained in:
dshivangi
2023-08-03 19:49:54 +00:00
committed by Shivangi Dubey
parent 60afc1259f
commit 7435bbc70a
10 changed files with 427 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/com/android/settings/display/FoldLockBehaviorPreferenceController.java Normal file
View File

@@ -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();
}
}

142
src/com/android/settings/display/FoldLockBehaviorSettings.java Normal file
View File

@@ -0,0 +1,142 @@
/*
* 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 android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.Log;
import com.android.settings.R;
import com.android.settings.support.actionbar.HelpResourceProvider;
import com.android.settings.utils.CandidateInfoExtra;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* Fragment that is used to control fold setting.
*
* Keep the setting values in this class in sync with the values in
* {@link com.android.server.utils.FoldSettingProvider}
*/
public class FoldLockBehaviorSettings extends RadioButtonPickerFragment implements
HelpResourceProvider {
public static final String SETTING_VALUE_STAY_AWAKE_ON_FOLD = "stay_awake_on_fold_key";
public static final String SETTING_VALUE_SELECTIVE_STAY_AWAKE = "selective_stay_awake_key";
public static final String SETTING_VALUE_SLEEP_ON_FOLD = "sleep_on_fold_key";
private static final String SETTING_VALUE_DEFAULT = SETTING_VALUE_SELECTIVE_STAY_AWAKE;
public static final String TAG = "FoldLockBehaviorSetting";
public static final HashSet<String> SETTING_VALUES = new HashSet<>(
Set.of(SETTING_VALUE_STAY_AWAKE_ON_FOLD, SETTING_VALUE_SELECTIVE_STAY_AWAKE,
SETTING_VALUE_SLEEP_ON_FOLD));
private Context mContext;
@Override
public void onAttach(Context context) {
super.onAttach(context);
mContext = context;
}
@Override
protected List<? extends CandidateInfo> getCandidates() {
List<CandidateInfoExtra> candidates = new ArrayList<>();
candidates.add(new CandidateInfoExtra(
resourceToString(R.string.stay_awake_on_fold_title),
resourceToString(R.string.stay_awake_on_fold_summary),
SETTING_VALUE_STAY_AWAKE_ON_FOLD, /* enabled */ true));
candidates.add(new CandidateInfoExtra(
resourceToString(R.string.selective_stay_awake_title),
resourceToString(R.string.selective_stay_awake_summary),
SETTING_VALUE_SELECTIVE_STAY_AWAKE, /* enabled */ true));
candidates.add(new CandidateInfoExtra(
resourceToString(R.string.sleep_on_fold_title),
resourceToString(R.string.sleep_on_fold_summary),
SETTING_VALUE_SLEEP_ON_FOLD, /* enabled */ true));
return candidates;
}
@Override
public void bindPreferenceExtra(SelectorWithWidgetPreference pref,
String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
if (!(info instanceof CandidateInfoExtra)) {
return;
}
pref.setSummary(((CandidateInfoExtra) info).loadSummary());
}
@Override
protected String getDefaultKey() {
String foldSettingValue = getCurrentFoldSettingValue();
foldSettingValue = (foldSettingValue != null) ? foldSettingValue : SETTING_VALUE_DEFAULT;
if (!SETTING_VALUES.contains(foldSettingValue)) {
Log.e(TAG,
"getDefaultKey: Invalid setting value, returning default setting value");
foldSettingValue = SETTING_VALUE_DEFAULT;
}
return foldSettingValue;
}
@Override
protected boolean setDefaultKey(String key) {
if (!SETTING_VALUES.contains(key)) {
Log.e(TAG, "setDefaultKey: Can not set invalid key: " + key);
key = SETTING_VALUE_SELECTIVE_STAY_AWAKE;
}
setCurrentFoldSettingValue(key);
return true;
}
@Override
public int getMetricsCategory() {
return SettingsEnums.FOLD_LOCK_BEHAVIOR;
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.fold_lock_behavior_settings;
}
private String getCurrentFoldSettingValue() {
return Settings.System.getStringForUser(mContext.getContentResolver(),
FOLD_LOCK_BEHAVIOR,
UserHandle.USER_CURRENT);
}
private void setCurrentFoldSettingValue(String key) {
Settings.System.putStringForUser(mContext.getContentResolver(),
FOLD_LOCK_BEHAVIOR,
key,
UserHandle.USER_CURRENT);
}
private String resourceToString(int resource) {
return mContext.getText(resource).toString();
}
}

75
src/com/android/settings/display/StayAwakeOnFoldPreferenceController.java
View File

@@ -1,75 +0,0 @@
/*
* 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 android.content.Context;
import android.content.res.Resources;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
* A preference controller for the "Stay unlocked on fold" 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
*/
public class StayAwakeOnFoldPreferenceController extends TogglePreferenceController {
private final Resources mResources;
public StayAwakeOnFoldPreferenceController(Context context, String key) {
this(context, key, context.getResources());
}
public StayAwakeOnFoldPreferenceController(Context context, String key, Resources resources) {
super(context, key);
mResources = resources;
}
@Override
public int getAvailabilityStatus() {
return mResources.getBoolean(R.bool.config_stay_awake_on_fold) ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
@Override
public boolean isChecked() {
return Settings.System.getInt(
mContext.getContentResolver(),
Settings.System.STAY_AWAKE_ON_FOLD,
0) == 1;
}
@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);
}
@Override
public int getSliceHighlightMenuRes() {
return R.string.menu_key_display;
}
}