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

Merge "Add new folding grace period settings strings" into main

Browse Source
This commit is contained in:
Beverly Tai
2024-01-03 13:48:42 +00:00
committed by Android (Google) Code Review
parent df262ad2d6 20e48424d9
commit b996d0a4ea
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/display/FoldLockBehaviorPreferenceController.java
View File

@@ -29,6 +29,7 @@ import android.provider.Settings;
import androidx.preference.Preference;
import com.android.internal.foldables.FoldGracePeriodProvider;
import com.android.internal.foldables.FoldLockSettingAvailabilityProvider;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -58,8 +59,13 @@ public class FoldLockBehaviorPreferenceController extends BasePreferenceControll
mFoldLockSettingAvailabilityProvider = foldLockSettingAvailabilityProvider;
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));
if (new FoldGracePeriodProvider().isEnabled()) {
KEY_TO_TEXT.put(SETTING_VALUE_SELECTIVE_STAY_AWAKE,
resourceToString(R.string.stay_awake_on_lockscreen_title));
} else {
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));
}

17
src/com/android/settings/display/FoldLockBehaviorSettings.java
View File

@@ -24,6 +24,7 @@ import android.os.UserHandle;
import android.provider.Settings;
import android.util.Log;
import com.android.internal.foldables.FoldGracePeriodProvider;
import com.android.settings.R;
import com.android.settings.support.actionbar.HelpResourceProvider;
import com.android.settings.utils.CandidateInfoExtra;
@@ -54,6 +55,7 @@ public class FoldLockBehaviorSettings extends RadioButtonPickerFragment implemen
SETTING_VALUE_SLEEP_ON_FOLD));
private static final String SETTING_VALUE_DEFAULT = SETTING_VALUE_SELECTIVE_STAY_AWAKE;
private Context mContext;
private final FoldGracePeriodProvider mFoldGracePeriodProvider = new FoldGracePeriodProvider();
@Override
public void onAttach(Context context) {
@@ -69,10 +71,17 @@ public class FoldLockBehaviorSettings extends RadioButtonPickerFragment implemen
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));
if (mFoldGracePeriodProvider.isEnabled()) {
candidates.add(new CandidateInfoExtra(
resourceToString(R.string.stay_awake_on_lockscreen_title),
resourceToString(R.string.stay_awake_on_lockscreen_summary),
SETTING_VALUE_SELECTIVE_STAY_AWAKE, /* enabled */ true));
} else {
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),