AudioFX: Use default material toggle

Change-Id: Ie84c93326e8768db0736d704dbc9c05ce88ff98e

5 files changed, 8 insertions, 12 deletions

diff --git a/res/layout/action_bar_custom_components.xml b/res/layout/action_bar_custom_components.xml
index 3d65eb3..b2a5342 100644
--- a/res/layout/action_bar_custom_components.xml
+++ b/res/layout/action_bar_custom_components.xml
@@ -11,13 +11,11 @@
             android:layout_height="wrap_content"
     />
 
-    <CheckBox
+    <Switch
             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/controls_maxx_audio.xml b/res/layout/controls_maxx_audio.xml
index 1903385..3ef5010 100644
--- a/res/layout/controls_maxx_audio.xml
+++ b/res/layout/controls_maxx_audio.xml
@@ -28,11 +28,10 @@
                 android:layout_width="12dp"
                 android:layout_height="match_parent"/>
 
-        <CheckBox
+        <Switch
                 android:id="@+id/maxx_volume_switch"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:button="@drawable/toggle_check"
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"/>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 93019de..48e9fa0 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -33,7 +33,6 @@
     <dimen name="preset_text_size">30sp</dimen>
     <dimen name="preset_text_padding">4dp</dimen>
 
-    <dimen name="action_bar_switch_padding">16dip</dimen>
     <dimen name="action_bar_button_width">96dip</dimen>
     <dimen name="action_bar_button_height">34dip</dimen>
 
diff --git a/src/org/cyanogenmod/audiofx/activity/ActivityMusic.java b/src/org/cyanogenmod/audiofx/activity/ActivityMusic.java
index 19b9249..d1d6019 100644
--- a/src/org/cyanogenmod/audiofx/activity/ActivityMusic.java
+++ b/src/org/cyanogenmod/audiofx/activity/ActivityMusic.java
@@ -26,8 +26,8 @@ import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewStub;
-import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.Switch;
 import org.cyanogenmod.audiofx.AudioFxApplication;
 import org.cyanogenmod.audiofx.Constants;
 import org.cyanogenmod.audiofx.R;
@@ -44,7 +44,7 @@ public class ActivityMusic extends Activity {
     public static final String TAG_AUDIOFX = "audiofx";
     public static final String EXTRA_CALLING_PACKAGE = "audiofx::extra_calling_package";
 
-    private CheckBox mCurrentDeviceToggle;
+    private Switch mCurrentDeviceToggle;
     MasterConfigControl mConfig;
     String mCallingPackage;
 
@@ -140,7 +140,7 @@ public class ActivityMusic extends Activity {
         ab.setCustomView(extraView, lp);
         ab.setDisplayShowCustomEnabled(true);
 
-        mCurrentDeviceToggle = (CheckBox) ab.getCustomView().findViewById(R.id.global_toggle);
+        mCurrentDeviceToggle = (Switch) ab.getCustomView().findViewById(R.id.global_toggle);
         mCurrentDeviceToggle.setOnCheckedChangeListener(mGlobalEnableToggleListener);
 
         if (savedInstanceState == null && findViewById(R.id.main_fragment) != null) {
diff --git a/src/org/cyanogenmod/audiofx/fragment/ControlsFragment.java b/src/org/cyanogenmod/audiofx/fragment/ControlsFragment.java
index 0c24bad..218f31e 100644
--- a/src/org/cyanogenmod/audiofx/fragment/ControlsFragment.java
+++ b/src/org/cyanogenmod/audiofx/fragment/ControlsFragment.java
@@ -22,8 +22,8 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.Switch;
 
 import org.cyanogenmod.audiofx.R;
 import org.cyanogenmod.audiofx.activity.MasterConfigControl;
@@ -37,7 +37,7 @@ public class ControlsFragment extends AudioFxBaseFragment {
 
     KnobCommander mKnobCommander;
     KnobContainer mKnobContainer;
-    CheckBox mMaxxVolumeSwitch;
+    Switch mMaxxVolumeSwitch;
 
     private CompoundButton.OnCheckedChangeListener mMaxxVolumeListener
             = new CompoundButton.OnCheckedChangeListener() {
@@ -103,7 +103,7 @@ public class ControlsFragment extends AudioFxBaseFragment {
         super.onViewCreated(view, savedInstanceState);
 
         mKnobContainer = (KnobContainer) view.findViewById(R.id.knob_container);
-        mMaxxVolumeSwitch = (CheckBox) view.findViewById(R.id.maxx_volume_switch);
+        mMaxxVolumeSwitch = (Switch) view.findViewById(R.id.maxx_volume_switch);
 
         updateFragmentBackgroundColors(getCurrentBackgroundColor());