Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the pointer position when displayed in RTL" into tm-dev

Browse Source
This commit is contained in:
Mady Mellor
2022-05-31 15:10:09 +00:00
committed by Android (Google) Code Review
parent f598205c2d fed87296db
commit 91d28d1b21
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java
View File

@@ -706,6 +706,8 @@ public class BubbleExpandedView extends LinearLayout {
* @param animate whether the pointer should animate to this position. * @param animate whether the pointer should animate to this position.
*/ */
public void setPointerPosition(float bubblePosition, boolean onLeft, boolean animate) { public void setPointerPosition(float bubblePosition, boolean onLeft, boolean animate) {
final boolean isRtl = mContext.getResources().getConfiguration().getLayoutDirection()
== LAYOUT_DIRECTION_RTL;
// Pointer gets drawn in the padding // Pointer gets drawn in the padding
final boolean showVertically = mPositioner.showBubblesVertically(); final boolean showVertically = mPositioner.showBubblesVertically();
final float paddingLeft = (showVertically && onLeft) final float paddingLeft = (showVertically && onLeft)
@@ -732,12 +734,22 @@ public class BubbleExpandedView extends LinearLayout {
float pointerX; float pointerX;
if (showVertically) { if (showVertically) {
pointerY = bubbleCenter - (mPointerWidth / 2f); pointerY = bubbleCenter - (mPointerWidth / 2f);
pointerX = onLeft if (!isRtl) {
? -mPointerHeight + mPointerOverlap pointerX = onLeft
: getWidth() - mPaddingRight - mPointerOverlap; ? -mPointerHeight + mPointerOverlap
: getWidth() - mPaddingRight - mPointerOverlap;
} else {
pointerX = onLeft
? -(getWidth() - mPaddingLeft - mPointerOverlap)
: mPointerHeight - mPointerOverlap;
}
} else { } else {
pointerY = mPointerOverlap; pointerY = mPointerOverlap;
pointerX = bubbleCenter - (mPointerWidth / 2f); if (!isRtl) {
pointerX = bubbleCenter - (mPointerWidth / 2f);
} else {
pointerX = -(getWidth() - mPaddingLeft - bubbleCenter) + (mPointerWidth / 2f);
}
} }
if (animate) { if (animate) {
mPointerView.animate().translationX(pointerX).translationY(pointerY).start(); mPointerView.animate().translationX(pointerX).translationY(pointerY).start();