diff options
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/IconCache.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/model/GridSizeMigrationTask.java | 8 | ||||
| -rw-r--r-- | src/com/android/launcher3/util/IconNormalizer.java | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index 9ed42f71a..effecaf06 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -802,7 +802,7 @@ public class IconCache { } private static final class IconDB extends SQLiteCacheHelper { - private final static int DB_VERSION = 8; + private final static int DB_VERSION = 9; private final static int RELEASE_VERSION = DB_VERSION + (FeatureFlags.LAUNCHER3_DISABLE_ICON_NORMALIZATION ? 0 : 1); diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index daeb4c17b..5606a244d 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1565,8 +1565,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } else if (getCurrentPage() > mTempVisiblePagesRange[1]) { setCurrentPage(mTempVisiblePagesRange[1]); } - } else { - setCurrentPage(getPageNearestToCenterOfScreen()); } setEnableOverscroll(!freeScroll); diff --git a/src/com/android/launcher3/model/GridSizeMigrationTask.java b/src/com/android/launcher3/model/GridSizeMigrationTask.java index 931466c3b..e0547343e 100644 --- a/src/com/android/launcher3/model/GridSizeMigrationTask.java +++ b/src/com/android/launcher3/model/GridSizeMigrationTask.java @@ -958,13 +958,15 @@ public class GridSizeMigrationTask { // The following list defines all possible grid sizes (and intermediate steps // during migration). Note that at each step, dx <= 1 && dy <= 1. Any grid size // which is not in this list is not migrated. + // Note that the InvariantDeviceProfile defines (rows, cols) but the Points + // specified here are defined as (cols, rows). ArrayList<Point> gridSizeSteps = new ArrayList<>(); - gridSizeSteps.add(new Point(2, 3)); + gridSizeSteps.add(new Point(3, 2)); gridSizeSteps.add(new Point(3, 3)); - gridSizeSteps.add(new Point(3, 4)); + gridSizeSteps.add(new Point(4, 3)); gridSizeSteps.add(new Point(4, 4)); gridSizeSteps.add(new Point(5, 5)); - gridSizeSteps.add(new Point(5, 6)); + gridSizeSteps.add(new Point(6, 5)); gridSizeSteps.add(new Point(6, 6)); gridSizeSteps.add(new Point(7, 7)); diff --git a/src/com/android/launcher3/util/IconNormalizer.java b/src/com/android/launcher3/util/IconNormalizer.java index 001cac0f0..4087d7bcf 100644 --- a/src/com/android/launcher3/util/IconNormalizer.java +++ b/src/com/android/launcher3/util/IconNormalizer.java @@ -28,7 +28,7 @@ import java.nio.ByteBuffer; public class IconNormalizer { // Ratio of icon visible area to full icon size for a square shaped icon - private static final float MAX_SQUARE_AREA_FACTOR = 359.0f / 576; + private static final float MAX_SQUARE_AREA_FACTOR = 375.0f / 576; // Ratio of icon visible area to full icon size for a circular shaped icon private static final float MAX_CIRCLE_AREA_FACTOR = 380.0f / 576; |