summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-06-08 14:46:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-08 14:46:50 -0700
commit585f0caa3549f5a700e9a939a9ce05ad7d1d6bb6 (patch)
tree562caabb500b665ff0e67ecbeb09eac918e08e0d /src/com/android/camera
parent9cd9b54a025bfd8e9be35d8c85cf1ba0e7a646b4 (diff)
parent5665e3790841ffc54ab3494ef6627026d5048a8c (diff)
downloadLegacyCamera-585f0caa3549f5a700e9a939a9ce05ad7d1d6bb6.zip
LegacyCamera-585f0caa3549f5a700e9a939a9ce05ad7d1d6bb6.tar.gz
LegacyCamera-585f0caa3549f5a700e9a939a9ce05ad7d1d6bb6.tar.bz2
am 5665e379: am 4b478c99: Merge "Camcorder HUD no longer disappears when opening slider"
* commit '5665e3790841ffc54ab3494ef6627026d5048a8c': Camcorder HUD no longer disappears when opening slider
Diffstat (limited to 'src/com/android/camera')
-rw-r--r--src/com/android/camera/VideoCamera.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index e002bf5..02ca25c 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -459,8 +459,8 @@ public class VideoCamera extends ActivityBase
// becomes landscape.
Configuration config = getResources().getConfiguration();
if (config.orientation == Configuration.ORIENTATION_LANDSCAPE
- && !mPausing && mGLRootView == null) {
- attachHeadUpDisplay();
+ && !mPausing) {
+ if (mGLRootView == null) attachHeadUpDisplay();
} else if (mGLRootView != null) {
detachHeadUpDisplay();
}