summaryrefslogtreecommitdiffstats
path: root/res/layout-land/camera_controls.xml
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-08-06 14:31:52 -0700
committerSascha Haeberling <haeberling@google.com>2013-08-06 14:58:07 -0700
commit37f3611bbdc787c996a99894dcef7d8fb77e3f7c (patch)
tree4dc08a60a543dc4d2b0672a8c0cc4efdc30b52ad /res/layout-land/camera_controls.xml
parent8fe71f31bc8ab1b634566a3060e041e22e9b2e41 (diff)
downloadandroid_packages_apps_Snap-37f3611bbdc787c996a99894dcef7d8fb77e3f7c.tar.gz
android_packages_apps_Snap-37f3611bbdc787c996a99894dcef7d8fb77e3f7c.tar.bz2
android_packages_apps_Snap-37f3611bbdc787c996a99894dcef7d8fb77e3f7c.zip
This adds the following four CLs to Camera2:
http://ag/339319 http://ag/338974 http://ag/338401 http://ag/324149 Adapted to work in Camera2 and adding a .gitignore so that temporary Eclipse files and folders are not submitted. Change-Id: I40295c7f0139f76270c44f0ca395c0574a288569
Diffstat (limited to 'res/layout-land/camera_controls.xml')
-rw-r--r--res/layout-land/camera_controls.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
index 432ae9ebd..d1772401e 100644
--- a/res/layout-land/camera_controls.xml
+++ b/res/layout-land/camera_controls.xml
@@ -59,11 +59,12 @@
android:scaleType="center"
android:src="@drawable/btn_new_shutter" />
- <View
+ <ImageView
android:id="@+id/preview_thumb"
android:visibility="invisible"
android:layout_width="@dimen/capture_size"
android:layout_height="@dimen/capture_size"
+ android:scaleType="centerInside"
android:layout_gravity="top|right" />
</com.android.camera.ui.CameraControls>