summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-06-07 13:21:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-07 13:21:59 -0700
commit5665e3790841ffc54ab3494ef6627026d5048a8c (patch)
tree029b00c9d5180f6f1d1785a4196616944b7f43e9
parentdd56e778e4f16a615b62961bbb9588feeac9200f (diff)
parent4b478c9940ad3e79f1c99ad70b2aa7b4643b3946 (diff)
downloadpackages_apps_LegacyCamera-5665e3790841ffc54ab3494ef6627026d5048a8c.zip
packages_apps_LegacyCamera-5665e3790841ffc54ab3494ef6627026d5048a8c.tar.gz
packages_apps_LegacyCamera-5665e3790841ffc54ab3494ef6627026d5048a8c.tar.bz2
am 4b478c99: Merge "Camcorder HUD no longer disappears when opening slider"
* commit '4b478c9940ad3e79f1c99ad70b2aa7b4643b3946': Camcorder HUD no longer disappears when opening slider
-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 f76f7f0..445dc40 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -454,8 +454,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();
}