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

Commit 29c3b875 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Update fold setting illustrations" into main

parents 92fb442d 78d5efeb

res/raw/fold_setting_grace_period_selective_stay_awake_lottie.json

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.

res/raw/fold_setting_sleep_on_fold_lottie.json

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

res/raw/fold_setting_stay_awake_on_fold_lottie.json

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

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

+7 −2
Original line number Diff line number Diff line
@@ -160,8 +160,13 @@ 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,