Merge "Gallery2: Modify the UI of audio effect." into android_ui.lnx.1.2-dev

2 files changed, 47 insertions, 20 deletions

diff --git a/res/layout/audio_effects_dialog.xml b/res/layout/audio_effects_dialog.xml
index 49dcafb56..b2143d643 100644
--- a/res/layout/audio_effects_dialog.xml
+++ b/res/layout/audio_effects_dialog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2013, The Linux Foundation. All rights reserved.
+Copyright (c) 2013, 2016, The Linux Foundation. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -40,33 +40,58 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:gravity="center_horizontal"
-        android:paddingBottom="10dp">
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp">
 
-        <LinearLayout
+        <RelativeLayout
             android:id="@+id/aEffectsPanel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
             android:layout_marginTop="12dp"
             android:layout_marginBottom="10dp"
             android:gravity="center_vertical">
 
-            <com.android.gallery3d.ui.Knob
-                android:id="@+id/bBStrengthKnob"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                custom:label="@string/bass_boost_strength"
-                custom:foreground="@drawable/knob" />
+                android:layout_weight="1">
+                <com.android.gallery3d.ui.Knob
+                    android:id="@+id/bBStrengthKnob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    custom:foreground="@drawable/knob"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:layout_below="@id/bBStrengthKnob"
+                    android:layout_marginTop="12dp"
+                    android:textColor="@android:color/black"
+                    android:text="@string/bass_boost_strength"/>
+            </RelativeLayout>
 
-            <com.android.gallery3d.ui.Knob
-                android:id="@+id/vIStrengthKnob"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                custom:label="@string/virtualizer_strength"
-                custom:foreground="@drawable/knob" />
-
-        </LinearLayout>
+                android:layout_marginEnd="24dp"
+                android:layout_alignParentRight="true"
+                android:layout_weight="1">
+                <com.android.gallery3d.ui.Knob
+                    android:id="@+id/vIStrengthKnob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    custom:foreground="@drawable/knob"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/vIStrengthKnob"
+                    android:layout_marginTop="12dp"
+                    android:layout_centerHorizontal="true"
+                    android:textColor="@android:color/black"
+                    android:text="@string/virtualizer_strength"/>
+            </RelativeLayout>
+        </RelativeLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/audio_effects_title.xml b/res/layout/audio_effects_title.xml
index fcfb11d1e..2e200d5aa 100644
--- a/res/layout/audio_effects_title.xml
+++ b/res/layout/audio_effects_title.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (c) 2014, The Linux Foundation. All rights reserved.
+Copyright (c) 2014, 2016, The Linux Foundation. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
@@ -40,9 +40,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         android:gravity="left|center_vertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="10dp"
+        android:textColor="@android:color/black"
         android:textSize="20dp" />
 
     <View
@@ -54,7 +55,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         android:id="@+id/audio_effects_switch"
         android:textOn=""
         android:textOff=""
+        android:background="@null"
+        android:gravity="center_vertical|right"
         android:layout_width="72dp"
-        android:layout_height="34dp"
-        android:layout_marginEnd="4dp"/>
+        android:layout_height="34dp"/>
 </LinearLayout>