Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fae76f5b: Fix issue #1985502: Sapphire (and any other device) reports that it has a hard keyboard

Browse Source 
Merge commit 'fae76f5bdeed68efd85805db143b0426de92f7e0'

* commit 'fae76f5bdeed68efd85805db143b0426de92f7e0':
  Fix issue #1985502: Sapphire (and any other device) reports that it has a hard keyboard
This commit is contained in:
Dianne Hackborn
2009-07-16 17:54:44 -07:00
committed by Android Git Automerger
parent b2536b0b5c fae76f5bde
commit 265c9d2a14
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -11881,10 +11881,12 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
config.reqTouchScreen = mConfiguration.touchscreen;
config.reqKeyboardType = mConfiguration.keyboard;
config.reqNavigation = mConfiguration.navigation;
if (mConfiguration.navigation != Configuration.NAVIGATION_NONAV) {
if (mConfiguration.navigation == Configuration.NAVIGATION_DPAD
|| mConfiguration.navigation == Configuration.NAVIGATION_TRACKBALL) {
config.reqInputFeatures |= ConfigurationInfo.INPUT_FEATURE_FIVE_WAY_NAV;
}
if (mConfiguration.keyboard != Configuration.KEYBOARD_UNDEFINED) {
if (mConfiguration.keyboard != Configuration.KEYBOARD_UNDEFINED
&& mConfiguration.keyboard != Configuration.KEYBOARD_NOKEYS) {
config.reqInputFeatures |= ConfigurationInfo.INPUT_FEATURE_HARD_KEYBOARD;
}
}