From ae72b46b2cc4b92fd341698b0e695d903379b7e3 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Wed, 10 Mar 2021 16:18:40 -0800 Subject: [PATCH 1/4] Replace taskbar hotseat with real hotseat when folder is open - Seamlessly show real hotseat and hide taskbar hotseat, while keeping rest of taskbar visible - Update MultiValueAlpha to allow for taking max alpha instead of blending, and use that for Hotseat - Fix folder open bounds on home screen when taskbar is present Test: Open folder from taskbar on home, can drag out items Bug: 182079330 Bug: 171917176 Change-Id: I7c1983e3219b1341cf233260f0ccac9051c4dc14 --- quickstep/res/layout/taskbar.xml | 3 +- .../launcher3/BaseQuickstepLauncher.java | 4 + .../launcher3/taskbar/TaskbarController.java | 85 +++++++++++++++---- .../launcher3/taskbar/TaskbarView.java | 22 ++++- .../launcher3/AbstractFloatingView.java | 3 + src/com/android/launcher3/DeviceProfile.java | 3 +- src/com/android/launcher3/Hotseat.java | 17 ++++ .../WorkspaceStateTransitionAnimation.java | 5 +- .../launcher3/util/MultiValueAlpha.java | 43 ++++++++-- 9 files changed, 158 insertions(+), 27 deletions(-) diff --git a/quickstep/res/layout/taskbar.xml b/quickstep/res/layout/taskbar.xml index b124b33290..84e23043b0 100644 --- a/quickstep/res/layout/taskbar.xml +++ b/quickstep/res/layout/taskbar.xml @@ -25,7 +25,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@color/taskbar_background" - android:gravity="center" - android:animateLayoutChanges="true"/> + android:gravity="center"/> \ No newline at end of file diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java index 641e108be5..ff47eae20c 100644 --- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java @@ -315,6 +315,10 @@ public abstract class BaseQuickstepLauncher extends Launcher @Override public void onDragLayerHierarchyChanged() { onLauncherStateOrFocusChanged(); + + if (mTaskbarController != null) { + mTaskbarController.onLauncherDragLayerHierarchyChanged(); + } } @Override diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java index 544835c317..d96cf7c854 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java @@ -19,6 +19,8 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; +import static com.android.launcher3.AbstractFloatingView.TYPE_ALL; +import static com.android.launcher3.AbstractFloatingView.TYPE_REPLACE_TASKBAR_WITH_HOTSEAT; import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.systemui.shared.system.WindowManagerWrapper.ITYPE_BOTTOM_TAPPABLE_ELEMENT; @@ -40,6 +42,7 @@ import androidx.annotation.Nullable; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.BaseQuickstepLauncher; +import com.android.launcher3.Hotseat; import com.android.launcher3.LauncherState; import com.android.launcher3.QuickstepAppTransitionManagerImpl; import com.android.launcher3.R; @@ -144,22 +147,13 @@ public class TaskbarController { ActivityManagerWrapper.getInstance().startActivityFromRecents(task.key, ActivityOptions.makeBasic()); } else if (tag instanceof FolderInfo) { - FolderIcon folderIcon = (FolderIcon) view; - Folder folder = folderIcon.getFolder(); - - setTaskbarWindowFullscreen(true); - - mTaskbarContainerView.post(() -> { - folder.animateOpen(); - - folder.iterateOverItems((itemInfo, itemView) -> { - itemView.setOnClickListener(getItemOnClickListener()); - itemView.setOnLongClickListener(getItemOnLongClickListener()); - // To play haptic when dragging, like other Taskbar items do. - itemView.setHapticFeedbackEnabled(true); - return false; - }); - }); + if (mLauncher.hasBeenResumed()) { + FolderInfo folderInfo = (FolderInfo) tag; + onClickedOnFolderFromHome(folderInfo); + } else { + FolderIcon folderIcon = (FolderIcon) view; + onClickedOnFolderInApp(folderIcon); + } } else { ItemClickHandler.INSTANCE.onClick(view); } @@ -169,6 +163,34 @@ public class TaskbarController { }; } + // Open the real folder in Launcher. + private void onClickedOnFolderFromHome(FolderInfo folderInfo) { + alignRealHotseatWithTaskbar(); + + FolderIcon folderIcon = (FolderIcon) mLauncher.getHotseat() + .getFirstItemMatch((info, v) -> info == folderInfo); + folderIcon.post(folderIcon::performClick); + } + + // Open the Taskbar folder, and handle clicks on folder items. + private void onClickedOnFolderInApp(FolderIcon folderIcon) { + Folder folder = folderIcon.getFolder(); + + setTaskbarWindowFullscreen(true); + + mTaskbarContainerView.post(() -> { + folder.animateOpen(); + + folder.iterateOverItems((itemInfo, itemView) -> { + itemView.setOnClickListener(getItemOnClickListener()); + itemView.setOnLongClickListener(getItemOnLongClickListener()); + // To play haptic when dragging, like other Taskbar items do. + itemView.setHapticFeedbackEnabled(true); + return false; + }); + }); + } + @Override public View.OnLongClickListener getItemOnLongClickListener() { return view -> { @@ -306,6 +328,7 @@ public class TaskbarController { mAnimator = createAnimToLauncher(null, duration); } else { mAnimator = createAnimToApp(duration); + replaceTaskbarWithHotseatOrViceVersa(); } mAnimator.addListener(new AnimatorListenerAdapter() { @Override @@ -355,6 +378,7 @@ public class TaskbarController { @Override public void onAnimationStart(Animator animation) { mTaskbarView.updateHotseatItemsVisibility(); + setReplaceTaskbarWithHotseat(false); } }); return anim.buildAnim(); @@ -451,6 +475,35 @@ public class TaskbarController { mTaskbarView.getHeight() - hotseatBounds.bottom); } + /** + * A view was added or removed from DragLayer, check if we need to hide our hotseat copy and + * show the real one instead. + */ + public void onLauncherDragLayerHierarchyChanged() { + replaceTaskbarWithHotseatOrViceVersa(); + } + + private void replaceTaskbarWithHotseatOrViceVersa() { + boolean replaceTaskbarWithHotseat = AbstractFloatingView.getTopOpenViewWithType(mLauncher, + TYPE_ALL & TYPE_REPLACE_TASKBAR_WITH_HOTSEAT) != null; + if (!mLauncher.hasBeenResumed()) { + replaceTaskbarWithHotseat = false; + } + setReplaceTaskbarWithHotseat(replaceTaskbarWithHotseat); + } + + private void setReplaceTaskbarWithHotseat(boolean replaceTaskbarWithHotseat) { + Hotseat hotseat = mLauncher.getHotseat(); + if (replaceTaskbarWithHotseat) { + alignRealHotseatWithTaskbar(); + hotseat.getReplaceTaskbarAlpha().setValue(1f); + mTaskbarView.setHotseatViewsHidden(true); + } else { + hotseat.getReplaceTaskbarAlpha().setValue(0f); + mTaskbarView.setHotseatViewsHidden(false); + } + } + private float getTaskbarScaleOnHome() { return 1f / mTaskbarContainerView.getTaskbarActivityContext().getTaskbarIconScale(); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java index a729e7799f..1d762e9696 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java @@ -15,6 +15,7 @@ */ package com.android.launcher3.taskbar; +import android.animation.LayoutTransition; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; @@ -63,6 +64,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa private TaskbarController.TaskbarViewCallbacks mControllerCallbacks; // Initialized in init(). + private LayoutTransition mLayoutTransition; private int mHotseatStartIndex; private int mHotseatEndIndex; private View mHotseatRecentsDivider; @@ -76,6 +78,7 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa private boolean mIsDraggingItem; // Only non-null when the corresponding Folder is open. private @Nullable FolderIcon mLeaveBehindFolderIcon; + private boolean mIsHotseatHidden; public TaskbarView(@NonNull Context context) { this(context, null); @@ -107,6 +110,9 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa } protected void init(int numHotseatIcons, int numRecentIcons) { + mLayoutTransition = new LayoutTransition(); + setLayoutTransitionsEnabled(true); + mHotseatStartIndex = 0; mHotseatEndIndex = mHotseatStartIndex + numHotseatIcons - 1; updateHotseatItems(new ItemInfo[numHotseatIcons]); @@ -119,6 +125,10 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa updateRecentTasks(new Task[numRecentIcons]); } + private void setLayoutTransitionsEnabled(boolean enabled) { + setLayoutTransition(enabled ? mLayoutTransition : null); + } + protected void cleanup() { removeAllViews(); } @@ -206,9 +216,19 @@ public class TaskbarView extends LinearLayout implements FolderIcon.FolderIconPa } } + /** + * Hides or shows the hotseat items immediately (without layout transitions). + */ + protected void setHotseatViewsHidden(boolean hidden) { + mIsHotseatHidden = hidden; + setLayoutTransitionsEnabled(false); + updateHotseatItemsVisibility(); + setLayoutTransitionsEnabled(true); + } + private void updateHotseatItemVisibility(View hotseatView) { if (hotseatView.getTag() != null) { - hotseatView.setVisibility(VISIBLE); + hotseatView.setVisibility(mIsHotseatHidden ? INVISIBLE : VISIBLE); } else { int oldVisibility = hotseatView.getVisibility(); int newVisibility = mControllerCallbacks.getEmptyHotseatViewVisibility(); diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index 95cdbdd147..e263c7af55 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -98,6 +98,9 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE | TYPE_SNACKBAR | TYPE_WIDGET_RESIZE_FRAME | TYPE_LISTENER; + // When these types of floating views are open, hide the taskbar hotseat and show the real one. + public static final int TYPE_REPLACE_TASKBAR_WITH_HOTSEAT = TYPE_FOLDER | TYPE_ACTION_POPUP; + public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_LISTENER & ~TYPE_ALL_APPS_EDU; diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 2440854028..fb7a99f433 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -708,10 +708,11 @@ public class DeviceProfile { mInsets.top + availableHeightPx); } else { // Folders should only appear below the drop target bar and above the hotseat + int hotseatTop = isTaskbarPresent ? taskbarSize : hotseatBarSizePx; return new Rect(mInsets.left + edgeMarginPx, mInsets.top + dropTargetBarSizePx + edgeMarginPx, mInsets.left + availableWidthPx - edgeMarginPx, - mInsets.top + availableHeightPx - hotseatBarSizePx + mInsets.top + availableHeightPx - hotseatTop - workspacePageIndicatorHeight - edgeMarginPx); } } diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index b2112ad83a..e5b75c1382 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -29,6 +29,7 @@ import android.widget.FrameLayout; import androidx.annotation.Nullable; import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.util.MultiValueAlpha; import java.util.function.Consumer; @@ -37,6 +38,10 @@ import java.util.function.Consumer; */ public class Hotseat extends CellLayout implements Insettable { + private static final int ALPHA_INDEX_STATE = 0; + private static final int ALPHA_INDEX_REPLACE_TASKBAR = 1; + private static final int NUM_ALPHA_CHANNELS = 2; + @ViewDebug.ExportedProperty(category = "launcher") private boolean mHasVerticalHotseat; private Workspace mWorkspace; @@ -44,6 +49,8 @@ public class Hotseat extends CellLayout implements Insettable { @Nullable private Consumer mOnVisibilityAggregatedCallback; + private final MultiValueAlpha mMultiValueAlpha; + public Hotseat(Context context) { this(context, null); } @@ -54,6 +61,8 @@ public class Hotseat extends CellLayout implements Insettable { public Hotseat(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); + mMultiValueAlpha = new MultiValueAlpha(this, NUM_ALPHA_CHANNELS, MultiValueAlpha.Mode.MAX); + mMultiValueAlpha.setUpdateVisibility(true); } /** @@ -174,4 +183,12 @@ public class Hotseat extends CellLayout implements Insettable { public View getFirstItemMatch(Workspace.ItemOperator itemOperator) { return mWorkspace.getFirstMatch(new CellLayout[] { this }, itemOperator); } + + public MultiValueAlpha.AlphaProperty getStateAlpha() { + return mMultiValueAlpha.getProperty(ALPHA_INDEX_STATE); + } + + public MultiValueAlpha.AlphaProperty getReplaceTaskbarAlpha() { + return mMultiValueAlpha.getProperty(ALPHA_INDEX_REPLACE_TASKBAR); + } } diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 660eeabbdc..d6d2f733c3 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -55,6 +55,7 @@ import com.android.launcher3.graphics.SysUiScrim; import com.android.launcher3.graphics.WorkspaceDragScrim; import com.android.launcher3.states.StateAnimationConfig; import com.android.launcher3.util.DynamicResource; +import com.android.launcher3.util.MultiValueAlpha; import com.android.systemui.plugins.ResourceProvider; /** @@ -143,8 +144,8 @@ public class WorkspaceStateTransitionAnimation { } float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0; - propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha, - config.getInterpolator(ANIM_HOTSEAT_FADE, fadeInterpolator)); + propertySetter.setFloat(hotseat.getStateAlpha(), MultiValueAlpha.VALUE, + hotseatIconsAlpha, config.getInterpolator(ANIM_HOTSEAT_FADE, fadeInterpolator)); float workspacePageIndicatorAlpha = (elements & WORKSPACE_PAGE_INDICATOR) != 0 ? 1 : 0; propertySetter.setViewAlpha(mLauncher.getWorkspace().getPageIndicator(), workspacePageIndicatorAlpha, fadeInterpolator); diff --git a/src/com/android/launcher3/util/MultiValueAlpha.java b/src/com/android/launcher3/util/MultiValueAlpha.java index 5be95292b4..c79b1f6c99 100644 --- a/src/com/android/launcher3/util/MultiValueAlpha.java +++ b/src/com/android/launcher3/util/MultiValueAlpha.java @@ -42,16 +42,49 @@ public class MultiValueAlpha { } }; + /** + * Determines how each alpha should factor into the final alpha. + */ + public enum Mode { + BLEND(1f) { + @Override + public float calculateNewAlpha(float currentAlpha, float otherAlpha) { + return currentAlpha * otherAlpha; + } + }, + + MAX(0f) { + @Override + public float calculateNewAlpha(float currentAlpha, float otherAlpha) { + return Math.max(currentAlpha, otherAlpha); + } + }; + + Mode(float startAlpha) { + mStartAlpha = startAlpha; + } + + protected final float mStartAlpha; + protected abstract float calculateNewAlpha(float currentAlpha, float otherAlpha); + } + private final View mView; private final AlphaProperty[] mMyProperties; + private final Mode mMode; private int mValidMask; // Whether we should change from INVISIBLE to VISIBLE and vice versa at low alpha values. private boolean mUpdateVisibility; public MultiValueAlpha(View view, int size) { + this(view, size, Mode.BLEND); + } + + public MultiValueAlpha(View view, int size, Mode mode) { mView = view; mMyProperties = new AlphaProperty[size]; + mMode = mode; + mView.setAlpha(mMode.mStartAlpha); mValidMask = 0; for (int i = 0; i < size; i++) { @@ -79,9 +112,9 @@ public class MultiValueAlpha { private final int mMyMask; - private float mValue = 1; + private float mValue = mMode.mStartAlpha; // Factor of all other alpha channels, only valid if mMyMask is present in mValidMask. - private float mOthers = 1; + private float mOthers = mMode.mStartAlpha; AlphaProperty(int myMask) { mMyMask = myMask; @@ -94,10 +127,10 @@ public class MultiValueAlpha { if ((mValidMask & mMyMask) == 0) { // Our cache value is not correct, recompute it. - mOthers = 1; + mOthers = mMode.mStartAlpha; for (AlphaProperty prop : mMyProperties) { if (prop != this) { - mOthers *= prop.mValue; + mOthers = mMode.calculateNewAlpha(mOthers, prop.mValue); } } } @@ -107,7 +140,7 @@ public class MultiValueAlpha { mValidMask = mMyMask; mValue = value; - mView.setAlpha(mOthers * mValue); + mView.setAlpha(mMode.calculateNewAlpha(mOthers, mValue)); if (mUpdateVisibility) { AlphaUpdateListener.updateVisibility(mView); } From 647baded97ea0835b53d5fc247126c5f69b85adb Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Fri, 12 Mar 2021 12:50:29 -0800 Subject: [PATCH 2/4] Make ENABLE_TASKBAR and ENABLE_OVERVIEW_GRID DebugFlags instead of DeviceFlags Test: reinstalled and flag values stayed the same and work Change-Id: Icd3d6a5333de29d0e054a7a2eed512bfbfa9d4e3 --- src/com/android/launcher3/config/FeatureFlags.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index e406e9b8d6..3657e892ad 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -198,10 +198,10 @@ public final class FeatureFlags { "ENABLE_APP_PREDICTIONS_WHILE_VISIBLE", true, "Allows app " + "predictions to be updated while they are visible to the user."); - public static final BooleanFlag ENABLE_TASKBAR = new DeviceFlag( + public static final BooleanFlag ENABLE_TASKBAR = getDebugFlag( "ENABLE_TASKBAR", false, "Allows a system Taskbar to be shown on larger devices."); - public static final BooleanFlag ENABLE_OVERVIEW_GRID = new DeviceFlag( + public static final BooleanFlag ENABLE_OVERVIEW_GRID = getDebugFlag( "ENABLE_OVERVIEW_GRID", false, "Uses grid overview layout. " + "Only applicable on large screen devices."); From e92a4add9938091ce3e193a56478fc7c872e6f3c Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Fri, 12 Mar 2021 15:30:41 -0500 Subject: [PATCH 3/4] Do not add arrow to OptionsPopupView. Bug: 175329686 Test: open home menu, notice no arrow open long press menu, notice arrow still visible Change-Id: I3f480d570b5134376324d4b8051da639ee8d8b27 --- .../android/launcher3/popup/ArrowPopup.java | 24 +++++++++++++++---- .../launcher3/views/OptionsPopupView.java | 5 ++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java index 5a34d2a74f..15915e5380 100644 --- a/src/com/android/launcher3/popup/ArrowPopup.java +++ b/src/com/android/launcher3/popup/ArrowPopup.java @@ -164,7 +164,9 @@ public abstract class ArrowPopup extends Abstrac reverseOrder(viewsToFlip); } onInflationComplete(reverseOrder); - addArrow(); + if (shouldAddArrow()) { + addArrow(); + } animateOpen(); } @@ -174,7 +176,9 @@ public abstract class ArrowPopup extends Abstrac protected void show() { setupForDisplay(); onInflationComplete(false); - addArrow(); + if (shouldAddArrow()) { + addArrow(); + } animateOpen(); } @@ -232,6 +236,13 @@ public abstract class ArrowPopup extends Abstrac mArrow.setPivotY(mIsAboveIcon ? mArrowHeight : 0); } + /** + * Returns whether or not we should add the arrow. + */ + protected boolean shouldAddArrow() { + return true; + } + /** * Provide the location of the target object relative to the dragLayer. */ @@ -392,13 +403,18 @@ public abstract class ArrowPopup extends Abstrac return getChildCount() > 0 ? getChildAt(0) : this; } + private int getArrowDuration() { + return shouldAddArrow() + ? getResources().getInteger(R.integer.config_popupArrowOpenCloseDuration) + : 0; + } private void animateOpen() { setVisibility(View.VISIBLE); final AnimatorSet openAnim = new AnimatorSet(); final Resources res = getResources(); final long revealDuration = (long) res.getInteger(R.integer.config_popupOpenCloseDuration); - final long arrowDuration = res.getInteger(R.integer.config_popupArrowOpenCloseDuration); + final long arrowDuration = getArrowDuration(); final TimeInterpolator revealInterpolator = ACCEL_DEACCEL; // Rectangular reveal. @@ -460,7 +476,7 @@ public abstract class ArrowPopup extends Abstrac final Resources res = getResources(); final TimeInterpolator revealInterpolator = ACCEL_DEACCEL; final long revealDuration = res.getInteger(R.integer.config_popupOpenCloseDuration); - final long arrowDuration = res.getInteger(R.integer.config_popupArrowOpenCloseDuration); + final long arrowDuration = getArrowDuration(); // Hide the arrow Animator scaleArrow = ObjectAnimator.ofFloat(mArrow, LauncherAnimUtils.SCALE_PROPERTY, 0) diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index 899dcf702b..1a114f3ce7 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -113,6 +113,11 @@ public class OptionsPopupView extends ArrowPopup return (type & TYPE_OPTIONS_POPUP) != 0; } + @Override + protected boolean shouldAddArrow() { + return false; + } + @Override protected void getTargetObjectLocation(Rect outPos) { mTargetRect.roundOut(outPos); From 68f7fbfb8286d954045f1fc561051838f3bef7cd Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 2 Feb 2021 23:29:09 -0800 Subject: [PATCH 4/4] Update calls to go through the feature interface instead of sysui proxy Bug: 180074017 Test: atest PinnedStackTests Test: Verify Pip works w/ launcher (shelf offsets, autoenter, etc) Change-Id: Ie41b0b77a7d5a79288af91f862e2a2cdda85fb66 --- .../launcher3/QuickstepTransitionManager.java | 2 +- .../com/android/quickstep/SystemUiProxy.java | 258 ++++++++++-------- .../quickstep/TouchInteractionService.java | 24 +- .../android/quickstep/views/RecentsView.java | 23 +- 4 files changed, 178 insertions(+), 129 deletions(-) diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index 343b87e735..f04c58d586 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -86,7 +86,6 @@ import com.android.quickstep.util.RemoteAnimationProvider; import com.android.quickstep.util.StaggeredWorkspaceAnim; import com.android.quickstep.util.SurfaceTransactionApplier; import com.android.quickstep.views.RecentsView; -import com.android.systemui.shared.recents.IStartingWindowListener; import com.android.systemui.shared.system.ActivityCompat; import com.android.systemui.shared.system.ActivityOptionsCompat; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; @@ -98,6 +97,7 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat; import com.android.systemui.shared.system.RemoteTransitionCompat; import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams; import com.android.systemui.shared.system.WindowManagerWrapper; +import com.android.wm.shell.startingsurface.IStartingWindowListener; import java.util.LinkedHashMap; diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 5668817da8..f25c358fea 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -35,12 +35,17 @@ import android.util.Log; import android.view.MotionEvent; import com.android.launcher3.util.MainThreadInitializedObject; -import com.android.systemui.shared.recents.IPinnedStackAnimationListener; -import com.android.systemui.shared.recents.ISplitScreenListener; -import com.android.systemui.shared.recents.IStartingWindowListener; import com.android.systemui.shared.recents.ISystemUiProxy; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.RemoteTransitionCompat; +import com.android.wm.shell.onehanded.IOneHanded; +import com.android.wm.shell.pip.IPip; +import com.android.wm.shell.pip.IPipAnimationListener; +import com.android.wm.shell.splitscreen.ISplitScreen; +import com.android.wm.shell.splitscreen.ISplitScreenListener; +import com.android.wm.shell.startingsurface.IStartingWindow; +import com.android.wm.shell.startingsurface.IStartingWindowListener; +import com.android.wm.shell.transition.IShellTransitions; /** * Holds the reference to SystemUI. @@ -52,8 +57,13 @@ public class SystemUiProxy implements ISystemUiProxy { new MainThreadInitializedObject<>(SystemUiProxy::new); private ISystemUiProxy mSystemUiProxy; + private IPip mPip; + private ISplitScreen mSplitScreen; + private IOneHanded mOneHanded; + private IShellTransitions mShellTransitions; + private IStartingWindow mStartingWindow; private final DeathRecipient mSystemUiProxyDeathRecipient = () -> { - MAIN_EXECUTOR.execute(() -> setProxy(null)); + MAIN_EXECUTOR.execute(() -> clearProxy()); }; // Used to dedupe calls to SystemUI @@ -75,12 +85,23 @@ public class SystemUiProxy implements ISystemUiProxy { return null; } - public void setProxy(ISystemUiProxy proxy) { + public void setProxy(ISystemUiProxy proxy, IPip pip, ISplitScreen splitScreen, + IOneHanded oneHanded, IShellTransitions shellTransitions, + IStartingWindow startingWindow) { unlinkToDeath(); mSystemUiProxy = proxy; + mPip = pip; + mSplitScreen = splitScreen; + mOneHanded = oneHanded; + mShellTransitions = shellTransitions; + mStartingWindow = startingWindow; linkToDeath(); } + public void clearProxy() { + setProxy(null, null, null, null, null, null); + } + // TODO(141886704): Find a way to remove this public void setLastSystemUiStateFlags(int stateFlags) { mLastSystemUiStateFlags = stateFlags; @@ -268,21 +289,6 @@ public class SystemUiProxy implements ISystemUiProxy { } } - @Override - public void setShelfHeight(boolean visible, int shelfHeight) { - boolean changed = visible != mLastShelfVisible || shelfHeight != mLastShelfHeight; - if (mSystemUiProxy != null && changed) { - mLastShelfVisible = visible; - mLastShelfHeight = shelfHeight; - try { - mSystemUiProxy.setShelfHeight(visible, shelfHeight); - } catch (RemoteException e) { - Log.w(TAG, "Failed call setShelfHeight visible: " + visible - + " height: " + shelfHeight, e); - } - } - } - @Override public void handleImageAsScreenshot(Bitmap bitmap, Rect rect, Insets insets, int i) { if (mSystemUiProxy != null) { @@ -319,20 +325,6 @@ public class SystemUiProxy implements ISystemUiProxy { } } - /** - * Sets listener to get pinned stack animation callbacks. - */ - @Override - public void setPinnedStackAnimationListener(IPinnedStackAnimationListener listener) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.setPinnedStackAnimationListener(listener); - } catch (RemoteException e) { - Log.w(TAG, "Failed call setPinnedStackAnimationListener", e); - } - } - } - @Override public void onQuickSwitchToNewTask(int rotation) { if (mSystemUiProxy != null) { @@ -357,28 +349,6 @@ public class SystemUiProxy implements ISystemUiProxy { } } - @Override - public void startOneHandedMode() { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.startOneHandedMode(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call startOneHandedMode", e); - } - } - } - - @Override - public void stopOneHandedMode() { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.stopOneHandedMode(); - } catch (RemoteException e) { - Log.w(TAG, "Failed call stopOneHandedMode", e); - } - } - } - @Override public void expandNotificationPanel() { if (mSystemUiProxy != null) { @@ -390,12 +360,45 @@ public class SystemUiProxy implements ISystemUiProxy { } } - @Override + // + // Pip + // + + /** + * Sets the shelf height. + */ + public void setShelfHeight(boolean visible, int shelfHeight) { + boolean changed = visible != mLastShelfVisible || shelfHeight != mLastShelfHeight; + if (mPip != null && changed) { + mLastShelfVisible = visible; + mLastShelfHeight = shelfHeight; + try { + mPip.setShelfHeight(visible, shelfHeight); + } catch (RemoteException e) { + Log.w(TAG, "Failed call setShelfHeight visible: " + visible + + " height: " + shelfHeight, e); + } + } + } + + /** + * Sets listener to get pinned stack animation callbacks. + */ + public void setPinnedStackAnimationListener(IPipAnimationListener listener) { + if (mPip != null) { + try { + mPip.setPinnedStackAnimationListener(listener); + } catch (RemoteException e) { + Log.w(TAG, "Failed call setPinnedStackAnimationListener", e); + } + } + } + public Rect startSwipePipToHome(ComponentName componentName, ActivityInfo activityInfo, PictureInPictureParams pictureInPictureParams, int launcherRotation, int shelfHeight) { - if (mSystemUiProxy != null) { + if (mPip != null) { try { - return mSystemUiProxy.startSwipePipToHome(componentName, activityInfo, + return mPip.startSwipePipToHome(componentName, activityInfo, pictureInPictureParams, launcherRotation, shelfHeight); } catch (RemoteException e) { Log.w(TAG, "Failed call startSwipePipToHome", e); @@ -404,111 +407,85 @@ public class SystemUiProxy implements ISystemUiProxy { return null; } - @Override public void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds) { - if (mSystemUiProxy != null) { + if (mPip != null) { try { - mSystemUiProxy.stopSwipePipToHome(componentName, destinationBounds); + mPip.stopSwipePipToHome(componentName, destinationBounds); } catch (RemoteException e) { Log.w(TAG, "Failed call stopSwipePipToHome"); } } } - @Override - public void registerRemoteTransition(RemoteTransitionCompat remoteTransition) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.registerRemoteTransition(remoteTransition); - } catch (RemoteException e) { - Log.w(TAG, "Failed call registerRemoteTransition"); - } - } - } + // + // Splitscreen + // - @Override - public void unregisterRemoteTransition(RemoteTransitionCompat remoteTransition) { - if (mSystemUiProxy != null) { - try { - mSystemUiProxy.unregisterRemoteTransition(remoteTransition); - } catch (RemoteException e) { - Log.w(TAG, "Failed call registerRemoteTransition"); - } - } - } - - @Override public void registerSplitScreenListener(ISplitScreenListener listener) { - if (mSystemUiProxy != null) { + if (mSplitScreen != null) { try { - mSystemUiProxy.registerSplitScreenListener(listener); + mSplitScreen.registerSplitScreenListener(listener); } catch (RemoteException e) { Log.w(TAG, "Failed call registerSplitScreenListener"); } } } - @Override public void unregisterSplitScreenListener(ISplitScreenListener listener) { - if (mSystemUiProxy != null) { + if (mSplitScreen != null) { try { - mSystemUiProxy.unregisterSplitScreenListener(listener); + mSplitScreen.unregisterSplitScreenListener(listener); } catch (RemoteException e) { Log.w(TAG, "Failed call unregisterSplitScreenListener"); } } } - @Override public void setSideStageVisibility(boolean visible) { - if (mSystemUiProxy != null) { + if (mSplitScreen != null) { try { - mSystemUiProxy.setSideStageVisibility(visible); + mSplitScreen.setSideStageVisibility(visible); } catch (RemoteException e) { Log.w(TAG, "Failed call setSideStageVisibility"); } } } - @Override public void exitSplitScreen() { - if (mSystemUiProxy != null) { + if (mSplitScreen != null) { try { - mSystemUiProxy.exitSplitScreen(); + mSplitScreen.exitSplitScreen(); } catch (RemoteException e) { Log.w(TAG, "Failed call exitSplitScreen"); } } } - @Override public void exitSplitScreenOnHide(boolean exitSplitScreenOnHide) { - if (mSystemUiProxy != null) { + if (mSplitScreen != null) { try { - mSystemUiProxy.exitSplitScreenOnHide(exitSplitScreenOnHide); + mSplitScreen.exitSplitScreenOnHide(exitSplitScreenOnHide); } catch (RemoteException e) { Log.w(TAG, "Failed call exitSplitScreen"); } } } - @Override public void startTask(int taskId, int stage, int position, Bundle options) { - if (mSystemUiProxy != null) { + if (mSplitScreen != null) { try { - mSystemUiProxy.startTask(taskId, stage, position, options); + mSplitScreen.startTask(taskId, stage, position, options); } catch (RemoteException e) { Log.w(TAG, "Failed call startTask"); } } } - @Override public void startShortcut(String packageName, String shortcutId, int stage, int position, Bundle options, UserHandle user) { - if (mSystemUiProxy != null) { + if (mSplitScreen != null) { try { - mSystemUiProxy.startShortcut(packageName, shortcutId, stage, position, options, + mSplitScreen.startShortcut(packageName, shortcutId, stage, position, options, user); } catch (RemoteException e) { Log.w(TAG, "Failed call startShortcut"); @@ -516,38 +493,87 @@ public class SystemUiProxy implements ISystemUiProxy { } } - @Override - public void startIntent(PendingIntent intent, Intent fillInIntent, int stage, - int position, Bundle options) { - if (mSystemUiProxy != null) { + public void startIntent(PendingIntent intent, Intent fillInIntent, int stage, int position, + Bundle options) { + if (mSplitScreen != null) { try { - mSystemUiProxy.startIntent(intent, fillInIntent, stage, position, - options); + mSplitScreen.startIntent(intent, fillInIntent, stage, position, options); } catch (RemoteException e) { Log.w(TAG, "Failed call startIntent"); } } } - @Override public void removeFromSideStage(int taskId) { - if (mSystemUiProxy != null) { + if (mSplitScreen != null) { try { - mSystemUiProxy.removeFromSideStage(taskId); + mSplitScreen.removeFromSideStage(taskId); } catch (RemoteException e) { Log.w(TAG, "Failed call removeFromSideStage"); } } } + // + // One handed + // + + public void startOneHandedMode() { + if (mOneHanded != null) { + try { + mOneHanded.startOneHanded(); + } catch (RemoteException e) { + Log.w(TAG, "Failed call startOneHandedMode", e); + } + } + } + + public void stopOneHandedMode() { + if (mOneHanded != null) { + try { + mOneHanded.stopOneHanded(); + } catch (RemoteException e) { + Log.w(TAG, "Failed call stopOneHandedMode", e); + } + } + } + + // + // Remote transitions + // + + public void registerRemoteTransition(RemoteTransitionCompat remoteTransition) { + if (mShellTransitions != null) { + try { + mShellTransitions.registerRemote(remoteTransition.getFilter(), + remoteTransition.getTransition()); + } catch (RemoteException e) { + Log.w(TAG, "Failed call registerRemoteTransition"); + } + } + } + + public void unregisterRemoteTransition(RemoteTransitionCompat remoteTransition) { + if (mShellTransitions != null) { + try { + mShellTransitions.unregisterRemote(remoteTransition.getTransition()); + } catch (RemoteException e) { + Log.w(TAG, "Failed call registerRemoteTransition"); + } + } + } + + // + // Starting window + // + /** * Sets listener to get callbacks when launching a task. */ - @Override public void setStartingWindowListener(IStartingWindowListener listener) { - if (mSystemUiProxy != null) { + if (mStartingWindow != null) { try { - mSystemUiProxy.setStartingWindowListener(listener); + mStartingWindow.setStartingWindowListener(listener); } catch (RemoteException e) { Log.w(TAG, "Failed call setStartingWindowListener", e); } diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index fc805d0794..1cb5f5d04e 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -24,6 +24,11 @@ import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.quickstep.GestureState.DEFAULT_STATE; import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE; +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.SYSUI_STATE_TRACING_ENABLED; @@ -101,6 +106,11 @@ import com.android.systemui.shared.system.InputChannelCompat.InputEventReceiver; import com.android.systemui.shared.system.InputConsumerController; import com.android.systemui.shared.system.InputMonitorCompat; import com.android.systemui.shared.tracing.ProtoTraceable; +import com.android.wm.shell.onehanded.IOneHanded; +import com.android.wm.shell.pip.IPip; +import com.android.wm.shell.splitscreen.ISplitScreen; +import com.android.wm.shell.startingsurface.IStartingWindow; +import com.android.wm.shell.transition.IShellTransitions; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -140,8 +150,18 @@ public class TouchInteractionService extends Service implements PluginListener { - SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy); + SystemUiProxy.INSTANCE.get(TouchInteractionService.this).setProxy(proxy, pip, + splitscreen, onehanded, shellTransitions, startingWindow); TouchInteractionService.this.initInputMonitor(); preloadOverview(true /* fromInit */); mDeviceState.runOnUserUnlocked(() -> { @@ -421,7 +441,7 @@ public class TouchInteractionService extends Service implements PluginListener extends PagedView } }; - private final PinnedStackAnimationListener mIPinnedStackAnimationListener = + private final PinnedStackAnimationListener mIPipAnimationListener = new PinnedStackAnimationListener(); // Used to keep track of the last requested task list id, so that we do not request to load the @@ -597,9 +598,9 @@ public abstract class RecentsView extends PagedView mLiveTileParams.setSyncTransactionApplier(mSyncTransactionApplier); RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this); mIdp.addOnChangeListener(this); - mIPinnedStackAnimationListener.setActivity(mActivity); + mIPipAnimationListener.setActivity(mActivity); SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener( - mIPinnedStackAnimationListener); + mIPipAnimationListener); mOrientationState.initListeners(); SplitScreenBounds.INSTANCE.addOnChangeListener(this); mTaskOverlayFactory.initListeners(); @@ -618,7 +619,7 @@ public abstract class RecentsView extends PagedView mIdp.removeOnChangeListener(this); SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(null); SplitScreenBounds.INSTANCE.removeOnChangeListener(this); - mIPinnedStackAnimationListener.setActivity(null); + mIPipAnimationListener.setActivity(null); mOrientationState.destroyListeners(); mTaskOverlayFactory.removeListeners(); } @@ -2922,7 +2923,7 @@ public abstract class RecentsView extends PagedView } private static class PinnedStackAnimationListener extends - IPinnedStackAnimationListener.Stub { + IPipAnimationListener.Stub { private T mActivity; public void setActivity(T activity) { @@ -2930,10 +2931,12 @@ public abstract class RecentsView extends PagedView } @Override - public void onPinnedStackAnimationStarted() { - // Needed for activities that auto-enter PiP, which will not trigger a remote - // animation to be created - mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS); + public void onPipAnimationStarted() { + MAIN_EXECUTOR.execute(() -> { + // Needed for activities that auto-enter PiP, which will not trigger a remote + // animation to be created + mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS); + }); } } }