summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-03-03 22:23:07 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-03 22:23:07 -0800
commit48f91e35c5188f3dc78c12b8e8638a248221691b (patch)
treeb4921f287b2d23044f7bd9b865d0cce06474497f /services/java
parent1e158e9ce78c25dc5de402f14654a8955de7fddc (diff)
parente3a7f628c6d9fef42be24999b3137ebe5c6f3525 (diff)
downloadframeworks_base-48f91e35c5188f3dc78c12b8e8638a248221691b.zip
frameworks_base-48f91e35c5188f3dc78c12b8e8638a248221691b.tar.gz
frameworks_base-48f91e35c5188f3dc78c12b8e8638a248221691b.tar.bz2
Merge "Fix Fragment.onInflate() to actually work correctly." into honeycomb-mr1
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/InputMethodManagerService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index f2cf942..6d3c560 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1860,8 +1860,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
});
}
mSwitchingDialog = mDialogBuilder.create();
+ mSwitchingDialog.setCanceledOnTouchOutside(true);
mSwitchingDialog.getWindow().setType(
WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG);
+ mSwitchingDialog.getWindow().getAttributes().setTitle("Select input method");
mSwitchingDialog.show();
}
}