diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-10-28 06:25:00 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-28 06:25:00 +0000 |
| commit | e1c1aabc877d21c5e79b8b0da4ef3b5ef025184c (patch) | |
| tree | d52ae043187c67f3cdf0c6a55b975c2efb84d9b9 /java/src/com/android/inputmethod/latin/settings/SettingsValues.java | |
| parent | d2bca0257d495c50dd26fb16df9c956c9ccfb6a6 (diff) | |
| parent | 395009c03eeda42b2b2114d005c3ed8d7e4bfd4b (diff) | |
| download | latinime-e1c1aabc877d21c5e79b8b0da4ef3b5ef025184c.tar.gz latinime-e1c1aabc877d21c5e79b8b0da4ef3b5ef025184c.tar.xz latinime-e1c1aabc877d21c5e79b8b0da4ef3b5ef025184c.zip | |
am 395009c0: Fix NPE in AppearanceSettingsFragment
* commit '395009c03eeda42b2b2114d005c3ed8d7e4bfd4b':
Fix NPE in AppearanceSettingsFragment
Diffstat (limited to 'java/src/com/android/inputmethod/latin/settings/SettingsValues.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/SettingsValues.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java index e488cb10c..bdb4e64e0 100644 --- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java @@ -29,7 +29,6 @@ import com.android.inputmethod.latin.InputAttributes; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.RichInputMethodManager; import com.android.inputmethod.latin.SubtypeSwitcher; -import com.android.inputmethod.latin.common.Constants; import com.android.inputmethod.latin.utils.AsyncResultHolder; import com.android.inputmethod.latin.utils.ResourceUtils; import com.android.inputmethod.latin.utils.TargetPackageInfoGetterTask; @@ -158,7 +157,7 @@ public class SettingsValues { mHasHardwareKeyboard = Settings.readHasHardwareKeyboard(res.getConfiguration()); mEnableMetricsLogging = prefs.getBoolean(Settings.PREF_ENABLE_METRICS_LOGGING, true); mIsSplitKeyboardEnabled = prefs.getBoolean(Settings.PREF_ENABLE_SPLIT_KEYBOARD, false); - mScreenMetrics = res.getInteger(R.integer.config_screen_metrics); + mScreenMetrics = Settings.readScreenMetrics(res); mShouldShowLxxSuggestionUi = Settings.SHOULD_SHOW_LXX_SUGGESTION_UI && prefs.getBoolean(DebugSettings.PREF_SHOULD_SHOW_LXX_SUGGESTION_UI, true); @@ -224,11 +223,6 @@ public class SettingsValues { return mEnableMetricsLogging; } - public boolean isTablet() { - return mScreenMetrics == Constants.SCREEN_METRICS_SMALL_TABLET - || mScreenMetrics == Constants.SCREEN_METRICS_LARGE_TABLET; - } - public boolean isApplicationSpecifiedCompletionsOn() { return mInputAttributes.mApplicationSpecifiedCompletionOn; } |