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

Commit f2974a5c authored by Jonathan Miranda's avatar Jonathan Miranda
Browse files

[automerger] Revert "Update Folders to match spec." am: 9ad87463 

Change-Id: I75ad19eba41a0bab0461a0255954092a4790c617
parents cab2e0e8 9ad87463

res/layout/folder_application.xml

+1 −6
Original line number Diff line number Diff line
@@ -19,9 +19,4 @@ 
    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    style="@style/BaseIcon"

    android:includeFontPadding="false"

    android:paddingLeft="@dimen/folder_cell_x_padding"

    android:paddingTop="@dimen/folder_cell_y_padding"

    android:paddingRight="@dimen/folder_cell_x_padding"

    android:paddingBottom="@dimen/folder_cell_y_padding"

    launcher:centerVertically="true"

    launcher:iconDisplay="folder" />

res/values/dimens.xml

+3 −4
Original line number Diff line number Diff line
@@ -138,11 +138,10 @@ 
    <dimen name="folder_preview_padding">10dp</dimen>

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



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

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

    <dimen name="folder_cell_x_padding">9dp</dimen>

    <dimen name="folder_cell_y_padding">6dp</dimen>

    <dimen name="folder_child_text_size">13sp</dimen>

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

    <dimen name="folder_label_padding_top">12dp</dimen>

    <dimen name="folder_label_padding_top">4dp</dimen>

    <dimen name="folder_label_padding_bottom">12dp</dimen>

    <dimen name="folder_label_text_size">14sp</dimen>

src/com/android/launcher3/DeviceProfile.java

+3 −7
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ public class DeviceProfile { 
    public int folderChildIconSizePx;

    public int folderChildTextSizePx;

    public int folderChildDrawablePaddingPx;

    public final int folderChildDrawablePaddingOriginalPx;



    // Hotseat

    public int hotseatCellHeightPx;
@@ -221,9 +220,6 @@ public class DeviceProfile { 
        hotseatLandRightNavBarGutterPx = res.getDimensionPixelSize(

                R.dimen.dynamic_grid_hotseat_land_right_nav_bar_gutter_width);



        folderChildDrawablePaddingOriginalPx =

                res.getDimensionPixelSize(R.dimen.folder_child_icon_drawable_padding);



        // Determine sizes.

        widthPx = width;

        heightPx = height;
@@ -403,15 +399,15 @@ public class DeviceProfile { 
        folderChildIconSizePx = (int) (Utilities.pxFromDp(inv.iconSize, dm) * scale);

        folderChildTextSizePx =

                (int) (res.getDimensionPixelSize(R.dimen.folder_child_text_size) * scale);

        folderChildDrawablePaddingPx = (int) (folderChildDrawablePaddingOriginalPx * scale);



        int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx);

        int cellPaddingX = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_x_padding) * scale);

        int cellPaddingY = (int) (res.getDimensionPixelSize(R.dimen.folder_cell_y_padding) * scale);



        folderCellWidthPx = folderChildIconSizePx + 2 * cellPaddingX;

        folderCellHeightPx = folderChildIconSizePx + 2 * cellPaddingY + textHeight

                + folderChildDrawablePaddingPx;

        folderCellHeightPx = folderChildIconSizePx + 2 * cellPaddingY + textHeight;

        folderChildDrawablePaddingPx = Math.max(0,

                (folderCellHeightPx - folderChildIconSizePx - textHeight) / 3);

    }



    public void updateInsets(Rect insets) {

src/com/android/launcher3/folder/FolderAnimationManager.java

+3 −6
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ public class FolderAnimationManager { 
        final DragLayer.LayoutParams lp = (DragLayer.LayoutParams) mFolder.getLayoutParams();

        FolderIcon.PreviewLayoutRule rule = mFolderIcon.getLayoutRule();

        final List<BubbleTextView> itemsInPreview = mFolderIcon.getPreviewItems();

        BubbleTextView btv = itemsInPreview.get(0);



        // Match position of the FolderIcon

        final Rect folderIconPos = new Rect();
@@ -132,7 +131,7 @@ public class FolderAnimationManager { 
        // Match size/scale of icons in the preview

        float previewScale = rule.scaleForItem(0, itemsInPreview.size());

        float previewSize = rule.getIconSize() * previewScale;

        float initialScale = previewSize / btv.getIconSize()

        float initialScale = previewSize / itemsInPreview.get(0).getIconSize()

                * scaleRelativeToDragLayer;

        final float finalScale = 1f;

        float scale = mIsOpening ? initialScale : finalScale;
@@ -149,12 +148,10 @@ public class FolderAnimationManager { 
            previewItemOffsetX = (int) (lp.width * initialScale - initialSize - previewItemOffsetX);

        }



        // Note that we do not include btv.getPaddingLeft() in the calculation, since it is

        // handled in addPreviewItemAnimators as part of iconOffsetX.

        final int paddingOffsetX = (int) ((mFolder.getPaddingLeft() + mContent.getPaddingLeft())

                * initialScale);

        final int paddingOffsetY = (int) ((mFolder.getPaddingTop() + mContent.getPaddingTop()

                + btv.getPaddingTop()) * initialScale);

        final int paddingOffsetY = (int) ((mFolder.getPaddingTop() + mContent.getPaddingTop())

                * initialScale);



        int initialX = folderIconPos.left + mPreviewBackground.getOffsetX() - paddingOffsetX

                - previewItemOffsetX;