Fix merge conflicts

Closes #42.
Goooler · Dec 22, 2023 · bf10368 · bf10368
1 parent edc256e
commit bf10368
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
@@ -1337,7 +1337,7 @@ private void restoreState(Bundle savedState) {
         LauncherState[] stateValues = LauncherState.values();
         LauncherState state = stateValues[stateOrdinal];
 
-        NonConfigInstance lastInstance = (NonConfigInstance) getLastNonConfigurationInstance();
+        NonConfigInstance lastInstance = (NonConfigInstance) getLastCustomNonConfigurationInstance();
         boolean forceRestore = lastInstance != null
                 && (lastInstance.config.diff(mOldConfig) & CONFIG_UI_MODE) != 0;
         if (forceRestore || !state.shouldDisableRestore()) {
@@ -1608,6 +1608,14 @@ public void onDetachedFromWindow() {
         closeContextMenu();
     }
 
+    @Nullable
+    @Override
+    public Object onRetainCustomNonConfigurationInstance() {
+        NonConfigInstance instance = new NonConfigInstance();
+        instance.config = new Configuration(mOldConfig);
+        return instance;
+    }
+
     public AllAppsTransitionController getAllAppsController() {
         return mAllAppsController;
     }