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

Commit af02fa4e authored by Mady Mellor's avatar Mady Mellor
Browse files

Fix up some IME stuff with the setForwardedInsets work around 

Test: manual - test opening / collapsing IME in bubble
             - test opening / locking screen with bubble
             - test after opening / collapsing IME in bubble that content
               in ActivityView is touchable where epxected
Fixes: 150798706
Change-Id: I6e279000b86e8e9ee7431b359b2c203b3bd9e1e8
parent 019ff80d

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

            }