Remove "display name" and always use "title" field in display.
diff --git a/src/com/android/camera/MenuHelper.java b/src/com/android/camera/MenuHelper.java
index 2d1eb4a..937f9da 100644
--- a/src/com/android/camera/MenuHelper.java
+++ b/src/com/android/camera/MenuHelper.java
@@ -384,7 +384,7 @@
TextView textView = (TextView) d.findViewById(
R.id.details_image_title);
- textView.setText(image.getDisplayName());
+ textView.setText(image.getTitle());
long length = getImageFileSize(image);
String lengthString = length < 0
diff --git a/src/com/android/camera/gallery/BaseImage.java b/src/com/android/camera/gallery/BaseImage.java
index 1349deb..db84065 100644
--- a/src/com/android/camera/gallery/BaseImage.java
+++ b/src/com/android/camera/gallery/BaseImage.java
@@ -49,7 +49,6 @@
protected String mMimeType;
private final long mDateTaken;
private String mTitle;
- private final String mDisplayName;
protected BaseImageList mContainer;
@@ -58,7 +57,7 @@
protected BaseImage(BaseImageList container, ContentResolver cr,
long id, int index, Uri uri, String dataPath, String mimeType,
- long dateTaken, String title, String displayName) {
+ long dateTaken, String title) {
mContainer = container;
mContentResolver = cr;
mId = id;
@@ -68,7 +67,6 @@
mMimeType = mimeType;
mDateTaken = dateTaken;
mTitle = title;
- mDisplayName = displayName;
}
public String getDataPath() {
@@ -139,10 +137,6 @@
return mTitle;
}
- public String getDisplayName() {
- return mDisplayName;
- }
-
private void setupDimension() {
ParcelFileDescriptor input = null;
try {
diff --git a/src/com/android/camera/gallery/DrmImageList.java b/src/com/android/camera/gallery/DrmImageList.java
index cd1586d..0806928 100644
--- a/src/com/android/camera/gallery/DrmImageList.java
+++ b/src/com/android/camera/gallery/DrmImageList.java
@@ -60,9 +60,9 @@
protected DrmImage(BaseImageList container, ContentResolver cr,
long id, int index, Uri uri, String dataPath,
long miniThumbMagic, String mimeType, long dateTaken,
- String title, String displayName, int rotation) {
+ String title, int rotation) {
super(container, cr, id, index, uri, dataPath,
- mimeType, dateTaken, title, displayName, rotation);
+ mimeType, dateTaken, title, rotation);
}
@Override
@@ -91,11 +91,6 @@
return fullSizeBitmap(IImage.THUMBNAIL_TARGET_SIZE,
IImage.THUMBNAIL_MAX_NUM_PIXELS);
}
-
- @Override
- public String getDisplayName() {
- return getTitle();
- }
}
@Override
@@ -105,6 +100,6 @@
String mimeType = cursor.getString(INDEX_MIME_TYPE);
return new DrmImage(this, mContentResolver, id, cursor.getPosition(),
contentUri(id), dataPath, 0, mimeType, 0, "DrmImage-" + id,
- "DrmImage-" + id, 0);
+ 0);
}
}
diff --git a/src/com/android/camera/gallery/IImage.java b/src/com/android/camera/gallery/IImage.java
index 8b443d6..22e1228 100644
--- a/src/com/android/camera/gallery/IImage.java
+++ b/src/com/android/camera/gallery/IImage.java
@@ -64,8 +64,6 @@
public abstract int getHeight();
- public abstract String getDisplayName();
-
// Get property of the image
public abstract boolean isReadonly();
public abstract boolean isDrm();
diff --git a/src/com/android/camera/gallery/Image.java b/src/com/android/camera/gallery/Image.java
index 69575f1..317c5cf 100644
--- a/src/com/android/camera/gallery/Image.java
+++ b/src/com/android/camera/gallery/Image.java
@@ -44,10 +44,10 @@
public Image(BaseImageList container, ContentResolver cr,
long id, int index, Uri uri, String dataPath,
- String mimeType, long dateTaken, String title, String displayName,
+ String mimeType, long dateTaken, String title,
int rotation) {
super(container, cr, id, index, uri, dataPath,
- mimeType, dateTaken, title, displayName);
+ mimeType, dateTaken, title);
mRotation = rotation;
}
diff --git a/src/com/android/camera/gallery/ImageList.java b/src/com/android/camera/gallery/ImageList.java
index 96136d7..8f2c8c8 100644
--- a/src/com/android/camera/gallery/ImageList.java
+++ b/src/com/android/camera/gallery/ImageList.java
@@ -131,9 +131,8 @@
if (title == null || title.length() == 0) {
title = dataPath;
}
- String displayName = title;
return new Image(this, mContentResolver, id, cursor.getPosition(),
contentUri(id), dataPath, mimeType, dateTaken, title,
- displayName, orientation);
+ orientation);
}
}
diff --git a/src/com/android/camera/gallery/UriImage.java b/src/com/android/camera/gallery/UriImage.java
index 0f27b24..1d04257 100644
--- a/src/com/android/camera/gallery/UriImage.java
+++ b/src/com/android/camera/gallery/UriImage.java
@@ -116,10 +116,6 @@
return mUri.toString();
}
- public String getDisplayName() {
- return getTitle();
- }
-
public Bitmap thumbBitmap(boolean rotateAsNeeded) {
return fullSizeBitmap(THUMBNAIL_TARGET_SIZE, THUMBNAIL_MAX_NUM_PIXELS,
rotateAsNeeded);
diff --git a/src/com/android/camera/gallery/VideoList.java b/src/com/android/camera/gallery/VideoList.java
index 4417c14..18b1de1 100644
--- a/src/com/android/camera/gallery/VideoList.java
+++ b/src/com/android/camera/gallery/VideoList.java
@@ -37,7 +37,6 @@
Media.DATA,
Media.DATE_TAKEN,
Media.TITLE,
- Media.DISPLAY_NAME,
Media.MINI_THUMB_MAGIC,
Media.MIME_TYPE,
Media.DATE_MODIFIED};
@@ -46,10 +45,9 @@
private static final int INDEX_DATA_PATH = 1;
private static final int INDEX_DATE_TAKEN = 2;
private static final int INDEX_TITLE = 3;
- private static final int INDEX_DISPLAY_NAME = 4;
- private static final int INDEX_MIMI_THUMB_MAGIC = 5;
- private static final int INDEX_MIME_TYPE = 6;
- private static final int INDEX_DATE_MODIFIED = 7;
+ private static final int INDEX_MIMI_THUMB_MAGIC = 4;
+ private static final int INDEX_MIME_TYPE = 5;
+ private static final int INDEX_DATE_MODIFIED = 6;
@Override
protected long getImageId(Cursor cursor) {
@@ -64,14 +62,15 @@
if (dateTaken == 0) {
dateTaken = cursor.getLong(INDEX_DATE_MODIFIED) * 1000;
}
- String title = cursor.getString(INDEX_TITLE);
- String displayName = cursor.getString(INDEX_DISPLAY_NAME);
long miniThumbMagic = cursor.getLong(INDEX_MIMI_THUMB_MAGIC);
+ String title = cursor.getString(INDEX_TITLE);
String mimeType = cursor.getString(INDEX_MIME_TYPE);
-
+ if (title == null || title.length() == 0) {
+ title = dataPath;
+ }
return new VideoObject(this, mContentResolver,
id, cursor.getPosition(), contentUri(id), dataPath,
- mimeType, dateTaken, title, displayName);
+ mimeType, dateTaken, title);
}
public VideoList(ContentResolver resolver, Uri uri, int sort,
diff --git a/src/com/android/camera/gallery/VideoObject.java b/src/com/android/camera/gallery/VideoObject.java
index 3ef06b1..91598a7 100644
--- a/src/com/android/camera/gallery/VideoObject.java
+++ b/src/com/android/camera/gallery/VideoObject.java
@@ -44,9 +44,9 @@
*/
protected VideoObject(BaseImageList container, ContentResolver cr,
long id, int index, Uri uri, String dataPath,
- String mimeType, long dateTaken, String title, String displayName) {
+ String mimeType, long dateTaken, String title) {
super(container, cr, id, index, uri, dataPath,
- mimeType, dateTaken, title, displayName);
+ mimeType, dateTaken, title);
}
@Override