Add preliminary landscape layout, remove reset.

Change-Id: Ib55481157a572d29a6ca0c3ab4de10020898c74a

2 files changed, 0 insertions, 73 deletions

diff --git a/src/com/android/musicfx/ActivityMusic.java b/src/com/android/musicfx/ActivityMusic.java
index 47f10bc..b3c8e99 100644
--- a/src/com/android/musicfx/ActivityMusic.java
+++ b/src/com/android/musicfx/ActivityMusic.java
@@ -70,7 +70,6 @@ public class ActivityMusic extends Activity implements OnSeekBarChangeListener {
      */
     static final int DIALOG_EQUALIZER = 0;
     static final int DIALOG_PRESET_REVERB = 1;
-    static final int DIALOG_RESET_DEFAULTS = 2;
 
     /**
      * Indicates if Virtualizer effect is supported.
@@ -429,15 +428,6 @@ public class ActivityMusic extends Activity implements OnSeekBarChangeListener {
                 });
             }
 
-            // init reset defaults
-            final View view = findViewById(R.id.resetDefaultsLayout);
-            view.setOnClickListener(new OnClickListener() {
-
-                @Override
-                public void onClick(final View v) {
-                    showDialog(DIALOG_RESET_DEFAULTS);
-                }
-            });
         } else {
             viewGroup.setVisibility(View.GONE);
             mainToggleView.setVisibility(View.GONE);
@@ -594,22 +584,6 @@ public class ActivityMusic extends Activity implements OnSeekBarChangeListener {
             alertDialog = builder.create();
             break;
         }
-        case DIALOG_RESET_DEFAULTS: {
-            final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setTitle(R.string.reset_defaults_dialog_title);
-            builder.setMessage(getString(R.string.reset_defaults_dialog_message));
-            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(final DialogInterface dialog, final int whichButton) {
-                    ControlPanelEffect.setEffectDefaults(mContext, mCallingPackageName,
-                            mAudioSession);
-                    updateUI();
-                }
-            });
-            builder.setNegativeButton(android.R.string.cancel, null);
-            alertDialog = builder.create();
-            break;
-        }
         default:
             Log.e(TAG, "onCreateDialog invalid Dialog id: " + id);
             alertDialog = null;
@@ -651,9 +625,6 @@ public class ActivityMusic extends Activity implements OnSeekBarChangeListener {
             listView.setSelection(mPRPreset);
             break;
         }
-        case DIALOG_RESET_DEFAULTS: {
-            break;
-        }
         default:
             Log.e(TAG, "onPrepareDialog invalid Dialog id: " + id);
             break;
diff --git a/src/com/android/musicfx/ControlPanelEffect.java b/src/com/android/musicfx/ControlPanelEffect.java
index d8729bd..15d0445 100644
--- a/src/com/android/musicfx/ControlPanelEffect.java
+++ b/src/com/android/musicfx/ControlPanelEffect.java
@@ -1259,50 +1259,6 @@ public class ControlPanelEffect {
     }
 
     /**
-     * Sets the defaults for all effects.
-     *
-     * @param context
-     * @param packageName
-     * @param audioSession
-     *            System wide unique audio session identifier.
-     */
-    public static void setEffectDefaults(final Context context, final String packageName,
-            final int audioSession) {
-        final SharedPreferences prefs = context.getSharedPreferences(packageName,
-                Context.MODE_PRIVATE);
-        final SharedPreferences.Editor editor = prefs.edit();
-
-        setParameterBoolean(context, packageName, audioSession, Key.global_enabled,
-                GLOBAL_ENABLED_DEFAULT);
-        setParameterBoolean(context, packageName, audioSession, Key.virt_enabled,
-                VIRTUALIZER_ENABLED_DEFAULT);
-        setParameterInt(context, packageName, audioSession, Key.virt_strength,
-                VIRTUALIZER_STRENGTH_DEFAULT);
-        setParameterBoolean(context, packageName, audioSession, Key.bb_enabled,
-                BASS_BOOST_ENABLED_DEFAULT);
-        setParameterInt(context, packageName, audioSession, Key.bb_strength,
-                BASS_BOOST_STRENGTH_DEFAULT);
-        setParameterBoolean(context, packageName, audioSession, Key.eq_enabled,
-                EQUALIZER_ENABLED_DEFAULT);
-        // CI preset idx = numPresets
-        final int numPresets = prefs.getInt(Key.eq_num_presets.toString(), EQUALIZER_NUMBER_PRESETS_DEFAULT);
-        setParameterInt(context, packageName, audioSession, Key.eq_current_preset, numPresets);
-        // Reset User EQ levels
-        final int numBands = prefs.getInt(Key.eq_num_bands.toString(), EQUALIZER_NUMBER_BANDS_DEFAULT);
-        final short[] eQPresetUserBandLevelDefault = Arrays.copyOf(
-                EQUALIZER_PRESET_USER_BAND_LEVEL_DEFAULT, numBands);
-        for (short band = 0; band < numBands; band++) {
-            editor.putInt(Key.eq_preset_user_band_level.toString() + band,
-                    eQPresetUserBandLevelDefault[band]);
-        }
-        setParameterBoolean(context, packageName, numBands, Key.pr_enabled,
-                PRESET_REVERB_ENABLED_DEFAULT);
-        setParameterInt(context, packageName, numBands, Key.pr_current_preset,
-                PRESET_REVERB_CURRENT_PRESET_DEFAULT);
-        editor.commit();
-    }
-
-    /**
      * Gets the virtualizer effect for the given audio session. If the effect on the session doesn't
      * exist yet, create it and add to collection.
      *