diff options
| author | Doris Liu <tianliu@google.com> | 2013-10-17 17:46:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-17 17:46:48 +0000 |
| commit | 8470cae9049959ee6bb28cde1c53185f2ffd10a1 (patch) | |
| tree | 4d59a5eff928fa20c58f9297971546a9f391c68a /res | |
| parent | f149ec53a0fa3330617ce01751964662d3273c88 (diff) | |
| parent | 3a45c33d74fe0ad0ade9be3d037560a53891c627 (diff) | |
| download | android_packages_apps_Snap-8470cae9049959ee6bb28cde1c53185f2ffd10a1.tar.gz android_packages_apps_Snap-8470cae9049959ee6bb28cde1c53185f2ffd10a1.tar.bz2 android_packages_apps_Snap-8470cae9049959ee6bb28cde1c53185f2ffd10a1.zip | |
Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/panorama_module.xml | 6 | ||||
| -rw-r--r-- | res/layout/photo_module.xml | 6 | ||||
| -rw-r--r-- | res/layout/video_module.xml | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml index 0b2785a3e..581170f07 100644 --- a/res/layout/panorama_module.xml +++ b/res/layout/panorama_module.xml @@ -19,6 +19,12 @@ android:layout_width="match_parent" android:layout_height="match_parent"> <include layout="@layout/pano_module_capture" /> + <View + android:id="@+id/preview_cover" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/black" + android:visibility="gone" /> <include layout="@layout/pano_module_review" /> <include layout="@layout/camera_controls" android:layout_gravity="center" diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index b63d53662..0410f16fc 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -33,6 +33,12 @@ android:id="@+id/preview_content" android:layout_width="match_parent" android:layout_height="match_parent" /> + <View + android:id="@+id/preview_cover" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/black" + android:visibility="gone" /> </FrameLayout> <ImageView android:id="@+id/review_image" diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml index b4444e7f0..198be8913 100644 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.xml @@ -26,6 +26,12 @@ android:id="@+id/preview_content" android:layout_width="match_parent" android:layout_height="match_parent" /> + <View + android:id="@+id/preview_cover" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/black" + android:visibility="gone" /> </FrameLayout> <View android:id="@+id/flash_overlay" |