From 272f4541f98e314758c1cd90c96f3d42023db6a7 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 28 Oct 2020 00:13:03 -0700 Subject: [PATCH 1/2] DO NOT MERGE Revert "Defer recreation until resumed" Bug: 171707437 Test: Repro steps in bug This reverts commit 3f8d868110b426e40e09ece8b305fd84c1dde60c. Change-Id: I909ab701c674fe975982a7de06dc9e89dcd03aea --- src/com/android/launcher3/BaseDraggingActivity.java | 13 +------------ src/com/android/launcher3/Launcher.java | 1 - 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java index 833ce1501d..f2a5c656ff 100644 --- a/src/com/android/launcher3/BaseDraggingActivity.java +++ b/src/com/android/launcher3/BaseDraggingActivity.java @@ -42,7 +42,6 @@ import android.widget.Toast; import androidx.annotation.Nullable; -import com.android.launcher3.Launcher.OnResumeCallback; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.logging.InstanceId; import com.android.launcher3.logging.InstanceIdSequence; @@ -109,20 +108,10 @@ public abstract class BaseDraggingActivity extends BaseActivity private void updateTheme() { if (mThemeRes != Themes.getActivityThemeRes(this)) { - // Workaround (b/162812884): The system currently doesn't allow recreating an activity - // when it is not resumed, in such a case defer recreation until it is possible - if (hasBeenResumed()) { - recreate(); - } else { - addOnResumeCallback(this::recreate); - } + recreate(); } } - protected void addOnResumeCallback(OnResumeCallback callback) { - // To be overridden - } - @Override public void onActionModeStarted(ActionMode mode) { super.onActionModeStarted(mode); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index dede9542a1..e1f2b325f3 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1944,7 +1944,6 @@ public class Launcher extends StatefulActivity implements Launche return result; } - @Override public void addOnResumeCallback(OnResumeCallback callback) { mOnResumeCallbacks.add(callback); } From 4b4341d3a7df63796f09c9162a5678a865686134 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Wed, 28 Oct 2020 00:13:57 -0700 Subject: [PATCH 2/2] DO NOT MERGE Revert "Handle uiMode changes" Bug: 171707437 Test: Repro steps on bug This reverts commit 0ad7b172e67294d76e4fc8785336badb9d0a8344. Change-Id: If30cbb6c155e879dc8307a0a4a06dfb548b389a1 --- AndroidManifest.xml | 2 +- quickstep/AndroidManifest-launcher.xml | 2 +- quickstep/AndroidManifest.xml | 2 +- tests/AndroidManifest-common.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bc0cd97685..b031ffbee4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -49,7 +49,7 @@ android:stateNotNeeded="true" android:windowSoftInputMode="adjustPan" android:screenOrientation="unspecified" - android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode" + android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize" android:resizeableActivity="true" android:resumeWhilePausing="true" android:taskAffinity="" diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml index d680507e3b..60afddb0a8 100644 --- a/quickstep/AndroidManifest-launcher.xml +++ b/quickstep/AndroidManifest-launcher.xml @@ -49,7 +49,7 @@ android:stateNotNeeded="true" android:windowSoftInputMode="adjustPan" android:screenOrientation="unspecified" - android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode" + android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize" android:resizeableActivity="true" android:resumeWhilePausing="true" android:taskAffinity="" diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml index bb83b761e7..e49f2ecdc0 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -60,7 +60,7 @@ android:stateNotNeeded="true" android:theme="@style/LauncherTheme" android:screenOrientation="unspecified" - android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode" + android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize" android:resizeableActivity="true" android:resumeWhilePausing="true" android:taskAffinity="" /> diff --git a/tests/AndroidManifest-common.xml b/tests/AndroidManifest-common.xml index 33c8fbd96e..1c8f095810 100644 --- a/tests/AndroidManifest-common.xml +++ b/tests/AndroidManifest-common.xml @@ -92,7 +92,7 @@