diff options
author | Adam Cohen <adamcohen@google.com> | 2011-11-09 17:20:41 -0800 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2011-11-11 11:38:53 -0800 |
commit | ebea84d1c95f4c38ba8cee46cd586fd757b4fce2 (patch) | |
tree | 6278e0e16611db2a59bfd5a481636e0efee9bb0f /src/com/android/launcher2/DragLayer.java | |
parent | 31234d811dc69c159757a6890852eb0f53d559a9 (diff) | |
download | Launcher2-ebea84d1c95f4c38ba8cee46cd586fd757b4fce2.tar.gz |
Unifying overscroll btw phone and tablet
-> Using separate assets for removing and uninstalling
Change-Id: I183967c3ca482531ae28f71cd9053b673c6a8d03
Diffstat (limited to 'src/com/android/launcher2/DragLayer.java')
-rw-r--r-- | src/com/android/launcher2/DragLayer.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java index 433db505..3c626d46 100644 --- a/src/com/android/launcher2/DragLayer.java +++ b/src/com/android/launcher2/DragLayer.java @@ -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; } |