diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-16 17:57:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-16 17:57:54 +0000 |
| commit | 4b187a5f88786e569e93fdc056af1203db892e13 (patch) | |
| tree | 2b3ffd361a4c9eda7adfb58fbd1b6f97d8a00c36 | |
| parent | e4ba3f4893c77b3318b977a682f7bfb2d33ffa11 (diff) | |
| parent | 5b4b42f74076e903a810b84129e0647493ca08b2 (diff) | |
| download | ThemePicker-4b187a5f88786e569e93fdc056af1203db892e13.tar.gz | |
Merge "Rename the title of the first gird option" into sc-dev
| -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)); } |