summaryrefslogtreecommitdiffstats
path: root/src/com/android/photos/data
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2013-03-07 08:55:18 -0800
committerMangesh Ghiware <mghiware@google.com>2013-03-07 09:15:26 -0800
commit5e46468ff8bce4c2912b9f5fb64df68f24f281cc (patch)
tree152b81df3955390a59bb371e48b36fa0d9ed586b /src/com/android/photos/data
parent2678d9626f3efc6b0728de52c193598ecef02a8a (diff)
downloadandroid_packages_apps_Snap-5e46468ff8bce4c2912b9f5fb64df68f24f281cc.tar.gz
android_packages_apps_Snap-5e46468ff8bce4c2912b9f5fb64df68f24f281cc.tar.bz2
android_packages_apps_Snap-5e46468ff8bce4c2912b9f5fb64df68f24f281cc.zip
Remove redundant Album NAME (replaced by TITLE)
Change-Id: I0482f8b4bd85e07aefe4af02b1e8dab4702eb9f6
Diffstat (limited to 'src/com/android/photos/data')
-rw-r--r--src/com/android/photos/data/PhotoDatabase.java5
-rw-r--r--src/com/android/photos/data/PhotoProvider.java2
2 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/photos/data/PhotoDatabase.java b/src/com/android/photos/data/PhotoDatabase.java
index 8585edc04..a87f00bfa 100644
--- a/src/com/android/photos/data/PhotoDatabase.java
+++ b/src/com/android/photos/data/PhotoDatabase.java
@@ -59,14 +59,13 @@ public class PhotoDatabase extends SQLiteOpenHelper {
{ Albums.ACCOUNT_ID, "INTEGER NOT NULL" },
// Albums.PARENT_ID is a foreign key to Albums._ID
{ Albums.PARENT_ID, "INTEGER" },
- { Albums.NAME, "Text NOT NULL" },
{ Albums.VISIBILITY, "INTEGER NOT NULL" },
{ Albums.LOCATION_STRING, "TEXT" },
- { Albums.TITLE, "TEXT" },
+ { Albums.TITLE, "TEXT NOT NULL" },
{ Albums.SUMMARY, "TEXT" },
{ Albums.DATE_PUBLISHED, "INTEGER" },
{ Albums.DATE_MODIFIED, "INTEGER" },
- createUniqueConstraint(Albums.PARENT_ID, Albums.NAME),
+ createUniqueConstraint(Albums.PARENT_ID, Albums.TITLE),
};
private static final String[][] CREATE_METADATA = {
diff --git a/src/com/android/photos/data/PhotoProvider.java b/src/com/android/photos/data/PhotoProvider.java
index a4fe8fdd2..7d751bf95 100644
--- a/src/com/android/photos/data/PhotoProvider.java
+++ b/src/com/android/photos/data/PhotoProvider.java
@@ -131,8 +131,6 @@ public class PhotoProvider extends ContentProvider {
public static final String ACCOUNT_ID = "account_id";
/** Parent directory or null if this is in the root. */
public static final String PARENT_ID = "parent_id";
- /** Column name for the name of the album. String value. */
- public static final String NAME = "name";
/**
* Column name for the visibility level of the album. Can be any of the
* VISIBILITY_* values.