summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-07-21 18:11:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-21 15:43:35 +0000
commit871f3f8bbe66f681cf9cedffa8c9366e2d8d2d82 (patch)
tree0d2f819e2d8ff5c7215d8d825d716b7f96bc1025
parent82cc3fe6c77322d93ff74b25354e4bca77ab4a83 (diff)
parente7de3b2c2c2f6447c11d90846f491a4396d6c42d (diff)
downloadandroid_packages_apps_Trebuchet-871f3f8bbe66f681cf9cedffa8c9366e2d8d2d82.tar.gz
android_packages_apps_Trebuchet-871f3f8bbe66f681cf9cedffa8c9366e2d8d2d82.tar.bz2
android_packages_apps_Trebuchet-871f3f8bbe66f681cf9cedffa8c9366e2d8d2d82.zip
Merge "Mergin motorola patch to avoind 0 id for all apps button" into ub-now-master
-rw-r--r--src/com/android/launcher3/Hotseat.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index 9934f6665..79cac8f64 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -167,7 +167,7 @@ public class Hotseat extends FrameLayout {
int y = getCellYFromOrder(mAllAppsButtonRank);
CellLayout.LayoutParams lp = new CellLayout.LayoutParams(x,y,1,1);
lp.canReorder = false;
- mContent.addViewToCellLayout(allAppsButton, -1, 0, lp, true);
+ mContent.addViewToCellLayout(allAppsButton, -1, allAppsButton.getId(), lp, true);
}
}