aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 08:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't add offset to CellLayout's fullscreen children.

Browse Source 
Bug: 25411084
Change-Id: Ifbcd0a53cf04a7fc29386f4f09aaf7f972e7354a
This commit is contained in:
Tony Wickham
2015-11-10 14:44:32 -08:00
parent 3cfa97d4c1
commit 26b0142543
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/launcher3/CellLayout.java
View File

@@ -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,

1
src/com/android/launcher3/ShortcutAndWidgetContainer.java
View File

@@ -23,7 +23,6 @@ import android.graphics.Paint;
import android.graphics.Rect;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
public class ShortcutAndWidgetContainer extends ViewGroup {
static final String TAG = "CellLayoutChildren";