From 1ef76d4cbd73c02cb8d02cf4cde3f4cee81548d6 Mon Sep 17 00:00:00 2001
From: Alan Newberger <alann@google.com>
Date: Wed, 4 Sep 2013 19:01:59 -0700
Subject: reintroduce action bar hiding for onDataChanged

this code was present but got inadvertently removed by a subsequent
change Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8.

Change-Id: If6c0f31497406fc3056dbb48d67b195342f6d10f
---
 src/com/android/camera/CameraActivity.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/com')

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 3521de2d4..01da30932 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -243,7 +243,14 @@ public class CameraActivity extends Activity
                                     hidePanoStitchingProgress();
                                     return;
                                 }
-                                updateActionBarMenu(dataID);
+
+                                if (currentData.getLocalDataType() ==
+                                        LocalData.LOCAL_CAMERA_PREVIEW) {
+                                    // Don't show the action bar in Camera preview.
+                                    mActionBar.hide();
+                                } else {
+                                    updateActionBarMenu(dataID);
+                                }
 
                                 Uri contentUri = currentData.getContentUri();
                                 if (contentUri == null) {
-- 
cgit v1.2.3