diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-04-17 21:56:53 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-17 21:56:53 -0700 |
| commit | d7138a5f820af06fe4644f4a0e0f47cd7b38f141 (patch) | |
| tree | 0193317513fc4b9a9d056a377097e8e8d44d03b6 /src/com/android/camera/PhotoModule.java | |
| parent | a136064e151b0aade3e06356b3b32991a1ea7201 (diff) | |
| parent | 04ef4a0580634fbaf1e2441485b8f37650aaa2fe (diff) | |
| download | android_packages_apps_Snap-d7138a5f820af06fe4644f4a0e0f47cd7b38f141.tar.gz android_packages_apps_Snap-d7138a5f820af06fe4644f4a0e0f47cd7b38f141.tar.bz2 android_packages_apps_Snap-d7138a5f820af06fe4644f4a0e0f47cd7b38f141.zip | |
Merge "SnapdragonCamera: Fix auto HDR indication issue" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 3abd74cca..4d2ec6ad8 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1128,23 +1128,26 @@ public class PhotoModule for (int i =0;i<3;i++) { metadata[i] = byteToInt( (byte []) data, i*4); } - if (metadata[2] == 1) { - mAutoHdrEnable = true; - mActivity.runOnUiThread(new Runnable() { - public void run() { - if (mDrawAutoHDR != null) - mDrawAutoHDR.AutoHDR(); - } - }); - } - else { - mAutoHdrEnable = false; - mActivity.runOnUiThread(new Runnable() { - public void run() { - if (mDrawAutoHDR != null) - mDrawAutoHDR.AutoHDR(); - } - }); + /* Checking if the meta data is for auto HDR */ + if (metadata[0] == 3) { + if (metadata[2] == 1) { + mAutoHdrEnable = true; + mActivity.runOnUiThread(new Runnable() { + public void run() { + if (mDrawAutoHDR != null) + mDrawAutoHDR.AutoHDR(); + } + }); + } + else { + mAutoHdrEnable = false; + mActivity.runOnUiThread(new Runnable() { + public void run() { + if (mDrawAutoHDR != null) + mDrawAutoHDR.AutoHDR(); + } + }); + } } } } @@ -4983,7 +4986,7 @@ class DrawAutoHDR extends View{ AutoHDRPaint.setStyle(Paint.Style.STROKE); AutoHDRPaint.setColor(Color.MAGENTA); AutoHDRPaint.setStrokeWidth(1); - AutoHDRPaint.setTextSize(16); + AutoHDRPaint.setTextSize(32); AutoHDRPaint.setAlpha (255); canvas.drawText("HDR On",200,100,AutoHDRPaint); } |