Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1aeddb8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rename the title of the first gird option" into sc-dev am: 4b187a5f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/14986351

Change-Id: I24bdf2c1cf951bccd4c0cf400ebdfd6cb3cc2962
parents 71dd47f3 4b187a5f

src/com/android/customization/model/grid/LauncherGridOptionsProvider.java

+1 −6
Original line number Diff line number Diff line
@@ -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));

            }