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

Commit e0107043 authored by Liran Binyamin's avatar Liran Binyamin Committed by Android (Google) Code Review
Browse files

Merge "Fix bubble bar expanded view content bottom" into main

parents c5cb25b5 638dd788

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelperTest.kt

+1 −2
Original line number Original line Diff line number Diff line
@@ -290,11 +290,10 @@ class BubbleBarAnimationHelperTest { 




        assertThat(semaphore.tryAcquire(5, TimeUnit.SECONDS)).isTrue()

        assertThat(semaphore.tryAcquire(5, TimeUnit.SECONDS)).isTrue()





        val bbevBottom = bbev.contentBottomOnScreen + bubblePositioner.insets.top

        activityScenario.onActivity {

        activityScenario.onActivity {

            // notify that the IME top coordinate is greater than the bottom of the expanded view.

            // notify that the IME top coordinate is greater than the bottom of the expanded view.

            // there's no overlap so it should not be clipped.

            // there's no overlap so it should not be clipped.

            animationHelper.onImeTopChanged(bbevBottom * 2)

            animationHelper.onImeTopChanged(bbev.contentBottomOnScreen * 2)

        }

        }

        val outline = Outline()

        val outline = Outline()

        bbev.outlineProvider.getOutline(bbev, outline)

        bbev.outlineProvider.getOutline(bbev, outline)

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -674,9 +674,7 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView 
        if (mTaskView != null) {

        if (mTaskView != null) {

            mTaskView.getBoundsOnScreen(mTempBounds);

            mTaskView.getBoundsOnScreen(mTempBounds);

        }

        }

        // return the bottom of the content rect, adjusted for insets so the result is in screen

        return mTempBounds.bottom;

        // coordinate

        return mTempBounds.bottom + mPositioner.getInsets().top;

    }

    }





    /** Update the amount by which to clip the expanded view at the bottom. */

    /** Update the amount by which to clip the expanded view at the bottom. */