From 0810b63739c9981f993063749f804b54faed0ba5 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Thu, 1 May 2014 14:42:56 -0700 Subject: Load device default theme mapping from resources Also adds a few missing styles and reorganizes some XML files. Makes stackViewStyle public since it's defined in DeviceDefault. Change-Id: I8f6a0f93410948b38619594474d60dc40ece5917 --- core/java/android/inputmethodservice/InputMethodService.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'core/java/android/inputmethodservice/InputMethodService.java') 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); -- cgit v1.2.3