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

Commit eb5bc4f3 authored by Tyson Miller's avatar Tyson Miller
Browse files

Trebuchet: RemoteFolder: fix folder increasing top margin & adjust badge position 

Change-Id: Iea364efc9ab96df1f223ae2dcb9c0a64ac175bbf
parent 80d4ff8d

res/layout/user_folder.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    android:paddingStart="@dimen/folder_preview_padding"

    android:paddingEnd="@dimen/folder_preview_padding"

    android:paddingBottom="@dimen/folder_preview_padding"

    android:layout_marginBottom="@dimen/folder_margin"

    android:layout_margin="@dimen/folder_margin"

    android:layout_gravity="bottom|center_horizontal"

    android:background="@drawable/folder_bg">

res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ 
    <!-- Folder icon dimens -->

    <dimen name="folder_icon">64dp</dimen>

    <dimen name="folder_icon_app_preview">22dp</dimen>

    <dimen name="folder_icon_overlay_margin">10dp</dimen>



<!-- Sizes for managed profile badges -->

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

src/com/android/launcher3/Folder.java

+2 −0
Original line number Diff line number Diff line
@@ -1347,6 +1347,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList 
        int left = (grid.availableWidthPx - width) / 2;

        // Drop the top down a little so it isn't bounded by the page indicators

        int top = (int) (bounds.top + (bounds.height() * 1.15) - height);

        // Make sure the top margin stays consistent

        lp.topMargin = getResources().getDimensionPixelSize(R.dimen.folder_margin);



        if (width >= bounds.width()) {

            // If the folder doesn't fit within the bounds, center it about the desired bounds