2 files changed, 125 insertions, 4 deletions
diff --git a/core/java/android/preference/ListPreferenceMultiSelect.java b/core/java/android/preference/ListPreferenceMultiSelect.java
new file mode 100644
index 0000000..83edc72
--- /dev/null
+++ b/core/java/android/preference/ListPreferenceMultiSelect.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2012 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.preference;
+
+import android.app.AlertDialog.Builder;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+
+/**
+ * This Preference type is required for the Power Widget functionality.  It should
+ * not be used for any other multi select lists, use the Android MultiselectListPreference
+ * instead
+ * @hide
+ */
+public class ListPreferenceMultiSelect extends ListPreference {
+
+    private static final String SEPARATOR = "OV=I=XseparatorX=I=VO";
+
+    private boolean[] mClickedDialogEntryIndices;
+
+    public ListPreferenceMultiSelect(Context context) {
+        super(context);
+    }
+
+    public ListPreferenceMultiSelect(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(Builder builder) {
+        CharSequence[] entries = getEntries();
+        CharSequence[] entryValues = getEntryValues();
+
+        if (entries == null || entryValues == null || entries.length != entryValues.length) {
+            throw new IllegalStateException(
+                    this.getClass().getSimpleName()
+                            + " requires an entries array and an entryValues array which are both the same length");
+        }
+
+        mClickedDialogEntryIndices = new boolean[entryValues.length];
+        restoreCheckedEntries();
+        builder.setMultiChoiceItems(entries, mClickedDialogEntryIndices, new DialogInterface.OnMultiChoiceClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which, boolean isChecked) {
+                mClickedDialogEntryIndices[which] = isChecked;
+            }
+        });
+    }
+
+    public static String[] parseStoredValue(CharSequence val) {
+        if (TextUtils.isEmpty(val)) {
+            return null;
+        } else {
+            return val.toString().split(SEPARATOR);
+        }
+    }
+
+    private void restoreCheckedEntries() {
+        CharSequence[] entryValues = getEntryValues();
+
+        String[] vals = parseStoredValue(getValue());
+        if (vals != null) {
+            for (String val : vals) {
+                for (int i = 0; i < entryValues.length; i++) {
+                    CharSequence entry = entryValues[i];
+                    if (entry.equals(val)) {
+                        mClickedDialogEntryIndices[i] = true;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        CharSequence[] entryValues = getEntryValues();
+
+        if (positiveResult && entryValues != null) {
+            StringBuilder value = new StringBuilder();
+            for (int i = 0; i < entryValues.length; i++) {
+                if (mClickedDialogEntryIndices[i]) {
+                    if (value.length() > 0) {
+                        value.append(SEPARATOR);
+                    }
+                    value.append(entryValues[i]);
+                }
+            }
+
+            String val = value.toString();
+            if (callChangeListener(val)) {
+                setValue(val);
+            }
+        }
+    }
+}
diff --git a/core/java/android/preference/VolumePreference.java b/core/java/android/preference/VolumePreference.java
index caf55d7..b763022 100644
--- a/core/java/android/preference/VolumePreference.java
+++ b/core/java/android/preference/VolumePreference.java
@@ -146,6 +146,11 @@ public class VolumePreference extends SeekBarDialogPreference implements
         }
     }
 
+    /** @hide */
+    protected boolean onVolumeChange(SeekBarVolumizer volumizer, int value) {
+        return true;
+    }
+
     @Override
     protected Parcelable onSaveInstanceState() {
         final Parcelable superState = super.onSaveInstanceState();
@@ -305,10 +310,14 @@ public class VolumePreference extends SeekBarDialogPreference implements
         }
 
         void postSetVolume(int progress) {
-            // Do the volume changing separately to give responsive UI
-            mLastProgress = progress;
-            mHandler.removeCallbacks(this);
-            mHandler.post(this);
+            if (onVolumeChange(this, progress)) {
+                // Do the volume changing separately to give responsive UI
+                mLastProgress = progress;
+                mHandler.removeCallbacks(this);
+                mHandler.post(this);
+            } else {
+                mSeekBar.setProgress(mLastProgress);
+            }
         }
 
         public void onStartTrackingTouch(SeekBar seekBar) {