diff options
| author | Alan Viverette <alanv@google.com> | 2014-05-05 12:25:33 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-05-05 12:26:03 -0700 |
| commit | 5effd7e89f83824ac8982a6cbcebbf5cc331e436 (patch) | |
| tree | 6e46eec8e5b7bee8ec967d32252f526a464a325b /core/java/android/inputmethodservice/InputMethodService.java | |
| parent | 5d039c458c67e8c08334e597a6a8781eda6aab13 (diff) | |
Partial revert "Load device default theme mapping from resources"
This reverts commit e4ab72d54cf41d16819b72e94d9b0d0d51289647.
Change-Id: Id17170312c75993fc1f7859d52c7e050b2aeaf80
Diffstat (limited to 'core/java/android/inputmethodservice/InputMethodService.java')
| -rw-r--r-- | core/java/android/inputmethodservice/InputMethodService.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index 4160633a2e5f..f6438b444cb5 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -654,11 +654,13 @@ public class InputMethodService extends AbstractInputMethodService { return false; } - @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); + @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); super.setTheme(mTheme); super.onCreate(); mImm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE); |
