am fd80d1ad: Merge "Deactivate h/w keyboard when not an internal build."

* commit 'fd80d1ad482b7ee9d6dcdb3f4463bdf0d2bf2bfb':
  Deactivate h/w keyboard when not an internal build.
main
Jean Chalard 2013-01-18 03:30:27 -08:00 committed by Android Git Automerger
commit 753a457cc1
2 changed files with 3 additions and 0 deletions

View File

@ -2429,6 +2429,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
// Hooks for hardware keyboard // Hooks for hardware keyboard
@Override @Override
public boolean onKeyDown(final int keyCode, final KeyEvent event) { public boolean onKeyDown(final int keyCode, final KeyEvent event) {
if (!ProductionFlag.IS_HARDWARE_KEYBOARD_SUPPORTED) return super.onKeyDown(keyCode, event);
// onHardwareKeyEvent, like onKeyDown returns true if it handled the event, false if // onHardwareKeyEvent, like onKeyDown returns true if it handled the event, false if
// it doesn't know what to do with it and leave it to the application. For example, // it doesn't know what to do with it and leave it to the application. For example,
// hardware key events for adjusting the screen's brightness are passed as is. // hardware key events for adjusting the screen's brightness are passed as is.

View File

@ -28,4 +28,6 @@ public final class ProductionFlag {
// be false, and any privacy controls should be enforced. IS_EXPERIMENTAL_DEBUG should be false // be false, and any privacy controls should be enforced. IS_EXPERIMENTAL_DEBUG should be false
// for any released build. // for any released build.
public static final boolean IS_EXPERIMENTAL_DEBUG = false; public static final boolean IS_EXPERIMENTAL_DEBUG = false;
public static final boolean IS_HARDWARE_KEYBOARD_SUPPORTED = true;
} }