summaryrefslogtreecommitdiffstats
path: root/core/java/android/inputmethodservice
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-01-14 11:43:24 -0800
committerDianne Hackborn <hackbod@google.com>2011-01-14 12:28:23 -0800
commitd922ae01ca99a2b6d39a9393f86776a1d10ebd14 (patch)
tree19bde02a79e0dd2d84c94aebfedc1a106c83b2eb /core/java/android/inputmethodservice
parent1e02ebd225cfe629a4ab2b98f19e4e08ad97c397 (diff)
downloadframeworks_base-d922ae01ca99a2b6d39a9393f86776a1d10ebd14.zip
frameworks_base-d922ae01ca99a2b6d39a9393f86776a1d10ebd14.tar.gz
frameworks_base-d922ae01ca99a2b6d39a9393f86776a1d10ebd14.tar.bz2
Add Holo theme for IMEs.
Also clean up theme selection code to get rid of duplication. Change-Id: Idf7b21db70ee83fce24756ead877169bd08b77a9
Diffstat (limited to 'core/java/android/inputmethodservice')
-rw-r--r--core/java/android/inputmethodservice/InputMethodService.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 8150493..23b9ad5 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -22,6 +22,7 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import android.app.Dialog;
import android.content.Context;
import android.content.res.Configuration;
+import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Rect;
import android.os.Bundle;
@@ -220,7 +221,7 @@ public class InputMethodService extends AbstractInputMethodService {
InputMethodManager mImm;
- int mTheme = android.R.style.Theme_InputMethod;
+ int mTheme = 0;
LayoutInflater mInflater;
TypedArray mThemeAttrs;
@@ -556,6 +557,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);
super.setTheme(mTheme);
super.onCreate();
mImm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);