From 7c3dd1f14ea4f7a155f1b613ee71a5f0efb5f4bc Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 23 Mar 2018 17:34:04 -0700
Subject: [PATCH] Add drag indicator to hotseat

Change-Id: Iad5b08ad290f07c6cdd3c9091e160b5af859859e
---
 res/layout/hotseat.xml                                 | 10 ++++++++++
 res/values/dimens.xml                                  |  1 +
 .../com/android/launcher3/uioverrides/UiFactory.java   |  5 ++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/res/layout/hotseat.xml b/res/layout/hotseat.xml
index 73c0e523e2..01cd92a63d 100644
--- a/res/layout/hotseat.xml
+++ b/res/layout/hotseat.xml
@@ -17,6 +17,16 @@
     android:theme="@style/HomeScreenElementTheme"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto">
+
+    <ImageView
+        android:id="@+id/drag_indicator"
+        android:layout_width="@dimen/hotseat_drag_indicator_height"
+        android:layout_height="@dimen/hotseat_drag_indicator_height"
+        android:src="@drawable/ic_drag_indicator"
+        android:tint="?attr/workspaceTextColor"
+        android:scaleType="centerInside"
+        android:layout_gravity="top|center_horizontal"/>
+
     <com.android.launcher3.CellLayout
         android:id="@+id/layout"
         android:layout_width="wrap_content"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b7e7ca1d2c..3a06cdd815 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -37,6 +37,7 @@
     <dimen name="dynamic_grid_hotseat_bottom_padding">2dp</dimen>
     <dimen name="dynamic_grid_hotseat_size">80dp</dimen>
     <dimen name="dynamic_grid_hotseat_side_padding">0dp</dimen>
+    <dimen name="hotseat_drag_indicator_height">24dp</dimen>
 
     <!-- Hotseat/all-apps scrim -->
     <dimen name="all_apps_scrim_radius">8dp</dimen>
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java b/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java
index 94abcce57e..2f1de7bf64 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java
@@ -22,6 +22,7 @@ import android.view.View.AccessibilityDelegate;
 import com.android.launcher3.Hotseat;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.LauncherStateManager.StateHandler;
+import com.android.launcher3.R;
 import com.android.launcher3.util.TouchController;
 
 public class UiFactory {
@@ -49,6 +50,8 @@ public class UiFactory {
     public static void onTrimMemory(Launcher launcher, int level) { }
 
     public static View[] getHotseatExtraContent(Hotseat hotseat) {
-        return new View[0];
+        return new View[] {
+            hotseat.findViewById(R.id.drag_indicator),
+        };
     }
 }