diff options
author | Erin Dahlgren <edahlgren@google.com> | 2013-10-14 23:42:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-14 23:42:13 +0000 |
commit | 831da6132122d9d9a35183ef832994be659c3740 (patch) | |
tree | 8f83dd813d79b05d143d2065b490bc3fc1116774 /src/com/android/camera/WideAnglePanoramaModule.java | |
parent | 2670f3e45f5818f7c1074b10ef336df30af74583 (diff) | |
parent | 3044d8c577432d6e9721fc8b26ac2afbbaf21266 (diff) | |
download | android_packages_apps_Snap-831da6132122d9d9a35183ef832994be659c3740.tar.gz android_packages_apps_Snap-831da6132122d9d9a35183ef832994be659c3740.tar.bz2 android_packages_apps_Snap-831da6132122d9d9a35183ef832994be659c3740.zip |
Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/camera/WideAnglePanoramaModule.java')
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index 91c3049c6..aa66bdcd3 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -144,6 +144,7 @@ public class WideAnglePanoramaModule private OrientationManager mOrientationManager; private ComboPreferences mPreferences; private boolean mMosaicPreviewConfigured; + private boolean mPreviewFocused; @Override public void onPreviewUIReady() { @@ -308,11 +309,13 @@ public class WideAnglePanoramaModule @Override public void onPreviewFocusChanged(boolean previewFocused) { - if (previewFocused) { - mUI.showUI(); - } else { - mUI.hideUI(); - } + mPreviewFocused = previewFocused; + mUI.onPreviewFocusChanged(previewFocused); + } + + @Override + public boolean arePreviewControlsVisible() { + return mUI.arePreviewControlsVisible(); } /** @@ -705,7 +708,9 @@ public class WideAnglePanoramaModule mActivity.setSwipingEnabled(true); // Orientation change will trigger onLayoutChange->configMosaicPreview-> // resetToPreview. Do not show the capture UI in film strip. - mUI.showPreviewUI(); + if (mPreviewFocused) { + mUI.showPreviewUI(); + } mMosaicFrameProcessor.reset(); } |