summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/layout/photo_module.xml2
-rw-r--r--src/com/android/camera/PhotoModule.java39
2 files changed, 22 insertions, 19 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index 10017192b..9c5b2c0d0 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -65,7 +65,7 @@
android:id="@+id/autohdr_view"
android:layout_width="200dip"
android:layout_height="200dip"
- android:layout_marginTop="15dip"
+ android:layout_marginTop="50dip"
android:layout_marginLeft="15dip" />
</RelativeLayout>
<ImageView
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);
}