From d8e89b7851586a46f67837e289f51d63a32b68a8 Mon Sep 17 00:00:00 2001
From: cretin45 <cretin45@gmail.com>
Date: Thu, 10 Dec 2015 15:39:19 -0800
Subject: Trebuchet: Add scrubber to widget view

Change-Id: I68711e95ed31a962b47e995e979e32de37570b44
---
 res/layout/widgets_view.xml | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'res')

diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml
index 1f276adb9..5d9702158 100644
--- a/res/layout/widgets_view.xml
+++ b/res/layout/widgets_view.xml
@@ -21,8 +21,7 @@
     android:id="@+id/widgets_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:descendantFocusability="afterDescendants">
+    android:orientation="vertical">
 
     <FrameLayout
         android:id="@+id/content"
@@ -37,24 +36,33 @@
             android:elevation="2dp"
             android:visibility="invisible" />
 
-        <!-- DO NOT CHANGE THE ID -->
-        <com.android.launcher3.widget.WidgetsRecyclerView
-            android:id="@+id/widgets_list_view"
-            android:theme="@style/Theme.Dark.CustomOverscroll"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_gravity="center"
             android:elevation="15dp"
-            android:visibility="gone" />
+            android:focusable="true"
+            android:focusableInTouchMode="true">
 
-        <ViewStub
-            android:id="@+id/scrubber_container_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/scrubber_container"
-            android:layout="@layout/scrubber_container"
-            android:layout_gravity="bottom"
-            android:clipToPadding="false"/>
+            <!-- DO NOT CHANGE THE ID -->
+            <com.android.launcher3.widget.WidgetsRecyclerView
+                android:id="@+id/widgets_list_view"
+                android:theme="@style/Theme.Dark.CustomOverscroll"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:visibility="gone"
+                android:descendantFocusability="afterDescendants"/>
+
+            <ViewStub
+                android:id="@+id/scrubber_container_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inflatedId="@+id/scrubber_container"
+                android:layout="@layout/scrubber_container"
+                android:layout_gravity="bottom"
+                android:clipToPadding="false"/>
+
+        </FrameLayout>
     </FrameLayout>
 
 </com.android.launcher3.widget.WidgetsContainerView>
\ No newline at end of file
-- 
cgit v1.2.3