diff options
author | Chuck Liao <chuckliao@google.com> | 2021-06-16 10:38:43 +0800 |
---|---|---|
committer | Chuck Liao <chuckliao@google.com> | 2021-06-16 10:38:43 +0800 |
commit | 5b4b42f74076e903a810b84129e0647493ca08b2 (patch) | |
tree | 275ff1fafac972211720f9830d5a2d19f41b1962 | |
parent | bea7265cf4ac1bacb5c35153bbea7ad3916886f8 (diff) | |
download | ThemePicker-5b4b42f74076e903a810b84129e0647493ca08b2.tar.gz |
Rename the title of the first gird option
Rename it from "Default" to "5x5" to avoid misleading
when Launcher's default grid configuration is not 5x5.
Screenshots:
Before: https://screenshot.googleplex.com/4aTmiqZ3RUFbj3t.png
After: https://screenshot.googleplex.com/6ecXhDa9mDUi9aC.png
Bug: 191118996
Test: manual
Change-Id: Ic2f0cfaf7d783b489123af7426d26742afd915c8
-rw-r--r-- | src/com/android/customization/model/grid/LauncherGridOptionsProvider.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java index aeb6e713..fd403631 100644 --- a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java +++ b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java @@ -48,9 +48,6 @@ public class LauncherGridOptionsProvider { private static final String COL_PREVIEW_COUNT = "preview_count"; private static final String COL_IS_DEFAULT = "is_default"; - // Normal gird size name - private static final String GRID_NAME_NORMAL = "normal"; - private static final String METADATA_KEY_PREVIEW_VERSION = "preview_version"; private final Context mContext; @@ -91,9 +88,7 @@ public class LauncherGridOptionsProvider { int cols = c.getInt(c.getColumnIndex(COL_COLS)); int previewCount = c.getInt(c.getColumnIndex(COL_PREVIEW_COUNT)); 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); + String title = mContext.getString(R.string.grid_title_pattern, cols, rows); mOptions.add(new GridOption(title, name, isSet, rows, cols, mPreviewUtils.getUri(PREVIEW), previewCount, iconPath)); } |