summaryrefslogtreecommitdiff
path: root/core/java/android/inputmethodservice/InputMethodService.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-08-14 16:48:32 -0700
committerAdam Powell <adamp@google.com>2011-08-14 16:49:22 -0700
commit6e90a362bc66cc67b1beae27b21d3f0148403b08 (patch)
tree0ebfe4ce91bbeaa0c6c275106682a0cb79685dce /core/java/android/inputmethodservice/InputMethodService.java
parent52727fc38aaf6821bac6adf33235f154139638d0 (diff)
Fix bug 5159736 - Make DeviceDefault the default
Have the framework refer to the DeviceDefault themes for ICS apps that don't explicitly request another theme. Change-Id: I27dd0bbaa60f71df4f36e47d260f556d923ba075
Diffstat (limited to 'core/java/android/inputmethodservice/InputMethodService.java')
-rw-r--r--core/java/android/inputmethodservice/InputMethodService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 9481a880fb08..370e22a0f84c 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -617,7 +617,9 @@ public class InputMethodService extends AbstractInputMethodService {
@Override public void onCreate() {
mTheme = Resources.selectSystemTheme(mTheme,
getApplicationInfo().targetSdkVersion,
- android.R.style.Theme_InputMethod, android.R.style.Theme_Holo_InputMethod);
+ android.R.style.Theme_InputMethod,
+ android.R.style.Theme_Holo,
+ android.R.style.Theme_DeviceDefault_InputMethod);
super.setTheme(mTheme);
super.onCreate();
mImm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);