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

Hybrid hotseat predicted icon visuals

Browse Source 
Bug:142753423
Test: Manual
Change-Id: I6f056aaec905c8ca357b7cf78a657cdaac84e2f1
This commit is contained in:
Samuel Fufa
2019-11-18 17:12:46 -08:00
parent 0cdb388ac2
commit 1e2d004dd5
5 changed files with 357 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@ public class CellLayout extends ViewGroup implements Transposable {
private OnTouchListener mInterceptTouchListener;
private final ArrayList<PreviewBackground> mFolderBackgrounds = new ArrayList<>();
private final ArrayList<DelegatedCellDrawing> mDelegatedCellDrawings = new ArrayList<>();
final PreviewBackground mFolderLeaveBehind = new PreviewBackground();
private static final int[] BACKGROUND_STATE_ACTIVE = new int[] { android.R.attr.state_active };
@@ -219,8 +219,8 @@ public class CellLayout extends ViewGroup implements Transposable {
mPreviousReorderDirection[0] = INVALID_DIRECTION;
mPreviousReorderDirection[1] = INVALID_DIRECTION;
mFolderLeaveBehind.delegateCellX = -1;
mFolderLeaveBehind.delegateCellY = -1;
mFolderLeaveBehind.mDelegateCellX = -1;
mFolderLeaveBehind.mDelegateCellY = -1;
setAlwaysDrawnWithCacheEnabled(false);
final Resources res = getResources();
@@ -466,21 +466,18 @@ public class CellLayout extends ViewGroup implements Transposable {
}
}
for (int i = 0; i < mFolderBackgrounds.size(); i++) {
PreviewBackground bg = mFolderBackgrounds.get(i);
cellToPoint(bg.delegateCellX, bg.delegateCellY, mTempLocation);
for (int i = 0; i < mDelegatedCellDrawings.size(); i++) {
DelegatedCellDrawing cellDrawing = mDelegatedCellDrawings.get(i);
cellToPoint(cellDrawing.mDelegateCellX, cellDrawing.mDelegateCellY, mTempLocation);
canvas.save();
canvas.translate(mTempLocation[0], mTempLocation[1]);
bg.drawBackground(canvas);
if (!bg.isClipping) {
bg.drawBackgroundStroke(canvas);
}
cellDrawing.drawUnderItem(canvas);
canvas.restore();
}
if (mFolderLeaveBehind.delegateCellX >= 0 && mFolderLeaveBehind.delegateCellY >= 0) {
cellToPoint(mFolderLeaveBehind.delegateCellX,
mFolderLeaveBehind.delegateCellY, mTempLocation);
if (mFolderLeaveBehind.mDelegateCellX >= 0 && mFolderLeaveBehind.mDelegateCellY >= 0) {
cellToPoint(mFolderLeaveBehind.mDelegateCellX,
mFolderLeaveBehind.mDelegateCellY, mTempLocation);
canvas.save();
canvas.translate(mTempLocation[0], mTempLocation[1]);
mFolderLeaveBehind.drawLeaveBehind(canvas);
@@ -492,23 +489,28 @@ public class CellLayout extends ViewGroup implements Transposable {
protected void dispatchDraw(Canvas canvas) {
super.dispatchDraw(canvas);
for (int i = 0; i < mFolderBackgrounds.size(); i++) {
PreviewBackground bg = mFolderBackgrounds.get(i);
if (bg.isClipping) {
cellToPoint(bg.delegateCellX, bg.delegateCellY, mTempLocation);
canvas.save();
canvas.translate(mTempLocation[0], mTempLocation[1]);
bg.drawBackgroundStroke(canvas);
canvas.restore();
}
for (int i = 0; i < mDelegatedCellDrawings.size(); i++) {
DelegatedCellDrawing bg = mDelegatedCellDrawings.get(i);
cellToPoint(bg.mDelegateCellX, bg.mDelegateCellY, mTempLocation);
canvas.save();
canvas.translate(mTempLocation[0], mTempLocation[1]);
bg.drawOverItem(canvas);
canvas.restore();
}
}
public void addFolderBackground(PreviewBackground bg) {
mFolderBackgrounds.add(bg);
/**
* Add Delegated cell drawing
*/
public void addDelegatedCellDrawing(DelegatedCellDrawing bg) {
mDelegatedCellDrawings.add(bg);
}
public void removeFolderBackground(PreviewBackground bg) {
mFolderBackgrounds.remove(bg);
/**
* Remove item from DelegatedCellDrawings
*/
public void removeDelegatedCellDrawing(DelegatedCellDrawing bg) {
mDelegatedCellDrawings.remove(bg);
}
public void setFolderLeaveBehindCell(int x, int y) {
@@ -516,14 +518,14 @@ public class CellLayout extends ViewGroup implements Transposable {
mFolderLeaveBehind.setup(getContext(), mActivity, null,
child.getMeasuredWidth(), child.getPaddingTop());
mFolderLeaveBehind.delegateCellX = x;
mFolderLeaveBehind.delegateCellY = y;
mFolderLeaveBehind.mDelegateCellX = x;
mFolderLeaveBehind.mDelegateCellY = y;
invalidate();
}
public void clearFolderLeaveBehind() {
mFolderLeaveBehind.delegateCellX = -1;
mFolderLeaveBehind.delegateCellY = -1;
mFolderLeaveBehind.mDelegateCellX = -1;
mFolderLeaveBehind.mDelegateCellY = -1;
invalidate();
}
@@ -2743,6 +2745,24 @@ public class CellLayout extends ViewGroup implements Transposable {
}
}
/**
* A Delegated cell Drawing for drawing on CellLayout
*/
public abstract static class DelegatedCellDrawing {
public int mDelegateCellX;
public int mDelegateCellY;
/**
* Draw under CellLayout
*/
public abstract void drawUnderItem(Canvas canvas);
/**
* Draw over CellLayout
*/
public abstract void drawOverItem(Canvas canvas);
}
/**
* Returns whether an item can be placed in this CellLayout (after rearranging and/or resizing
* if necessary).