PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reduce margin for DropTargetBar to avoid buttons to be truncated." into sc-dev

Browse Source
This commit is contained in:
Alina Zaidi
2021-07-01 11:10:26 +00:00
committed by Android (Google) Code Review
parent d9128413cc 1b5efa3216
commit eefccccb19
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/values-sw340dp/dimens.xml
-1
View File
@@ -19,6 +19,5 @@
<!-- Drag padding to add to the bottom of drop targets --> <!-- Drag padding to add to the bottom of drop targets -->
<dimen name="drop_target_drag_padding">20dp</dimen> <dimen name="drop_target_drag_padding">20dp</dimen>
<dimen name="drop_target_text_size">16sp</dimen>
</resources> </resources>
res/values/dimens.xml
+2 -1
View File
@@ -189,8 +189,9 @@
<!-- Dragging --> <!-- Dragging -->
<!-- Drag padding to add to the bottom of drop targets --> <!-- Drag padding to add to the bottom of drop targets -->
<dimen name="drop_target_drag_padding">14dp</dimen> <dimen name="drop_target_drag_padding">14dp</dimen>
<dimen name="drop_target_text_size">20sp</dimen> <dimen name="drop_target_text_size">16sp</dimen>
<dimen name="drop_target_shadow_elevation">2dp</dimen> <dimen name="drop_target_shadow_elevation">2dp</dimen>
<dimen name="drop_target_bar_margin_horizontal">4dp</dimen>
<!-- the distance an icon must be dragged before button drop targets accept it --> <!-- the distance an icon must be dragged before button drop targets accept it -->
<dimen name="drag_distanceThreshold">30dp</dimen> <dimen name="drag_distanceThreshold">30dp</dimen>
res/values/styles.xml
+1 -1
View File
@@ -258,7 +258,7 @@
<!-- Drop targets --> <!-- Drop targets -->
<style name="DropTargetButtonBase" parent="@android:style/TextAppearance.DeviceDefault"> <style name="DropTargetButtonBase" parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:drawablePadding">8dp</item> <item name="android:drawablePadding">8dp</item>
<item name="android:padding">16dp</item> <item name="android:padding">14dp</item>
<item name="android:textColor">@color/drop_target_text</item> <item name="android:textColor">@color/drop_target_text</item>
<item name="android:textSize">@dimen/drop_target_text_size</item> <item name="android:textSize">@dimen/drop_target_text_size</item>
<item name="android:singleLine">true</item> <item name="android:singleLine">true</item>
src/com/android/launcher3/DropTargetBar.java
+2 -1
View File
@@ -105,7 +105,8 @@ public class DropTargetBar extends FrameLayout
/ (2 * (grid.inv.numColumns + 1))) / (2 * (grid.inv.numColumns + 1)))
+ grid.edgeMarginPx; + grid.edgeMarginPx;
} else { } else {
gap = grid.desiredWorkspaceLeftRightMarginPx - grid.inv.defaultWidgetPadding.right; gap = getContext().getResources()
.getDimensionPixelSize(R.dimen.drop_target_bar_margin_horizontal);
} }
lp.width = grid.availableWidthPx - 2 * gap; lp.width = grid.availableWidthPx - 2 * gap;