Merge remote-tracking branch 'github/cm-11.0' into HEAD

3 files changed, 20 insertions, 1 deletions

diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index 9be3134c1..6457fdc31 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -31,6 +31,8 @@ import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
 import com.android.launcher3.settings.SettingsProvider;
 
 import java.util.ArrayList;
@@ -402,6 +404,14 @@ class DeviceProfile {
         }
         searchBar.setLayoutParams(lp);
 
+        // Layout the drop target icons
+        LinearLayout dropTargetBar = (LinearLayout) launcher.getSearchBar().getDropTargetBar();
+        if (hasVerticalBarLayout) {
+            dropTargetBar.setOrientation(LinearLayout.VERTICAL);
+        } else {
+            dropTargetBar.setOrientation(LinearLayout.HORIZONTAL);
+        }
+
         // Layout the search bar
         View qsbBar = launcher.getQsbBar();
         qsbBar.setVisibility(searchBarVisible ? View.VISIBLE : View.GONE);
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 383204817..416c80641 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -195,6 +195,11 @@ public class Launcher extends Activity
     private static final String TOOLBAR_VOICE_SEARCH_ICON_METADATA_NAME =
             "com.android.launcher.toolbar_voice_search_icon";
 
+    private static final String WALLPAPER_PICKER_PACKAGE =
+            "com.android.wallpapercropper";
+    private static final String WALLPAPER_PICKER_ACTIVITY =
+            "com.android.wallpapercropper.WallpaperPickerActivity";
+
     public static final String SHOW_WEIGHT_WATCHER = "debug.show_mem";
     public static final boolean SHOW_WEIGHT_WATCHER_DEFAULT = false;
 
@@ -2322,7 +2327,7 @@ public class Launcher extends Activity
     }
 
     protected ComponentName getWallpaperPickerComponent() {
-        return new ComponentName(getPackageName(), WallpaperPickerActivity.class.getName());
+        return new ComponentName(WALLPAPER_PICKER_PACKAGE, WALLPAPER_PICKER_ACTIVITY);
     }
 
     /**
diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java
index 435dbda1d..15452070c 100644
--- a/src/com/android/launcher3/SearchDropTargetBar.java
+++ b/src/com/android/launcher3/SearchDropTargetBar.java
@@ -242,4 +242,8 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
             return null;
         }
     }
+
+    public View getDropTargetBar() {
+        return mDropTargetBar;
+    }
 }