diff options
author | Tony Wickham <twickham@google.com> | 2018-03-26 18:11:49 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-26 18:11:49 +0000 |
commit | 864ae5a2b39fe2b756bb2b28a672598dc88fa2ed (patch) | |
tree | 8e6fc89ab4854476a48b5ec35a890c03d3d3a3a9 /res | |
parent | f757f9cb17964dffa8bcd4a03ac9a22fbe514bed (diff) | |
parent | 7c3dd1f14ea4f7a155f1b613ee71a5f0efb5f4bc (diff) | |
download | android_packages_apps_Trebuchet-864ae5a2b39fe2b756bb2b28a672598dc88fa2ed.tar.gz android_packages_apps_Trebuchet-864ae5a2b39fe2b756bb2b28a672598dc88fa2ed.tar.bz2 android_packages_apps_Trebuchet-864ae5a2b39fe2b756bb2b28a672598dc88fa2ed.zip |
Merge "Add drag indicator to hotseat" into ub-launcher3-master
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/hotseat.xml | 10 | ||||
-rw-r--r-- | res/values/dimens.xml | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/res/layout/hotseat.xml b/res/layout/hotseat.xml index 73c0e523e..01cd92a63 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 b7e7ca1d2..3a06cdd81 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> |