diff --git a/src/com/android/settings/homepage/contextualcards/CardDatabaseHelper.java b/src/com/android/settings/homepage/contextualcards/CardDatabaseHelper.java index 39c48c1e847..8c471b00c6c 100644 --- a/src/com/android/settings/homepage/contextualcards/CardDatabaseHelper.java +++ b/src/com/android/settings/homepage/contextualcards/CardDatabaseHelper.java @@ -31,7 +31,7 @@ import androidx.annotation.VisibleForTesting; public class CardDatabaseHelper extends SQLiteOpenHelper { private static final String TAG = "CardDatabaseHelper"; private static final String DATABASE_NAME = "homepage_cards.db"; - private static final int DATABASE_VERSION = 5; + private static final int DATABASE_VERSION = 6; public static final String CARD_TABLE = "cards"; @@ -61,11 +61,6 @@ public class CardDatabaseHelper extends SQLiteOpenHelper { */ String CATEGORY = "category"; - /** - * Keep the card last display's locale. - */ - String LOCALIZED_TO_LOCALE = "localized_to_locale"; - /** * Package name for all card candidates. */ @@ -76,51 +71,6 @@ public class CardDatabaseHelper extends SQLiteOpenHelper { */ String APP_VERSION = "app_version"; - /** - * Title resource name of the package. - */ - String TITLE_RES_NAME = "title_res_name"; - - /** - * Title of the package to be shown. - */ - String TITLE_TEXT = "title_text"; - - /** - * Summary resource name of the package. - */ - String SUMMARY_RES_NAME = "summary_res_name"; - - /** - * Summary of the package to be shown. - */ - String SUMMARY_TEXT = "summary_text"; - - /** - * Icon resource name of the package. - */ - String ICON_RES_NAME = "icon_res_name"; - - /** - * Icon resource id of the package. - */ - String ICON_RES_ID = "icon_res_id"; - - /** - * Key value mapping to Intent in Settings. Do action when user presses card. - */ - String CARD_ACTION = "card_action"; - - /** - * Expire time of the card. The unit of the value is mini-second. - */ - String EXPIRE_TIME_MS = "expire_time_ms"; - - /** - * Decide the card display full-length width or half-width in screen. - */ - String SUPPORT_HALF_WIDTH = "support_half_width"; - /** * Decide the card is dismissed or not. */ @@ -140,30 +90,10 @@ public class CardDatabaseHelper extends SQLiteOpenHelper { " TEXT, " + CardColumns.CATEGORY + " INTEGER DEFAULT 0, " + - CardColumns.LOCALIZED_TO_LOCALE + - " TEXT, " + CardColumns.PACKAGE_NAME + " TEXT NOT NULL, " + CardColumns.APP_VERSION + " INTEGER NOT NULL, " + - CardColumns.TITLE_RES_NAME + - " TEXT, " + - CardColumns.TITLE_TEXT + - " TEXT, " + - CardColumns.SUMMARY_RES_NAME + - " TEXT, " + - CardColumns.SUMMARY_TEXT + - " TEXT, " + - CardColumns.ICON_RES_NAME + - " TEXT, " + - CardColumns.ICON_RES_ID + - " INTEGER DEFAULT 0, " + - CardColumns.CARD_ACTION + - " INTEGER, " + - CardColumns.EXPIRE_TIME_MS + - " INTEGER, " + - CardColumns.SUPPORT_HALF_WIDTH + - " INTEGER DEFAULT 0, " + CardColumns.CARD_DISMISSED + " INTEGER DEFAULT 0 " + ");"; diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCard.java b/src/com/android/settings/homepage/contextualcards/ContextualCard.java index ccfb22d3e17..0269c0e36a9 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCard.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCard.java @@ -56,17 +56,10 @@ public class ContextualCard { private final double mRankingScore; private final String mSliceUri; private final int mCategory; - private final String mLocalizedToLocale; private final String mPackageName; private final long mAppVersion; - private final String mTitleResName; private final String mTitleText; - private final String mSummaryResName; private final String mSummaryText; - private final String mIconResName; - private final int mIconResId; - private final int mCardAction; - private final long mExpireTimeMS; private final boolean mIsLargeCard; private final Drawable mIconDrawable; @LayoutRes @@ -98,10 +91,6 @@ public class ContextualCard { return mCategory; } - public String getLocalizedToLocale() { - return mLocalizedToLocale; - } - public String getPackageName() { return mPackageName; } @@ -110,38 +99,14 @@ public class ContextualCard { return mAppVersion; } - public String getTitleResName() { - return mTitleResName; - } - public String getTitleText() { return mTitleText; } - public String getSummaryResName() { - return mSummaryResName; - } - public String getSummaryText() { return mSummaryText; } - public String getIconResName() { - return mIconResName; - } - - public int getIconResId() { - return mIconResId; - } - - public int getCardAction() { - return mCardAction; - } - - public long getExpireTimeMS() { - return mExpireTimeMS; - } - public Drawable getIconDrawable() { return mIconDrawable; } @@ -177,17 +142,10 @@ public class ContextualCard { mRankingScore = builder.mRankingScore; mSliceUri = builder.mSliceUri; mCategory = builder.mCategory; - mLocalizedToLocale = builder.mLocalizedToLocale; mPackageName = builder.mPackageName; mAppVersion = builder.mAppVersion; - mTitleResName = builder.mTitleResName; mTitleText = builder.mTitleText; - mSummaryResName = builder.mSummaryResName; mSummaryText = builder.mSummaryText; - mIconResName = builder.mIconResName; - mIconResId = builder.mIconResId; - mCardAction = builder.mCardAction; - mExpireTimeMS = builder.mExpireTimeMS; mIconDrawable = builder.mIconDrawable; mIsLargeCard = builder.mIsLargeCard; mViewType = builder.mViewType; @@ -207,31 +165,14 @@ public class ContextualCard { mBuilder.setSliceUri(Uri.parse(mSliceUri)); mCategory = c.getInt(c.getColumnIndex(CardDatabaseHelper.CardColumns.CATEGORY)); mBuilder.setCategory(mCategory); - mLocalizedToLocale = c.getString( - c.getColumnIndex(CardDatabaseHelper.CardColumns.LOCALIZED_TO_LOCALE)); - mBuilder.setLocalizedToLocale(mLocalizedToLocale); mPackageName = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.PACKAGE_NAME)); mBuilder.setPackageName(mPackageName); mAppVersion = c.getLong(c.getColumnIndex(CardDatabaseHelper.CardColumns.APP_VERSION)); mBuilder.setAppVersion(mAppVersion); - mTitleResName = c.getString( - c.getColumnIndex(CardDatabaseHelper.CardColumns.TITLE_RES_NAME)); - mBuilder.setTitleResName(mTitleResName); - mTitleText = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.TITLE_TEXT)); + mTitleText = ""; mBuilder.setTitleText(mTitleText); - mSummaryResName = c.getString( - c.getColumnIndex(CardDatabaseHelper.CardColumns.SUMMARY_RES_NAME)); - mBuilder.setSummaryResName(mSummaryResName); - mSummaryText = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.SUMMARY_TEXT)); - mBuilder.setSummaryText(mSummaryText); - mIconResName = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.ICON_RES_NAME)); - mBuilder.setIconResName(mIconResName); - mIconResId = c.getInt(c.getColumnIndex(CardDatabaseHelper.CardColumns.ICON_RES_ID)); - mBuilder.setIconResId(mIconResId); - mCardAction = c.getInt(c.getColumnIndex(CardDatabaseHelper.CardColumns.CARD_ACTION)); - mBuilder.setCardAction(mCardAction); - mExpireTimeMS = c.getLong(c.getColumnIndex(CardDatabaseHelper.CardColumns.EXPIRE_TIME_MS)); - mBuilder.setExpireTimeMS(mExpireTimeMS); + mSummaryText = ""; + mBuilder.setTitleText(mSummaryText); mIsLargeCard = false; mBuilder.setIsLargeCard(mIsLargeCard); mIconDrawable = null; @@ -278,17 +219,10 @@ public class ContextualCard { private double mRankingScore; private String mSliceUri; private int mCategory; - private String mLocalizedToLocale; private String mPackageName; private long mAppVersion; - private String mTitleResName; private String mTitleText; - private String mSummaryResName; private String mSummaryText; - private String mIconResName; - private int mIconResId; - private int mCardAction; - private long mExpireTimeMS; private Drawable mIconDrawable; private boolean mIsLargeCard; @LayoutRes @@ -321,11 +255,6 @@ public class ContextualCard { return this; } - public Builder setLocalizedToLocale(String localizedToLocale) { - mLocalizedToLocale = localizedToLocale; - return this; - } - public Builder setPackageName(String packageName) { mPackageName = packageName; return this; @@ -336,46 +265,16 @@ public class ContextualCard { return this; } - public Builder setTitleResName(String titleResName) { - mTitleResName = titleResName; - return this; - } - public Builder setTitleText(String titleText) { mTitleText = titleText; return this; } - public Builder setSummaryResName(String summaryResName) { - mSummaryResName = summaryResName; - return this; - } - public Builder setSummaryText(String summaryText) { mSummaryText = summaryText; return this; } - public Builder setIconResName(String iconResName) { - mIconResName = iconResName; - return this; - } - - public Builder setIconResId(int iconResId) { - mIconResId = iconResId; - return this; - } - - public Builder setCardAction(int cardAction) { - mCardAction = cardAction; - return this; - } - - public Builder setExpireTimeMS(long expireTimeMS) { - mExpireTimeMS = expireTimeMS; - return this; - } - public Builder setIconDrawable(Drawable iconDrawable) { mIconDrawable = iconDrawable; return this; diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java index 36e4f047c61..7c769993e0d 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java @@ -67,18 +67,8 @@ public class CardDatabaseHelperTest { CardDatabaseHelper.CardColumns.SCORE, CardDatabaseHelper.CardColumns.SLICE_URI, CardDatabaseHelper.CardColumns.CATEGORY, - CardDatabaseHelper.CardColumns.LOCALIZED_TO_LOCALE, CardDatabaseHelper.CardColumns.PACKAGE_NAME, CardDatabaseHelper.CardColumns.APP_VERSION, - CardDatabaseHelper.CardColumns.TITLE_RES_NAME, - CardDatabaseHelper.CardColumns.TITLE_TEXT, - CardDatabaseHelper.CardColumns.SUMMARY_RES_NAME, - CardDatabaseHelper.CardColumns.SUMMARY_TEXT, - CardDatabaseHelper.CardColumns.ICON_RES_NAME, - CardDatabaseHelper.CardColumns.ICON_RES_ID, - CardDatabaseHelper.CardColumns.CARD_ACTION, - CardDatabaseHelper.CardColumns.EXPIRE_TIME_MS, - CardDatabaseHelper.CardColumns.SUPPORT_HALF_WIDTH, CardDatabaseHelper.CardColumns.CARD_DISMISSED, };