aboutsummaryrefslogtreecommitdiffstats
path: root/java-overridable/src/com/android
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-10-14 11:29:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-14 11:29:20 +0000
commit97b986f670bbd00c7eded2462e52a02fe70c83b6 (patch)
treeeae05d02506bd0930fc70d0c3c221fed44d7112b /java-overridable/src/com/android
parentfb09fa1b2256ae261db66486e64294567c7aedfb (diff)
parent10ac9403125aa6e56f2eb81724500d0946499c95 (diff)
downloadlatinime-97b986f670bbd00c7eded2462e52a02fe70c83b6.tar.gz
latinime-97b986f670bbd00c7eded2462e52a02fe70c83b6.tar.xz
latinime-97b986f670bbd00c7eded2462e52a02fe70c83b6.zip
am 10ac9403: Merge "[ML24] Add facilities to read the script of a subtype"
* commit '10ac9403125aa6e56f2eb81724500d0946499c95': [ML24] Add facilities to read the script of a subtype
Diffstat (limited to 'java-overridable/src/com/android')
-rw-r--r--java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java b/java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
index 747a3b06e..f9ebb9702 100644
--- a/java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
+++ b/java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
@@ -18,6 +18,7 @@ package com.android.inputmethod.latin.settings;
import android.content.Context;
import android.content.SharedPreferences;
+import android.content.res.Resources;
import android.preference.PreferenceFragment;
import android.view.inputmethod.InputMethodSubtype;
@@ -48,7 +49,8 @@ public class AdditionalFeaturesSettingUtils {
public static RichInputMethodSubtype createRichInputMethodSubtype(
@Nonnull final RichInputMethodManager imm,
- @Nonnull final InputMethodSubtype subtype) {
+ @Nonnull final InputMethodSubtype subtype,
+ final Resources resources) {
return new RichInputMethodSubtype(subtype);
}
}