From 3b272227805c44756f0857d3c5aadabe8961b239 Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Mon, 23 May 2022 19:59:57 +0000 Subject: [PATCH] Fix a padding issue for bubble user education in RTL The education view is placed on the right hand side of the screen so the padding calculation to align the manage button in the education view with the real manage button is slightly different. Bug: 230579507 Test: manual - force education for bubbles to show, set RTL language, open up stack and look at manage button education Change-Id: I282ed7eb2014d5d1a6d2b428572e495ce0d77c78 --- .../android/wm/shell/bubbles/ManageEducationView.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/ManageEducationView.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/ManageEducationView.kt index 2ecf388ee5142..e95e8e5cdaea1 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/ManageEducationView.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/ManageEducationView.kt @@ -109,8 +109,15 @@ class ManageEducationView constructor(context: Context, positioner: BubblePositi visibility = View.VISIBLE expandedView.getManageButtonBoundsOnScreen(realManageButtonRect) val isRTL = mContext.resources.configuration.layoutDirection == LAYOUT_DIRECTION_RTL - manageView.setPadding(realManageButtonRect.left - expandedView.manageButtonMargin, - manageView.paddingTop, manageView.paddingRight, manageView.paddingBottom) + 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 {