diff options
author | Winson Chung <winsonc@google.com> | 2019-05-29 00:10:02 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-29 00:10:02 +0000 |
commit | 293d964024ba2107014d98bf15cbf876f84b2107 (patch) | |
tree | 8409bb5ffd6e8f4d906c87aa565e5e58cea7663d /quickstep/src | |
parent | 5860288fc85dd45cd58e85be5454c8191bd38e23 (diff) | |
parent | dd71ca04370a8885cfeeb1d2c6846f5299e8edcc (diff) | |
download | android_packages_apps_Trebuchet-293d964024ba2107014d98bf15cbf876f84b2107.tar.gz android_packages_apps_Trebuchet-293d964024ba2107014d98bf15cbf876f84b2107.tar.bz2 android_packages_apps_Trebuchet-293d964024ba2107014d98bf15cbf876f84b2107.zip |
Merge "Support individual lock task features" into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep/src')
3 files changed, 30 insertions, 1 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java index 0c29fcf5a..6030cea93 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java @@ -26,6 +26,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL; import static com.android.launcher3.anim.Interpolators.DEACCEL; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED; import android.animation.TimeInterpolator; import android.animation.ValueAnimator; @@ -46,9 +47,11 @@ import com.android.launcher3.touch.SwipeDetector; import com.android.launcher3.uioverrides.states.OverviewState; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; +import com.android.quickstep.OverviewInteractionState; import com.android.quickstep.RecentsModel; import com.android.quickstep.TouchInteractionService; import com.android.quickstep.util.LayoutUtils; +import com.android.systemui.shared.system.QuickStepContract; /** * Touch controller for handling various state transitions in portrait UI. @@ -135,7 +138,10 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr } else if (fromState == OVERVIEW) { return isDragTowardPositive ? ALL_APPS : NORMAL; } else if (fromState == NORMAL && isDragTowardPositive) { + int stateFlags = OverviewInteractionState.INSTANCE.get(mLauncher) + .getSystemUiStateFlags(); return mAllowDragToOverview && TouchInteractionService.isConnected() + && (stateFlags & SYSUI_STATE_OVERVIEW_DISABLED) == 0 ? OVERVIEW : ALL_APPS; } return fromState; diff --git a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java index a2f07e318..b5da836e6 100644 --- a/quickstep/src/com/android/quickstep/OverviewComponentObserver.java +++ b/quickstep/src/com/android/quickstep/OverviewComponentObserver.java @@ -22,6 +22,7 @@ import static android.content.Intent.ACTION_PACKAGE_REMOVED; import static com.android.launcher3.util.PackageManagerHelper.getPackageFilter; import static com.android.systemui.shared.system.PackageManagerWrapper.ACTION_PREFERRED_ACTIVITY_CHANGED; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -32,6 +33,7 @@ import android.content.pm.ResolveInfo; import com.android.systemui.shared.system.PackageManagerWrapper; +import com.android.systemui.shared.system.QuickStepContract; import java.util.ArrayList; /** @@ -56,6 +58,7 @@ public final class OverviewComponentObserver { private String mUpdateRegisteredPackage; private ActivityControlHelper mActivityControlHelper; private Intent mOverviewIntent; + private int mSystemUiStateFlags; public OverviewComponentObserver(Context context) { mContext = context; @@ -71,6 +74,15 @@ public final class OverviewComponentObserver { updateOverviewTargets(); } + public void onSystemUiStateChanged(int stateFlags) { + boolean homeDisabledChanged = (mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) + != (stateFlags & SYSUI_STATE_HOME_DISABLED); + mSystemUiStateFlags = stateFlags; + if (homeDisabledChanged) { + updateOverviewTargets(); + } + } + /** * Update overview intent and {@link ActivityControlHelper} based off the current launcher home * component. @@ -81,7 +93,8 @@ public final class OverviewComponentObserver { final String overviewIntentCategory; ComponentName overviewComponent; - if (defaultHome == null || mMyHomeComponent.equals(defaultHome)) { + if ((mSystemUiStateFlags & SYSUI_STATE_HOME_DISABLED) == 0 && + (defaultHome == null || mMyHomeComponent.equals(defaultHome))) { // User default home is same as out home app. Use Overview integrated in Launcher. overviewComponent = mMyHomeComponent; mActivityControlHelper = new LauncherActivityControllerHelper(); diff --git a/quickstep/src/com/android/quickstep/OverviewInteractionState.java b/quickstep/src/com/android/quickstep/OverviewInteractionState.java index 79d922c24..78b48d77a 100644 --- a/quickstep/src/com/android/quickstep/OverviewInteractionState.java +++ b/quickstep/src/com/android/quickstep/OverviewInteractionState.java @@ -53,6 +53,8 @@ public class OverviewInteractionState { private ISystemUiProxy mISystemUiProxy; private float mBackButtonAlpha = 1; + private int mSystemUiStateFlags; + private OverviewInteractionState(Context context) { mContext = context; @@ -83,6 +85,14 @@ public class OverviewInteractionState { mBgHandler.obtainMessage(MSG_SET_PROXY, proxy).sendToTarget(); } + public void setSystemUiStateFlags(int stateFlags) { + mSystemUiStateFlags = stateFlags; + } + + public int getSystemUiStateFlags() { + return mSystemUiStateFlags; + } + private boolean handleUiMessage(Message msg) { if (msg.what == MSG_SET_BACK_BUTTON_ALPHA) { mBackButtonAlpha = (float) msg.obj; |