summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFei Zhang <feizhang@codeaurora.org>2014-04-01 17:48:14 +0800
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2014-10-20 23:14:09 +0000
commitd989a5f46d8335b2ff38fac41a41689d35a4cf7b (patch)
tree6eca2bf51b1294df25a36891acac365788b61c2c
parent0121f804d1bb080780b2dc07a1cb4890c70e82df (diff)
downloadandroid_packages_apps_Camera2-d989a5f46d8335b2ff38fac41a41689d35a4cf7b.tar.gz
android_packages_apps_Camera2-d989a5f46d8335b2ff38fac41a41689d35a4cf7b.tar.bz2
android_packages_apps_Camera2-d989a5f46d8335b2ff38fac41a41689d35a4cf7b.zip
Camera2: add new mime type for panorama picture
Add mime type 'image/jpeg', along with 'jpeg', So the DISPLAY_NAME of captured picture is correctly saved. Change-Id: I40a3c660311f1a3c69078ae3580dd74def9d69ba
-rw-r--r--src/com/android/camera/Storage.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/Storage.java b/src/com/android/camera/Storage.java
index 340bf5b07..aa0fbb71e 100644
--- a/src/com/android/camera/Storage.java
+++ b/src/com/android/camera/Storage.java
@@ -123,7 +123,9 @@ public class Storage {
// Insert into MediaStore.
ContentValues values = new ContentValues(9);
values.put(ImageColumns.TITLE, title);
- if (mimeType.equalsIgnoreCase("jpeg") || mimeType == null) {
+ if (mimeType.equalsIgnoreCase("jpeg") ||
+ mimeType.equalsIgnoreCase("image/jpeg") ||
+ mimeType == null) {
values.put(ImageColumns.DISPLAY_NAME, title + ".jpg");
} else {
values.put(ImageColumns.DISPLAY_NAME, title + ".raw");