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

Commit a2d85dec authored by Charlie Anderson's avatar Charlie Anderson
Browse files

Fixing polish issues with the U app shortcut popup design 

Test: locally verified against design
Flag: NONE
Bug: 304807548

Change-Id: Iff22b3515b638700fb66e856944ec4aa1287e401
parent f5677d69

res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -284,7 +284,8 @@ 
    <dimen name="pre_drag_view_scale">6dp</dimen>

    <!-- an icon with shortcuts must be dragged this far before the container is removed. -->

    <dimen name="deep_shortcuts_start_drag_threshold">16dp</dimen>

    <dimen name="deep_shortcut_icon_size">32dp</dimen>

    <!-- Possibly related to b/235886078, icon needs to be scaled up to match expected visual size of 32 dp -->

    <dimen name="deep_shortcut_icon_size">35dp</dimen>

    <dimen name="popup_margin">2dp</dimen>

    <dimen name="popup_single_item_radius">100dp</dimen>

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

src/com/android/launcher3/popup/ArrowPopup.java

+2 −1
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ public abstract class ArrowPopup<T extends Context & ActivityContext> 


    protected final float mElevation;



    // Tag for Views that have children that will need to be iterated to add styling.

    private final String mIterateChildrenTag;



    protected final int[] mColorIds;
@@ -244,7 +245,7 @@ public abstract class ArrowPopup<T extends Context & ActivityContext> 
        for (int i = 0; i < count; i++) {

            View view = viewGroup.getChildAt(i);

            if (view.getVisibility() == VISIBLE) {

                if (lastView != null) {

                if (lastView != null && (isShortcutContainer(lastView))) {

                    MarginLayoutParams mlp = (MarginLayoutParams) lastView.getLayoutParams();

                    mlp.bottomMargin = mChildContainerMargin;

                }

src/com/android/launcher3/views/OptionsPopupView.java

+7 −0
Original line number Diff line number Diff line
@@ -149,6 +149,13 @@ public class OptionsPopupView<T extends Context & ActivityContext> extends Arrow 
    public void assignMarginsAndBackgrounds(ViewGroup viewGroup) {

        assignMarginsAndBackgrounds(viewGroup,

                getColorStateList(getContext(), mColorIds[0]).getDefaultColor());

        // last shortcut doesn't need bottom margin

        final int count = viewGroup.getChildCount() - 1;

        for (int i = 0; i < count; i++) {

            // These are shortcuts and not shortcut containers, but they still need bottom margin

            MarginLayoutParams mlp = (MarginLayoutParams) viewGroup.getChildAt(i).getLayoutParams();

            mlp.bottomMargin = mChildContainerMargin;

        }

    }



    public static <T extends Context & ActivityContext> OptionsPopupView<T> show(