Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c623fff0 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Fix keyboard hidden flag." into honeycomb

parents 6cf32312 597eec8c

services/java/com/android/server/WindowManagerService.java

+9 −6
Original line number Diff line number Diff line
@@ -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;

    }