summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2015-10-30 10:13:25 -0700
committerCamera Software Integration <camswint@localhost>2015-12-22 16:25:32 +0530
commit488679fccee078348a5fd79d701fdec365199051 (patch)
treec9b5b7319bdab7e86952f5b0341896c141d40808 /res
parent956aaa62fec3b4379103515b02eb5459b3fad92f (diff)
downloadandroid_packages_apps_Snap-488679fccee078348a5fd79d701fdec365199051.zip
android_packages_apps_Snap-488679fccee078348a5fd79d701fdec365199051.tar.gz
android_packages_apps_Snap-488679fccee078348a5fd79d701fdec365199051.tar.bz2
SnapdragonCamera: Introducing mute button
Introducing audio mute button on video recording Change-Id: I69ff6fe97c4b8d76a890b5e41667dab534d69ba8 CRs-Fixed: 937239
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_muted_button.pngbin0 -> 3484 bytes
-rw-r--r--res/drawable-hdpi/ic_unmuted_button.pngbin0 -> 2532 bytes
-rw-r--r--res/drawable-xhdpi/ic_muted_button.pngbin0 -> 4559 bytes
-rw-r--r--res/drawable-xhdpi/ic_unmuted_button.pngbin0 -> 3238 bytes
-rw-r--r--res/drawable-xxhdpi/ic_muted_button.pngbin0 -> 7013 bytes
-rw-r--r--res/drawable-xxhdpi/ic_unmuted_button.pngbin0 -> 4708 bytes
-rw-r--r--res/layout/camera_controls.xml6
-rw-r--r--res/values/dimens.xml1
-rw-r--r--res/values/qcomstrings.xml2
-rw-r--r--res/values/styles.xml5
10 files changed, 14 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_muted_button.png b/res/drawable-hdpi/ic_muted_button.png
new file mode 100644
index 0000000..5068ae1
--- /dev/null
+++ b/res/drawable-hdpi/ic_muted_button.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_unmuted_button.png b/res/drawable-hdpi/ic_unmuted_button.png
new file mode 100644
index 0000000..bcd722e
--- /dev/null
+++ b/res/drawable-hdpi/ic_unmuted_button.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_muted_button.png b/res/drawable-xhdpi/ic_muted_button.png
new file mode 100644
index 0000000..db9ce97
--- /dev/null
+++ b/res/drawable-xhdpi/ic_muted_button.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_unmuted_button.png b/res/drawable-xhdpi/ic_unmuted_button.png
new file mode 100644
index 0000000..78ad39d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_unmuted_button.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_muted_button.png b/res/drawable-xxhdpi/ic_muted_button.png
new file mode 100644
index 0000000..dfc97b8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_muted_button.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_unmuted_button.png b/res/drawable-xxhdpi/ic_unmuted_button.png
new file mode 100644
index 0000000..fd9ec79
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_unmuted_button.png
Binary files differ
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index af47a13..66519d4 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 564cd09..96394ad 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 388ac0a..4c68115 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 c6b9962..bb13cc5 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>