commit 71863f3b48588cbbcae93bc784ebefbeec47c25f
author Amith Yamasani <yamasani@google.com> Tue Feb 01 05:28:41 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 01 05:28:41 2011 -0800
tree 48277597d1b9162314e79e3668f5ae978b77ea26
parent 649b9f19e1193547f339239afa32d569f43358fc
parent 424953d55b1cf790aa9ace5774469ead3d49181e

Merge "Use a custom media file for media volume sample." into honeycomb

res/raw/media_volume.ogg

diff --git a/res/raw/media_volume.ogg b/res/raw/media_volume.ogg
new file mode 100644
index 0000000..88db9d9
--- /dev/null
+++ b/res/raw/media_volume.ogg
Binary files differ

src/com/android/settings/RingerVolumePreference.java

diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 7000e4e..daae1a7 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -17,13 +17,16 @@
 package com.android.settings;
 
 import android.app.Dialog;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.media.AudioManager;
+import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.preference.VolumePreference;
 import android.provider.Settings;
 import android.util.AttributeSet;
+import android.view.KeyEvent;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -40,6 +43,7 @@
 
     private CheckBox mNotificationsUseRingVolumeCheckbox;
     private SeekBarVolumizer [] mSeekBarVolumizer;
+    private boolean mIgnoreVolumeKeys;
     private static final int[] SEEKBAR_ID = new int[] {
         R.id.notification_volume_seekbar,
         R.id.media_volume_seekbar,
@@ -70,6 +74,7 @@
         setDialogIcon(R.drawable.ic_settings_sound);
 
         mSeekBarVolumizer = new SeekBarVolumizer[SEEKBAR_ID.length];
+        mIgnoreVolumeKeys = !Utils.isVoiceCapable(context);
     }
 
     @Override
@@ -78,8 +83,13 @@
 
         for (int i = 0; i < SEEKBAR_ID.length; i++) {
             SeekBar seekBar = (SeekBar) view.findViewById(SEEKBAR_ID[i]);
-            mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(), seekBar,
-                SEEKBAR_TYPE[i]);
+            if (SEEKBAR_TYPE[i] == AudioManager.STREAM_MUSIC) {
+                mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(), seekBar,
+                        SEEKBAR_TYPE[i], getMediaVolumeUri(getContext()));
+            } else {
+                mSeekBarVolumizer[i] = new SeekBarVolumizer(getContext(), seekBar,
+                        SEEKBAR_TYPE[i]);
+            }
         }
 
         mNotificationVolumeTitle = (TextView) view.findViewById(R.id.notification_volume_title);
@@ -95,6 +105,12 @@
         disableSettingsThatNeedVoice(view);
     }
 
+    private Uri getMediaVolumeUri(Context context) {
+        return Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://"
+                + context.getPackageName()
+                + "/" + R.raw.media_volume);
+    }
+
     private void disableSettingsThatNeedVoice(View parent) {
         final boolean voiceCapable = Utils.isVoiceCapable(getContext());
         if (!voiceCapable) {
@@ -139,6 +155,23 @@
     }
 
     @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        boolean isdown = (event.getAction() == KeyEvent.ACTION_DOWN);
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_VOLUME_DOWN:
+            case KeyEvent.KEYCODE_VOLUME_UP:
+            case KeyEvent.KEYCODE_VOLUME_MUTE:
+                if (mIgnoreVolumeKeys) {
+                    return true;
+                } else {
+                    return super.onKey(v, keyCode, event);
+                }
+            default:
+                return false;
+        }
+    }
+
+    @Override
     protected void onSampleStarting(SeekBarVolumizer volumizer) {
         super.onSampleStarting(volumizer);
         for (SeekBarVolumizer vol : mSeekBarVolumizer) {