summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhisek Devkota <ciwrl@cyanogenmod.com>2014-05-14 00:56:31 (GMT)
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-05-14 00:56:31 (GMT)
commit4bf0d276210dd413581ca14fecbdd3e667b44fa1 (patch)
treeb60df4c7ffd437ea389c7f68481dd307bb7d057b
parent9319afbea6b17e42bcee0716a7d08caccec880df (diff)
parent15053474ee17aafcacafda42db8233f8ccd7770f (diff)
downloadandroid_packages_apps_Trebuchet-4bf0d276210dd413581ca14fecbdd3e667b44fa1.zip
android_packages_apps_Trebuchet-4bf0d276210dd413581ca14fecbdd3e667b44fa1.tar.gz
android_packages_apps_Trebuchet-4bf0d276210dd413581ca14fecbdd3e667b44fa1.tar.bz2
Merge "Fix hidden "Remove" and "App info" buttons in landscape" into cm-11.0
-rw-r--r--src/com/android/launcher3/DynamicGrid.java10
-rw-r--r--src/com/android/launcher3/SearchDropTargetBar.java4
2 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index 9be3134..6457fdc 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/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java
index 435dbda..1545207 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;
+ }
}