diff options
| author | Pierre-Louis Guidez <plg@google.com> | 2021-05-06 11:02:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-06 11:02:18 +0000 |
| commit | e274b3184ec58ffbb2819be292129e36266f756e (patch) | |
| tree | c21eb70005a07681509e5b4ef21f6789828674bb /src | |
| parent | 150df00bacf65322584cff43763b9fbddd85d5c5 (diff) | |
| parent | 1b33e3e43d1827057b1515cb46d9c02b7bb710ba (diff) | |
| download | ThemePicker-e274b3184ec58ffbb2819be292129e36266f756e.tar.gz | |
Merge "Draw 4x5 graph for grid options" into sc-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/customization/model/grid/LauncherGridOptionsProvider.java | 2 | ||||
| -rw-r--r-- | src/com/android/customization/widget/GridTileDrawable.java | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java index cdab1a6b..06c4761f 100644 --- a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java +++ b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java @@ -92,7 +92,7 @@ public class LauncherGridOptionsProvider { int rows = c.getInt(c.getColumnIndex(COL_ROWS)); int cols = c.getInt(c.getColumnIndex(COL_COLS)); int previewCount = c.getInt(c.getColumnIndex(COL_PREVIEW_COUNT)); - boolean isSet = Boolean.valueOf(c.getString(c.getColumnIndex(COL_IS_DEFAULT))); + boolean isSet = Boolean.parseBoolean(c.getString(c.getColumnIndex(COL_IS_DEFAULT))); String title = GRID_NAME_NORMAL.equals(name) ? mContext.getString(R.string.default_theme_title) : mContext.getString(R.string.grid_title_pattern, cols, rows); diff --git a/src/com/android/customization/widget/GridTileDrawable.java b/src/com/android/customization/widget/GridTileDrawable.java index 5039cf64..83cd0b57 100644 --- a/src/com/android/customization/widget/GridTileDrawable.java +++ b/src/com/android/customization/widget/GridTileDrawable.java @@ -40,7 +40,8 @@ public class GridTileDrawable extends Drawable { @Override protected void onBoundsChange(Rect bounds) { super.onBoundsChange(bounds); - mCellSize = (float) bounds.height() / mRows; + int longestSide = Math.max(mRows, mCols); + mCellSize = (float) bounds.width() / longestSide; float scaleFactor = (mCellSize - 2 * SPACE_BETWEEN_ICONS) / PATH_SIZE; mScaleMatrix.setScale(scaleFactor, scaleFactor); @@ -49,11 +50,13 @@ public class GridTileDrawable extends Drawable { @Override public void draw(Canvas canvas) { + double size = getBounds().width(); + for (int r = 0; r < mRows; r++) { for (int c = 0; c < mCols; c++) { int saveCount = canvas.save(); - float x = (c * mCellSize) + SPACE_BETWEEN_ICONS; - float y = (r * mCellSize) + SPACE_BETWEEN_ICONS; + float x = (float) ((r * size / mRows) + SPACE_BETWEEN_ICONS); + float y = (float) ((c * size / mCols) + SPACE_BETWEEN_ICONS); canvas.translate(x, y); canvas.drawPath(mTransformedPath, mPaint); canvas.restoreToCount(saveCount); |