PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ignore the volume hard keys in Volume settings screen."

Browse Source
This commit is contained in:
Amith Yamasani
2011-09-01 14:49:08 -07:00
committed by Android (Google) Code Review
parent 9bc770b0b7 697d9384f1
commit 1679b2c2e6
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/RingerVolumePreference.java
View File

@@ -58,7 +58,6 @@ public class RingerVolumePreference extends VolumePreference implements OnClickL
private static final int MSG_RINGER_MODE_CHANGED = 101; private static final int MSG_RINGER_MODE_CHANGED = 101;
private SeekBarVolumizer [] mSeekBarVolumizer; private SeekBarVolumizer [] mSeekBarVolumizer;
private boolean mIgnoreVolumeKeys;
// These arrays must all match in length and order // These arrays must all match in length and order
private static final int[] SEEKBAR_ID = new int[] { 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); //setDialogIcon(R.drawable.ic_settings_sound);
mSeekBarVolumizer = new SeekBarVolumizer[SEEKBAR_ID.length]; mSeekBarVolumizer = new SeekBarVolumizer[SEEKBAR_ID.length];
mIgnoreVolumeKeys = !Utils.isVoiceCapable(context);
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); 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_DOWN:
case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_UP:
case KeyEvent.KEYCODE_VOLUME_MUTE: case KeyEvent.KEYCODE_VOLUME_MUTE:
if (mIgnoreVolumeKeys) { return true;
return true;
} else {
return super.onKey(v, keyCode, event);
}
default: default:
return false; return false;
} }