From 773bf8fbd0e2383f232a43c35115e1df59e1317d Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 8 Mar 2018 14:20:32 -0800 Subject: [PATCH] Initial changes for handling overview button in Launcher Adding a debug flag to show the overview button and placeholder methods for handling the callbacks Change-Id: I35055e768d96b43b835bac2eb146e47850a7f4b1 --- quickstep/libs/sysui_shared.jar | Bin 117015 -> 117505 bytes .../quickstep/OtherActivityTouchConsumer.java | 13 +- .../quickstep/OverviewCommandHelper.java | 111 ++++++++++++++++++ .../quickstep/OverviewInteractionState.java | 4 +- .../com/android/quickstep/RecentsModel.java | 1 - .../quickstep/TouchInteractionService.java | 43 ++++--- .../states/InternalStateHandler.java | 8 +- 7 files changed, 149 insertions(+), 31 deletions(-) create mode 100644 quickstep/src/com/android/quickstep/OverviewCommandHelper.java diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar index 6e62add8edd7f724b473cf4ccfcd8b8e8e86f138..dbc2763cdd8d0f118f3fb760f18d9aa86181d52d 100644 GIT binary patch delta 9977 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 Ip}0{052?%IT>t<8 delta 9734 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 0; } @Override @@ -124,7 +129,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC // Start the window animation on down to give more time for launcher to draw if the // user didn't start the gesture over the back button - if (!isUsingScreenShot() && mDownHitTarget != HIT_TARGET_BACK) { + if (!isUsingScreenShot() && !mIsDeferredDownTarget) { startTouchTrackingForWindowAnimation(ev.getEventTime()); } @@ -166,7 +171,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC if (isUsingScreenShot()) { startTouchTrackingForScreenshotAnimation(); - } else if (mDownHitTarget == HIT_TARGET_BACK) { + } else if (mIsDeferredDownTarget) { // If we deferred starting the window animation on touch down, then // start tracking now startTouchTrackingForWindowAnimation(ev.getEventTime()); diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java new file mode 100644 index 0000000000..b60d1e2ddc --- /dev/null +++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep; + +import static com.android.launcher3.LauncherState.OVERVIEW; + +import android.annotation.TargetApi; +import android.app.ActivityManager.RecentTaskInfo; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ResolveInfo; +import android.os.Build; +import android.os.SystemClock; +import android.os.UserHandle; +import android.view.ViewConfiguration; + +import com.android.launcher3.AbstractFloatingView; +import com.android.launcher3.Launcher; +import com.android.launcher3.LauncherAppState; +import com.android.launcher3.states.InternalStateHandler; +import com.android.systemui.shared.system.ActivityManagerWrapper; + +/** + * Helper class to handle various atomic commands for switching between Overview. + */ +@TargetApi(Build.VERSION_CODES.P) +public class OverviewCommandHelper extends InternalStateHandler { + + private final Context mContext; + private final ActivityManagerWrapper mAM; + + public final Intent homeIntent; + public final ComponentName launcher; + + private long mLastToggleTime; + + public OverviewCommandHelper(Context context) { + mContext = context; + mAM = ActivityManagerWrapper.getInstance(); + + homeIntent = new Intent(Intent.ACTION_MAIN) + .addCategory(Intent.CATEGORY_HOME) + .setPackage(context.getPackageName()) + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + ResolveInfo info = context.getPackageManager().resolveActivity(homeIntent, 0); + launcher = new ComponentName(context.getPackageName(), info.activityInfo.name); + // Clear the packageName as system can fail to dedupe it b/64108432 + homeIntent.setComponent(launcher).setPackage(null); + } + + public void onOverviewToggle() { + long elapsedTime = SystemClock.elapsedRealtime() - mLastToggleTime; + mLastToggleTime = SystemClock.elapsedRealtime(); + + if (isOverviewAlmostVisible()) { + boolean isQuickTap = elapsedTime < ViewConfiguration.getDoubleTapTimeout(); + startNonLauncherTask(isQuickTap ? 2 : 1); + } else { + Intent intent = addToIntent(new Intent(homeIntent)); + mContext.startActivity(intent); + initWhenReady(); + } + } + + private void startNonLauncherTask(int backStackCount) { + for (RecentTaskInfo rti : mAM.getRecentTasks(backStackCount, UserHandle.myUserId())) { + backStackCount--; + if (backStackCount == 0) { + mAM.startActivityFromRecents(rti.id, null); + } + } + } + + private boolean isOverviewAlmostVisible() { + if (clearReference()) { + return true; + } + if (!mAM.getRunningTask().topActivity.equals(launcher)) { + return false; + } + Launcher launcher = getLauncher(); + return launcher != null && launcher.isStarted() && launcher.isInState(OVERVIEW); + } + + private Launcher getLauncher() { + return (Launcher) LauncherAppState.getInstance(mContext).getModel().getCallback(); + } + + @Override + protected boolean init(Launcher launcher, boolean alreadyOnHome) { + AbstractFloatingView.closeAllOpenViews(launcher, alreadyOnHome); + launcher.getStateManager().goToState(OVERVIEW, alreadyOnHome); + clearReference(); + return false; + } + +} diff --git a/quickstep/src/com/android/quickstep/OverviewInteractionState.java b/quickstep/src/com/android/quickstep/OverviewInteractionState.java index 3c68281a82..4af89bf46b 100644 --- a/quickstep/src/com/android/quickstep/OverviewInteractionState.java +++ b/quickstep/src/com/android/quickstep/OverviewInteractionState.java @@ -15,7 +15,9 @@ */ package com.android.quickstep; +import static com.android.quickstep.TouchInteractionService.DEBUG_SHOW_OVERVIEW_BUTTON; import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_HIDE_BACK_BUTTON; +import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_SHOW_OVERVIEW_BUTTON; import android.content.Context; import android.os.Handler; @@ -60,7 +62,7 @@ public class OverviewInteractionState { } }; - private static int sFlags; + private static int sFlags = DEBUG_SHOW_OVERVIEW_BUTTON ? FLAG_SHOW_OVERVIEW_BUTTON : 0; public static void setBackButtonVisible(Context context, boolean visible) { updateFlagOnUi(context, FLAG_HIDE_BACK_BUTTON, !visible); diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java index 3e3b3b2451..b4ce646667 100644 --- a/quickstep/src/com/android/quickstep/RecentsModel.java +++ b/quickstep/src/com/android/quickstep/RecentsModel.java @@ -31,7 +31,6 @@ import android.support.annotation.WorkerThread; import android.util.LruCache; import android.util.SparseArray; -import com.android.launcher3.Launcher; import com.android.launcher3.MainThreadExecutor; import com.android.launcher3.R; import com.android.launcher3.util.Preconditions; diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index e5af3e51bd..12c21701cf 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -23,15 +23,12 @@ import static android.view.MotionEvent.ACTION_POINTER_UP; import static android.view.MotionEvent.ACTION_UP; import static com.android.launcher3.LauncherState.FAST_OVERVIEW; -import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.quickstep.QuickScrubController.QUICK_SWITCH_START_DURATION; import android.annotation.TargetApi; import android.app.ActivityManager.RunningTaskInfo; import android.app.Service; -import android.content.ComponentName; import android.content.Intent; -import android.content.pm.ResolveInfo; import android.graphics.PointF; import android.os.Build; import android.os.Handler; @@ -62,6 +59,8 @@ import com.android.systemui.shared.system.NavigationBarCompat.HitTarget; @TargetApi(Build.VERSION_CODES.O) public class TouchInteractionService extends Service { + public static final boolean DEBUG_SHOW_OVERVIEW_BUTTON = false; + private static final SparseArray sMotionEventNames; static { @@ -132,6 +131,17 @@ public class TouchInteractionService extends Service { mEventQueue.onQuickScrubEnd(); TraceHelper.endSection("SysUiBinder", "onQuickScrubEnd"); } + + @Override + public void onOverviewToggle() { + mOverviewCommandHelper.onOverviewToggle(); + } + + @Override + public void onOverviewShown(boolean triggeredFromAltTab) { } + + @Override + public void onOverviewHidden(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { } }; private final TouchConsumer mNoOpTouchConsumer = (ev) -> {}; @@ -143,13 +153,11 @@ public class TouchInteractionService extends Service { } private ActivityManagerWrapper mAM; - private RunningTaskInfo mRunningTask; private RecentsModel mRecentsModel; - private Intent mHomeIntent; - private ComponentName mLauncher; private MotionEventQueue mEventQueue; private MainThreadExecutor mMainThreadExecutor; private ISystemUiProxy mISystemUiProxy; + private OverviewCommandHelper mOverviewCommandHelper; private Choreographer mMainThreadChoreographer; private Choreographer mBackgroundThreadChoreographer; @@ -161,16 +169,7 @@ public class TouchInteractionService extends Service { mAM = ActivityManagerWrapper.getInstance(); mRecentsModel = RecentsModel.getInstance(this); mMainThreadExecutor = new MainThreadExecutor(); - - mHomeIntent = new Intent(Intent.ACTION_MAIN) - .addCategory(Intent.CATEGORY_HOME) - .setPackage(getPackageName()) - .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - ResolveInfo info = getPackageManager().resolveActivity(mHomeIntent, 0); - mLauncher = new ComponentName(getPackageName(), info.activityInfo.name); - // Clear the packageName as system can fail to dedupe it b/64108432 - mHomeIntent.setComponent(mLauncher).setPackage(null); - + mOverviewCommandHelper = new OverviewCommandHelper(this); mMainThreadChoreographer = Choreographer.getInstance(); mNoOpEventQueue = new MotionEventQueue(mMainThreadChoreographer, mNoOpTouchConsumer); mEventQueue = mNoOpEventQueue; @@ -195,19 +194,19 @@ public class TouchInteractionService extends Service { } private void onBinderPreMotionEvent(@HitTarget int downHitTarget) { - mRunningTask = mAM.getRunningTask(); + RunningTaskInfo runningTaskInfo = mAM.getRunningTask(); mEventQueue.reset(); - if (mRunningTask == null) { + if (runningTaskInfo == null) { mEventQueue = mNoOpEventQueue; - } else if (mRunningTask.topActivity.equals(mLauncher)) { + } else if (runningTaskInfo.topActivity.equals(mOverviewCommandHelper.launcher)) { mEventQueue = getLauncherEventQueue(); } else { mEventQueue = new MotionEventQueue(mMainThreadChoreographer, - new OtherActivityTouchConsumer(this, mRunningTask, mRecentsModel, - mHomeIntent, mISystemUiProxy, mMainThreadExecutor, - mBackgroundThreadChoreographer, downHitTarget)); + new OtherActivityTouchConsumer(this, runningTaskInfo, mRecentsModel, + mOverviewCommandHelper.homeIntent, mISystemUiProxy, mMainThreadExecutor, + mBackgroundThreadChoreographer, downHitTarget)); } } diff --git a/src/com/android/launcher3/states/InternalStateHandler.java b/src/com/android/launcher3/states/InternalStateHandler.java index d3c0fef4e6..0a2c3e4fa1 100644 --- a/src/com/android/launcher3/states/InternalStateHandler.java +++ b/src/com/android/launcher3/states/InternalStateHandler.java @@ -56,8 +56,8 @@ public abstract class InternalStateHandler extends Binder { sScheduler.schedule(this); } - public void clearReference() { - sScheduler.clearReference(this); + public boolean clearReference() { + return sScheduler.clearReference(this); } public static boolean handleCreate(Launcher launcher, Intent intent) { @@ -125,10 +125,12 @@ public abstract class InternalStateHandler extends Binder { return false; } - public synchronized void clearReference(InternalStateHandler handler) { + public synchronized boolean clearReference(InternalStateHandler handler) { if (mPendingHandler.get() == handler) { mPendingHandler.clear(); + return true; } + return false; } } } \ No newline at end of file