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

Commit 1b5efa32 authored by Alina Zaidi's avatar Alina Zaidi
Browse files

Reduce margin for DropTargetBar to avoid buttons to be truncated. 

Bug: 187036287
Test: Tested manually by QA testing team on 4X5 grid size
Change-Id: Iaa4cd3e464ccf50427a5aa96d97093601e1d2948
parent b31d55d9

res/values-sw340dp/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,6 +19,5 @@ 


    <!-- Drag padding to add to the bottom of drop targets -->

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

    <dimen name="drop_target_text_size">16sp</dimen>



</resources>
 
 No newline at end of file

res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -189,8 +189,9 @@ 
<!-- Dragging -->

    <!-- Drag padding to add to the bottom of drop targets -->

    <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_bar_margin_horizontal">4dp</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
@@ -258,7 +258,7 @@ 
    <!-- Drop targets -->

    <style name="DropTargetButtonBase" parent="@android:style/TextAppearance.DeviceDefault">

        <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:textSize">@dimen/drop_target_text_size</item>

        <item name="android:singleLine">true</item>

src/com/android/launcher3/DropTargetBar.java

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ public class DropTargetBar extends FrameLayout 
                        / (2 * (grid.inv.numColumns + 1)))

                        + grid.edgeMarginPx;

            } 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;