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 am: b5a4639c36 am: c1a9c426ef

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

Change-Id: I7aa84a0abd8134e5f0b9f2369ec74e3e385e66e8
This commit is contained in:
TreeHugger Robot
2020-06-19 16:11:29 +00:00
committed by Automerger Merge Worker
parent 82a9f99f1b c1a9c426ef
commit 2936598044
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 mPointerHeight;
private ShapeDrawable mPointerDrawable;
private int mExpandedViewPadding;
@Nullable private Bubble mBubble;
@@ -345,11 +347,9 @@ public class BubbleExpandedView extends LinearLayout {
return view.onApplyWindowInsets(insets);
});
final int expandedViewPadding =
res.getDimensionPixelSize(R.dimen.bubble_expanded_view_padding);
setPadding(
expandedViewPadding, expandedViewPadding, expandedViewPadding, expandedViewPadding);
mExpandedViewPadding = res.getDimensionPixelSize(R.dimen.bubble_expanded_view_padding);
setPadding(mExpandedViewPadding, mExpandedViewPadding, mExpandedViewPadding,
mExpandedViewPadding);
setOnTouchListener((view, motionEvent) -> {
if (!usingActivityView()) {
return false;
@@ -729,7 +729,7 @@ public class BubbleExpandedView extends LinearLayout {
*/
public void setPointerPosition(float x) {
float halfPointerWidth = mPointerWidth / 2f;
float pointerLeft = x - halfPointerWidth;
float pointerLeft = x - halfPointerWidth - mExpandedViewPadding;
mPointerView.setTranslationX(pointerLeft);
mPointerView.setVisibility(VISIBLE);
}