Merge branch 'master' into icade

This commit is contained in:
Yoshi Sugawara 2016-03-28 20:50:58 -04:00
commit 53e8a24f15
1 changed files with 4 additions and 2 deletions

View File

@ -2183,8 +2183,10 @@ int x_adb_get_keypad_y()
debug_printf("setInputAccessoryView:accessView");
// IOS8
[self.accessView removeFromSuperview];
[self.textField setInputAccessoryView:self.accessView];
if ( !isHardwareKeyboard() ) {
[self.accessView removeFromSuperview];
[self.textField setInputAccessoryView:self.accessView];
}
[self.textField becomeFirstResponder];
}