Merge "Changed the app_version type"
diff --git a/src/com/android/settings/homepage/CardDatabaseHelper.java b/src/com/android/settings/homepage/CardDatabaseHelper.java
index b53479e..53de441 100644
--- a/src/com/android/settings/homepage/CardDatabaseHelper.java
+++ b/src/com/android/settings/homepage/CardDatabaseHelper.java
@@ -30,7 +30,7 @@
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 = 2;
+ private static final int DATABASE_VERSION = 3;
public static final String CARD_TABLE = "cards";
@@ -143,7 +143,7 @@
CardColumns.PACKAGE_NAME +
" TEXT NOT NULL, " +
CardColumns.APP_VERSION +
- " TEXT NOT NULL, " +
+ " INTEGER NOT NULL, " +
CardColumns.TITLE_RES_NAME +
" TEXT, " +
CardColumns.TITLE_TEXT +
diff --git a/src/com/android/settings/homepage/ContextualCard.java b/src/com/android/settings/homepage/ContextualCard.java
index 5bd265b..130b878 100644
--- a/src/com/android/settings/homepage/ContextualCard.java
+++ b/src/com/android/settings/homepage/ContextualCard.java
@@ -50,7 +50,7 @@
private final int mCategory;
private final String mLocalizedToLocale;
private final String mPackageName;
- private final String mAppVersion;
+ private final long mAppVersion;
private final String mTitleResName;
private final String mTitleText;
private final String mSummaryResName;
@@ -94,7 +94,7 @@
return mPackageName;
}
- public String getAppVersion() {
+ public long getAppVersion() {
return mAppVersion;
}
@@ -172,7 +172,7 @@
mLocalizedToLocale = c.getString(
c.getColumnIndex(CardDatabaseHelper.CardColumns.LOCALIZED_TO_LOCALE));
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(
c.getColumnIndex(CardDatabaseHelper.CardColumns.TITLE_RES_NAME));
mTitleText = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.TITLE_TEXT));
@@ -217,7 +217,7 @@
private int mCategory;
private String mLocalizedToLocale;
private String mPackageName;
- private String mAppVersion;
+ private long mAppVersion;
private String mTitleResName;
private String mTitleText;
private String mSummaryResName;
@@ -264,7 +264,7 @@
return this;
}
- public Builder setAppVersion(String appVersion) {
+ public Builder setAppVersion(long appVersion) {
mAppVersion = appVersion;
return this;
}
diff --git a/tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java b/tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java
index 84955e2..f89d037 100644
--- a/tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java
@@ -235,7 +235,7 @@
"content://com.android.settings.slices/action/auto_rotate");
values.put(CardDatabaseHelper.CardColumns.CATEGORY, 2);
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;
}
@@ -252,7 +252,7 @@
"content://com.android.settings.slices/action/toggle_airplane");
values.put(CardDatabaseHelper.CardColumns.CATEGORY, 2);
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;
return twoRows;