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: 6cb7469564

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

Change-Id: I415ab087552478fe95d4055735300be1c77b01bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andrew Cole
2023-03-30 16:47:29 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 2 deletions

View File

@@ -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>

View File

@@ -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;
}
/**