commit 577455a74b47f057ab141e581b6832e767253050
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri May 11 22:26:34 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri May 11 22:26:34 2018 +0000
tree 4ec344597f25dd979496d93b04d8cf6b9810c6fd
parent 8d035d7885e0d8e01aaf63b7dd246ebd425a9f96
parent 6e180fdee5eb26cce398e58c659cfc7e1f0f1381

[automerger] Restoring the vertical progress if the task launch failed am: 6e180fdee5

Change-Id: I8f6b9a2057d59173d5a3b9c2cb54c28797b1aef5

quickstep/src/com/android/quickstep/views/LauncherRecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index e237500..950f7fb 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -148,6 +148,9 @@
     protected void onTaskLaunched(boolean success) {
         if (success) {
             mActivity.getStateManager().goToState(NORMAL, false /* animate */);
+        } else {
+            LauncherState state = mActivity.getStateManager().getState();
+            mActivity.getAllAppsController().setProgress(state.getVerticalProgress(mActivity));
         }
         super.onTaskLaunched(success);
     }