Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c1dfbc1 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Update constants used for resolving shell services" into tm-qpr-dev

parents 6fa0562a 73ab56a3

quickstep/src/com/android/quickstep/TouchInteractionService.java

+10 −10
Original line number Diff line number Diff line
@@ -25,19 +25,19 @@ import static com.android.quickstep.GestureState.DEFAULT_STATE; 
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_DOWN;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.MOTION_UP;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_RECENT_TASKS;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_BACK_ANIMATION;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_DESKTOP_MODE;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_FLOATING_TASKS;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_ONE_HANDED;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_PIP;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_SHELL_TRANSITIONS;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_SPLIT_SCREEN;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SHELL_STARTING_WINDOW;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNLOCK_ANIMATION_CONTROLLER;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_TRACING_ENABLED;

import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_BACK_ANIMATION;

import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_DESKTOP_MODE;

import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_FLOATING_TASKS;

import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_ONE_HANDED;

import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_PIP;

import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_RECENT_TASKS;

import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_SHELL_TRANSITIONS;

import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_SPLIT_SCREEN;

import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_STARTING_WINDOW;



import android.annotation.TargetApi;

import android.app.PendingIntent;
@@ -182,7 +182,7 @@ public class TouchInteractionService extends Service 
                    ISysuiUnlockAnimationController.Stub.asInterface(

                            bundle.getBinder(KEY_EXTRA_UNLOCK_ANIMATION_CONTROLLER));

            IRecentTasks recentTasks = IRecentTasks.Stub.asInterface(

                    bundle.getBinder(KEY_EXTRA_RECENT_TASKS));

                    bundle.getBinder(KEY_EXTRA_SHELL_RECENT_TASKS));

            IBackAnimation backAnimation = IBackAnimation.Stub.asInterface(

                    bundle.getBinder(KEY_EXTRA_SHELL_BACK_ANIMATION));

            IDesktopMode desktopMode = IDesktopMode.Stub.asInterface(