Merge "[Rlog79c] Cleanup of feedback strings and text entry"
diff --git a/java/res/layout/research_feedback_fragment_layout.xml b/java/res/layout/research_feedback_fragment_layout.xml
index 2725e7f..2915a77 100644
--- a/java/res/layout/research_feedback_fragment_layout.xml
+++ b/java/res/layout/research_feedback_fragment_layout.xml
@@ -63,7 +63,7 @@
android:minLines="2"
android:scrollbars="vertical"
android:hint="@string/research_feedback_hint"
- android:inputType="textMultiLine">
+ android:inputType="textMultiLine|textCapSentences">
<requestFocus />
</EditText>
<CheckBox
diff --git a/java/res/values/research_strings.xml b/java/res/values/research_strings.xml
index f67943e..e738711 100644
--- a/java/res/values/research_strings.xml
+++ b/java/res/values/research_strings.xml
@@ -21,8 +21,20 @@
<!-- Contents of note explaining what data is collected and how. -->
<!-- TODO: remove translatable=false attribute once text is stable -->
<string name="research_splash_content" translatable="false"></string>
+ <!-- Account type allowed for inclusion in user-invoked feedback logs [CHAR LIMIT=38] -->
<string name="research_account_type" translatable="false"></string>
+ <!-- Account domain allowed for inclusion in user-invoked feedback logs [CHAR LIMIT=38] -->
<string name="research_allowed_account_domain" translatable="false"></string>
+
+ <!-- Menu option that lets user send feedback for research purposes about the IME [CHAR LIMIT=38] -->
+ <!-- TODO: remove translatable=false attribute once text is stable -->
+ <string name="research_feedback_menu_option" translatable="false">Send feedback</string>
+ <!-- Title of dialog box that lets user send feedback for research purposes about the IME [CHAR LIMIT=38] -->
+ <!-- TODO: remove translatable=false attribute once text is stable -->
+ <string name="research_feedback_dialog_title" translatable="false">Send feedback</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>
<!-- Message informing the user that the feedback string must not be empty [CHAR LIMIT=100] -->
<!-- TODO: remove translatable=false attribute once text is stable -->
<string name="research_feedback_empty_feedback_error_message" translatable="false">The feedback field must not be empty.</string>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index fdc8581..ee79b45 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -266,12 +266,6 @@
<!-- TODO: remove translatable=false attribute once text is stable -->
<string name="research_notify_session_logging_enabled" translatable="false">Session logging enabled</string>
- <!-- Menu option that lets user send feedback for research purposes about the IME [CHAR LIMIT=38] -->
- <!-- TODO: remove translatable=false attribute once text is stable -->
- <string name="research_feedback_menu_option" translatable="false">Send feedback</string>
- <!-- Dialog box title that lets user send feedback for research purposes about the IME [CHAR LIMIT=38] -->
- <!-- TODO: remove translatable=false attribute once text is stable -->
- <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 -->
<string name="research_feedback_include_history_label" translatable="false">Include session history</string>
@@ -281,9 +275,6 @@
<!-- Text for checkbox option to include a recording in feedback for research purposes [CHAR LIMIT=50] -->
<!-- TODO: remove translatable=false attribute once text is stable -->
<string name="research_feedback_include_recording_label" translatable="false">Include recorded demonstration</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>
<!-- Dialog button choice to send research feedback [CHAR LIMIT=35] -->
<!-- TODO: remove translatable=false attribute once text is stable -->
<string name="research_feedback_send" translatable="false">Send</string>