AudioFX: fix regressions

- always work with in-memory presets
- update global preset levels as appropriate
- remove extra intercept layout
- always go through with updateDeviceState() method
- smooth up eq swiping a little

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

2 files changed, 59 insertions, 76 deletions

diff --git a/res/layout/activity_main_generic.xml b/res/layout/activity_main_generic.xml
index ca407f4..41dcda8 100644
--- a/res/layout/activity_main_generic.xml
+++ b/res/layout/activity_main_generic.xml
@@ -8,56 +8,48 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <com.cyngn.audiofx.widget.InterceptableLinearLayout
+    <com.cyngn.audiofx.eq.EqSwipeController
+            android:id="@+id/swipe_interceptor"
             android:orientation="vertical"
-            android:id="@+id/top_content"
             android:layout_weight="1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
+        <include
+                layout="@layout/eq_container"
+                android:layout_weight="1"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"/>
 
-        <com.cyngn.audiofx.eq.EqSwipeController
-                android:id="@+id/swipe_interceptor"
+        <LinearLayout
                 android:orientation="vertical"
-                android:layout_weight="1"
+                android:id="@+id/preset_container"
+                android:layout_weight="0"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-            <include
-                    layout="@layout/eq_container"
-                    android:layout_weight="1"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"/>
 
-            <LinearLayout
-                    android:orientation="vertical"
-                    android:id="@+id/preset_container"
-                    android:layout_weight="0"
+            <com.cyngn.audiofx.preset.InfiniteViewPager
+                    android:id="@+id/pager"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                <com.cyngn.audiofx.preset.InfiniteViewPager
-                        android:id="@+id/pager"
-                        android:layout_width="match_parent"
-                        android:layout_height="40dp"
-                        />
+                    android:layout_height="40dp"
+                    />
 
-                <com.viewpagerindicator.CirclePageIndicator
-                        android:id="@+id/indicator"
-                        android:padding="10dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        />
+            <com.viewpagerindicator.CirclePageIndicator
+                    android:id="@+id/indicator"
+                    android:padding="10dip"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    />
 
-                <android.support.v4.view.ViewPager
-                        android:layout_height="0dp"
-                        android:layout_width="0dp"
-                        android:visibility="gone"
-                        android:id="@+id/fake_pager"
-                        />
+            <android.support.v4.view.ViewPager
+                    android:layout_height="0dp"
+                    android:layout_width="0dp"
+                    android:visibility="gone"
+                    android:id="@+id/fake_pager"
+                    />
 
-            </LinearLayout>
-        </com.cyngn.audiofx.eq.EqSwipeController>
-    </com.cyngn.audiofx.widget.InterceptableLinearLayout>
+        </LinearLayout>
+    </com.cyngn.audiofx.eq.EqSwipeController>
 
     <LinearLayout
             android:background="@color/knob_container_background"
diff --git a/res/layout/activity_main_maxx_audio.xml b/res/layout/activity_main_maxx_audio.xml
index d6e5368..c183375 100644
--- a/res/layout/activity_main_maxx_audio.xml
+++ b/res/layout/activity_main_maxx_audio.xml
@@ -8,58 +8,49 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <com.cyngn.audiofx.widget.InterceptableLinearLayout
+    <com.cyngn.audiofx.eq.EqSwipeController
+            android:id="@+id/swipe_interceptor"
             android:orientation="vertical"
-            android:id="@+id/top_content"
             android:layout_weight="1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-        <com.cyngn.audiofx.eq.EqSwipeController
-                android:id="@+id/swipe_interceptor"
-                android:orientation="vertical"
+        <include
+                layout="@layout/eq_container"
                 android:layout_weight="1"
                 android:layout_width="match_parent"
+                android:layout_height="0dp"/>
+
+        <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/preset_container"
+                android:layout_weight="0"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-            <include
-                    layout="@layout/eq_container"
-                    android:layout_weight="1"
+            <com.cyngn.audiofx.preset.InfiniteViewPager
+                    android:id="@+id/pager"
                     android:layout_width="match_parent"
-                    android:layout_height="0dp"/>
+                    android:layout_height="40dp"
+                    />
 
-            <LinearLayout
-                    android:orientation="vertical"
-                    android:id="@+id/preset_container"
-                    android:layout_weight="0"
+            <com.viewpagerindicator.CirclePageIndicator
+                    android:id="@+id/indicator"
+                    android:padding="10dip"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                <com.cyngn.audiofx.preset.InfiniteViewPager
-                        android:id="@+id/pager"
-                        android:layout_width="match_parent"
-                        android:layout_height="40dp"
-                        />
-
-                <com.viewpagerindicator.CirclePageIndicator
-                        android:id="@+id/indicator"
-                        android:padding="10dip"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        />
-
-                <android.support.v4.view.ViewPager
-                        android:layout_height="0dp"
-                        android:layout_width="0dp"
-                        android:visibility="gone"
-                        android:id="@+id/fake_pager"
-                        />
-            </LinearLayout>
+                    />
 
-        </com.cyngn.audiofx.eq.EqSwipeController>
+            <android.support.v4.view.ViewPager
+                    android:layout_height="0dp"
+                    android:layout_width="0dp"
+                    android:visibility="gone"
+                    android:id="@+id/fake_pager"
+                    />
+        </LinearLayout>
 
-    </com.cyngn.audiofx.widget.InterceptableLinearLayout>
+    </com.cyngn.audiofx.eq.EqSwipeController>
 
     <LinearLayout
             android:background="@color/knob_container_background"
@@ -215,4 +206,4 @@
         </com.cyngn.audiofx.knobs.KnobContainer>
 
     </LinearLayout>
-</com.cyngn.audiofx.widget.InterceptableLinearLayout>
\ No newline at end of file
+</com.cyngn.audiofx.widget.InterceptableLinearLayout>