diff options
author | Jack Yoo <jyoo@codeaurora.org> | 2015-12-18 15:38:48 -0800 |
---|---|---|
committer | Camera Software Integration <camswint@localhost> | 2016-01-20 23:34:08 -0700 |
commit | 666692bf730a1c46210cc74781a56afb4b6fcf28 (patch) | |
tree | bfb626b79a0c85c9cad5df7323b7dd7651caa0fd /res | |
parent | 0a67cc64e652830a67f3635f28a7d659b29e258a (diff) | |
download | android_packages_apps_Snap-666692bf730a1c46210cc74781a56afb4b6fcf28.tar.gz android_packages_apps_Snap-666692bf730a1c46210cc74781a56afb4b6fcf28.tar.bz2 android_packages_apps_Snap-666692bf730a1c46210cc74781a56afb4b6fcf28.zip |
SnapdragonCamera: Adding help screen on first start
Adding menu help screen.
Change-Id: I8f88a20b0c3599bfa35040e66562ced012d6213d
CRs-Fixed: 951551
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/menu_help.xml | 69 | ||||
-rw-r--r-- | res/layout/photo_module.xml | 4 |
2 files changed, 72 insertions, 1 deletions
diff --git a/res/layout/menu_help.xml b/res/layout/menu_help.xml new file mode 100644 index 000000000..aa6b97ac5 --- /dev/null +++ b/res/layout/menu_help.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (c) 2016, 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.MenuHelp xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/menu_help" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <View + android:id="@+id/background" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="bottom"/> + <com.android.camera.ui.Arrows + android:id="@+id/arrows" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + <com.android.camera.ui.RotateLayout + android:id="@+id/help_text_0_0" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/MenuButton"/> + <com.android.camera.ui.RotateLayout + android:id="@+id/help_text_1_0" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/MenuButton"/> + <com.android.camera.ui.RotateLayout + android:id="@+id/help_text_3_0" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/MenuButton"/> + <com.android.camera.ui.RotateLayout + android:id="@+id/help_text_4_6" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/MenuButton"/> + <com.android.camera.ui.RotateLayout + android:id="@+id/help_ok_2_4" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/MenuButton"/> +</com.android.camera.ui.MenuHelp> diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index c6d0a8def..10017192b 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -100,7 +100,9 @@ <include layout="@layout/camera_controls" android:layout_gravity="center" style="@style/CameraControls"/> - + <include layout="@layout/menu_help" + android:layout_gravity="center" + style="@style/CameraControls"/> <RelativeLayout android:id="@+id/id_tsmakeup_level_layout_root" android:layout_width="match_parent" |