PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changed the app_version type"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-09-28 03:33:22 +00:00
committed by Android (Google) Code Review
parent 5f9d178360 672febf859
commit 3f9ded6206
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/homepage/CardDatabaseHelper.java
View File

@@ -30,7 +30,7 @@ import androidx.annotation.VisibleForTesting;
public class CardDatabaseHelper extends SQLiteOpenHelper { public class CardDatabaseHelper extends SQLiteOpenHelper {
private static final String TAG = "CardDatabaseHelper"; private static final String TAG = "CardDatabaseHelper";
private static final String DATABASE_NAME = "homepage_cards.db"; private static final String DATABASE_NAME = "homepage_cards.db";
private static final int DATABASE_VERSION = 2; private static final int DATABASE_VERSION = 3;
public static final String CARD_TABLE = "cards"; public static final String CARD_TABLE = "cards";
@@ -143,7 +143,7 @@ public class CardDatabaseHelper extends SQLiteOpenHelper {
CardColumns.PACKAGE_NAME + CardColumns.PACKAGE_NAME +
" TEXT NOT NULL, " + " TEXT NOT NULL, " +
CardColumns.APP_VERSION + CardColumns.APP_VERSION +
" TEXT NOT NULL, " + " INTEGER NOT NULL, " +
CardColumns.TITLE_RES_NAME + CardColumns.TITLE_RES_NAME +
" TEXT, " + " TEXT, " +
CardColumns.TITLE_TEXT + CardColumns.TITLE_TEXT +

10
src/com/android/settings/homepage/ContextualCard.java
View File

@@ -50,7 +50,7 @@ public class ContextualCard {
private final int mCategory; private final int mCategory;
private final String mLocalizedToLocale; private final String mLocalizedToLocale;
private final String mPackageName; private final String mPackageName;
private final String mAppVersion; private final long mAppVersion;
private final String mTitleResName; private final String mTitleResName;
private final String mTitleText; private final String mTitleText;
private final String mSummaryResName; private final String mSummaryResName;
@@ -94,7 +94,7 @@ public class ContextualCard {
return mPackageName; return mPackageName;
} }
public String getAppVersion() { public long getAppVersion() {
return mAppVersion; return mAppVersion;
} }
@@ -172,7 +172,7 @@ public class ContextualCard {
mLocalizedToLocale = c.getString( mLocalizedToLocale = c.getString(
c.getColumnIndex(CardDatabaseHelper.CardColumns.LOCALIZED_TO_LOCALE)); c.getColumnIndex(CardDatabaseHelper.CardColumns.LOCALIZED_TO_LOCALE));
mPackageName = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.PACKAGE_NAME)); mPackageName = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.PACKAGE_NAME));
mAppVersion = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.APP_VERSION)); mAppVersion = c.getLong(c.getColumnIndex(CardDatabaseHelper.CardColumns.APP_VERSION));
mTitleResName = c.getString( mTitleResName = c.getString(
c.getColumnIndex(CardDatabaseHelper.CardColumns.TITLE_RES_NAME)); c.getColumnIndex(CardDatabaseHelper.CardColumns.TITLE_RES_NAME));
mTitleText = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.TITLE_TEXT)); mTitleText = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.TITLE_TEXT));
@@ -217,7 +217,7 @@ public class ContextualCard {
private int mCategory; private int mCategory;
private String mLocalizedToLocale; private String mLocalizedToLocale;
private String mPackageName; private String mPackageName;
private String mAppVersion; private long mAppVersion;
private String mTitleResName; private String mTitleResName;
private String mTitleText; private String mTitleText;
private String mSummaryResName; private String mSummaryResName;
@@ -264,7 +264,7 @@ public class ContextualCard {
return this; return this;
} }
public Builder setAppVersion(String appVersion) { public Builder setAppVersion(long appVersion) {
mAppVersion = appVersion; mAppVersion = appVersion;
return this; return this;
} }

4
tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java
View File

@@ -235,7 +235,7 @@ public class CardContentProviderTest {
"content://com.android.settings.slices/action/auto_rotate"); "content://com.android.settings.slices/action/auto_rotate");
values.put(CardDatabaseHelper.CardColumns.CATEGORY, 2); values.put(CardDatabaseHelper.CardColumns.CATEGORY, 2);
values.put(CardDatabaseHelper.CardColumns.PACKAGE_NAME, "com.android.settings"); values.put(CardDatabaseHelper.CardColumns.PACKAGE_NAME, "com.android.settings");
values.put(CardDatabaseHelper.CardColumns.APP_VERSION, "1.0.0"); values.put(CardDatabaseHelper.CardColumns.APP_VERSION, 10001);
return values; return values;
} }
@@ -252,7 +252,7 @@ public class CardContentProviderTest {
"content://com.android.settings.slices/action/toggle_airplane"); "content://com.android.settings.slices/action/toggle_airplane");
values.put(CardDatabaseHelper.CardColumns.CATEGORY, 2); values.put(CardDatabaseHelper.CardColumns.CATEGORY, 2);
values.put(CardDatabaseHelper.CardColumns.PACKAGE_NAME, "com.android.settings"); values.put(CardDatabaseHelper.CardColumns.PACKAGE_NAME, "com.android.settings");
values.put(CardDatabaseHelper.CardColumns.APP_VERSION, "1.0.0"); values.put(CardDatabaseHelper.CardColumns.APP_VERSION, 10001);
twoRows[1] = values; twoRows[1] = values;
return twoRows; return twoRows;