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

Commit 04621462 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge changes I282ed7eb,I4e9ca9ed into tm-dev am: 772f09fe 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18563479



Change-Id: Ib8235836da91a35c23a1089d3b8b660914043ecc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 557b5227 772f09fe

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/ManageEducationView.kt

+15 −3
Original line number Diff line number Diff line
@@ -108,8 +108,16 @@ class ManageEducationView constructor(context: Context, positioner: BubblePositi 
        alpha = 0f

        visibility = View.VISIBLE

        expandedView.getManageButtonBoundsOnScreen(realManageButtonRect)

        val isRTL = mContext.resources.configuration.layoutDirection == LAYOUT_DIRECTION_RTL

        if (isRTL) {

            val rightPadding = positioner.screenRect.right - realManageButtonRect.right -

                    expandedView.manageButtonMargin

            manageView.setPadding(manageView.paddingLeft, manageView.paddingTop,

                    rightPadding, manageView.paddingBottom)

        } else {

            manageView.setPadding(realManageButtonRect.left - expandedView.manageButtonMargin,

            manageView.paddingTop, manageView.paddingRight, manageView.paddingBottom)

        }

        post {

            manageButton

                .setOnClickListener {
@@ -122,7 +130,11 @@ class ManageEducationView constructor(context: Context, positioner: BubblePositi 
            val offsetViewBounds = Rect()

            manageButton.getDrawingRect(offsetViewBounds)

            manageView.offsetDescendantRectToMyCoords(manageButton, offsetViewBounds)

            if (isRTL && (positioner.isLargeScreen || positioner.isLandscape)) {

                translationX = (positioner.screenRect.right - width).toFloat()

            } else {

                translationX = 0f

            }

            translationY = (realManageButtonRect.top - offsetViewBounds.top).toFloat()

            bringToFront()

            animate()

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/StackEducationView.kt

+6 −0
Original line number Diff line number Diff line
@@ -146,6 +146,12 @@ class StackEducationView constructor( 
                } else {

                    setPadding(paddingLeft, paddingTop, positioner.bubbleSize + stackPadding,

                            paddingBottom)

                    if (positioner.isLargeScreen || positioner.isLandscape) {

                        translationX = (positioner.screenRect.right - width - stackPadding)

                                .toFloat()

                    } else {

                        translationX = 0f

                    }

                }

                translationY = stackPosition.y + positioner.bubbleSize / 2 - getHeight() / 2

            }