From a36c8004edb2f2af1d896aae03d4fb55734e0205 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 11 Jun 2019 16:15:54 -0700
Subject: [PATCH] Reset the overview sysui state when returning to the previous
 task

- Otherwise, it gets stuck until the next time launcher pauses/task launch

Bug: 135008910
Change-Id: Ia0696d764522e36a4064583cb82003c1e9c0cb7a
---
 src/com/android/launcher3/BaseActivity.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index 424ffde1ff..64550560ff 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -175,6 +175,10 @@ public abstract class BaseActivity extends Activity
         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