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

Commit cb6459f2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix up some IME stuff with the setForwardedInsets work around" into... 

Merge "Fix up some IME stuff with the setForwardedInsets work around" into rvc-dev am: 52a8fc73 am: 20ae658a am: 9217545e

Change-Id: I7d4090b64881b631ce98c2adba8ca8fd6544c9f3
parents 5b06adfd 9217545e

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+12 −2
Original line number Diff line number Diff line
@@ -308,8 +308,15 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 
        mKeyboardVisible = false;

        mNeedsNewHeight = false;

        if (mActivityView != null) {

            // TODO: Temporary hack to offset the view until we can properly inset Bubbles again.

            if (sNewInsetsMode == NEW_INSETS_MODE_FULL) {

                mStackView.animate()

                        .setDuration(100)

                        .translationY(0);

            } else {

                mActivityView.setForwardedInsets(Insets.of(0, 0, 0, 0));

            }

        }

        if (DEBUG_BUBBLE_EXPANDED_VIEW) {

            Log.d(TAG, "onDetachedFromWindow: bubble=" + getBubbleKey());

        }
@@ -351,7 +358,10 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 


            // TODO: Temporary hack to offset the view until we can properly inset Bubbles again.

            if (sNewInsetsMode == NEW_INSETS_MODE_FULL) {

                mStackView.animate().translationY(-insetsBottom);

                mStackView.animate()

                        .setDuration(100)

                        .translationY(-insetsBottom)

                        .withEndAction(() -> mActivityView.onLocationChanged());

            } else {

                mActivityView.setForwardedInsets(Insets.of(0, 0, 0, insetsBottom));

            }