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

Commit d1c0d5c0 authored by Andrew Cole's avatar Andrew Cole Committed by Automerger Merge Worker
Browse files

Merge "Fixing an issue with the drop target font becoming very small for... 

Merge "Fixing an issue with the drop target font becoming very small for removing and uninstalling. I also verified that this doesnt break a fix presented in b/264732627" into tm-qpr-dev am: 6cb74695 am: 67f44682

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



Change-Id: I27d4ed2572abc6b4bd4e445b56cc9348dcb88fb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6468ce77 67f44682

res/values-sw720dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <dimen name="drop_target_text_size">20sp</dimen>

    <dimen name="dynamic_grid_drop_target_size">72dp</dimen>

    <dimen name="drop_target_button_drawable_horizontal_padding">24dp</dimen>

    <dimen name="drop_target_button_drawable_vertical_padding">20dp</dimen>

    <dimen name="drop_target_button_drawable_vertical_padding">8dp</dimen>

    <dimen name="drop_target_button_gap">32dp</dimen>

    <dimen name="drop_target_button_workspace_edge_gap">32dp</dimen>

    <dimen name="drop_target_top_margin">110dp</dimen>

src/com/android/launcher3/ButtonDropTarget.java

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ public abstract class ButtonDropTarget extends TextView 
        getPaint().getTextBounds(mText.toString(), 0, mText.length(), mTempRect);

        // Add bounds bottom to height, as text bounds height measures from the text baseline and

        // above, which characters can descend below

        return mTempRect.bottom + mTempRect.height() <= availableHeight;

        return mTempRect.bottom + mTempRect.height() >= availableHeight;

    }



    /**