From a462cd80ae9d07cea596c61c54d7b1b2ba6c6645 Mon Sep 17 00:00:00 2001
From: Satoshi Kataoka <satok@google.com>
Date: Tue, 19 Mar 2013 16:49:19 +0900
Subject: [PATCH] Support feedback
Bug: 8143554
Change-Id: If0a6bafc94da040f97f27c6d046fb58bed9fd615
---
java/res/values/strings.xml | 2 ++
java/res/xml/prefs.xml | 3 ++
.../inputmethod/latin/FeedbackUtils.java | 28 +++++++++++++++++++
.../android/inputmethod/latin/Settings.java | 2 ++
.../inputmethod/latin/SettingsFragment.java | 21 ++++++++++++++
5 files changed, 56 insertions(+)
create mode 100644 java/src/com/android/inputmethod/latin/FeedbackUtils.java
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 03dce9ca63..2735251006 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -308,6 +308,8 @@
- operation[CHAR LIMIT=100] -->
<!-- TODO: remove translatable=false attribute once text is stable -->
<string name="research_feedback_demonstration_instructions" translatable="false">Please demonstrate the issue you are writing about.\n\nWhen finished, select the \"Bug?\" button again."</string>
+ <!-- Title of a preference to send feedback. [CHAR LIMIT=30]-->
+ <string name="send_feedback">Send feedback</string>
<!-- Temporary notification of recording failure [CHAR LIMIT=100] -->
<!-- TODO: remove translatable=false attribute once text is stable -->
<string name="research_feedback_recording_failure" translatable="false">Recording cancelled due to timeout</string>
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 51f580721a..e299ce4f8c 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -176,6 +176,9 @@
android:key="pref_show_setup_wizard_icon"
android:title="@string/show_setup_wizard_icon" />
</PreferenceScreen>
+ <PreferenceScreen
+ android:key="send_feedback"
+ android:title="@string/send_feedback" />
<PreferenceScreen
android:key="debug_settings"
android:title="Debug settings"
diff --git a/java/src/com/android/inputmethod/latin/FeedbackUtils.java b/java/src/com/android/inputmethod/latin/FeedbackUtils.java
new file mode 100644
index 0000000000..1e5260e34f
--- /dev/null
+++ b/java/src/com/android/inputmethod/latin/FeedbackUtils.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.inputmethod.latin;
+
+import android.content.Context;
+
+public class FeedbackUtils {
+ public static boolean isFeedbackFormSupported() {
+ return false;
+ }
+
+ public static void showFeedbackForm(Context context) {
+ }
+}
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index 4cbfa8ea18..ce659bf45a 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -77,6 +77,8 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
private static final String PREF_SUPPRESS_LANGUAGE_SWITCH_KEY =
"pref_suppress_language_switch_key";
+ public static final String PREF_SEND_FEEDBACK = "send_feedback";
+
private Resources mRes;
private SharedPreferences mPrefs;
private Locale mCurrentLocale;
diff --git a/java/src/com/android/inputmethod/latin/SettingsFragment.java b/java/src/com/android/inputmethod/latin/SettingsFragment.java
index fa17b4ffcf..4fdd839112 100644
--- a/java/src/com/android/inputmethod/latin/SettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/SettingsFragment.java
@@ -16,6 +16,7 @@
package com.android.inputmethod.latin;
+import android.app.Activity;
import android.app.backup.BackupManager;
import android.content.Context;
import android.content.Intent;
@@ -26,6 +27,7 @@ import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
import android.view.inputmethod.InputMethodSubtype;
@@ -103,6 +105,25 @@ public final class SettingsFragment extends InputMethodSettingsFragment
}
}
+ final Preference feedbackSettings = findPreference(Settings.PREF_SEND_FEEDBACK);
+ if (feedbackSettings != null) {
+ if (FeedbackUtils.isFeedbackFormSupported()) {
+ feedbackSettings.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+ @Override
+ public boolean onPreferenceClick(Preference arg0) {
+ final Activity activity = getActivity();
+ FeedbackUtils.showFeedbackForm(activity);
+ if (!activity.isFinishing()) {
+ activity.finish();
+ }
+ return true;
+ }
+ });
+ } else {
+ miscSettings.removePreference(feedbackSettings);
+ }
+ }
+
final boolean showVoiceKeyOption = res.getBoolean(
R.bool.config_enable_show_voice_key_option);
if (!showVoiceKeyOption) {
--
GitLab