Ignore the volume hard keys in Volume settings screen.

Bug: 5214785

Also brings that dialog in compliance with the new volume spec.

Change-Id: I68ce68887515193f1a73a5c8b1182dc290da05c6

1 files changed, 1 insertions, 7 deletions

diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index a62690363..22c05caec 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -58,7 +58,6 @@ public class RingerVolumePreference extends VolumePreference implements OnClickL
     private static final int MSG_RINGER_MODE_CHANGED = 101;
 
     private SeekBarVolumizer [] mSeekBarVolumizer;
-    private boolean mIgnoreVolumeKeys;
 
     // These arrays must all match in length and order
     private static final int[] SEEKBAR_ID = new int[] {
@@ -145,7 +144,6 @@ public class RingerVolumePreference extends VolumePreference implements OnClickL
         //setDialogIcon(R.drawable.ic_settings_sound);
 
         mSeekBarVolumizer = new SeekBarVolumizer[SEEKBAR_ID.length];
-        mIgnoreVolumeKeys = !Utils.isVoiceCapable(context);
 
         mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
     }
@@ -242,11 +240,7 @@ public class RingerVolumePreference extends VolumePreference implements OnClickL
             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);
-                }
+                return true;
             default:
                 return false;
         }