Merge "[PostBoot] Do not destroy post boot loader because of theme change" into main
diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index 177b28c..5f5fb72 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -50,6 +50,8 @@
// 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 @@
updateTheme();
}
- private void updateTheme() {
+ public boolean isThemeUpdatedBeforeRecreate() {
+ return mIsThemeUpdatedBeforeRecreate;
+ }
+
+ protected void updateTheme() {
if (mThemeRes != Themes.getActivityThemeRes(this)) {
+ mIsThemeUpdatedBeforeRecreate = true;
recreate();
}
}