summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/model
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-06-22 09:50:21 -0700
committerSunny Goyal <sunnygoyal@google.com>2016-06-22 09:51:07 -0700
commit803896767b37e447bcdff7be6b9872612e93b7bf (patch)
tree185a69f66dc153114abd60255e1119bb9e773943 /src/com/android/launcher3/model
parent4efaed56372085c5fa473b9e83bb497940ffbaaf (diff)
downloadandroid_packages_apps_Trebuchet-803896767b37e447bcdff7be6b9872612e93b7bf.tar.gz
android_packages_apps_Trebuchet-803896767b37e447bcdff7be6b9872612e93b7bf.tar.bz2
android_packages_apps_Trebuchet-803896767b37e447bcdff7be6b9872612e93b7bf.zip
Fixing bug in GridSizeMigrationTask, where it was not accounting for
an extra space when there is no all-apps icon Bug: 29569843 Change-Id: Ib768f0d069aed413bd8f4c2aa86ab1d3d657680e
Diffstat (limited to 'src/com/android/launcher3/model')
-rw-r--r--src/com/android/launcher3/model/GridSizeMigrationTask.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java
index 8e8e551eb..9db79f061 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationTask.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java
@@ -150,7 +150,7 @@ public class GridSizeMigrationTask {
protected boolean migrateHotseat() throws Exception {
ArrayList<DbEntry> items = loadHotseatEntries();
- int requiredCount = mDestHotseatSize - 1;
+ int requiredCount = FeatureFlags.NO_ALL_APPS_ICON ? mDestHotseatSize : mDestHotseatSize - 1;
while (items.size() > requiredCount) {
// Pick the center item by default.