From db897c4fe93cd80da332eea49aed00cdc6f8afbc Mon Sep 17 00:00:00 2001 From: Fengjiang Li Date: Wed, 23 Oct 2024 15:50:38 +0800 Subject: [PATCH] [PostBoot] Do not destroy post boot loader because of theme change Bug: 298231234 Test: manual Flag: NONE - xml flag not supported Change-Id: I7ee9de3bddaac8578b639f091d6bbbf3ae458fd1 --- src/com/android/launcher3/BaseDraggingActivity.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java index 177b28c80f..5f5fb728a0 100644 --- a/src/com/android/launcher3/BaseDraggingActivity.java +++ b/src/com/android/launcher3/BaseDraggingActivity.java @@ -50,6 +50,8 @@ public abstract class BaseDraggingActivity extends BaseActivity // automatically when user interacts with the launcher. public static final Object AUTO_CANCEL_ACTION_MODE = new Object(); + private boolean mIsThemeUpdatedBeforeRecreate; + private ActionMode mCurrentActionMode; private int mThemeRes = R.style.AppTheme; @@ -80,8 +82,13 @@ public abstract class BaseDraggingActivity extends BaseActivity updateTheme(); } - private void updateTheme() { + public boolean isThemeUpdatedBeforeRecreate() { + return mIsThemeUpdatedBeforeRecreate; + } + + protected void updateTheme() { if (mThemeRes != Themes.getActivityThemeRes(this)) { + mIsThemeUpdatedBeforeRecreate = true; recreate(); } }