diff options
Diffstat (limited to 'res')
| -rwxr-xr-x | res/layout/capture_module.xml | 6 | ||||
| -rw-r--r-- | res/layout/menu_help.xml | 69 | ||||
| -rwxr-xr-x | res/layout/photo_module.xml | 4 | ||||
| -rw-r--r-- | res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | res/values/colors.xml | 14 | ||||
| -rwxr-xr-x | res/values/qcomstrings.xml | 16 | ||||
| -rw-r--r-- | res/values/styles.xml | 5 |
7 files changed, 4 insertions, 113 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index 2c381bfdf..7a04a188d 100755 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -24,7 +24,6 @@ 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"> @@ -122,11 +121,6 @@ layout="@layout/one_ui_layout" android:layout_gravity="center" /> - <include - style="@style/CameraControls" - layout="@layout/menu_help" - android:layout_gravity="center" /> - <FrameLayout android:id="@+id/preview_of_intent" android:layout_height="match_parent" diff --git a/res/layout/menu_help.xml b/res/layout/menu_help.xml deleted file mode 100644 index aa6b97ac5..000000000 --- a/res/layout/menu_help.xml +++ /dev/null @@ -1,69 +0,0 @@ -<?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 9d767a126..dc22dd685 100755 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -90,9 +90,7 @@ <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" diff --git a/res/values/attrs.xml b/res/values/attrs.xml index bf79746a3..a243e5fa6 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -45,7 +45,4 @@ <attr name="images" format="reference" /> </declare-styleable> - <declare-styleable name="MenuHelp"> - <attr name="forCamera2" format="boolean"/> - </declare-styleable> </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index d663d2c8e..ee79867cb 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -81,20 +81,6 @@ <color name="refocus_indicator_1">#a0ffffff</color> <color name="refocus_indicator_2">#ff29b6f6</color> - <!-- Help menu text color --> - <color name="help_menu_scene_mode_1">#ffffff</color> - <color name="help_menu_scene_mode_2">#00ff00</color> - <color name="help_menu_scene_mode_3">#ffffff</color> - <color name="help_menu_color_filter_1">#ffffff</color> - <color name="help_menu_color_filter_2">#00ff00</color> - <color name="help_menu_color_filter_3">#ffffff</color> - <color name="help_menu_color_filter_4">#ffffff</color> - <color name="help_menu_beautify_1">#ffffff</color> - <color name="help_menu_beautify_2">#ffffff</color> - <color name="help_menu_beautify_3">#00ff00</color> - <color name="help_menu_switcher_1">#00ff00</color> - <color name="help_menu_switcher_2">#ffffff</color> - <color name="help_menu_switcher_3">#ffffff</color> <color name="dialog_background">#ffffff</color> <color name="dialog_text">#000000</color> <color name="dialog_button">#008B8B</color> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index baa70d0e8..57df98ab3 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -933,22 +933,6 @@ <string name="mute_button_desc">Mute Button</string> - <!-- Help menu strings --> - <string name="help_menu_ok" translatable="true">OK</string> - <string name="help_menu_scene_mode_1" translatable="true">Select a</string> - <string name="help_menu_scene_mode_2" translatable="true">Scene Mode</string> - <string name="help_menu_scene_mode_3" translatable="true">for better pictures</string> - <string name="help_menu_color_filter_1" translatable="true">Apply color</string> - <string name="help_menu_color_filter_2" translatable="true">filters</string> - <string name="help_menu_color_filter_3" translatable="true">to</string> - <string name="help_menu_color_filter_4" translatable="true">improve pictures</string> - <string name="help_menu_beautify_1" translatable="true">Enhance portraits</string> - <string name="help_menu_beautify_2" translatable="true">with the</string> - <string name="help_menu_beautify_3" translatable="true">Beautify feature</string> - <string name="help_menu_switcher_1" translatable="true">Switch</string> - <string name="help_menu_switcher_2" translatable="true">between</string> - <string name="help_menu_switcher_3" translatable="true">camera, video, and panorama</string> - <string name="pref_camera2_camera2_title" translatable="true">Camera2 Mode</string> <string name="pref_camera2_camera2_entry_enable" translatable="true">Enable</string> <string name="pref_camera2_camera2_entry_disable" translatable="true">Disable</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 1ec7a99c5..4b93f33de 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -270,8 +270,9 @@ <item name="android:scaleType">center</item> </style> <style name="OneUIMenuButton"> - <item name="android:layout_width">25dp</item> - <item name="android:layout_height">25dp</item> + <item name="android:layout_width">45dp</item> + <item name="android:layout_height">45dp</item> + <item name="android:padding">10dp</item> <item name="android:scaleType">fitCenter</item> </style> <style name="MenuIndicator"> |