Merge "t0lte: user configureable voice/streaming volumes [2/2]" into cm-10.1

5 files changed, 274 insertions, 4 deletions

diff --git a/DeviceSettings/res/layout/preference_dialog_incall_audio_tuning.xml b/DeviceSettings/res/layout/preference_dialog_incall_audio_tuning.xml
new file mode 100644
index 0000000..633f729
--- /dev/null
+++ b/DeviceSettings/res/layout/preference_dialog_incall_audio_tuning.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:paddingBottom="20dip">
+
+        <TextView android:id="@+id/incall_earpiece_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/incall_earpiece_audio_title_head"
+                android:paddingTop="10dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+        <TextView android:id="@+id/earpiece_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+		android:layout_toRightOf="@id/incall_earpiece_text"
+                android:paddingTop="10dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+
+        <SeekBar android:id="@+id/earpiece_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+		android:layout_below="@id/incall_earpiece_text"
+                android:paddingTop="2dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+
+        <TextView android:id="@+id/incall_headphone_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/incall_headphone_audio_title_head"
+		android:layout_below="@id/earpiece_seekbar"
+                android:paddingTop="10dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+        <TextView android:id="@+id/headphone_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+		android:layout_toRightOf="@id/incall_headphone_text"
+		android:layout_below="@id/earpiece_seekbar"
+                android:paddingTop="10dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+
+        <SeekBar android:id="@+id/headphone_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/incall_headphone_text"
+                android:paddingTop="2dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+
+        <TextView android:id="@+id/incall_speaker_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/incall_speaker_audio_title_head"
+		android:layout_below="@id/headphone_seekbar"
+                android:paddingTop="10dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+        <TextView android:id="@+id/speaker_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+		android:layout_toRightOf="@id/incall_speaker_text"
+		android:layout_below="@id/headphone_seekbar"
+                android:paddingTop="10dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+
+        <SeekBar android:id="@+id/speaker_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/incall_speaker_text"
+                android:paddingTop="2dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+
+        <TextView android:id="@+id/incall_bt_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/incall_bt_audio_title_head"
+		android:layout_below="@id/speaker_seekbar"
+                android:paddingTop="10dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+        <TextView android:id="@+id/bt_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+		android:layout_toRightOf="@id/incall_bt_text"
+		android:layout_below="@id/speaker_seekbar"
+                android:paddingTop="10dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+
+        <SeekBar android:id="@+id/bt_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/incall_bt_text"
+                android:paddingTop="2dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+
+        <TextView
+                android:id="@+id/incall_textWarn"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/bt_seekbar"
+                android:paddingTop="8dip"
+                android:gravity="center"
+                android:text="@string/incall_warning"
+                android:textSize="15dp" />
+
+    </RelativeLayout>
+</ScrollView>
diff --git a/DeviceSettings/res/layout/preference_dialog_output_audio_tuning.xml b/DeviceSettings/res/layout/preference_dialog_output_audio_tuning.xml
new file mode 100644
index 0000000..c6d5018
--- /dev/null
+++ b/DeviceSettings/res/layout/preference_dialog_output_audio_tuning.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:paddingBottom="20dip">
+
+        <TextView android:id="@+id/audioout_headphone_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/audioout_headphone_audio_title_head"
+                android:paddingTop="10dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+        <TextView android:id="@+id/audioout_headphone_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+		android:layout_toRightOf="@id/audioout_headphone_text"
+                android:paddingTop="10dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+
+        <SeekBar android:id="@+id/audioout_headphone_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+		android:layout_below="@id/audioout_headphone_text"
+                android:paddingTop="2dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+
+        <TextView android:id="@+id/audioout_speaker_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/audioout_speaker_audio_title_head"
+		android:layout_below="@id/audioout_headphone_seekbar"
+                android:paddingTop="10dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+        <TextView android:id="@+id/audioout_speaker_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+		android:layout_toRightOf="@id/audioout_speaker_text"
+		android:layout_below="@id/audioout_headphone_seekbar"
+                android:paddingTop="10dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+
+        <SeekBar android:id="@+id/audioout_speaker_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/audioout_speaker_text"
+                android:paddingTop="2dip"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip" />
+
+        <TextView
+                android:id="@+id/audioout_textWarn"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/audioout_speaker_seekbar"
+                android:paddingTop="8dip"
+                android:gravity="center"
+                android:text="@string/audioout_warning"
+                android:textSize="15dp" />
+
+    </RelativeLayout>
+</ScrollView>
diff --git a/DeviceSettings/res/values/config.xml b/DeviceSettings/res/values/config.xml
index b289bd9..df9a427 100644
--- a/DeviceSettings/res/values/config.xml
+++ b/DeviceSettings/res/values/config.xml
@@ -30,4 +30,17 @@
     <string name="spen_sysfs_file">"/sys/class/sec/sec_epen"</string>
     <string name="spen_powersaving_sysfs_file">"/sys/class/sec/sec_epen/epen_saving_mode"</string>
 
