From 79a352169f0197f5d0ea2be32cd8cf2f7dbef1ad Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 9 Mar 2020 16:31:21 -0700
Subject: [PATCH] Show drag handle indictor in 2 zone model

Note this is just the tiny arrow we show in accessibility mode, will
probably need to get some updated visual treatment going forward.

Bug: 143361609
Change-Id: I65975727f101984429aadc35a650826e36d9c9aa
---
 .../src/com/android/quickstep/views/ShelfScrimView.java    | 7 +++++++
 src/com/android/launcher3/views/ScrimView.java             | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
index 1ce3549f39..14c458ed53 100644
--- a/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
+++ b/quickstep/src/com/android/quickstep/views/ShelfScrimView.java
@@ -237,6 +237,13 @@ public class ShelfScrimView extends ScrimView<BaseQuickstepLauncher>
         }
     }
 
+    @Override
+    protected boolean shouldDragHandleBeVisible() {
+        boolean twoZoneSwipeModel = FeatureFlags.ENABLE_OVERVIEW_ACTIONS.get()
+                && SysUINavigationMode.removeShelfFromOverview(mLauncher);
+        return twoZoneSwipeModel || super.shouldDragHandleBeVisible();
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         drawBackground(canvas);
diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java
index 8ce98f2777..70d6c7e6a8 100644
--- a/src/com/android/launcher3/views/ScrimView.java
+++ b/src/com/android/launcher3/views/ScrimView.java
@@ -336,7 +336,7 @@ public class ScrimView<T extends Launcher> extends View implements Insettable, O
     }
 
     private void updateDragHandleVisibility(Drawable recycle) {
-        boolean visible = mLauncher.getDeviceProfile().isVerticalBarLayout() || mAM.isEnabled();
+        boolean visible = shouldDragHandleBeVisible();
         boolean wasVisible = mDragHandle != null;
         if (visible != wasVisible) {
             if (visible) {
@@ -352,6 +352,10 @@ public class ScrimView<T extends Launcher> extends View implements Insettable, O
         }
     }
 
+    protected boolean shouldDragHandleBeVisible() {
+        return mLauncher.getDeviceProfile().isVerticalBarLayout() || mAM.isEnabled();
+    }
+
     @Override
     public boolean dispatchHoverEvent(MotionEvent event) {
         return mAccessibilityHelper.dispatchHoverEvent(event) || super.dispatchHoverEvent(event);