diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-10-11 22:09:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-11 22:09:48 +0000 |
| commit | f8fa9e4124bccea8faa73726598cdf1f2dd78720 (patch) | |
| tree | b33819bafcd2fca1e782da4f62a3b10972662802 /res | |
| parent | 9c76a9cecedd1e33708aa6d19980cfc73ae2caf8 (diff) | |
| parent | 5d9fb0e92f2ef2b25f3aa93c1f89838ccc68aa88 (diff) | |
| download | android_packages_apps_Trebuchet-f8fa9e4124bccea8faa73726598cdf1f2dd78720.tar.gz android_packages_apps_Trebuchet-f8fa9e4124bccea8faa73726598cdf1f2dd78720.tar.bz2 android_packages_apps_Trebuchet-f8fa9e4124bccea8faa73726598cdf1f2dd78720.zip | |
Merge "Simplifying fast scroller logic" into ub-launcher3-master
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/all_apps.xml | 16 | ||||
| -rw-r--r-- | res/layout/widgets_view.xml | 16 | ||||
| -rw-r--r-- | res/values/dimens.xml | 1 |
3 files changed, 33 insertions, 0 deletions
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index 926883927..d48bd500e 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -55,6 +55,22 @@ android:focusable="true" android:theme="@style/CustomOverscroll.Light" /> + <!-- Fast scroller popup --> + <TextView + android:background="@drawable/container_fastscroll_popup_bg" + android:layout_width="@dimen/container_fastscroll_popup_size" + android:layout_height="@dimen/container_fastscroll_popup_size" + android:textSize="@dimen/container_fastscroll_popup_text_size" + android:layout_below="@+id/search_container" + android:id="@+id/fast_scroller_popup" + android:layout_alignParentEnd="true" + android:gravity="center" + android:alpha="0" + android:elevation="3dp" + android:saveEnabled="false" + android:layout_marginEnd="@dimen/container_fastscroll_popup_margin" + android:textColor="@android:color/white" /> + <FrameLayout android:id="@+id/search_container" android:layout_width="match_parent" diff --git a/res/layout/widgets_view.xml b/res/layout/widgets_view.xml index c4431be25..2cf951938 100644 --- a/res/layout/widgets_view.xml +++ b/res/layout/widgets_view.xml @@ -49,6 +49,22 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> + <!-- Fast scroller popup --> + <TextView + android:background="@drawable/container_fastscroll_popup_bg" + android:layout_width="@dimen/container_fastscroll_popup_size" + android:layout_height="@dimen/container_fastscroll_popup_size" + android:textSize="@dimen/container_fastscroll_popup_text_size" + android:layout_below="@+id/search_container" + android:id="@+id/fast_scroller_popup" + android:elevation="3dp" + android:gravity="center" + android:alpha="0" + android:saveEnabled="false" + android:layout_gravity="top|end" + android:layout_marginEnd="@dimen/container_fastscroll_popup_margin" + android:textColor="@android:color/white" /> + <ProgressBar android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 0616915e8..9967b7ea0 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -54,6 +54,7 @@ <dimen name="container_fastscroll_thumb_min_width">5dp</dimen> <dimen name="container_fastscroll_thumb_max_width">9dp</dimen> + <dimen name="container_fastscroll_popup_margin">18dp</dimen> <dimen name="container_fastscroll_thumb_height">72dp</dimen> <dimen name="container_fastscroll_thumb_touch_inset">-24dp</dimen> <dimen name="container_fastscroll_popup_size">72dp</dimen> |