diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2019-05-02 12:11:06 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2019-05-02 12:11:40 -0700 |
commit | 1f2bb9d0b7d7bd4878307f0ec635df2fe96fed7b (patch) | |
tree | 643c09dba1d76d565a88cf08640cdaf616e9387a /quickstep | |
parent | da9cf0f66b3595518edde8e53b40b0f0c67226c4 (diff) | |
download | android_packages_apps_Trebuchet-1f2bb9d0b7d7bd4878307f0ec635df2fe96fed7b.tar.gz android_packages_apps_Trebuchet-1f2bb9d0b7d7bd4878307f0ec635df2fe96fed7b.tar.bz2 android_packages_apps_Trebuchet-1f2bb9d0b7d7bd4878307f0ec635df2fe96fed7b.zip |
Updating the quickswitch direction in SEASCAPE
Change-Id: I9b4ff52971a70e2eae0567c2430916b0deaebd32
Diffstat (limited to 'quickstep')
3 files changed, 15 insertions, 12 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityInputConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityInputConsumer.java index 833a46845..7fc5d502f 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityInputConsumer.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/OtherActivityInputConsumer.java @@ -45,6 +45,7 @@ import android.view.ViewConfiguration; import android.view.WindowManager; import com.android.launcher3.R; +import com.android.launcher3.graphics.RotationMode; import com.android.launcher3.util.Preconditions; import com.android.launcher3.util.RaceConditionTracker; import com.android.launcher3.util.TraceHelper; @@ -164,8 +165,10 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC // Proxy events to recents view if (mPassedDragSlop && mInteractionHandler != null && !mRecentsViewDispatcher.hasConsumer()) { - mRecentsViewDispatcher.setConsumer(mInteractionHandler - .getRecentsViewDispatcher(isNavBarOnLeft() || isNavBarOnRight())); + mRecentsViewDispatcher.setConsumer(mInteractionHandler.getRecentsViewDispatcher( + isNavBarOnLeft() + ? RotationMode.SEASCAPE + : (isNavBarOnRight() ? RotationMode.LANDSCAPE : RotationMode.NORMAL))); } int edgeFlags = ev.getEdgeFlags(); ev.setEdgeFlags(edgeFlags | EDGE_NAV_BAR); @@ -402,15 +405,13 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC } private float getDisplacement(MotionEvent ev) { - final float displacement; if (isNavBarOnRight()) { - displacement = ev.getX() - mDownPos.x; + return ev.getX() - mDownPos.x; } else if (isNavBarOnLeft()) { - displacement = mDownPos.x - ev.getX(); + return mDownPos.x - ev.getX(); } else { - displacement = ev.getY() - mDownPos.y; + return ev.getY() - mDownPos.y; } - return displacement; } @Override diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java index 30fce527a..9c6102e22 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -77,6 +77,7 @@ import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimationSuccessListener; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.Interpolators; +import com.android.launcher3.graphics.RotationMode; import com.android.launcher3.logging.UserEventDispatcher; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch; @@ -533,8 +534,8 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> return TaskView.getCurveScaleForInterpolation(interpolation); } - public Consumer<MotionEvent> getRecentsViewDispatcher(boolean isTransposed) { - return mRecentsView != null ? mRecentsView.getEventDispatcher(isTransposed) : null; + public Consumer<MotionEvent> getRecentsViewDispatcher(RotationMode rotationMode) { + return mRecentsView != null ? mRecentsView.getEventDispatcher(rotationMode) : null; } @UiThread diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java index 2fdfda1c6..b5f90a555 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java @@ -83,6 +83,7 @@ import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PropertyListBuilder; import com.android.launcher3.anim.SpringObjectAnimator; import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.graphics.RotationMode; import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch; @@ -1641,10 +1642,10 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl return mClearAllButton; } - public Consumer<MotionEvent> getEventDispatcher(boolean isTransposed) { - if (isTransposed) { + public Consumer<MotionEvent> getEventDispatcher(RotationMode rotationMode) { + if (rotationMode.isTransposed) { Matrix transform = new Matrix(); - transform.setRotate(90); + transform.setRotate(-rotationMode.surfaceRotation); if (getWidth() > 0 && getHeight() > 0) { float scale = ((float) getWidth()) / getHeight(); |