summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/photo_module.xml1
-rw-r--r--res/layout/selfie_flash_view.xml35
2 files changed, 36 insertions, 0 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index 7487e73b2..e1211baea 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -25,6 +25,7 @@
android:layout_height="match_parent"
android:layout_gravity="center" >
<include layout="@layout/count_down_to_capture" />
+ <include layout="@layout/selfie_flash_view" />
<FrameLayout
android:id="@+id/preview_container"
android:layout_width="match_parent"
diff --git a/res/layout/selfie_flash_view.xml b/res/layout/selfie_flash_view.xml
new file mode 100644
index 000000000..14ac8eae8
--- /dev/null
+++ b/res/layout/selfie_flash_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2015, The Linux Foundation. All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<com.android.camera.ui.SelfieFlashView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/selfie_flash"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="invisible" >
+</com.android.camera.ui.SelfieFlashView>