+    <!-- Audio Tuning -->
+    <bool name="has_incall_audio_tuning">false</bool>
+    <bool name="has_output_audio_tuning">false</bool>
+
+    <string name="incall_max_value">10</string>
+    <string name="incall_warning_threshold">9</string>
+    <string name="incall_default_value">5</string>
+    <string name="incall_min_value">1</string>
+    <string name="audioout_max_value">63</string>
+    <string name="audioout_warning_threshold">60</string>
+    <string name="audioout_default_value">0</string>
+    <string name="audioout_min_value">0</string>
+
 </resources>
diff --git a/DeviceSettings/res/values/strings.xml b/DeviceSettings/res/values/strings.xml
index e3cb7e8..0f75ae3 100644
--- a/DeviceSettings/res/values/strings.xml
+++ b/DeviceSettings/res/values/strings.xml
@@ -61,11 +61,21 @@
     <string name="hspa_title_head">HSPA</string>
     <string name="hspa_summary_head">Enable HSDPA/HSUPA</string>
 
-    <!-- Dock Preference -->
-    <string name="category_dock_title">Dock</string>
-    <string name="dockaudio_subcat_title">Audio</string>
-    <string name="use_dock_audio_title_head">Use Dock USB Audio</string>
+    <!-- Audio Preference -->
+    <string name="category_audio_title">Audio</string>
+    <string name="dockaudio_subcat_title">Dock audio</string>
+    <string name="use_dock_audio_title_head">Use USB Dock Audio</string>
     <string name="use_dock_audio_summary_head">Use the passive audio out on the dock</string>
+    <string name="incallaudio_subcat_title">In-call audio volumes</string>
+    <string name="incall_earpiece_audio_title_head">Earpiece</string>
+    <string name="incall_headphone_audio_title_head">Headphone</string>
+    <string name="incall_speaker_audio_title_head">Speaker</string>
+    <string name="incall_bt_audio_title_head">BT</string>
+    <string name="incall_warning">Values higher than %1$d are not recommended</string>
+    <string name="audioout_subcat_title">Streaming audio volumes</string>
+    <string name="audioout_headphone_audio_title_head">Headphone</string>
+    <string name="audioout_speaker_audio_title_head">Speaker</string>
+    <string name="audioout_warning">Values higher than %1$d are not recommended</string>
 
     <!-- S-Pen -->
     <string name="spen_subcat_title">S-Pen</string>
diff --git a/DeviceSettings/res/xml/dock_preferences.xml b/DeviceSettings/res/xml/audio_preferences.xml
index 62c962c..e6f762e 100644
--- a/DeviceSettings/res/xml/dock_preferences.xml
+++ b/DeviceSettings/res/xml/audio_preferences.xml
@@ -23,4 +23,25 @@
                 android:summary="@string/use_dock_audio_summary_head"
                 />
     </PreferenceCategory>
+
+    <PreferenceCategory
+                android:title="@string/incallaudio_subcat_title">
+
+    <com.cyanogenmod.settings.device.IncallAudio
+            android:key="incall_tuning"
+            android:title="@string/incallaudio_subcat_title"
+            android:dialogTitle="@string/incallaudio_subcat_title" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+                android:title="@string/audioout_subcat_title">
+
+    <com.cyanogenmod.settings.device.AudioOut
+            android:key="audioout_tuning"
+            android:title="@string/audioout_subcat_title"
+            android:dialogTitle="@string/audioout_subcat_title" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>