diff options
| -rw-r--r-- | res/layout/photo_module.xml | 12 | ||||
| -rw-r--r-- | res/layout/video_module.xml | 12 | ||||
| -rw-r--r-- | src/com/android/camera/VideoUI.java | 2 |
3 files changed, 19 insertions, 7 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index f5525b832..b0bca3c97 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -24,10 +24,16 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center"> - <TextureView - android:id="@+id/preview_content" + <!-- Wrap a frame layout around texture view so that when scaled, texture + view will not draw outside its unscaled bounds --> + <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent"> + <TextureView + android:id="@+id/preview_content" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </FrameLayout> <View android:id="@+id/flash_overlay" android:layout_width="match_parent" diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml index 0f4857965..b4444e7f0 100644 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.xml @@ -17,10 +17,16 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="match_parent" android:layout_width="match_parent"> - <TextureView - android:id="@+id/preview_content" + <!-- Wrap a frame layout around texture view so that when scaled, texture + view will not draw outside its unscaled bounds --> + <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent"> + <TextureView + android:id="@+id/preview_content" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </FrameLayout> <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 74d4cea9b..ad42b1aa0 100644 --- a/src/com/android/camera/VideoUI.java +++ b/src/com/android/camera/VideoUI.java @@ -168,7 +168,7 @@ public class VideoUI implements PieRenderer.PieListener, mActivity.getLayoutInflater().inflate(R.layout.video_module, (ViewGroup) mRootView, true); mTextureView = (TextureView) mRootView.findViewById(R.id.preview_content); mTextureView.setSurfaceTextureListener(this); - mRootView.addOnLayoutChangeListener(mLayoutListener); + mTextureView.addOnLayoutChangeListener(mLayoutListener); ((CameraRootView) mRootView).setDisplayChangeListener(this); mFlashOverlay = mRootView.findViewById(R.id.flash_overlay); mShutterButton = (ShutterButton) mRootView.findViewById(R.id.shutter_button); |