Snap for 12587146 from 0ae53d6d7a50fb0403f6848566957afec96bac7b to 25Q1-release
Change-Id: Iaf5650554537a1b53f329a555db57892427d77fa
diff --git a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
index 8350248..f08acc9 100644
--- a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
+++ b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
@@ -47,6 +47,7 @@
private static final String DEFAULT_GRID = "default_grid";
private static final String COL_NAME = "name";
+ private static final String COL_GRID_TITLE = "grid_title";
private static final String COL_ROWS = "rows";
private static final String COL_COLS = "cols";
private static final String COL_PREVIEW_COUNT = "preview_count";
@@ -91,11 +92,15 @@
mOptions = new ArrayList<>();
while(c.moveToNext()) {
String name = c.getString(c.getColumnIndex(COL_NAME));
+ String title = c.getString(c.getColumnIndex(COL_GRID_TITLE));
+
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.parseBoolean(c.getString(c.getColumnIndex(COL_IS_DEFAULT)));
- String title = mContext.getString(R.string.grid_title_pattern, cols, rows);
+ if (title == null) {
+ title = mContext.getString(R.string.grid_title_pattern, cols, rows);
+ }
mOptions.add(new GridOption(title, name, isSet, rows, cols,
mPreviewUtils.getUri(PREVIEW), previewCount, iconPath));
}