diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-08-06 14:31:52 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-08-06 14:58:07 -0700 |
| commit | 37f3611bbdc787c996a99894dcef7d8fb77e3f7c (patch) | |
| tree | 4dc08a60a543dc4d2b0672a8c0cc4efdc30b52ad /res/layout/video_module.xml | |
| parent | 8fe71f31bc8ab1b634566a3060e041e22e9b2e41 (diff) | |
| download | android_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/video_module.xml')
| -rw-r--r-- | res/layout/video_module.xml | 7 |
1 files changed, 7 insertions, 0 deletions
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" |