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

Merge "Fix off-center bubble pointer" into rvc-dev am: ade182cdb6

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

Change-Id: I9cd8a17179ddf8bc2e064ae9ce61aa9727c8b5f7
This commit is contained in:
TreeHugger Robot
2020-06-19 15:57:26 +00:00
committed by Automerger Merge Worker
parent 691e4c6427 ade182cdb6
commit 75b6c1ff4e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
View File

@@ -120,6 +120,8 @@ public class BubbleExpandedView extends LinearLayout {
private int mPointerWidth; private int mPointerWidth;
private int mPointerHeight; private int mPointerHeight;
private ShapeDrawable mPointerDrawable; private ShapeDrawable mPointerDrawable;
private int mExpandedViewPadding;
@Nullable private Bubble mBubble; @Nullable private Bubble mBubble;
@@ -345,11 +347,9 @@ public class BubbleExpandedView extends LinearLayout {
return view.onApplyWindowInsets(insets); return view.onApplyWindowInsets(insets);
}); });
final int expandedViewPadding = mExpandedViewPadding = res.getDimensionPixelSize(R.dimen.bubble_expanded_view_padding);
res.getDimensionPixelSize(R.dimen.bubble_expanded_view_padding); setPadding(mExpandedViewPadding, mExpandedViewPadding, mExpandedViewPadding,
mExpandedViewPadding);
setPadding(
expandedViewPadding, expandedViewPadding, expandedViewPadding, expandedViewPadding);
setOnTouchListener((view, motionEvent) -> { setOnTouchListener((view, motionEvent) -> {
if (!usingActivityView()) { if (!usingActivityView()) {
return false; return false;
@@ -729,7 +729,7 @@ public class BubbleExpandedView extends LinearLayout {
*/ */
public void setPointerPosition(float x) { public void setPointerPosition(float x) {
float halfPointerWidth = mPointerWidth / 2f; float halfPointerWidth = mPointerWidth / 2f;
float pointerLeft = x - halfPointerWidth; float pointerLeft = x - halfPointerWidth - mExpandedViewPadding;
mPointerView.setTranslationX(pointerLeft); mPointerView.setTranslationX(pointerLeft);
mPointerView.setVisibility(VISIBLE); mPointerView.setVisibility(VISIBLE);
} }