diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-07-17 02:23:29 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-07-16 23:37:00 +0000 |
| commit | 6f80ed3901b32112114e039cb3a239a9e8d12130 (patch) | |
| tree | 1a8f9f571a8b8ee20f06b3503e7d0cdc3169a5e6 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | 0de52fa68a7c20623653a6c9c632dbf6b90cb4e2 (diff) | |
| parent | 2dae79b1966a7970c25c8b79beec1c95c13f6c87 (diff) | |
| download | latinime-6f80ed3901b32112114e039cb3a239a9e8d12130.tar.gz latinime-6f80ed3901b32112114e039cb3a239a9e8d12130.tar.xz latinime-6f80ed3901b32112114e039cb3a239a9e8d12130.zip | |
Merge "Rename LatinImeLogger to DebugFlags" into lmp-dev
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index d2c4ca712..e1f34ee48 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -37,6 +37,7 @@ import android.net.ConnectivityManager; import android.os.Debug; import android.os.IBinder; import android.os.Message; +import android.preference.PreferenceManager; import android.text.InputType; import android.text.TextUtils; import android.util.Log; @@ -67,6 +68,7 @@ import com.android.inputmethod.keyboard.KeyboardSwitcher; import com.android.inputmethod.keyboard.MainKeyboardView; import com.android.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback; import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; +import com.android.inputmethod.latin.define.DebugFlags; import com.android.inputmethod.latin.define.ProductionFlag; import com.android.inputmethod.latin.inputlogic.InputLogic; import com.android.inputmethod.latin.personalization.ContextualDictionaryUpdater; @@ -516,7 +518,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen @Override public void onCreate() { Settings.init(this); - LatinImeLogger.init(this); + DebugFlags.init(PreferenceManager.getDefaultSharedPreferences(this)); RichInputMethodManager.init(this); mRichImm = RichInputMethodManager.getInstance(); SubtypeSwitcher.init(this); @@ -528,7 +530,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen super.onCreate(); mHandler.onCreate(); - DEBUG = LatinImeLogger.sDBG; + DEBUG = DebugFlags.DEBUG_ENABLED; // TODO: Resolve mutual dependencies of {@link #loadSettings()} and {@link #initSuggest()}. loadSettings(); @@ -764,7 +766,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen if (editorInfo == null) { Log.e(TAG, "Null EditorInfo in onStartInputView()"); - if (LatinImeLogger.sDBG) { + if (DebugFlags.DEBUG_ENABLED) { throw new NullPointerException("Null EditorInfo in onStartInputView()"); } return; |