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"

Browse Source
This commit is contained in:
Mady Mellor
2022-05-27 17:12:27 +00:00
committed by Android (Google) Code Review
parent 735cccf341 f7c69b784f
commit 4a717f7ff3
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -908,6 +908,8 @@ public class BubbleExpandedView extends LinearLayout {
* @param animate whether the pointer should animate to this position.
*/
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
final boolean showVertically = mPositioner.showBubblesVertically();
final float paddingLeft = (showVertically && onLeft)
@@ -932,12 +934,23 @@ public class BubbleExpandedView extends LinearLayout {
updatePointerView();
if (showVertically) {
mPointerPos.y = bubbleCenter - (mPointerWidth / 2f);
mPointerPos.x = onLeft
? -mPointerHeight + mPointerOverlap
: getWidth() - mPaddingRight - mPointerOverlap;
if (!isRtl) {
mPointerPos.x = onLeft
? -mPointerHeight + mPointerOverlap
: getWidth() - mPaddingRight - mPointerOverlap;
} else {
mPointerPos.x = onLeft
? -(getWidth() - mPaddingLeft - mPointerOverlap)
: mPointerHeight - mPointerOverlap;
}
} else {
mPointerPos.y = mPointerOverlap;
mPointerPos.x = bubbleCenter - (mPointerWidth / 2f);
if (!isRtl) {
mPointerPos.x = bubbleCenter - (mPointerWidth / 2f);
} else {
mPointerPos.x = -(getWidth() - mPaddingLeft - bubbleCenter)
+ (mPointerWidth / 2f);
}
}
if (animate) {
mPointerView.animate().translationX(mPointerPos.x).translationY(