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

Commit eb37d241 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove fold_grace_period_enabled" into main

parents d507b103 b23f9861

res/raw/fold_setting_selective_stay_awake_lottie.json

deleted100644 → 0
+0 −1

File deleted.

Preview size limit exceeded, changes collapsed.

res/values/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -100,10 +100,6 @@ 
    <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 fold grace period radio button that, on fold, goes to the lockscreen. [CHAR_LIMIT=NONE] -->

    <string name="stay_awake_on_lockscreen_title">Swipe up to continue</string>

    <!-- Summary for folding grace period radio button that, on fold, goes to the lockscreen. [CHAR_LIMIT=NONE] -->

src/com/android/settings/display/FoldLockBehaviorPreferenceController.java

+2 −8
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 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;
@@ -59,13 +58,8 @@ 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));

        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));

    }

src/com/android/settings/display/FoldLockBehaviorSettings.java

+6 −20
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 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;
@@ -55,7 +54,6 @@ 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) {
@@ -71,17 +69,10 @@ 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));

        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),
@@ -160,13 +151,8 @@ public class FoldLockBehaviorSettings extends RadioButtonPickerFragment implemen 
                        IllustrationType.LOTTIE_ANIMATION);

                break;

            case SETTING_VALUE_SELECTIVE_STAY_AWAKE:

                if (mFoldGracePeriodProvider.isEnabled()) {

                setIllustration(R.raw.fold_setting_grace_period_selective_stay_awake_lottie,

                        IllustrationType.LOTTIE_ANIMATION);

                } else {

                    setIllustration(R.raw.fold_setting_selective_stay_awake_lottie,

                            IllustrationType.LOTTIE_ANIMATION);

                }

                break;

            case SETTING_VALUE_SLEEP_ON_FOLD:

                setIllustration(R.raw.fold_setting_sleep_on_fold_lottie,