Snap: update shutter buttons on CaptureUI

https://review.lineageos.org/#/c/200740/

Change-Id: I674de05dfb46fb714979ac66c16a85825af13c95

10 files changed, 3 insertions, 75 deletions

diff --git a/res/drawable/one_ui_shutter_1.png b/res/drawable/one_ui_shutter_1.png
deleted file mode 100644
index 46771e0cc..000000000
--- a/res/drawable/one_ui_shutter_1.png
+++ /dev/null
diff --git a/res/drawable/one_ui_shutter_2.png b/res/drawable/one_ui_shutter_2.png
deleted file mode 100644
index 07e1f72de..000000000
--- a/res/drawable/one_ui_shutter_2.png
+++ /dev/null
diff --git a/res/drawable/one_ui_shutter_3.png b/res/drawable/one_ui_shutter_3.png
deleted file mode 100644
index 503135797..000000000
--- a/res/drawable/one_ui_shutter_3.png
+++ /dev/null
diff --git a/res/drawable/one_ui_shutter_4.png b/res/drawable/one_ui_shutter_4.png
deleted file mode 100644
index 9d3f565af..000000000
--- a/res/drawable/one_ui_shutter_4.png
+++ /dev/null
diff --git a/res/drawable/one_ui_shutter_5.png b/res/drawable/one_ui_shutter_5.png
deleted file mode 100644
index df6ccd79f..000000000
--- a/res/drawable/one_ui_shutter_5.png
+++ /dev/null
diff --git a/res/drawable/one_ui_shutter_6.png b/res/drawable/one_ui_shutter_6.png
deleted file mode 100644
index 5165ef2c5..000000000
--- a/res/drawable/one_ui_shutter_6.png
+++ /dev/null
diff --git a/res/drawable/one_ui_shutter_anim.xml b/res/drawable/one_ui_shutter_anim.xml
deleted file mode 100644
index 980b9adad..000000000
--- a/res/drawable/one_ui_shutter_anim.xml
+++ /dev/null
@@ -1,72 +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.
--->
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/shutter_button_pressed"
-    android:oneshot="true" >
-
-    <item
-        android:drawable="@drawable/photo_capture"
-        android:duration="16"/>
-    <item
-        android:drawable="@drawable/one_ui_shutter_6"
-        android:duration="16"/>
-    <item
-        android:drawable="@drawable/one_ui_shutter_5"
-        android:duration="16"/>
-    <item
-        android:drawable="@drawable/one_ui_shutter_4"
-        android:duration="16"/>
-    <item
-        android:drawable="@drawable/one_ui_shutter_3"
-        android:duration="16"/>
-    <item
-        android:drawable="@drawable/one_ui_shutter_2"
-        android:duration="16"/>
-    <item
-        android:drawable="@drawable/one_ui_shutter_1"
-        android:duration="16"/>
-    <item
-        android:drawable="@drawable/one_ui_shutter_2"
-        android:duration="16"/>
-    <item
-        android:drawable="@drawable/one_ui_shutter_3"
-        android:duration="16"/>
-    <item
-        android:drawable="@drawable/one_ui_shutter_4"
-        android:duration="16"/>
-    <item
-        android:drawable="@drawable/one_ui_shutter_5"
-        android:duration="16"/>
-    <item
-        android:drawable="@drawable/one_ui_shutter_6"
-        android:duration="16"/>
-    <item
-        android:drawable="@drawable/photo_capture"
-        android:duration="16"/>
-</animation-list>
diff --git a/res/drawable/photo_capture.png b/res/drawable/photo_capture.png
deleted file mode 100644
index 89cdb9a8f..000000000
--- a/res/drawable/photo_capture.png
+++ /dev/null
diff --git a/res/drawable/video_capture.png b/res/drawable/video_capture.png
deleted file mode 100644
index f0c7c2289..000000000
--- a/res/drawable/video_capture.png
+++ /dev/null
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml
index 6baed0579..519978522 100755
--- a/res/layout/one_ui_layout.xml
+++ b/res/layout/one_ui_layout.xml
@@ -46,9 +46,9 @@
         android:contentDescription="@string/accessibility_shutter_button"
         android:focusable="true"
         android:scaleType="fitCenter"
-        android:src="@drawable/photo_capture" />
+        android:src="@drawable/btn_new_shutter" />
 
-    <com.android.camera.ui.RotateImageView
+    <ImageView
         android:id="@+id/video_button"
         android:layout_width="@dimen/one_ui_bottom_small"
         android:layout_height="@dimen/one_ui_bottom_small"
@@ -56,7 +56,7 @@
         android:contentDescription="@string/accessibility_shutter_button"
         android:focusable="true"
         android:scaleType="fitCenter"
-        android:src="@drawable/video_capture" />
+        android:src="@drawable/btn_new_shutter_video" />
 
     <com.android.camera.PauseButton
         android:id="@+id/video_pause"