diff options
author | Daniel Sandler <dsandler@android.com> | 2013-06-11 14:45:48 -0400 |
---|---|---|
committer | Daniel Sandler <dsandler@android.com> | 2013-06-11 22:01:47 -0400 |
commit | cc8befac3550c81d04ea206c170adae36c9a6c93 (patch) | |
tree | 844f01e8fe09b157fb39d74b3195e934a3e6a271 /src/com/android/launcher3/DragLayer.java | |
parent | ecf33e4819d0c4b019706edd456ed14a6a0f200c (diff) | |
download | android_packages_apps_Trebuchet-cc8befac3550c81d04ea206c170adae36c9a6c93.tar.gz android_packages_apps_Trebuchet-cc8befac3550c81d04ea206c170adae36c9a6c93.tar.bz2 android_packages_apps_Trebuchet-cc8befac3550c81d04ea206c170adae36c9a6c93.zip |
Move LauncherApplication's state and code to LauncherAppState.
This removes Launcher's static data and other state out of
the Application object. Now LauncherApplication (extends
Application) exists only to instantiate LauncherAppState.
Change-Id: I4e323bd78b77536b92054105536a55c0c2c19ba8
Diffstat (limited to 'src/com/android/launcher3/DragLayer.java')
-rw-r--r-- | src/com/android/launcher3/DragLayer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java index 5a1b4ccd0..3bf54e859 100644 --- a/src/com/android/launcher3/DragLayer.java +++ b/src/com/android/launcher3/DragLayer.java @@ -736,7 +736,7 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang protected int getChildDrawingOrder(int childCount, int i) { // TODO: We have turned off this custom drawing order because it now effects touch // dispatch order. We need to sort that issue out and then decide how to go about this. - if (true || LauncherApplication.isScreenLandscape(getContext()) || + if (true || LauncherAppState.isScreenLandscape(getContext()) || mWorkspaceIndex == -1 || mQsbIndex == -1 || mLauncher.getWorkspace().isDrawingBackgroundGradient()) { return i; @@ -779,7 +779,7 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang protected void dispatchDraw(Canvas canvas) { super.dispatchDraw(canvas); - if (mInScrollArea && !LauncherApplication.isScreenLarge()) { + if (mInScrollArea && !LauncherAppState.isScreenLarge()) { Workspace workspace = mLauncher.getWorkspace(); int width = workspace.getWidth(); Rect childRect = new Rect(); |