summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/CameraActivity.java16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index a2bfd1796..47a964f06 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -269,7 +269,11 @@ public class CameraActivity extends Activity
if (mActionBar.isShowing()) {
mActionBar.hide();
} else {
- mActionBar.show();
+ // In the preview, don't show the action bar if that is
+ // a capture intent.
+ if (!isCaptureIntent()) {
+ mActionBar.show();
+ }
}
return mActionBar.isShowing();
}
@@ -580,6 +584,16 @@ public class CameraActivity extends Activity
}
}
+ private boolean isCaptureIntent() {
+ if (MediaStore.ACTION_VIDEO_CAPTURE.equals(getIntent().getAction())
+ || MediaStore.ACTION_IMAGE_CAPTURE.equals(getIntent().getAction())
+ || MediaStore.ACTION_IMAGE_CAPTURE_SECURE.equals(getIntent().getAction())) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
@Override
public void onCreate(Bundle state) {
super.onCreate(state);