Retiring some feature flags

Change-Id: I80a00ecaec0785ce2ba6a5f14a54c8a76f555d43
This commit is contained in:
Sunny Goyal
2018-07-10 13:50:50 -07:00
parent 17b7d36594
commit 36b54228fc
27 changed files with 41 additions and 215 deletions

View File

@@ -138,10 +138,7 @@ public class GridSizeMigrationTask {
*/
protected boolean migrateHotseat() throws Exception {
ArrayList<DbEntry> items = loadHotseatEntries();
int requiredCount = FeatureFlags.NO_ALL_APPS_ICON ? mDestHotseatSize : mDestHotseatSize - 1;
while (items.size() > requiredCount) {
while (items.size() > mDestHotseatSize) {
// Pick the center item by default.
DbEntry toRemove = items.get(items.size() / 2);
@@ -171,9 +168,6 @@ public class GridSizeMigrationTask {
}
newScreenId++;
if (!FeatureFlags.NO_ALL_APPS_ICON && mIdp.isAllAppsButtonRank(newScreenId)) {
newScreenId++;
}
}
return applyOperations();