diff options
| author | Doris Liu <tianliu@google.com> | 2013-06-24 11:30:24 -0700 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2013-08-05 19:04:33 -0700 |
| commit | ae7ef761a14a4f84b3a196fc0c71069c8fd3fa56 (patch) | |
| tree | 339a46648189f43b23ca52d1ed7741d2b7f72b69 /res | |
| parent | 077e718ecb6eb07997ad7c458d38eb21b3b2e6f9 (diff) | |
| download | android_packages_apps_Gallery2-ae7ef761a14a4f84b3a196fc0c71069c8fd3fa56.tar.gz android_packages_apps_Gallery2-ae7ef761a14a4f84b3a196fc0c71069c8fd3fa56.tar.bz2 android_packages_apps_Gallery2-ae7ef761a14a4f84b3a196fc0c71069c8fd3fa56.zip | |
Implement capture animation
Also fix the thumb view by using real jpeg data rather than a preview frame
Bug: 10074619
Change-Id: Ie38884b30977c350b2ca0e0671bd9f5b10d3681e
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/camera_controls.xml | 3 | ||||
| -rw-r--r-- | res/layout-port/camera_controls.xml | 3 | ||||
| -rw-r--r-- | res/layout/video_module.xml | 7 |
3 files changed, 11 insertions, 2 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> diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index 7dd66e44f..5f89830c5 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/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>
\ No newline at end of file diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml index 9eb3e84e2..2df1adc9b 100644 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.xml @@ -21,6 +21,13 @@ android:id="@+id/preview_content" android:layout_width="match_parent" android:layout_height="match_parent" /> + <View + android:id="@+id/flash_overlay" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/white" + android:visibility="gone" + android:alpha="0" /> <FrameLayout android:id="@+id/preview_border" android:layout_width="match_parent" android:layout_height="match_parent" |