diff options
author | likaid <likaid@codeaurora.org> | 2015-07-06 14:01:01 +0800 |
---|---|---|
committer | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2016-01-08 22:48:57 -0800 |
commit | c134c1e13143d634d97d408b7f44d291acb30404 (patch) | |
tree | 6cbf1b4c4c3d8fd8f5a557601c01852b100cfad8 /src/com | |
parent | ba56fa8fe75c30881d4920738f085f9ca92adae1 (diff) | |
download | android_packages_apps_Snap-c134c1e13143d634d97d408b7f44d291acb30404.tar.gz android_packages_apps_Snap-c134c1e13143d634d97d408b7f44d291acb30404.tar.bz2 android_packages_apps_Snap-c134c1e13143d634d97d408b7f44d291acb30404.zip |
SnapdragonCamera: Hide the preview cover when preview has started
The preview cover was shown when onPause, but didn't hide after
resume. That caused the video preview turned to black screen.
After the camera preview starts, hide the preview cover if it is
still showing.
Change-Id: I79fdcd45d46d7c083a132e864bbf42649b100ae4
CRs-Fixed: 865933
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/camera/VideoModule.java | 1 | ||||
-rw-r--r-- | src/com/android/camera/VideoUI.java | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index d19d9f465..86afd16bc 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1233,6 +1233,7 @@ public class VideoModule implements CameraModule, private void onPreviewStarted() { mUI.enableShutter(true); + mUI.hidePreviewCover(); } @Override diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 2e1d300cc..3513c0e3b 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -134,6 +134,12 @@ public class VideoUI implements PieRenderer.PieListener, mPreviewCover.setVisibility(View.VISIBLE); } + public void hidePreviewCover() { + if (mPreviewCover != null && mPreviewCover.getVisibility() != View.GONE) { + mPreviewCover.setVisibility(View.GONE); + } + } + private class SettingsPopup extends PopupWindow { public SettingsPopup(View popup) { super(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); @@ -1044,9 +1050,7 @@ public class VideoUI implements PieRenderer.PieListener, public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { Log.v(TAG, "surfaceChanged: width = " + width + ", height = " + height); // Make sure preview cover is hidden if preview data is available. - if (mPreviewCover.getVisibility() != View.GONE) { - mPreviewCover.setVisibility(View.GONE); - } + hidePreviewCover(); } @Override |