diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-06-23 16:12:50 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-06-26 14:56:36 -0700 |
commit | 89d5c5a31bd6cf4caf815b680ec670896b91803d (patch) | |
tree | b9d0a9a9fd6dec880fb6076bc2b8d4f38870839f /res/layout/widgets_view.xml | |
parent | bbe504d24d5e0757d1a7772af822b7a6e274c9b4 (diff) | |
download | android_packages_apps_Trebuchet-89d5c5a31bd6cf4caf815b680ec670896b91803d.tar.gz android_packages_apps_Trebuchet-89d5c5a31bd6cf4caf815b680ec670896b91803d.tar.bz2 android_packages_apps_Trebuchet-89d5c5a31bd6cf4caf815b680ec670896b91803d.zip |
Updating fast scrollbar UI in Landscape
Creating a separate view for FastScrollBar and moving all the relavant logic in
the view.
For protrait, the touch handling is delegated by the recycler view just like before.
For landscape, the dcrollbar does not overlay with recyclerView and handles the touch
itself
Bug: 37015359
Change-Id: Ie1981326457ba739bdf0ac8063db1065f395f133
Diffstat (limited to 'res/layout/widgets_view.xml')
-rw-r--r-- | res/layout/widgets_view.xml | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml index 558556ad8..4f3c7c8df 100644 --- a/res/layout/widgets_view.xml +++ b/res/layout/widgets_view.xml @@ -23,25 +23,25 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:descendantFocusability="afterDescendants" - launcher:revealBackground="@drawable/round_rect_primary" - android:theme="?attr/widgetsTheme"> + android:theme="?attr/widgetsTheme" + launcher:revealBackground="@drawable/round_rect_primary"> <View android:id="@+id/reveal_view" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:focusable="false" android:elevation="2dp" + android:focusable="false" android:visibility="invisible" /> <FrameLayout android:id="@+id/main_content" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_gravity="center" android:elevation="15dp" - android:visibility="gone" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:visibility="gone"> <com.android.launcher3.widget.WidgetsRecyclerView android:id="@+id/widgets_list_view" @@ -50,17 +50,24 @@ <!-- Fast scroller popup --> <TextView - style="@style/FastScrollerPopup" android:id="@+id/fast_scroller_popup" + style="@style/FastScrollerPopup" android:layout_gravity="top|end" android:layout_marginEnd="@dimen/fastscroll_popup_margin" /> <ProgressBar + android:id="@+id/loader" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/loader" android:layout_gravity="center" /> - </FrameLayout> + <com.android.launcher3.views.RecyclerViewFastScroller + android:id="@+id/fast_scroller" + android:layout_width="@dimen/fastscroll_width" + android:layout_height="match_parent" + android:layout_gravity="end" + android:layout_marginEnd="@dimen/fastscroll_end_margin" /> + + </FrameLayout> </com.android.launcher3.widget.WidgetsContainerView>
\ No newline at end of file |