From c08253f3dfe0e7eeb3d4f23c84d3520e2911c2a1 Mon Sep 17 00:00:00 2001 From: ryanlwlin Date: Mon, 3 May 2021 19:43:38 +0800 Subject: [PATCH 01/20] Do not detect system gesture with new system ui state flag If the device is in 2-button or gesturl navgiation mode, touch events will be cancelled in the nav bar area. It leads to that users couldn't drag the window magnification via draghandle. To fix it, we add a new system ui state flag to stop detecting system gesture if it is set to true. This flag should be set only when the window magnification is overlapped with the nav bar from windowinsets. Bug: 179648683 Test: manually test Change-Id: I978a4b7d631e4115b293d341a89baee151c2881a --- .../src/com/android/quickstep/RecentsAnimationDeviceState.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index e271203d18..42b58c7ab5 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -31,6 +31,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_GLOBAL_ACTIONS_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_MAGNIFICATION_OVERLAP; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ONE_HANDED_ACTIVE; @@ -405,6 +406,7 @@ public class RecentsAnimationDeviceState implements return canStartWithNavHidden && (mSystemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED) == 0 && (mSystemUiStateFlags & SYSUI_STATE_QUICK_SETTINGS_EXPANDED) == 0 + && (mSystemUiStateFlags & SYSUI_STATE_MAGNIFICATION_OVERLAP) == 0 && ((mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0 || (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0); } From f4f0c4d82a993b73b0afe90bdfb1d14026625401 Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Wed, 5 May 2021 10:28:05 -0700 Subject: [PATCH 02/20] Prevent thumbnails from shifting if placeholder view doesn't overlap Always shift thumbnails when in phone mode. Bug: 181705607 Test: Placeholder view didn't shift when no thumbnails underneath it in portrait. Change-Id: Ib2f066fdf17134b3f5bbd9b465b87868e9ce7583 --- .../BaseRecentsViewStateController.java | 2 +- .../states/SplitScreenSelectState.java | 7 +++- .../android/quickstep/views/RecentsView.java | 42 +++++++++++++++++++ src/com/android/launcher3/LauncherState.java | 6 +-- 4 files changed, 51 insertions(+), 6 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java index e508690113..2eb19ec146 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java @@ -105,7 +105,7 @@ public abstract class BaseRecentsViewStateController TASK_PRIMARY_SPLIT_TRANSLATION, TASK_SECONDARY_SPLIT_TRANSLATION, mLauncher.getDeviceProfile()); setter.setFloat(mRecentsView, taskViewsFloat, - toState.getOverviewSecondaryTranslation(mLauncher), LINEAR); + toState.getSplitSelectTranslation(mLauncher), LINEAR); setter.setFloat(mRecentsView, getContentAlphaProperty(), toState.overviewUi ? 1 : 0, config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT)); diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java b/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java index 722d74a55a..6968494b0f 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java @@ -41,11 +41,14 @@ public class SplitScreenSelectState extends OverviewState { } @Override - public float getOverviewSecondaryTranslation(Launcher launcher) { + public float getSplitSelectTranslation(Launcher launcher) { RecentsView recentsView = launcher.getOverviewPanel(); - PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler(); int splitPosition = recentsView.getSplitPlaceholder().getSplitController() .getActiveSplitPositionOption().mStagePosition; + if (!recentsView.shouldShiftThumbnailsForSplitSelect(splitPosition)) { + return 0f; + } + PagedOrientationHandler orientationHandler = recentsView.getPagedOrientationHandler(); int direction = orientationHandler.getSplitTranslationDirectionFactor(splitPosition); return launcher.getResources().getDimension(R.dimen.split_placeholder_size) * direction; } diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index a04b886bd4..cf94d680e2 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -124,6 +124,7 @@ import com.android.launcher3.util.DynamicResource; import com.android.launcher3.util.IntSet; import com.android.launcher3.util.MultiValueAlpha; import com.android.launcher3.util.ResourceBasedOverride.Overrides; +import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.launcher3.util.Themes; import com.android.launcher3.util.TranslateEdgeEffect; @@ -2367,6 +2368,47 @@ public abstract class RecentsView