summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rwxr-xr-xres/layout/capture_module.xml6
-rw-r--r--res/layout/menu_help.xml69
-rwxr-xr-xres/layout/photo_module.xml4
3 files changed, 1 insertions, 78 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index 2c381bf..7a04a18 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 aa6b97a..0000000
--- 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 9d767a1..dc22dd6 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"