From 44981eb88ecdd4782e6bf6bb89eea6e9fc667335 Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Fri, 18 Sep 2020 17:37:06 +0800 Subject: [PATCH 1/2] Remove legacy involveSplitScreen API The onSplitScreenInvoked was used to notify system ui to reset the divider position before entering split screen. With SplitScreenTaskOrganizer, WM Shell library could know the exact time when entering/leaving split screen mode. Removes the legacy API and resets divider position when leaving split screen mode. Fix: 168869136 Test: atest WMShellTests Test: atest SystemUITests Test: manual check recents and split screen behavior Change-Id: Id14925619d1ec7c014a3e306fd99ec3734f227da --- .../src/com/android/quickstep/SystemUiProxy.java | 11 ----------- .../com/android/quickstep/TaskShortcutFactory.java | 1 - 2 files changed, 12 deletions(-) diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index e4b05aec12..2666869136 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -113,17 +113,6 @@ public class SystemUiProxy implements ISystemUiProxy { } } - @Override - public void onSplitScreenInvoked() { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.onSplitScreenInvoked(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call onSplitScreenInvoked", e); - } - } - } - @Override public void onOverviewShown(boolean fromHome) { onOverviewShown(fromHome, TAG); diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java index 3b245b3230..2b55b805c6 100644 --- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java +++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java @@ -228,7 +228,6 @@ public interface TaskShortcutFactory { @Override protected boolean onActivityStarted(BaseDraggingActivity activity) { - SystemUiProxy.INSTANCE.get(activity).onSplitScreenInvoked(); activity.getUserEventDispatcher().logActionOnControl(TAP, LauncherLogProto.ControlType.SPLIT_SCREEN_TARGET); return true; From 0a22d107f685a69e6eb59a0c010498da314d3943 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Thu, 24 Sep 2020 12:13:08 -0700 Subject: [PATCH 2/2] [DO NOT MERGE] Make overview to home translate faster Fixes: 169052350 Change-Id: Ia6f21f479498927a5561819fcc256b698acbd095 --- .../src/com/android/quickstep/util/OverviewToHomeAnim.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java index 4a298d3bad..1031c5b080 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/OverviewToHomeAnim.java @@ -18,8 +18,10 @@ package com.android.quickstep.util; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.anim.Interpolators.DEACCEL; +import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; import static com.android.launcher3.anim.Interpolators.FINAL_FRAME; import static com.android.launcher3.anim.Interpolators.INSTANT; +import static com.android.launcher3.anim.Interpolators.clampToProgress; import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_ACTIONS_FADE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE; @@ -110,7 +112,7 @@ public class OverviewToHomeAnim { boolean isLayoutNaturalToLauncher = recentsView.getPagedOrientationHandler() .isLayoutNaturalToLauncher(); config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, isLayoutNaturalToLauncher - ? DEACCEL : FINAL_FRAME); + ? clampToProgress(FAST_OUT_SLOW_IN, 0, 0.75f) : FINAL_FRAME); config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME); config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME); config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, INSTANT);