diff options
| author | Steven Ng <stevenckng@google.com> | 2021-09-24 10:32:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-09-24 10:32:27 +0000 |
| commit | d3140cdbc06491319d15576ee59eecb37586c98a (patch) | |
| tree | d8b4ed5511039232ba93013513ca39a6e87d3010 | |
| parent | b4585414702a52e04526609c62555eec5f86c3e5 (diff) | |
| parent | 658a58674accd827d58864467eced49fb0c9f663 (diff) | |
| download | Launcher3-d3140cdbc06491319d15576ee59eecb37586c98a.tar.gz | |
Merge "Remove drop target button drawable padding if text is hidden" into sc-qpr1-dev
| -rw-r--r-- | res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/ButtonDropTarget.java | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 37c4bed37b..a1e4cd9bb4 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -197,6 +197,7 @@ <dimen name="drop_target_text_size">16sp</dimen> <dimen name="drop_target_shadow_elevation">2dp</dimen> <dimen name="drop_target_bar_margin_horizontal">4dp</dimen> + <dimen name="drop_target_button_drawable_padding">8dp</dimen> <!-- the distance an icon must be dragged before button drop targets accept it --> <dimen name="drag_distanceThreshold">30dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index e4a245a5c2..b7661b9798 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -259,7 +259,7 @@ <!-- Drop targets --> <style name="DropTargetButtonBase" parent="@android:style/TextAppearance.DeviceDefault"> - <item name="android:drawablePadding">8dp</item> + <item name="android:drawablePadding">@dimen/drop_target_button_drawable_padding</item> <item name="android:padding">14dp</item> <item name="android:textColor">@color/drop_target_text</item> <item name="android:textSize">@dimen/drop_target_text_size</item> diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 61b5564941..bc4c982e4e 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -66,6 +66,8 @@ public abstract class ButtonDropTarget extends TextView private final int mDragDistanceThreshold; /** The size of the drawable shown in the drop target. */ private final int mDrawableSize; + /** The padding, in pixels, between the text and drawable. */ + private final int mDrawablePadding; protected CharSequence mText; protected Drawable mDrawable; @@ -85,6 +87,8 @@ public abstract class ButtonDropTarget extends TextView Resources resources = getResources(); mDragDistanceThreshold = resources.getDimensionPixelSize(R.dimen.drag_distanceThreshold); mDrawableSize = resources.getDimensionPixelSize(R.dimen.drop_target_text_size); + mDrawablePadding = resources.getDimensionPixelSize( + R.dimen.drop_target_button_drawable_padding); } @Override @@ -303,6 +307,8 @@ public abstract class ButtonDropTarget extends TextView mTextVisible = isVisible; setText(newText); setCompoundDrawablesRelative(mDrawable, null, null, null); + int drawablePadding = mTextVisible ? mDrawablePadding : 0; + setCompoundDrawablePadding(drawablePadding); } } |