mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Fix key presses disabled by softvolume.
This commit is contained in:
parent
fe4a0c99c6
commit
d2d195b698
1 changed files with 11 additions and 13 deletions
|
|
@ -34,21 +34,19 @@ public class SoftVolumeActivity extends Activity {
|
|||
|
||||
|
||||
public boolean onKeyDown(int keyCode, KeyEvent event) {
|
||||
if (keyCode != KeyEvent.KEYCODE_VOLUME_UP && keyCode != KeyEvent.KEYCODE_VOLUME_DOWN) {
|
||||
return false;
|
||||
if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)
|
||||
&& (Hacks.needSoftvolume() || LinphonePreferenceManager.getInstance().useSoftvolume())) {
|
||||
|
||||
if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
|
||||
LinphoneManager.getInstance().adjustSoftwareVolume(1);
|
||||
} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
|
||||
LinphoneManager.getInstance().adjustSoftwareVolume(-1);
|
||||
}
|
||||
}
|
||||
|
||||
if (!Hacks.needSoftvolume() && !LinphonePreferenceManager.getInstance().useSoftvolume())
|
||||
return false;
|
||||
|
||||
|
||||
if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
|
||||
LinphoneManager.getInstance().adjustSoftwareVolume(1);
|
||||
} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
|
||||
LinphoneManager.getInstance().adjustSoftwareVolume(-1);
|
||||
}
|
||||
|
||||
return preventVolumeBarToDisplay;
|
||||
if (!preventVolumeBarToDisplay) {
|
||||
return super.onKeyDown(keyCode, event);
|
||||
} else return true;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue