input: Add workaround for broken hardware keyboard support

* Add workaround var for devices with broken kernels Change-Id: I5bcda9c0464f75cc080c224382eaecbf48613bf0 Conflicts: core/res/res/values/config.xml core/res/res/values/public.xml services/java/com/android/server/wm/WindowManagerService.java
imnuts · Nov 21, 2012 · 57b013d · 57b013d
1 parent 6742892
commit 57b013d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
@@ -1002,4 +1002,7 @@
          provisioning on some carriers, working around a bug (7305641)
          where if the preferred is used we don't try the others. -->
     <bool name="config_dontPreferApn">false</bool>
+
+    <!-- Workaround for devices with broken keyboards -->
+    <bool name="config_forceDisableHardwareKeyboard">false</bool>
 </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
@@ -1825,4 +1825,7 @@
 
   <!-- Screenshot -->
   <java-symbol type="string" name="global_action_screenshot" />
+
+  <!-- Keyboard Workaround -->
+  <java-symbol type="bool" name="config_forceDisableHardwareKeyboard" />
 </resources>
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
@@ -576,6 +576,8 @@ public void onReceive(Context context, Intent intent) {
     final DisplayManagerService mDisplayManagerService;
     final DisplayManager mDisplayManager;
 
+    private boolean mForceDisableHardwareKeyboard = false;
+
     // Who is holding the screen on.
     Session mHoldingScreenOn;
     PowerManager.WakeLock mHoldingScreenWakeLock;
@@ -836,6 +838,9 @@ private WindowManagerService(Context context, PowerManagerService pm,
         mFxSession = new SurfaceSession();
         mAnimator = new WindowAnimator(this);
 
+        mForceDisableHardwareKeyboard = context.getResources().getBoolean(
+                com.android.internal.R.bool.config_forceDisableHardwareKeyboard);
+
         initPolicy(uiHandler);
 
         // Add ourself to the Watchdog monitors.
@@ -6966,7 +6971,10 @@ boolean computeScreenConfigurationLocked(Configuration config) {
             }
 
             // Determine whether a hard keyboard is available and enabled.
-            boolean hardKeyboardAvailable = config.keyboard != Configuration.KEYBOARD_NOKEYS;
+            boolean hardKeyboardAvailable = false;
+            if (!mForceDisableHardwareKeyboard) {
+                mHardKeyboardAvailable = config.keyboard != Configuration.KEYBOARD_NOKEYS;
+            }
             if (hardKeyboardAvailable != mHardKeyboardAvailable) {
                 mHardKeyboardAvailable = hardKeyboardAvailable;
                 mHardKeyboardEnabled = hardKeyboardAvailable;