commit a848c094857c8457a86e7a9159163df4b3af65d0
author Keisuke Kuroyanagi <ksk@google.com> Fri Aug 08 08:05:29 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 07 16:37:11 2014 +0000
tree 8f162c36ce9618a677fc3c46f1de3535ab54a5ff
parent 6fef4ff00d78fcf1b4bcd840899bcf02d1b6869f
parent e05eb2182602dd62e2bfa5b78ab6df7f331cff24

Merge "Rename distracter filter class." into lmp-dev

java/res/values/strings.xml

diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index b6601c8..cb03260 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -159,8 +159,9 @@
     <!-- Title for input language selection screen -->
     <string name="language_selection_title">Input languages</string>
 
-    <!-- Title of a preference to send feedback. [CHAR LIMIT=30]-->
-    <string name="send_feedback">Send feedback</string>
+    <!-- Title for the 'Help & feedback' settings fragment which shows a help page and has a button
+         for submitting feedback. [CHAR LIMIT=35] -->
+    <string name="help_and_feedback">Help &amp; feedback</string>
 
     <!-- Preference for input language selection -->
     <string name="select_language">Input languages</string>

java/src/com/android/inputmethod/latin/settings/SettingsFragment.java

diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
index 6734a9c..217a407 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
@@ -29,9 +29,12 @@
 import com.android.inputmethodcommon.InputMethodSettingsFragment;
 
 public final class SettingsFragment extends InputMethodSettingsFragment {
-    private static final int NO_MENU_GROUP = Menu.NONE; // We don't care about menu grouping.
-    private static final int MENU_FEEDBACK = Menu.FIRST; // The first menu item id and order.
-    private static final int MENU_ABOUT = Menu.FIRST + 1; // The second menu item id and order.
+    // We don't care about menu grouping.
+    private static final int NO_MENU_GROUP = Menu.NONE;
+    // The first menu item id and order.
+    private static final int MENU_HELP_AND_FEEDBACK = Menu.FIRST;
+    // The second menu item id and order.
+    private static final int MENU_ABOUT = Menu.FIRST + 1;
 
     @Override
     public void onCreate(final Bundle icicle) {
@@ -53,9 +56,9 @@
 
     @Override
     public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
-        if (FeedbackUtils.isFeedbackFormSupported()) {
-            menu.add(NO_MENU_GROUP, MENU_FEEDBACK /* itemId */, MENU_FEEDBACK /* order */,
-                    R.string.send_feedback);
+        if (FeedbackUtils.isHelpAndFeedbackFormSupported()) {
+            menu.add(NO_MENU_GROUP, MENU_HELP_AND_FEEDBACK /* itemId */,
+                    MENU_HELP_AND_FEEDBACK /* order */, R.string.help_and_feedback);
         }
         final int aboutResId = FeedbackUtils.getAboutKeyboardTitleResId();
         if (aboutResId != 0) {
@@ -66,8 +69,8 @@
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         final int itemId = item.getItemId();
-        if (itemId == MENU_FEEDBACK) {
-            FeedbackUtils.showFeedbackForm(getActivity());
+        if (itemId == MENU_HELP_AND_FEEDBACK) {
+            FeedbackUtils.showHelpAndFeedbackForm(getActivity());
             return true;
         }
         if (itemId == MENU_ABOUT) {

java/src/com/android/inputmethod/latin/utils/FeedbackUtils.java

diff --git a/java/src/com/android/inputmethod/latin/utils/FeedbackUtils.java b/java/src/com/android/inputmethod/latin/utils/FeedbackUtils.java
index ec7eaf4..0aed41e 100644
--- a/java/src/com/android/inputmethod/latin/utils/FeedbackUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/FeedbackUtils.java
@@ -20,11 +20,11 @@
 import android.content.Intent;
 
 public class FeedbackUtils {
-    public static boolean isFeedbackFormSupported() {
+    public static boolean isHelpAndFeedbackFormSupported() {
         return false;
     }
 
-    public static void showFeedbackForm(Context context) {
+    public static void showHelpAndFeedbackForm(Context context) {
     }
 
     public static int getAboutKeyboardTitleResId() {