Fix key presses disabled by softvolume.

This commit is contained in:
Guillaume Beraudo 2011-04-19 14:10:50 +02:00
parent fe4a0c99c6
commit d2d195b698

View file

@ -34,21 +34,19 @@ public class SoftVolumeActivity extends Activity {
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode != KeyEvent.KEYCODE_VOLUME_UP && keyCode != KeyEvent.KEYCODE_VOLUME_DOWN) { if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)
return false; && (Hacks.needSoftvolume() || LinphonePreferenceManager.getInstance().useSoftvolume())) {
}
if (!Hacks.needSoftvolume() && !LinphonePreferenceManager.getInstance().useSoftvolume())
return false;
if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) { if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
LinphoneManager.getInstance().adjustSoftwareVolume(1); LinphoneManager.getInstance().adjustSoftwareVolume(1);
} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) { } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
LinphoneManager.getInstance().adjustSoftwareVolume(-1); LinphoneManager.getInstance().adjustSoftwareVolume(-1);
} }
}
return preventVolumeBarToDisplay; if (!preventVolumeBarToDisplay) {
return super.onKeyDown(keyCode, event);
} else return true;
} }