diff options
| author | Tony Wickham <twickham@google.com> | 2015-11-10 23:38:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-10 23:38:00 +0000 |
| commit | a71391a5b1c5d19528e0fdf36d515530c1bbbf44 (patch) | |
| tree | 46b6968619b54ad1f691d247e1e9e38e7b02cad1 /src/com/android/launcher3/CellLayout.java | |
| parent | 72d4c0673cb4dc198ff179a93b49c1744532876e (diff) | |
| parent | 26b01425436277447fe24d01ad50d9e64f82109e (diff) | |
| download | android_packages_apps_Trebuchet-a71391a5b1c5d19528e0fdf36d515530c1bbbf44.tar.gz android_packages_apps_Trebuchet-a71391a5b1c5d19528e0fdf36d515530c1bbbf44.tar.bz2 android_packages_apps_Trebuchet-a71391a5b1c5d19528e0fdf36d515530c1bbbf44.zip | |
Don\'t add offset to CellLayout\'s fullscreen children.
am: 26b0142543
* commit '26b01425436277447fe24d01ad50d9e64f82109e':
Don't add offset to CellLayout's fullscreen children.
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
| -rw-r--r-- | src/com/android/launcher3/CellLayout.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 601ba7e3a..a28b835bd 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -887,9 +887,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, |