commit bf292a0bd37959aa3b67df2daec3656f8178af68
author Michael Jurka <mikejurka@google.com> Mon Nov 11 20:07:03 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 11 20:07:04 2013 +0000
tree ab65b5c3ebf502aad2745d9b41cd6deebe5ab596
parent ab087b9fbc56c78bf25a06068ff929f8a7ac7ae8
parent 2d13e6934fd613a289a220b224d45e76f5dd211d

Merge "Fix wallpaper cropping bugs" into jb-ub-now-jolly-elf

src/com/android/launcher3/DragController.java

diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java
index 5e733f0..ab48233 100644
--- a/src/com/android/launcher3/DragController.java
+++ b/src/com/android/launcher3/DragController.java
@@ -327,7 +327,7 @@
                 for (AppInfo info : appInfos) {
                     // Added null checks to prevent NPE we've seen in the wild
                     if (dragInfo != null &&
-                        dragInfo.intent != null) {
+                            dragInfo.intent != null && info != null) {
                         ComponentName cn = dragInfo.intent.getComponent();
                         boolean isSameComponent = cn.equals(info.componentName) ||
                                 packageNames.contains(cn.getPackageName());

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d52ef9f..ba334e3 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3953,6 +3953,11 @@
         return bounceAnim;
     }
 
+    public boolean useVerticalBarLayout() {
+        return LauncherAppState.getInstance().getDynamicGrid().
+                getDeviceProfile().isVerticalBarLayout();
+    }
+
     @Override
     public void bindSearchablesChanged() {
         boolean searchVisible = updateGlobalSearchIcon();