From 26b01425436277447fe24d01ad50d9e64f82109e Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Tue, 10 Nov 2015 14:44:32 -0800 Subject: Don't add offset to CellLayout's fullscreen children. Bug: 25411084 Change-Id: Ifbcd0a53cf04a7fc29386f4f09aaf7f972e7354a --- src/com/android/launcher3/CellLayout.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/com/android/launcher3/CellLayout.java') diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 71a1df30f..5f64a829b 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -899,9 +899,14 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { - int offset = getMeasuredWidth() - getPaddingLeft() - getPaddingRight() - - (mCountX * mCellWidth); - int left = getPaddingLeft() + (int) Math.ceil(offset / 2f); + boolean isFullscreen = mShortcutsAndWidgets.getChildCount() > 0 && + ((LayoutParams) mShortcutsAndWidgets.getChildAt(0).getLayoutParams()).isFullscreen; + int left = getPaddingLeft(); + if (!isFullscreen) { + int offset = getMeasuredWidth() - getPaddingLeft() - getPaddingRight() - + (mCountX * mCellWidth); + left += (int) Math.ceil(offset / 2f); + } int top = getPaddingTop(); mTouchFeedbackView.layout(left, top, -- cgit v1.2.3