summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2015-12-10 15:39:19 -0800
committercretin45 <cretin45@gmail.com>2015-12-10 16:19:01 -0800
commitd8e89b7851586a46f67837e289f51d63a32b68a8 (patch)
treebf359b7542f3b4a88759eeb3bc63e4add7831aa7 /res
parent7600c7f3125a845ce6d4add4ceff90b884e1c033 (diff)
downloadandroid_packages_apps_Trebuchet-d8e89b7851586a46f67837e289f51d63a32b68a8.tar.gz
android_packages_apps_Trebuchet-d8e89b7851586a46f67837e289f51d63a32b68a8.tar.bz2
android_packages_apps_Trebuchet-d8e89b7851586a46f67837e289f51d63a32b68a8.zip
Trebuchet: Add scrubber to widget viewstaging/cm-13.0
Change-Id: I68711e95ed31a962b47e995e979e32de37570b44
Diffstat (limited to 'res')
-rw-r--r--res/layout/widgets_view.xml40
1 files changed, 24 insertions, 16 deletions
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