Merge "Fix title don't refresh after changing in MTP mode" (acb1142f) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/data/LocalImage.java

100644 → 100755

+2 −2

src/com/android/gallery3d/data/LocalMediaItem.java

100644 → 100755

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -61,6 +61,23 @@ public abstract class LocalMediaItem extends MediaItem {
	return caption;		return caption;
	}		}

			public String getPathTile(String path) {
			// extract file name after last slash
			int lastSlash = path.lastIndexOf('/');
			if (lastSlash >= 0) {
			lastSlash++;
			if (lastSlash < path.length()) {
			path = path.substring(lastSlash);
			}
			}
			// truncate the file extension (if any)
			int lastDot = path.lastIndexOf('.');
			if (lastDot > 0) {
			path = path.substring(0, lastDot);
			}
			return path;
			}

	@Override		@Override
	public void getLatLong(double[] latLong) {		public void getLatLong(double[] latLong) {
	latLong[0] = latitude;		latLong[0] = latitude;

src/com/android/gallery3d/data/LocalVideo.java

100644 → 100755

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -133,7 +133,6 @@ public class LocalImage extends LocalMediaItem {

	private void loadFromCursor(Cursor cursor) {		private void loadFromCursor(Cursor cursor) {
	id = cursor.getInt(INDEX_ID);		id = cursor.getInt(INDEX_ID);
	caption = cursor.getString(INDEX_CAPTION);
	mimeType = cursor.getString(INDEX_MIME_TYPE);		mimeType = cursor.getString(INDEX_MIME_TYPE);
	latitude = cursor.getDouble(INDEX_LATITUDE);		latitude = cursor.getDouble(INDEX_LATITUDE);
	longitude = cursor.getDouble(INDEX_LONGITUDE);		longitude = cursor.getDouble(INDEX_LONGITUDE);
	@@ -141,6 +140,7 @@ public class LocalImage extends LocalMediaItem {
	dateAddedInSec = cursor.getLong(INDEX_DATE_ADDED);		dateAddedInSec = cursor.getLong(INDEX_DATE_ADDED);
	dateModifiedInSec = cursor.getLong(INDEX_DATE_MODIFIED);		dateModifiedInSec = cursor.getLong(INDEX_DATE_MODIFIED);
	filePath = cursor.getString(INDEX_DATA);		filePath = cursor.getString(INDEX_DATA);
			caption = getPathTile(filePath);
	rotation = cursor.getInt(INDEX_ORIENTATION);		rotation = cursor.getInt(INDEX_ORIENTATION);
	bucketId = cursor.getInt(INDEX_BUCKET_ID);		bucketId = cursor.getInt(INDEX_BUCKET_ID);
	fileSize = cursor.getLong(INDEX_SIZE);		fileSize = cursor.getLong(INDEX_SIZE);
	@@ -152,7 +152,6 @@ public class LocalImage extends LocalMediaItem {
	protected boolean updateFromCursor(Cursor cursor) {		protected boolean updateFromCursor(Cursor cursor) {
	UpdateHelper uh = new UpdateHelper();		UpdateHelper uh = new UpdateHelper();
	id = uh.update(id, cursor.getInt(INDEX_ID));		id = uh.update(id, cursor.getInt(INDEX_ID));
	caption = uh.update(caption, cursor.getString(INDEX_CAPTION));
	mimeType = uh.update(mimeType, cursor.getString(INDEX_MIME_TYPE));		mimeType = uh.update(mimeType, cursor.getString(INDEX_MIME_TYPE));
	latitude = uh.update(latitude, cursor.getDouble(INDEX_LATITUDE));		latitude = uh.update(latitude, cursor.getDouble(INDEX_LATITUDE));
	longitude = uh.update(longitude, cursor.getDouble(INDEX_LONGITUDE));		longitude = uh.update(longitude, cursor.getDouble(INDEX_LONGITUDE));
	@@ -163,6 +162,7 @@ public class LocalImage extends LocalMediaItem {
	dateModifiedInSec = uh.update(		dateModifiedInSec = uh.update(
	dateModifiedInSec, cursor.getLong(INDEX_DATE_MODIFIED));		dateModifiedInSec, cursor.getLong(INDEX_DATE_MODIFIED));
	filePath = uh.update(filePath, cursor.getString(INDEX_DATA));		filePath = uh.update(filePath, cursor.getString(INDEX_DATA));
			caption = uh.update(caption, getPathTile(filePath));
	rotation = uh.update(rotation, cursor.getInt(INDEX_ORIENTATION));		rotation = uh.update(rotation, cursor.getInt(INDEX_ORIENTATION));
	bucketId = uh.update(bucketId, cursor.getInt(INDEX_BUCKET_ID));		bucketId = uh.update(bucketId, cursor.getInt(INDEX_BUCKET_ID));
	fileSize = uh.update(fileSize, cursor.getLong(INDEX_SIZE));		fileSize = uh.update(fileSize, cursor.getLong(INDEX_SIZE));

Original line number	Original line	Diff line number	Diff line
	@@ -101,7 +101,6 @@ public class LocalVideo extends LocalMediaItem {

	private void loadFromCursor(Cursor cursor) {		private void loadFromCursor(Cursor cursor) {
	id = cursor.getInt(INDEX_ID);		id = cursor.getInt(INDEX_ID);
	caption = cursor.getString(INDEX_CAPTION);
	mimeType = cursor.getString(INDEX_MIME_TYPE);		mimeType = cursor.getString(INDEX_MIME_TYPE);
	latitude = cursor.getDouble(INDEX_LATITUDE);		latitude = cursor.getDouble(INDEX_LATITUDE);
	longitude = cursor.getDouble(INDEX_LONGITUDE);		longitude = cursor.getDouble(INDEX_LONGITUDE);
	@@ -109,6 +108,7 @@ public class LocalVideo extends LocalMediaItem {
	dateAddedInSec = cursor.getLong(INDEX_DATE_ADDED);		dateAddedInSec = cursor.getLong(INDEX_DATE_ADDED);
	dateModifiedInSec = cursor.getLong(INDEX_DATE_MODIFIED);		dateModifiedInSec = cursor.getLong(INDEX_DATE_MODIFIED);
	filePath = cursor.getString(INDEX_DATA);		filePath = cursor.getString(INDEX_DATA);
			caption = getPathTile(filePath);
	durationInSec = cursor.getInt(INDEX_DURATION) / 1000;		durationInSec = cursor.getInt(INDEX_DURATION) / 1000;
	bucketId = cursor.getInt(INDEX_BUCKET_ID);		bucketId = cursor.getInt(INDEX_BUCKET_ID);
	fileSize = cursor.getLong(INDEX_SIZE);		fileSize = cursor.getLong(INDEX_SIZE);
	@@ -133,7 +133,6 @@ public class LocalVideo extends LocalMediaItem {
	protected boolean updateFromCursor(Cursor cursor) {		protected boolean updateFromCursor(Cursor cursor) {
	UpdateHelper uh = new UpdateHelper();		UpdateHelper uh = new UpdateHelper();
	id = uh.update(id, cursor.getInt(INDEX_ID));		id = uh.update(id, cursor.getInt(INDEX_ID));
	caption = uh.update(caption, cursor.getString(INDEX_CAPTION));
	mimeType = uh.update(mimeType, cursor.getString(INDEX_MIME_TYPE));		mimeType = uh.update(mimeType, cursor.getString(INDEX_MIME_TYPE));
	latitude = uh.update(latitude, cursor.getDouble(INDEX_LATITUDE));		latitude = uh.update(latitude, cursor.getDouble(INDEX_LATITUDE));
	longitude = uh.update(longitude, cursor.getDouble(INDEX_LONGITUDE));		longitude = uh.update(longitude, cursor.getDouble(INDEX_LONGITUDE));
	@@ -144,6 +143,7 @@ public class LocalVideo extends LocalMediaItem {
	dateModifiedInSec = uh.update(		dateModifiedInSec = uh.update(
	dateModifiedInSec, cursor.getLong(INDEX_DATE_MODIFIED));		dateModifiedInSec, cursor.getLong(INDEX_DATE_MODIFIED));
	filePath = uh.update(filePath, cursor.getString(INDEX_DATA));		filePath = uh.update(filePath, cursor.getString(INDEX_DATA));
			caption = uh.update(caption, getPathTile(filePath));
	durationInSec = uh.update(		durationInSec = uh.update(
	durationInSec, cursor.getInt(INDEX_DURATION) / 1000);		durationInSec, cursor.getInt(INDEX_DURATION) / 1000);
	bucketId = uh.update(bucketId, cursor.getInt(INDEX_BUCKET_ID));		bucketId = uh.update(bucketId, cursor.getInt(INDEX_BUCKET_ID));