commit a71391a5b1c5d19528e0fdf36d515530c1bbbf44
author Tony Wickham <twickham@google.com> Tue Nov 10 23:38:00 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 10 23:38:00 2015 +0000
tree 46b6968619b54ad1f691d247e1e9e38e7b02cad1
parent 72d4c0673cb4dc198ff179a93b49c1744532876e
parent 26b01425436277447fe24d01ad50d9e64f82109e

Don\'t add offset to CellLayout\'s fullscreen children.
am: 26b0142543

* commit '26b01425436277447fe24d01ad50d9e64f82109e':
  Don't add offset to CellLayout's fullscreen children.

src/com/android/launcher3/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index 601ba7e..a28b835 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -887,9 +887,14 @@
 
     @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,