commit 58dc1cfc618507170d30aabac758c0ec92d711ef
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 12 17:40:06 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 12 17:40:06 2019 +0000
tree f572cb46b4453c9cd2829978425a64c9e6c62e03
parent 2fb6a4cfc9cca940790d136c8fca792087f27396
parent eff772457d17e98046d436fd6c270f8bafef4683

Merge "Merge branch 'ub-launcher3-qt-r1-dev' into ub-launcher3-qt-dev" into ub-launcher3-qt-dev

src/com/android/launcher3/BaseActivity.java

diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index 424ffde..6455056 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -175,6 +175,10 @@
         mActivityFlags &= ~ACTIVITY_STATE_STARTED & ~ACTIVITY_STATE_USER_ACTIVE;
         mForceInvisible = 0;
         super.onStop();
+
+        // Reset the overridden sysui flags used for the task-swipe launch animation, this is a
+        // catch all for if we do not get resumed (and therefore not paused below)
+        getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0);
     }
 
     @Override