diff options
author | Erin Dahlgren <edahlgren@google.com> | 2013-10-10 18:23:45 -0700 |
---|---|---|
committer | Erin Dahlgren <edahlgren@google.com> | 2013-10-14 13:40:45 -0700 |
commit | 3044d8c577432d6e9721fc8b26ac2afbbaf21266 (patch) | |
tree | eb9976bbe0b2bf5f74032af77b690dc56fd29bb3 /src/com/android/camera/WideAnglePanoramaModule.java | |
parent | b27668f0d0a1d5049759a8448e1701e199e05c71 (diff) | |
download | android_packages_apps_Snap-3044d8c577432d6e9721fc8b26ac2afbbaf21266.tar.gz android_packages_apps_Snap-3044d8c577432d6e9721fc8b26ac2afbbaf21266.tar.bz2 android_packages_apps_Snap-3044d8c577432d6e9721fc8b26ac2afbbaf21266.zip |
Set camera controls visibility based on whether the camera preview is centered.
Bug: 10861015
Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
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 189bf99d1..f91b41e04 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(); } |