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

am c623fff0: Merge "Fix keyboard hidden flag." into honeycomb

Browse Source 
* commit 'c623fff00c53f6002a8ec6c98cf4fdd6b1b2ad12':
  Fix keyboard hidden flag.
This commit is contained in:
Jeff Brown
2011-01-31 18:52:06 -08:00
committed by Android Git Automerger
parent db569b4918 c623fff00c
commit a70154b018
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/java/com/android/server/WindowManagerService.java
View File

@@ -5787,11 +5787,7 @@ public class WindowManagerService extends IWindowManager.Stub
}
config.screenLayout = mScreenLayout;
config.keyboardHidden = Configuration.KEYBOARDHIDDEN_NO;
config.hardKeyboardHidden = Configuration.HARDKEYBOARDHIDDEN_NO;
mPolicy.adjustConfigurationLw(config);
// Adjust the hard keyboard configuration based on whether the hard keyboard is enabled.
// Determine whether a hard keyboard is available and enabled.
boolean hardKeyboardAvailable = config.keyboard != Configuration.KEYBOARD_NOKEYS;
if (hardKeyboardAvailable != mHardKeyboardAvailable) {
mHardKeyboardAvailable = hardKeyboardAvailable;
@@ -5802,8 +5798,15 @@ public class WindowManagerService extends IWindowManager.Stub
}
if (!mHardKeyboardEnabled) {
config.keyboard = Configuration.KEYBOARD_NOKEYS;
config.hardKeyboardHidden = Configuration.HARDKEYBOARDHIDDEN_NO;
}
// Update value of keyboardHidden, hardKeyboardHidden and navigationHidden
// based on whether a hard or soft keyboard is present, whether navigation keys
// are present and the lid switch state.
config.keyboardHidden = Configuration.KEYBOARDHIDDEN_NO;
config.hardKeyboardHidden = Configuration.HARDKEYBOARDHIDDEN_NO;
config.navigationHidden = Configuration.NAVIGATIONHIDDEN_NO;
mPolicy.adjustConfigurationLw(config);
return true;
}