diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-04-26 12:37:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-26 12:37:17 -0700 |
| commit | 26068da0b1b0e4073f4afb9645c37ba6bfc84bf4 (patch) | |
| tree | 9998b4c2f1b644e87483ead269aed934e6121252 | |
| parent | 604e15d9f23f3b040796df4e3adbb25d2a73393f (diff) | |
| parent | 61253a495b5f5d57d57570e29c510d545762d8b3 (diff) | |
| download | android_packages_apps_Snap-26068da0b1b0e4073f4afb9645c37ba6bfc84bf4.tar.gz android_packages_apps_Snap-26068da0b1b0e4073f4afb9645c37ba6bfc84bf4.tar.bz2 android_packages_apps_Snap-26068da0b1b0e4073f4afb9645c37ba6bfc84bf4.zip | |
Merge "SnapdragonCamera: Fix viewfinder flashing issue in camcorder mode" into camera.lnx.1.0-dev.1.0
| -rw-r--r-- | res/layout/video_module.xml | 3 | ||||
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml index c1063510b..20d7be1d2 100644 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.xml @@ -42,8 +42,7 @@ android:id="@+id/preview_cover" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/black" - android:visibility="gone" /> + android:background="@android:color/black" /> <View android:id="@+id/flash_overlay" android:layout_width="match_parent" diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java index 8447db27e..c99c8c8f5 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -1123,8 +1123,6 @@ public class VideoUI implements PieRenderer.PieListener, @Override 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. - hidePreviewCover(); } @Override |