commit 919607c9e5de670a3634c321cd42eb9d418dc695
author The Android Open Source Project <initial-contribution@android.com> Thu Mar 05 14:34:37 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Thu Mar 05 14:34:37 2009 -0800
tree 08b38b579922f9d610ecef2aaf91223e568dfdab
parent 1f838aaece3cd61d07ab9e41c5c6af761d643324

auto import from //depot/cupcake/@136594

policy/com/android/internal/policy/impl/PhoneWindow.java

diff --git a/policy/com/android/internal/policy/impl/PhoneWindow.java b/policy/com/android/internal/policy/impl/PhoneWindow.java
index 0d26bfb..f3f166b 100644
--- a/policy/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindow.java
@@ -200,7 +200,7 @@
                     InputMethodManager imm = (InputMethodManager)
                             getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
                     if (imm != null) {
-                        imm.showSoftInputUnchecked(InputMethodManager.SHOW_FORCED);
+                        imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
                     }
                 } break;
                 case MSG_CALL_LONG_PRESS_COMPLETE: {

policy/com/android/internal/policy/impl/PhoneWindowManager.java

diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
index d1b7576..8ecb2b6 100644
--- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -277,9 +277,6 @@
                 rotation =  (orientation >= 270 - _LOWER_THRESHOLD
                         && orientation <= 270 + threshold)
                         ? Surface.ROTATION_90 : Surface.ROTATION_0;
-            } else if (orientation == WindowOrientationListener.ORIENTATION_FLAT) {
-                // return portrait 
-                rotation = Surface.ROTATION_0;
             } else {
                 // ignore orientation value
                 return;