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

Unifying overscroll btw phone and tablet

Browse Source 
-> Using separate assets for removing and uninstalling

Change-Id: I183967c3ca482531ae28f71cd9053b673c6a8d03
This commit is contained in:
Adam Cohen
2011-11-09 17:20:41 -08:00
parent 31234d811d
commit ebea84d1c9
21 changed files with 124 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/launcher2/DragLayer.java
View File

@@ -70,7 +70,7 @@ public class DragLayer extends FrameLayout {
private boolean mHoverPointClosesFolder = false;
private Rect mHitRect = new Rect();
private int mWorkspaceIndex = -1;
private int mHotseatIndex = -1;
private int mQsbIndex = -1;
/**
* Used to create a new DragLayer from XML.
@@ -627,13 +627,13 @@ public class DragLayer extends FrameLayout {
private void updateChildIndices() {
if (mLauncher != null) {
mWorkspaceIndex = indexOfChild(mLauncher.getWorkspace());
mHotseatIndex = indexOfChild(mLauncher.getHotseat());
mQsbIndex = indexOfChild(mLauncher.getSearchBar());
}
}
@Override
protected int getChildDrawingOrder(int childCount, int i) {
if (mWorkspaceIndex == -1 || mHotseatIndex == -1 ||
if (mWorkspaceIndex == -1 || mQsbIndex == -1 ||
mLauncher.getWorkspace().isDrawingBackgroundGradient()) {
return i;
}
@@ -641,10 +641,10 @@ public class DragLayer extends FrameLayout {
// This ensures that the workspace is drawn above the hotseat and qsb,
// except when the workspace is drawing a background gradient, in which
// case we want the workspace to stay behind these elements.
if (i == mHotseatIndex) {
if (i == mQsbIndex) {
return mWorkspaceIndex;
} else if (i == mWorkspaceIndex) {
return mHotseatIndex;
return mQsbIndex;
} else {
return i;
}