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

Commit f98b203d authored by Jeremy Sim's avatar Jeremy Sim Committed by Android (Google) Code Review
Browse files

Merge "Center paired app icons"

parents e8f8cd2f 66a265c8

src/com/android/launcher3/touch/LandscapePagedViewHandler.java

+5 −8
Original line number Original line Diff line number Diff line
@@ -482,17 +482,14 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { 
                (FrameLayout.LayoutParams) primaryIconView.getLayoutParams();

                (FrameLayout.LayoutParams) primaryIconView.getLayoutParams();

        FrameLayout.LayoutParams secondaryIconParams =

        FrameLayout.LayoutParams secondaryIconParams =

                new FrameLayout.LayoutParams(primaryIconParams);

                new FrameLayout.LayoutParams(primaryIconParams);

        int dividerBar = (splitConfig.appsStackedVertically ?

                splitConfig.visualDividerBounds.height() :

                splitConfig.visualDividerBounds.width());





        primaryIconParams.gravity = (isRtl ? START : END) | TOP;

        primaryIconParams.gravity = CENTER_VERTICAL | (isRtl ? START : END);

        primaryIconView.setTranslationY(primarySnapshotHeight - primaryIconView.getHeight() / 2f);

        primaryIconView.setTranslationX(0);

        primaryIconView.setTranslationX(0);



        primaryIconView.setTranslationY(-(taskIconHeight / 2f));

        secondaryIconParams.gravity = (isRtl ? START : END) | TOP;

        secondaryIconParams.gravity = CENTER_VERTICAL | (isRtl ? START : END);

        secondaryIconView.setTranslationY(primarySnapshotHeight + taskIconHeight + dividerBar);

        secondaryIconView.setTranslationX(0);

        secondaryIconView.setTranslationX(0);

        secondaryIconView.setTranslationY(taskIconHeight / 2f);



        primaryIconView.setLayoutParams(primaryIconParams);

        primaryIconView.setLayoutParams(primaryIconParams);

        secondaryIconView.setLayoutParams(secondaryIconParams);

        secondaryIconView.setLayoutParams(secondaryIconParams);

    }

    }

src/com/android/launcher3/touch/PortraitPagedViewHandler.java

+7 −18
Original line number Original line Diff line number Diff line
@@ -581,26 +581,15 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { 
                (FrameLayout.LayoutParams) primaryIconView.getLayoutParams();

                (FrameLayout.LayoutParams) primaryIconView.getLayoutParams();

        FrameLayout.LayoutParams secondaryIconParams =

        FrameLayout.LayoutParams secondaryIconParams =

                new FrameLayout.LayoutParams(primaryIconParams);

                new FrameLayout.LayoutParams(primaryIconParams);

        int dividerBar = (splitConfig.appsStackedVertically ?

                splitConfig.visualDividerBounds.height() :

                splitConfig.visualDividerBounds.width());





        if (deviceProfile.isLandscape) {

            primaryIconParams.gravity = TOP | START;

            primaryIconView.setTranslationX(

                    primarySnapshotWidth - primaryIconView.getMeasuredWidth());

            primaryIconView.setTranslationY(0);

            secondaryIconParams.gravity = TOP | START;

            secondaryIconView.setTranslationX(primarySnapshotWidth + dividerBar);

        } else {

        primaryIconParams.gravity = TOP | CENTER_HORIZONTAL;

        primaryIconParams.gravity = TOP | CENTER_HORIZONTAL;

            primaryIconView.setTranslationX(-(primaryIconView.getMeasuredWidth()) / 2f);

        // shifts icon half a width left (height is used conveniently here since icons are square)

        primaryIconView.setTranslationX(-(taskIconHeight / 2f));

        primaryIconView.setTranslationY(0);

        primaryIconView.setTranslationY(0);



        secondaryIconParams.gravity = TOP | CENTER_HORIZONTAL;

        secondaryIconParams.gravity = TOP | CENTER_HORIZONTAL;

            secondaryIconView.setTranslationX(secondaryIconView.getMeasuredWidth() / 2f);

        secondaryIconView.setTranslationX(taskIconHeight / 2f);

        }

        secondaryIconView.setTranslationY(0);

        secondaryIconView.setTranslationY(0);



        primaryIconView.setLayoutParams(primaryIconParams);

        primaryIconView.setLayoutParams(primaryIconParams);

        secondaryIconView.setLayoutParams(secondaryIconParams);

        secondaryIconView.setLayoutParams(secondaryIconParams);

    }

    }

src/com/android/launcher3/touch/SeascapePagedViewHandler.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.view.Gravity.BOTTOM; 
import static android.view.Gravity.CENTER_VERTICAL;

import static android.view.Gravity.CENTER_VERTICAL;

import static android.view.Gravity.END;

import static android.view.Gravity.END;

import static android.view.Gravity.START;

import static android.view.Gravity.START;

import static android.view.Gravity.TOP;





import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;

import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;

import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;

import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
@@ -183,8 +182,8 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler { 
        FrameLayout.LayoutParams secondaryIconParams =

        FrameLayout.LayoutParams secondaryIconParams =

                (FrameLayout.LayoutParams) secondaryIconView.getLayoutParams();

                (FrameLayout.LayoutParams) secondaryIconView.getLayoutParams();





        primaryIconParams.gravity = (isRtl ? END : START) | TOP;

        primaryIconParams.gravity = CENTER_VERTICAL | (isRtl ? END : START);

        secondaryIconParams.gravity = (isRtl ? END : START) | TOP;

        secondaryIconParams.gravity = CENTER_VERTICAL | (isRtl ? END : START);

        primaryIconView.setLayoutParams(primaryIconParams);

        primaryIconView.setLayoutParams(primaryIconParams);

        secondaryIconView.setLayoutParams(secondaryIconParams);

        secondaryIconView.setLayoutParams(secondaryIconParams);

    }

    }