Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ba1f809 authored by Steven Ng's avatar Steven Ng Committed by Automerger Merge Worker
Browse files

Merge "Remove drop target button drawable padding if text isn't hidden" into... 

Merge "Remove drop target button drawable padding if text isn't hidden" into sc-v2-dev am: 3de51d51 am: f7418f95

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15371938

Change-Id: I44c1e04eef206a4f26cbb0b7e9470fbf979e2017
parents a494c647 f7418f95

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,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>

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

src/com/android/launcher3/ButtonDropTarget.java

+6 −0
Original line number Diff line number Diff line
@@ -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
@@ -301,6 +305,8 @@ public abstract class ButtonDropTarget extends TextView 
            mTextVisible = isVisible;

            setText(newText);

            setCompoundDrawablesRelative(mDrawable, null, null, null);

            int drawablePadding = mTextVisible ? mDrawablePadding : 0;

            setCompoundDrawablePadding(drawablePadding);

        }

    }