From 91ef6856d7d025d6ac811e1d2b72a34afc9bea0c Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Fri, 18 Sep 2020 17:37:06 +0800 Subject: [PATCH] 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 (cherry picked from commit 44981eb88ecdd4782e6bf6bb89eea6e9fc667335) --- .../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;