nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3ff6fa72: am 5a5ee95f: Rename ProductionFlag to ProductionFlags 

* commit '3ff6fa72fb5c27fc4936420979806ff9fd6ff44e':
  Rename ProductionFlag to ProductionFlags
main
Tadashi G. Takaoka 2014-07-17 18:36:01 +00:00 committed by Android Git Automerger
parent 68fffa73b4 3ff6fa72fb
commit 86ca4988c2
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/compat/InputMethodServiceCompatUtils.java
View File

@ -17,7 +17,7 @@
package com.android.inputmethod.compat; package com.android.inputmethod.compat;
import android.inputmethodservice.InputMethodService; import android.inputmethodservice.InputMethodService;
import com.android.inputmethod.latin.define.ProductionFlag; import com.android.inputmethod.latin.define.ProductionFlags;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -37,7 +37,7 @@ public final class InputMethodServiceCompatUtils {
} }
public static void setCursorAnchorMonitorMode(final InputMethodService ims, final int mode) { public static void setCursorAnchorMonitorMode(final InputMethodService ims, final int mode) {
if (ProductionFlag.USES_CURSOR_ANCHOR_MONITOR) { if (ProductionFlags.USES_CURSOR_ANCHOR_MONITOR) {
ExperimentalAPIUtils.setCursorAnchorMonitorMode(ims, mode); ExperimentalAPIUtils.setCursorAnchorMonitorMode(ims, mode);
} }
} }

6
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -69,7 +69,7 @@ import com.android.inputmethod.keyboard.MainKeyboardView;
import com.android.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback; import com.android.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback;
import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
import com.android.inputmethod.latin.define.DebugFlags; import com.android.inputmethod.latin.define.DebugFlags;
import com.android.inputmethod.latin.define.ProductionFlag; import com.android.inputmethod.latin.define.ProductionFlags;
import com.android.inputmethod.latin.inputlogic.InputLogic; import com.android.inputmethod.latin.inputlogic.InputLogic;
import com.android.inputmethod.latin.personalization.ContextualDictionaryUpdater; import com.android.inputmethod.latin.personalization.ContextualDictionaryUpdater;
import com.android.inputmethod.latin.personalization.DictionaryDecayBroadcastReciever; import com.android.inputmethod.latin.personalization.DictionaryDecayBroadcastReciever;
@ -413,7 +413,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
if (latinIme != null) { if (latinIme != null) {
executePendingImsCallback(latinIme, editorInfo, restarting); executePendingImsCallback(latinIme, editorInfo, restarting);
latinIme.onStartInputInternal(editorInfo, restarting); latinIme.onStartInputInternal(editorInfo, restarting);
if (ProductionFlag.USES_CURSOR_ANCHOR_MONITOR) { if (ProductionFlags.USES_CURSOR_ANCHOR_MONITOR) {
// Currently we need to call this every time when the IME is attached to // Currently we need to call this every time when the IME is attached to
// new application. // new application.
// TODO: Consider if we can do this automatically in the framework. // TODO: Consider if we can do this automatically in the framework.
@ -1564,7 +1564,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// Hooks for hardware keyboard // Hooks for hardware keyboard
@Override @Override
public boolean onKeyDown(final int keyCode, final KeyEvent keyEvent) { public boolean onKeyDown(final int keyCode, final KeyEvent keyEvent) {
if (!ProductionFlag.IS_HARDWARE_KEYBOARD_SUPPORTED) { if (!ProductionFlags.IS_HARDWARE_KEYBOARD_SUPPORTED) {
return super.onKeyDown(keyCode, keyEvent); return super.onKeyDown(keyCode, keyEvent);
} }
final Event event = getHardwareKeyEventDecoder( final Event event = getHardwareKeyEventDecoder(

4
java/src/com/android/inputmethod/latin/define/ProductionFlag.java → java/src/com/android/inputmethod/latin/define/ProductionFlags.java
View File

@ -16,8 +16,8 @@
package com.android.inputmethod.latin.define; package com.android.inputmethod.latin.define;
public final class ProductionFlag { public final class ProductionFlags {
private ProductionFlag() { private ProductionFlags() {
// This class is not publicly instantiable. // This class is not publicly instantiable.
} }

4
java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
View File

@ -43,7 +43,7 @@ import com.android.inputmethod.keyboard.KeyboardTheme;
import com.android.inputmethod.latin.AudioAndHapticFeedbackManager; import com.android.inputmethod.latin.AudioAndHapticFeedbackManager;
import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.R;
import com.android.inputmethod.latin.SubtypeSwitcher; import com.android.inputmethod.latin.SubtypeSwitcher;
import com.android.inputmethod.latin.define.ProductionFlag; import com.android.inputmethod.latin.define.ProductionFlags;
import com.android.inputmethod.latin.setup.LauncherIconVisibilityManager; import com.android.inputmethod.latin.setup.LauncherIconVisibilityManager;
import com.android.inputmethod.latin.userdictionary.UserDictionaryList; import com.android.inputmethod.latin.userdictionary.UserDictionaryList;
import com.android.inputmethod.latin.userdictionary.UserDictionarySettings; import com.android.inputmethod.latin.userdictionary.UserDictionarySettings;
@ -199,7 +199,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment
correctionScreen.removePreference(dictionaryLink); correctionScreen.removePreference(dictionaryLink);
} }
if (ProductionFlag.IS_METRICS_LOGGING_SUPPORTED) { if (ProductionFlags.IS_METRICS_LOGGING_SUPPORTED) {
final Preference enableMetricsLogging = final Preference enableMetricsLogging =
findPreference(Settings.PREF_ENABLE_METRICS_LOGGING); findPreference(Settings.PREF_ENABLE_METRICS_LOGGING);
if (enableMetricsLogging != null) { if (enableMetricsLogging != null) {

4
java/src/com/android/inputmethod/latin/utils/SuggestionResults.java
View File

@ -17,7 +17,7 @@
package com.android.inputmethod.latin.utils; package com.android.inputmethod.latin.utils;
import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
import com.android.inputmethod.latin.define.ProductionFlag; import com.android.inputmethod.latin.define.ProductionFlags;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -43,7 +43,7 @@ public final class SuggestionResults extends TreeSet<SuggestedWordInfo> {
super(comparator); super(comparator);
mLocale = locale; mLocale = locale;
mCapacity = capacity; mCapacity = capacity;
if (ProductionFlag.INCLUDE_RAW_SUGGESTIONS) { if (ProductionFlags.INCLUDE_RAW_SUGGESTIONS) {
mRawSuggestions = new ArrayList<>(); mRawSuggestions = new ArrayList<>();
} else { } else {
mRawSuggestions = null; mRawSuggestions = null;