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

Commit 1c2782d5 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 am: cb6459f2

Change-Id: Ie3fc6e30acfa89d4f1c084b96c04fc89ea8e82f7
parents ace43e57 cb6459f2

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

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

        mKeyboardVisible = false;

        mNeedsNewHeight = false;

        mNeedsNewHeight = false;

        if (mActivityView != null) {

        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));

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

            }

            }

        }

        if (DEBUG_BUBBLE_EXPANDED_VIEW) {

        if (DEBUG_BUBBLE_EXPANDED_VIEW) {

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

            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.

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

            if (sNewInsetsMode == NEW_INSETS_MODE_FULL) {

            if (sNewInsetsMode == NEW_INSETS_MODE_FULL) {

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

                mStackView.animate()

                        .setDuration(100)

                        .translationY(-insetsBottom)

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

            } else {

            } else {

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

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

            }

            }