AudioFX: initial integration with DTS

Ref: AUDIO-143

Change-Id: I48e7419fe64e2623b943bbb8a954b19681fc0abc
Signed-off-by: Roman Birg <roman@cyngn.com>

8 files changed, 55 insertions, 82 deletions

diff --git a/res/drawable/logo_dts_fc.xml b/res/drawable/logo_dts_fc.xml
index ea9bbed..a9abeb3 100644
--- a/res/drawable/logo_dts_fc.xml
+++ b/res/drawable/logo_dts_fc.xml
@@ -80,4 +80,4 @@ c-0.1-0.1-0.1-0.2-0.2-0.2c0,0-0.1,0-0.1,0h-0.1v0.4H54.7z
 M54.9,3h0.2c0.1,0,0.2,0,0.2,0c0,0,0.1-0.1,0.1-0.1c0,0,0-0.1,0-0.1
 c0,0,0,0-0.1-0.1c0,0-0.1,0-0.2,0h-0.2V3z" />
     </group>
-</vector>
\ No newline at end of file
+</vector>
diff --git a/res/layout/action_bar.xml b/res/layout/action_bar.xml
deleted file mode 100644
index 6477951..0000000
--- a/res/layout/action_bar.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <Spinner xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/spinner"
-             android:layout_weight="0"
-             android:dropDownWidth="wrap_content"
-             android:layout_width="wrap_content"
-             android:layout_height="wrap_content"/>
-
-    <Space android:layout_width="0dp"
-           android:layout_height="wrap_content"
-           android:layout_weight="1"/>
-
-    <CheckBox
-            android:layout_weight="0"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:id="@+id/device_toggle"/>
-
-</LinearLayout>
diff --git a/res/layout/action_bar_custom_components.xml b/res/layout/action_bar_custom_components.xml
new file mode 100644
index 0000000..3d65eb3
--- /dev/null
+++ b/res/layout/action_bar_custom_components.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="wrap_content"
+              android:layout_height="match_parent">
+
+    <ViewStub
+            android:id="@+id/logo_stub"
+            android:gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+    />
+
+    <CheckBox
+            android:id="@+id/global_toggle"
+            android:layout_gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:button="@drawable/toggle_check"
+            android:paddingRight="@dimen/action_bar_switch_padding"
+    />
+
+</LinearLayout>
diff --git a/res/layout/action_bar_dts_logo.xml b/res/layout/action_bar_dts_logo.xml
new file mode 100644
index 0000000..89a439c
--- /dev/null
+++ b/res/layout/action_bar_dts_logo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="wrap_content"
+              android:layout_height="match_parent"
+              android:paddingRight="@dimen/action_bar_dts_switch_padding">
+
+    <TextView
+            android:text="@string/powered_by"
+            android:layout_gravity="center_horizontal"
+            android:textSize="10sp"
+            android:typeface="sans"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+    />
+
+    <ImageView
+            android:id="@+id/dts_logo"
+            android:src="@drawable/logo_dts_fc"
+            android:layout_weight="1"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+    />
+
+
+</LinearLayout>
diff --git a/res/layout/action_bar_spinner.xml b/res/layout/action_bar_spinner.xml
deleted file mode 100644
index 67b81d1..0000000
--- a/res/layout/action_bar_spinner.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:padding="8dp">
-
-    <TextView android:id="@android:id/summary"
-              android:textSize="14sp"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_alignParentBottom="true"
-              android:gravity="center_vertical"/>
-
-    <TextView android:id="@android:id/title"
-              android:textSize="18sp"
-              android:textStyle="bold"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_alignParentTop="true"
-              android:layout_above="@android:id/summary"
-              android:layout_alignWithParentIfMissing="true"
-              android:gravity="center_vertical"/>
-
-</RelativeLayout>
-
diff --git a/res/layout/action_bar_spinner_row.xml b/res/layout/action_bar_spinner_row.xml
deleted file mode 100644
index d081618..0000000
--- a/res/layout/action_bar_spinner_row.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:padding="8dp">
-
-    <TextView android:id="@android:id/summary"
-              android:textSize="14sp"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_alignParentBottom="true"
-              android:gravity="center_vertical"/>
-
-    <TextView android:id="@android:id/title"
-              android:textSize="18sp"
-              android:textStyle="bold"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_alignParentTop="true"
-              android:layout_above="@android:id/summary"
-              android:layout_alignWithParentIfMissing="true"
-              android:gravity="center_vertical"/>
-
-</RelativeLayout>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 6b25b14..d22a7f0 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -66,11 +66,12 @@
     <string name="rename">Rename</string>
     <string name="remove_custom_preset_warning_message">Are you sure you want to remove %1$s?</string>
 
-    <string name="mode_audiofx" translatable="false"></string>
-    <string name="mode_dts" translatable="false">with DTS Sound&#8482;</string>
-
     <string name="app_name" translatable="false">AudioFX</string>
     <string name="app_title" translatable="false">@string/app_name</string>
-    <string name="app_subtitle" translatable="false">Powered by MaxxAudio</string>
+
+    <string name="powered_by_maxx_audio" translatable="false">Powered by MaxxAudio</string>
+    <string name="mode_dts" translatable="false">with DTS Sound&#8482;</string>
+    <string name="powered_by">powered by</string>
+
 
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f7c8a71..93019de 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -52,7 +52,6 @@
     <dimen name="radial_text_size">18sp</dimen>
     <dimen name="radial_knob_stroke">22dp</dimen>
 
-    <!-- 16 dp + 64 dp -->
     <dimen name="action_bar_dts_switch_padding">48dp</dimen>
 
 </resources>