diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-28 21:59:23 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-28 21:59:23 +0000 |
commit | ed9127a732c1d406b12e9c0a16544af8af157f6a (patch) | |
tree | fb805f27d8d742a038d36e14e844ac74da70c672 | |
parent | 1dae67b49d307e8c295aa2625195f87e180bd53f (diff) | |
parent | 4f2d926d4276a0e0440f5e105458801cd425bb53 (diff) | |
download | android_packages_apps_Trebuchet-ed9127a732c1d406b12e9c0a16544af8af157f6a.tar.gz android_packages_apps_Trebuchet-ed9127a732c1d406b12e9c0a16544af8af157f6a.tar.bz2 android_packages_apps_Trebuchet-ed9127a732c1d406b12e9c0a16544af8af157f6a.zip |
Merge "Resetting UI state when the last has launched" into ub-launcher3-qt-dev
7 files changed, 26 insertions, 0 deletions
diff --git a/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java b/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java index eb0c5b942..057b48bb2 100644 --- a/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java +++ b/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java @@ -113,4 +113,7 @@ public final class FallbackActivityControllerHelper extends public int getContainerType() { return LauncherLogProto.ContainerType.SIDELOADED_LAUNCHER; } + + @Override + public void onLaunchTaskSuccess(RecentsActivity activity) { } } diff --git a/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java b/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java index d5950077d..b0d9cda6b 100644 --- a/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java +++ b/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java @@ -104,4 +104,9 @@ public final class LauncherActivityControllerHelper extends GoActivityControlHel return launcher != null ? launcher.getStateManager().getState().containerType : LauncherLogProto.ContainerType.APP; } + + @Override + public void onLaunchTaskSuccess(Launcher launcher) { + launcher.getStateManager().moveToRestState(); + } } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java index 4ae6d87b8..c43155b73 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java @@ -230,4 +230,9 @@ public final class FallbackActivityControllerHelper implements // TODO: probably go back to overview instead. activity.<RecentsView>getOverviewPanel().startHome(); } + + @Override + public void onLaunchTaskSuccess(RecentsActivity activity) { + activity.onTaskLaunched(); + } } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java index 07c049642..b2a71a488 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java @@ -488,4 +488,9 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe public void onLaunchTaskFailed(Launcher launcher) { launcher.getStateManager().goToState(OVERVIEW); } + + @Override + public void onLaunchTaskSuccess(Launcher launcher) { + launcher.getStateManager().moveToRestState(); + } }
\ No newline at end of file diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsActivity.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsActivity.java index 32a92618a..fc29a5663 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsActivity.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsActivity.java @@ -177,4 +177,8 @@ public final class RecentsActivity extends BaseRecentsActivity { super.onStart(); mFallbackRecentsView.resetTaskVisuals(); } + + public void onTaskLaunched() { + mFallbackRecentsView.resetTaskVisuals(); + } } diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java index e9aa6d078..f1d1141bc 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -1259,6 +1259,8 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> mActivityControlHelper.onLaunchTaskFailed(mActivity); nextTask.notifyTaskLaunchFailed(TAG); updateSysUiFlags(1 /* windowProgress == overview */); + } else { + mActivityControlHelper.onLaunchTaskSuccess(mActivity); } }, mMainThreadHandler); doLogGesture(NEW_TASK); diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java index 8675c3e02..cd2c9cb1b 100644 --- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java +++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java @@ -95,6 +95,8 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { void onLaunchTaskFailed(T activity); + void onLaunchTaskSuccess(T activity); + interface ActivityInitListener { void register(); |