summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2015-07-13 23:01:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-13 23:01:57 +0000
commitd5b0f69a457db4622e7ee6f73695a32e6f8c96f4 (patch)
treebb22cee394af742bee9aeb9b9fd3d62723be5a6a /core/java
parent19fd86589b87faf8e243c6c33be17390867e67bb (diff)
parent208934ff010cc2aff7d8fee9237d6cee0e5bb563 (diff)
downloadframeworks_base-d5b0f69a457db4622e7ee6f73695a32e6f8c96f4.zip
frameworks_base-d5b0f69a457db4622e7ee6f73695a32e6f8c96f4.tar.gz
frameworks_base-d5b0f69a457db4622e7ee6f73695a32e6f8c96f4.tar.bz2
am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
* commit '208934ff010cc2aff7d8fee9237d6cee0e5bb563': fix build by restoring deleted enum
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/logging/MetricsConstants.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/com/android/internal/logging/MetricsConstants.java b/core/java/com/android/internal/logging/MetricsConstants.java
index 400c442..7278d5c 100644
--- a/core/java/com/android/internal/logging/MetricsConstants.java
+++ b/core/java/com/android/internal/logging/MetricsConstants.java
@@ -83,6 +83,7 @@ public interface MetricsConstants {
public static final int INPUTMETHOD_LANGUAGE = 57;
public static final int INPUTMETHOD_KEYBOARD = 58;
public static final int INPUTMETHOD_SPELL_CHECKERS = 59;
+ public static final int INPUTMETHOD_SUBTYPE_ENABLER = 60;
public static final int INPUTMETHOD_USER_DICTIONARY = 61;
public static final int INPUTMETHOD_USER_DICTIONARY_ADD_WORD = 62;
public static final int LOCATION = 63;