Merge "Load device default theme mapping from resources"

1 files changed, 5 insertions, 7 deletions

diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 505ef9c0a234..e6dbcd0d4302 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -654,13 +654,11 @@ public class InputMethodService extends AbstractInputMethodService {
         return false;
     }
 
-    @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_DeviceDefault_InputMethod,
-                android.R.style.Theme_DeviceDefault_InputMethod);
+    @Override
+    public void onCreate() {
+        mTheme = getResources().selectSystemTheme(mTheme, getApplicationInfo().targetSdkVersion,
+                com.android.internal.R.array.system_theme_sdks,
+                com.android.internal.R.array.system_theme_ime_styles);
         super.setTheme(mTheme);
         super.onCreate();
         mImm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);