diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-09-30 17:47:44 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-13 16:33:07 -0700 |
commit | 0dbfdffc9994a17e60c57b17c3cc5743cc75e155 (patch) | |
tree | 211f7564226f8e7a52b2c9344eac5b24812ba779 /res | |
parent | 392d833321dd0d05aeb80bd33240394ea9ea5591 (diff) | |
download | android_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')
-rw-r--r-- | res/layout/capture_module.xml | 6 | ||||
-rw-r--r-- | res/values/attrs.xml | 3 | ||||
-rw-r--r-- | res/values/styles.xml | 5 |
3 files changed, 11 insertions, 3 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> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index a243e5fa6..bf79746a3 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -45,4 +45,7 @@ <attr name="images" format="reference" /> </declare-styleable> + <declare-styleable name="MenuHelp"> + <attr name="forCamera2" format="boolean"/> + </declare-styleable> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 765210fe2..082c5ed8a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -267,9 +267,8 @@ <item name="android:scaleType">center</item> </style> <style name="OneUIMenuButton"> - <item name="android:layout_width">45dp</item> - <item name="android:layout_height">45dp</item> - <item name="android:padding">10dp</item> + <item name="android:layout_width">25dp</item> + <item name="android:layout_height">25dp</item> <item name="android:scaleType">fitCenter</item> </style> <style name="MenuIndicator"> |