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

Commit 26311d98 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

Merge "Update folder to new specs." into sc-dev

parents 2db3ded7 22679f88

res/layout/user_folder_icon_normalized.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
        android:clipToPadding="false"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingLeft="8dp"

        android:paddingRight="8dp"

        android:paddingLeft="16dp"

        android:paddingRight="16dp"

        android:paddingTop="16dp"

        launcher:pageIndicator="@+id/folder_page_indicator" />

res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -149,9 +149,9 @@ 
    <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_label_padding_top">4dp</dimen>

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

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

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

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



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

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

src/com/android/launcher3/CellLayout.java

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.launcher3; 
import static android.animation.ValueAnimator.areAnimatorsEnabled;



import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;

import static com.android.launcher3.config.FeatureFlags.ENABLE_FOUR_COLUMNS;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -599,8 +600,10 @@ public class CellLayout extends ViewGroup { 
        if (child instanceof BubbleTextView) {

            BubbleTextView bubbleChild = (BubbleTextView) child;

            bubbleChild.setTextVisibility(mContainerType != HOTSEAT);

            if (ENABLE_FOUR_COLUMNS.get()) {

                bubbleChild.setCenterVertically(mContainerType != HOTSEAT);

            }

        }



        child.setScaleX(mChildScale);

        child.setScaleY(mChildScale);