summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorpezhan <pezhan@codeaurora.org>2017-01-09 11:19:54 +0800
committerpezhan <pezhan@codeaurora.org>2017-01-11 15:20:31 +0800
commit326822d1e444da7b227be3c86815e3ee6eb6453d (patch)
tree09fa64a75d294bbd63faf5298d861197d5e30478 /res/layout
parent15f6d966c807c371a12f68bf9f5f4e7447a9ba8e (diff)
downloadandroid_packages_apps_Snap-326822d1e444da7b227be3c86815e3ee6eb6453d.tar.gz
android_packages_apps_Snap-326822d1e444da7b227be3c86815e3ee6eb6453d.tar.bz2
android_packages_apps_Snap-326822d1e444da7b227be3c86815e3ee6eb6453d.zip
SnapdragonCamera:Fix [FR35432] BestPicture function lost.
Add dialog when saving selected BestPicture. Add "X" icon display beside camcorder icon to exit BestPicture mode. Add multiple selections(Three dots beside SAVE)and "X" icon. Add dialog when select "X" icon. Add overflow menu with multiple selections to chose "Save All" or "Delete All" when click overflow menu. Add click for "Save All" to save all 1o pictures. Add click for "Delete All" to pop delete all dialog. Change-Id: I59cdad0f77fde616ea34db4d9d186d322285e394 CRs-Fixed: 1102814, 1102807, 1099428
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/bestpicture_action_dialog.xml130
-rw-r--r--res/layout/bestpicture_editor.xml27
-rwxr-xr-xres/layout/one_ui_layout.xml14
-rw-r--r--res/layout/overflow.xml51
4 files changed, 218 insertions, 4 deletions
diff --git a/res/layout/bestpicture_action_dialog.xml b/res/layout/bestpicture_action_dialog.xml
new file mode 100644
index 000000000..d276c5947
--- /dev/null
+++ b/res/layout/bestpicture_action_dialog.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2017, 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.BestPictureActionDialogLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/dialog_background"
+ android:id="@+id/mlayout">
+
+ <TextView
+ android:id="@+id/mtitle"
+ android:layout_width="220dp"
+ android:layout_height="30dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="10dp"
+ android:textSize="20sp"
+ android:textStyle="bold"
+ android:textColor="@color/dialog_text"/>
+
+
+ <TextView
+ android:id="@+id/content"
+ android:layout_width="220dp"
+ android:layout_height="50dp"
+ android:layout_below="@+id/mtitle"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="10dp"
+ android:textSize="15sp"
+ android:textColor="@color/dialog_text"/>
+
+ <RelativeLayout
+ android:id="@+id/showagainlayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/content"
+ android:layout_marginTop="10dp">
+
+ <CheckBox
+ android:id="@+id/mcheck"
+ android:layout_width="35dp"
+ android:layout_height="35dp"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="30dp"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="5dp"
+ android:layout_toRightOf="@+id/mcheck"
+ android:text="@string/dialog_do_not_show"
+ android:textColor="@color/dialog_text"/>
+ </RelativeLayout>
+
+
+ <TextView
+ android:id="@+id/hr"
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_below="@+id/showagainlayout"
+ android:layout_marginTop="10dp"
+ android:background="@color/dialog_hr"/>
+
+ <Button
+ android:id="@+id/nativebt"
+ android:layout_width="100dp"
+ android:layout_height="50dp"
+ android:layout_alignParentLeft="true"
+ android:layout_below="@+id/hr"
+ android:layout_marginBottom="10dp"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="10dp"
+ android:background="@null"
+ android:textAllCaps="false"
+ android:textColor="@color/dialog_button"/>
+
+ <Button
+ android:id="@+id/positivebt"
+ android:layout_width="100dp"
+ android:layout_height="50dp"
+ android:layout_alignParentRight="true"
+ android:layout_below="@+id/hr"
+ android:layout_marginBottom="10dp"
+ android:layout_marginRight="20dp"
+ android:layout_marginTop="10dp"
+ android:background="@null"
+ android:textAllCaps="false"
+ android:textColor="@color/dialog_button"/>
+
+ <Button
+ android:id="@+id/okbt"
+ android:layout_width="100dp"
+ android:layout_height="50dp"
+ android:layout_below="@+id/hr"
+ android:layout_centerHorizontal="true"
+ android:layout_marginBottom="10dp"
+ android:layout_marginTop="10dp"
+ android:background="@null"
+ android:textAllCaps="false"
+ android:textColor="#8EE5EE"/>
+
+
+</com.android.camera.ui.BestPictureActionDialogLayout> \ No newline at end of file
diff --git a/res/layout/bestpicture_editor.xml b/res/layout/bestpicture_editor.xml
index 6c35c27a1..b90ead01f 100644
--- a/res/layout/bestpicture_editor.xml
+++ b/res/layout/bestpicture_editor.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright (c) 2016, The Linux Foundation. All rights reserved.
+Copyright (c) 2016-2017 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
@@ -42,17 +42,38 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="#b2191919">
+
+ <ImageView android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:id="@+id/delete_best"
+ android:src="@drawable/x"
+ android:layout_alignParentLeft="true"
+ android:layout_marginLeft="25dp"
+ android:layout_centerVertical="true"/>
+
+
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_alignParentRight="true">
+ android:layout_alignParentRight="true"
+ android:orientation="horizontal">
+
<TextView
android:id="@+id/bestpicture_done"
android:text="@string/bestpicture_done"
android:textColor="#ffffff"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"/>
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="5dp"/>
+
+ <com.android.camera.ui.RotateImageView
+ android:id="@+id/best_more"
+ android:layout_width="25dp"
+ android:layout_height="25dp"
+ android:layout_marginRight="10dp"
+ android:layout_gravity="center_vertical"/>
+
</LinearLayout>
</RelativeLayout>
<RelativeLayout
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml
index 38322663a..5904b5b96 100755
--- a/res/layout/one_ui_layout.xml
+++ b/res/layout/one_ui_layout.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved.
+<!-- Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
Not a Contribution.
Copyright (C) 2013 The Android Open Source Project
@@ -98,6 +98,18 @@
android:scaleType="fitCenter" />
<com.android.camera.ui.RotateImageView
+ android:id="@+id/exit_best_mode"
+ android:layout_width="25dp"
+ android:layout_height="25dp"
+ android:clickable="true"
+ android:contentDescription="@string/accessibility_exit_best_mode_button"
+ android:focusable="true"
+ android:layout_gravity="top|left"
+ android:scaleType="fitCenter"
+ android:src="@drawable/x"
+ android:visibility="gone"/>
+
+ <com.android.camera.ui.RotateImageView
android:id="@+id/front_back_switcher"
style="@style/OneUIMenuButton"
android:src="@drawable/front_back_camera" />
diff --git a/res/layout/overflow.xml b/res/layout/overflow.xml
new file mode 100644
index 000000000..2fd387e0e
--- /dev/null
+++ b/res/layout/overflow.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2017, 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/bg_shadow"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/overflow_item1"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:text="@string/overflow_best_item1"
+ style="@style/BestPhoneOverflow"/>
+
+ <TextView
+ android:id="@+id/overflow_item2"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:text="@string/overflow_best_item2"
+ style="@style/BestPhoneOverflow"/>
+</LinearLayout> \ No newline at end of file