diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-07-17 18:36:00 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-17 18:36:00 +0000 |
| commit | 68fffa73b4edab9b92c36ace077b689534f08221 (patch) | |
| tree | 9d0b5239dc4f00b1fec4496ffcd5f6af7a388573 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | b2fa1a593e8e54b46cb12c4c70d42841983eb071 (diff) | |
| parent | 34301f69a1e47fb6f7ee5498815dd30cad488921 (diff) | |
| download | latinime-68fffa73b4edab9b92c36ace077b689534f08221.tar.gz latinime-68fffa73b4edab9b92c36ace077b689534f08221.tar.xz latinime-68fffa73b4edab9b92c36ace077b689534f08221.zip | |
am 34301f69: am 6f80ed39: Merge "Rename LatinImeLogger to DebugFlags" into lmp-dev
* commit '34301f69a1e47fb6f7ee5498815dd30cad488921':
Rename LatinImeLogger to DebugFlags
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; |