Properly use KeyEvent.isConfirmKey() in both methods. Change-Id: Id87158f2163f75af20350dc445df6a59f7190752