From 488679fccee078348a5fd79d701fdec365199051 Mon Sep 17 00:00:00 2001
From: Camera Software Integration <camswint@localhost>
Date: Fri, 30 Oct 2015 10:13:25 -0700
Subject: SnapdragonCamera: Introducing mute button

Introducing audio mute button on video recording

Change-Id: I69ff6fe97c4b8d76a890b5e41667dab534d69ba8
CRs-Fixed: 937239
---
 res/drawable-hdpi/ic_muted_button.png     | Bin 0 -> 3484 bytes
 res/drawable-hdpi/ic_unmuted_button.png   | Bin 0 -> 2532 bytes
 res/drawable-xhdpi/ic_muted_button.png    | Bin 0 -> 4559 bytes
 res/drawable-xhdpi/ic_unmuted_button.png  | Bin 0 -> 3238 bytes
 res/drawable-xxhdpi/ic_muted_button.png   | Bin 0 -> 7013 bytes
 res/drawable-xxhdpi/ic_unmuted_button.png | Bin 0 -> 4708 bytes
 res/layout/camera_controls.xml            |   6 ++++++
 res/values/dimens.xml                     |   1 +
 res/values/qcomstrings.xml                |   2 ++
 res/values/styles.xml                     |   5 +++++
 10 files changed, 14 insertions(+)
 create mode 100644 res/drawable-hdpi/ic_muted_button.png
 create mode 100644 res/drawable-hdpi/ic_unmuted_button.png
 create mode 100644 res/drawable-xhdpi/ic_muted_button.png
 create mode 100644 res/drawable-xhdpi/ic_unmuted_button.png
 create mode 100644 res/drawable-xxhdpi/ic_muted_button.png
 create mode 100644 res/drawable-xxhdpi/ic_unmuted_button.png

(limited to 'res')

diff --git a/res/drawable-hdpi/ic_muted_button.png b/res/drawable-hdpi/ic_muted_button.png
new file mode 100644
index 000000000..5068ae16e
Binary files /dev/null and b/res/drawable-hdpi/ic_muted_button.png differ
diff --git a/res/drawable-hdpi/ic_unmuted_button.png b/res/drawable-hdpi/ic_unmuted_button.png
new file mode 100644
index 000000000..bcd722e99
Binary files /dev/null and b/res/drawable-hdpi/ic_unmuted_button.png differ
diff --git a/res/drawable-xhdpi/ic_muted_button.png b/res/drawable-xhdpi/ic_muted_button.png
new file mode 100644
index 000000000..db9ce97ba
Binary files /dev/null and b/res/drawable-xhdpi/ic_muted_button.png differ
diff --git a/res/drawable-xhdpi/ic_unmuted_button.png b/res/drawable-xhdpi/ic_unmuted_button.png
new file mode 100644
index 000000000..78ad39d05
Binary files /dev/null and b/res/drawable-xhdpi/ic_unmuted_button.png differ
diff --git a/res/drawable-xxhdpi/ic_muted_button.png b/res/drawable-xxhdpi/ic_muted_button.png
new file mode 100644
index 000000000..dfc97b86c
Binary files /dev/null and b/res/drawable-xxhdpi/ic_muted_button.png differ
diff --git a/res/drawable-xxhdpi/ic_unmuted_button.png b/res/drawable-xxhdpi/ic_unmuted_button.png
new file mode 100644
index 000000000..fd9ec79f9
Binary files /dev/null and b/res/drawable-xxhdpi/ic_unmuted_button.png differ
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index af47a13b6..66519d41c 100644
--- a/res/layout/camera_controls.xml
+++ b/res/layout/camera_controls.xml
@@ -39,6 +39,12 @@
         android:contentDescription="@string/accessibility_menu_button"
         android:src="@drawable/ic_settings" />
 
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/mute_button"
+        style="@style/MenuButton"
+        android:contentDescription="@string/mute_button_desc"
+        android:src="@drawable/ic_unmuted_button" />
+
     <com.android.camera.ui.ModuleSwitcher
         android:id="@+id/camera_switcher"
         style="@style/SwitcherButton"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 564cd099f..96394ad66 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -94,6 +94,7 @@
     <dimen name="switcher_size">72dp</dimen>
     <dimen name="menu_size">52dp</dimen>
     <dimen name="menu_outer_size">80dp</dimen>
+    <dimen name="mute_outer_size">80dp</dimen>
     <dimen name="toggle_size">30dp</dimen>
     <dimen name="toggle_outer_size">60dp</dimen>
     <dimen name="face_circle_stroke">2dip</dimen>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 388ac0ae5..4c681150d 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -910,5 +910,7 @@
     <string name="camera_thermal_shutdown">Phone overheated, closing camera.</string>
     <string name="camera_server_died">Media server died, closing camera.</string>
     <string name="camera_unknown_error">Unknown error, closing camera.</string>
+
+    <string name="mute_button_desc">Mute Button</string>
 </resources>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c6b99624e..bb13cc5c8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -252,6 +252,11 @@
         <item name="android:layout_height">@dimen/menu_outer_size</item>
         <item name="android:scaleType">center</item>
     </style>
+    <style name="MuteButton">
+        <item name="android:layout_width">@dimen/mute_outer_size</item>
+        <item name="android:layout_height">@dimen/mute_outer_size</item>
+        <item name="android:scaleType">center</item>
+    </style>
     <style name="ToggleButton">
         <item name="android:layout_width">@dimen/toggle_outer_size</item>
         <item name="android:layout_height">@dimen/toggle_outer_size</item>
-- 
cgit v1.2.3