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

Merge "Add appropriate (tiny) offset to widget drops so they land correctly." into ub-launcher3-burnaby-polish

Browse Source 
am: 8db5d7ca60

* commit '8db5d7ca60e79f007bfce7952c15c74d0ee44bc0':
  Add appropriate (tiny) offset to widget drops so they land correctly.
This commit is contained in:
Tony Wickham
2015-12-04 14:21:19 -08:00
committed by android-build-merger
parent 92b3397711 8db5d7ca60
commit 11c45f1141
6 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -890,9 +890,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
((LayoutParams) mShortcutsAndWidgets.getChildAt(0).getLayoutParams()).isFullscreen;
int left = getPaddingLeft();
if (!isFullscreen) {
int offset = getMeasuredWidth() - getPaddingLeft() - getPaddingRight() -
(mCountX * mCellWidth);
left += (int) Math.ceil(offset / 2f);
left += (int) Math.ceil(getUnusedHorizontalSpace() / 2f);
}
int top = getPaddingTop();
@@ -904,6 +902,15 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
top + b - t);
}
/**
* Returns the amount of space left over after subtracting padding and cells. This space will be
* very small, a few pixels at most, and is a result of rounding down when calculating the cell
* width in {@link DeviceProfile#calculateCellWidth(int, int)}.
*/
public int getUnusedHorizontalSpace() {
return getMeasuredWidth() - getPaddingLeft() - getPaddingRight() - (mCountX * mCellWidth);
}
@Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
super.onSizeChanged(w, h, oldw, oldh);
@@ -1036,8 +1043,8 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
return false;
}
void visualizeDropLocation(View v, Bitmap dragOutline, int originX, int originY, int cellX,
int cellY, int spanX, int spanY, boolean resize, DropTarget.DragObject dragObject) {
void visualizeDropLocation(View v, Bitmap dragOutline, int cellX, int cellY, int spanX,
int spanY, boolean resize, DropTarget.DragObject dragObject) {
final int oldDragCellX = mDragCell[0];
final int oldDragCellY = mDragCell[1];