From 14b800d858de4279584ba876aa795e87523511b8 Mon Sep 17 00:00:00 2001 From: Kurt Partridge <kep@google.com> Date: Thu, 23 Aug 2012 09:53:25 -0700 Subject: [PATCH] [Rlog14] Increase feedback buffer to cover whole session Change-Id: I55b61d9ca6eecd56181b8d2913f71559555cd89e --- java/res/values/strings.xml | 3 +-- .../com/android/inputmethod/research/ResearchLogger.java | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 5c5442708d..048670ada5 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -269,8 +269,7 @@ <string name="research_feedback_dialog_title" translatable="false">Send feedback</string> <!-- Text for checkbox option to include user data in feedback for research purposes [CHAR LIMIT=50] --> <!-- TODO: remove translatable=false attribute once text is stable --> - <!-- TODO: handle multilingual plurals --> - <string name="research_feedback_include_history_label" translatable="false">Include last <xliff:g id="word">%d</xliff:g> words entered</string> + <string name="research_feedback_include_history_label" translatable="false">Include session history</string> <!-- Hint to user about the text entry field where they should enter research feedback [CHAR LIMIT=40] --> <!-- TODO: remove translatable=false attribute once text is stable --> <string name="research_feedback_hint" translatable="false">Enter your feedback here.</string> diff --git a/java/src/com/android/inputmethod/research/ResearchLogger.java b/java/src/com/android/inputmethod/research/ResearchLogger.java index 8b6bff4953..83a6a3f05f 100644 --- a/java/src/com/android/inputmethod/research/ResearchLogger.java +++ b/java/src/com/android/inputmethod/research/ResearchLogger.java @@ -106,7 +106,8 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang // Change the default indicator to something very visible. Currently two red vertical bars on // either side of they keyboard. private static final boolean IS_SHOWING_INDICATOR_CLEARLY = false || IS_LOGGING_EVERYTHING; - public static final int FEEDBACK_WORD_BUFFER_SIZE = 5; + // FEEDBACK_WORD_BUFFER_SIZE should add 1 because it must also hold the feedback LogUnit itself. + public static final int FEEDBACK_WORD_BUFFER_SIZE = (Integer.MAX_VALUE - 1) + 1; // constants related to specific log points private static final String WHITESPACE_SEPARATORS = " \t\n\r"; @@ -391,9 +392,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang } if (mFeedbackLogBuffer == null) { mFeedbackLog = new ResearchLog(createLogFile(mFilesDir), mLatinIME); - // LogBuffer is one more than FEEDBACK_WORD_BUFFER_SIZE, because it must also hold - // the feedback LogUnit itself. - mFeedbackLogBuffer = new FixedLogBuffer(FEEDBACK_WORD_BUFFER_SIZE + 1); + mFeedbackLogBuffer = new FixedLogBuffer(FEEDBACK_WORD_BUFFER_SIZE); } } -- GitLab