am 4a946c9d: am 7b0459e1: Merge "Revert "ResearchLogging log when preferences change"" into jb-mr1-dev
* commit '4a946c9dd16825ddbdf220a1fbb0523892c8412b':
Revert "ResearchLogging log when preferences change"
diff --git a/java/src/com/android/inputmethod/research/ResearchLogger.java b/java/src/com/android/inputmethod/research/ResearchLogger.java
index 3cad2d0..1410ba9 100644
--- a/java/src/com/android/inputmethod/research/ResearchLogger.java
+++ b/java/src/com/android/inputmethod/research/ResearchLogger.java
@@ -731,9 +731,16 @@
stop();
}
- private static final String[] EVENTKEYS_USER_FEEDBACK = {
- "UserFeedback", "FeedbackContents"
+ private static final String[] EVENTKEYS_PREFS_CHANGED = {
+ "PrefsChanged", "prefs"
};
+ public static void prefsChanged(final SharedPreferences prefs) {
+ final ResearchLogger researchLogger = getInstance();
+ final Object[] values = {
+ prefs
+ };
+ researchLogger.enqueueEvent(EVENTKEYS_PREFS_CHANGED, values);
+ }
// Regular logging methods
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk
index b0b47af..29aba8b 100644
--- a/tools/dicttool/Android.mk
+++ b/tools/dicttool/Android.mk
@@ -24,6 +24,7 @@
$(filter-out $(addprefix %/, $(notdir $(LOCAL_TOOL_SRC_FILES))), $(LOCAL_MAIN_SRC_FILES)) \
$(call all-java-files-under,tests)
LOCAL_JAR_MANIFEST := etc/manifest.txt
+
LOCAL_MODULE := dicttool_aosp
LOCAL_JAVA_LIBRARIES := junit
diff --git a/tools/dicttool/etc/Android.mk b/tools/dicttool/etc/Android.mk
index 0c611b7..a0f5abd 100644
--- a/tools/dicttool/etc/Android.mk
+++ b/tools/dicttool/etc/Android.mk
@@ -16,4 +16,5 @@
include $(CLEAR_VARS)
LOCAL_PREBUILT_EXECUTABLES := dicttool_aosp makedict_aosp
+
include $(BUILD_HOST_PREBUILT)