summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2016-09-30 17:47:44 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-13 16:33:07 -0700
commit0dbfdffc9994a17e60c57b17c3cc5743cc75e155 (patch)
tree211f7564226f8e7a52b2c9344eac5b24812ba779 /res/layout
parent392d833321dd0d05aeb80bd33240394ea9ea5591 (diff)
downloadandroid_packages_apps_Snap-0dbfdffc9994a17e60c57b17c3cc5743cc75e155.tar.gz
android_packages_apps_Snap-0dbfdffc9994a17e60c57b17c3cc5743cc75e155.tar.bz2
android_packages_apps_Snap-0dbfdffc9994a17e60c57b17c3cc5743cc75e155.zip
SnapdragonCamera: Add help menu to camera2
Add help menu to camera2 CRs-Fixed: 1066519 Change-Id: Id15f5ffe8d52ac5a2eabab20791fce65e97bcf43
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/capture_module.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index 4b9a178c0..fc05fd0ca 100644
--- a/res/layout/capture_module.xml
+++ b/res/layout/capture_module.xml
@@ -24,6 +24,7 @@
layout. -->
<merge xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center">
@@ -95,4 +96,9 @@
style="@style/CameraControls"
layout="@layout/one_ui_layout"
android:layout_gravity="center" />
+
+ <include
+ style="@style/CameraControls"
+ layout="@layout/menu_help"
+ android:layout_gravity="center" />
</merge>