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

Commit 5390ce32 authored by Lyn Han's avatar Lyn Han
Browse files

Update test for spacing 

Follow up to http://ag/7816898

Bug: 134090085
Test: atest ExpandedAnimationControllerTest --- passed
atest SystemUITests --- non-bubbles failures:

com.android.systemui.assist.AssistHandleBehaviorControllerTest#showAndGo_doesNothingIfRecentlyHidden
com.android.systemui.assist.AssistHandleBehaviorControllerTest#hide_doesNothingWhenHiding
com.android.systemui.assist.AssistHandleBehaviorControllerTest#setBehavior_deactivatesThePreviousBehaviorWhenInGesturalMode
com.android.systemui.assist.AssistHandleBehaviorControllerTest#showAndStay_doesNothingWhenShowing
com.android.systemui.assist.AssistHandleBehaviorControllerTest#showAndGo_showsThenHidesHandlesWhenHiding
com.android.systemui.assist.AssistHandleBehaviorControllerTest#setBehavior_activatesTheBehaviorWhenInGesturalMode
com.android.systemui.assist.AssistHandleBehaviorControllerTest#showAndGo_hidesHandlesAfterTimeoutWhenShowing
com.android.systemui.assist.AssistHandleBehaviorControllerTest#hide_hidesHandlesWhenShowing
com.android.systemui.assist.AssistHandleBehaviorControllerTest#showAndStay_showsHandlesWhenHiding
com.android.systemui.assist.AssistHandleBehaviorControllerTest#setBehavior_doesNothingWhenNotInGesturalMode
com.android.systemui.statusbar.NavigationBarControllerTest#testCreateNavigationBarsIncludeDefaultFalse
com.android.systemui.statusbar.NavigationBarControllerTest#testCreateNavigationBarsIncludeDefaultTrue
com.android.systemui.statusbar.phone.KeyguardBottomAreaTest#initFrom_doesntCrash
com.android.systemui.statusbar.phone.NotificationPanelViewTest#testAffordanceLaunchingListener

Change-Id: I661d1d918c8c40ef2e9535fe01cab3e21b91f872
parent 977ce5d4

packages/SystemUI/src/com/android/systemui/bubbles/animation/ExpandedAnimationController.java

+1 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ public class ExpandedAnimationController 
     * @return Bubble left x from left edge of screen.

     */

    public float getBubbleLeft(int index) {

        float bubbleFromRowLeft = index * (mBubbleSizePx + getSpaceBetweenBubbles());

        final float bubbleFromRowLeft = index * (mBubbleSizePx + getSpaceBetweenBubbles());

        return getRowLeft() + bubbleFromRowLeft;

    }
@@ -408,7 +408,6 @@ public class ExpandedAnimationController 


        final int gapCount = mBubblesMaxRendered - 1;

        final float gapWidth = totalGapWidth / gapCount;



        return gapWidth;

    }

}

packages/SystemUI/tests/src/com/android/systemui/bubbles/animation/ExpandedAnimationControllerTest.java

+31 −14
Original line number Diff line number Diff line
@@ -45,14 +45,16 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC 


    private int mDisplayWidth = 500;

    private int mDisplayHeight = 1000;

    private int mExpandedViewPadding = 10;



    @Spy

    private ExpandedAnimationController mExpandedController =

            new ExpandedAnimationController(

                    new Point(mDisplayWidth, mDisplayHeight) /* displaySize */,

                    0 /* expandedViewPadding */);

                    mExpandedViewPadding);



    private int mStackOffset;

    private float mBubblePadding;

    private float mBubblePaddingTop;

    private float mBubbleSize;



    private PointF mExpansionPoint;
@@ -65,7 +67,7 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC 


        Resources res = mLayout.getResources();

        mStackOffset = res.getDimensionPixelSize(R.dimen.bubble_stack_offset);

        mBubblePadding = res.getDimensionPixelSize(R.dimen.bubble_padding);

        mBubblePaddingTop = res.getDimensionPixelSize(R.dimen.bubble_padding_top);

        mBubbleSize = res.getDimensionPixelSize(R.dimen.individual_bubble_size);

        mExpansionPoint = new PointF(100, 100);

    }
@@ -175,7 +177,7 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC 


        waitForPropertyAnimations(DynamicAnimation.TRANSLATION_X, DynamicAnimation.TRANSLATION_Y);



        assertEquals(mBubblePadding, mViews.get(1).getTranslationX(), 1f);

        assertEquals(mBubblePaddingTop, mViews.get(1).getTranslationX(), 1f);

    }



    @Test
@@ -264,8 +266,8 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC 
     * @return Bubble left x from left edge of screen.

     */

    public float getBubbleLeft(int index) {

        float bubbleLeftFromRowLeft = index * (mBubbleSize + mBubblePadding);

        return getRowLeft() + bubbleLeftFromRowLeft;

        final float bubbleLeft = index * (mBubbleSize + getSpaceBetweenBubbles());

        return getRowLeft() + bubbleLeft;

    }



    private float getRowLeft() {
@@ -276,15 +278,30 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC 
        if (bubbleCount > mMaxRenderedBubbles) {

            bubbleCount = mMaxRenderedBubbles;

        }

        // Width calculations.

        double bubble = bubbleCount * mBubbleSize;

        float gap = (bubbleCount - 1) * mBubblePadding;

        float row = gap + (float) bubble;

        final float totalBubbleWidth = bubbleCount * mBubbleSize;

        final float totalGapWidth = (bubbleCount - 1) * getSpaceBetweenBubbles();

        final float rowWidth = totalGapWidth + totalBubbleWidth;



        final float centerScreen = mDisplayWidth / 2f;

        final float halfRow = rowWidth / 2f;

        final float rowLeft = centerScreen - halfRow;



        return rowLeft;

    }



    /**

     * @return Space between bubbles in row above expanded view.

     */

    private float getSpaceBetweenBubbles() {

        final float launcherGridDiff = mBubbleSize / 2f;

        final float rowMargins = (mExpandedViewPadding + launcherGridDiff) * 2;

        final float maxRowWidth = mDisplayWidth - rowMargins;



        float halfRow = row / 2f;

        float centerScreen = mDisplayWidth / 2;

        float rowLeftFromScreenLeft = centerScreen - halfRow;

        final float totalBubbleWidth = mMaxRenderedBubbles * mBubbleSize;

        final float totalGapWidth = maxRowWidth - totalBubbleWidth;



        return rowLeftFromScreenLeft;

        final int gapCount = mMaxRenderedBubbles - 1;

        final float gapWidth = totalGapWidth / gapCount;

        return gapWidth;

    }

}