Merge 2 changes from master.
Change-Id: I20384bb557ec24bf55cdad0e633f4a814791e5e7
diff --git a/common/Android.mk b/common/Android.mk
index c8dfffc..ed7c479 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -26,7 +26,7 @@
include $(BUILD_STATIC_JAVA_LIBRARY)
# Include this library in the build server's output directory
-$(call dist-for-goals, droid, $(LOCAL_BUILT_MODULE):android-common.jar)
+$(call dist-for-goals, droidcore, $(LOCAL_BUILT_MODULE):android-common.jar)
# Build the test package
# we can't build the test for apps only build, because android.test.runner is not unbundled yet.
diff --git a/common/java/com/android/common/speech/LoggingEvents.java b/common/java/com/android/common/speech/LoggingEvents.java
index 1f3c6ef..4b438dc 100644
--- a/common/java/com/android/common/speech/LoggingEvents.java
+++ b/common/java/com/android/common/speech/LoggingEvents.java
@@ -110,6 +110,11 @@
public static final int START = 14;
public static final String EXTRA_START_LOCALE = "locale"; // value should be String
public static final String EXTRA_START_SWIPE = "swipe"; // value should be boolean
+ // EXTRA_START_SWIPE is deprecated; switch to EXTRA_START_METHOD instead
+ public static final String EXTRA_START_METHOD = "method"; // value should be int below
+ public static final int START_METHOD_BUTTON = 1;
+ public static final int START_METHOD_SWIPE = 2;
+ public static final int START_METHOD_MOTION = 3;
public static final int VOICE_INPUT_DELIVERED = 15;