diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-04-14 09:59:51 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-04-14 09:59:51 +0000 |
| commit | 83ac7b87df2cf3d9d5867a49eba94f6ed6381547 (patch) | |
| tree | 4d4381e1704264031e08e564098cf186358472bf /java/src/com/android/inputmethod/latin | |
| parent | 23aec08467dd1691eb03bc1bde815fa094b3ef1f (diff) | |
| parent | 3568fca95f92d5081755da88a5f6ca4cf518e2b2 (diff) | |
| download | latinime-83ac7b87df2cf3d9d5867a49eba94f6ed6381547.tar.gz latinime-83ac7b87df2cf3d9d5867a49eba94f6ed6381547.tar.xz latinime-83ac7b87df2cf3d9d5867a49eba94f6ed6381547.zip | |
am 3568fca9: Merge "Refactor KeyboardTheme as top-level class"
* commit '3568fca95f92d5081755da88a5f6ca4cf518e2b2':
Refactor KeyboardTheme as top-level class
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/Settings.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java index 1ba92adb1..4cb02284a 100644 --- a/java/src/com/android/inputmethod/latin/settings/Settings.java +++ b/java/src/com/android/inputmethod/latin/settings/Settings.java @@ -23,7 +23,7 @@ import android.content.res.Resources; import android.preference.PreferenceManager; import android.util.Log; -import com.android.inputmethod.keyboard.KeyboardSwitcher; +import com.android.inputmethod.keyboard.KeyboardTheme; import com.android.inputmethod.latin.AudioAndHapticFeedbackManager; import com.android.inputmethod.latin.InputAttributes; import com.android.inputmethod.latin.R; @@ -292,7 +292,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang try { return Integer.parseInt(defaultThemeIndexString); } catch (final NumberFormatException e) { - final int defaultThemeIndex = KeyboardSwitcher.DEFAULT_THEME_INDEX; + final int defaultThemeIndex = KeyboardTheme.DEFAULT_THEME_INDEX; Log.e(TAG, "Corrupted default keyoard theme in resource: " + defaultThemeIndexString + ", default to " + defaultThemeIndex, e); return defaultThemeIndex; |