diff options
| author |   Kurt Partridge <kep@google.com> | 2013-06-12 16:50:55 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-06-12 16:50:55 +0000 |
| commit | 14dd52b8c058b27adb17777536ff11c4b69616fc (patch) | |
| tree | 7da116f765176faea0efc635f827d6fe7eda44f9 /java/src/com/android/inputmethod/latin/SettingsFragment.java | |
| parent | eac0eb89f23a9962ece6eb884ce41610e0b85ea0 (diff) | |
| parent | 2a1a463e2e7cb9b6f129eb2ac368dfdd41f4c152 (diff) | |
| download | latinime-14dd52b8c058b27adb17777536ff11c4b69616fc.tar.gz latinime-14dd52b8c058b27adb17777536ff11c4b69616fc.tar.xz latinime-14dd52b8c058b27adb17777536ff11c4b69616fc.zip | |
Merge "Adjust settings for development-only versions"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/SettingsFragment.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsFragment.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/SettingsFragment.java b/java/src/com/android/inputmethod/latin/SettingsFragment.java index 8365cce3a..2d4de15d7 100644 --- a/java/src/com/android/inputmethod/latin/SettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/SettingsFragment.java @@ -42,6 +42,7 @@ import com.android.inputmethod.latin.define.ProductionFlag; import com.android.inputmethod.latin.setup.LauncherIconVisibilityManager; import com.android.inputmethod.latin.userdictionary.UserDictionaryList; import com.android.inputmethod.latin.userdictionary.UserDictionarySettings; +import com.android.inputmethod.research.ResearchLogger; import com.android.inputmethodcommon.InputMethodSettingsFragment; public final class SettingsFragment extends InputMethodSettingsFragment @@ -130,7 +131,12 @@ public final class SettingsFragment extends InputMethodSettingsFragment feedbackSettings.setOnPreferenceClickListener(new OnPreferenceClickListener() { @Override public boolean onPreferenceClick(final Preference pref) { - FeedbackUtils.showFeedbackForm(getActivity()); + if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { + // Use development-only feedback mechanism + ResearchLogger.getInstance().presentFeedbackDialogFromSettings(); + } else { + FeedbackUtils.showFeedbackForm(getActivity()); + } return true; } }); @@ -141,6 +147,10 @@ public final class SettingsFragment extends InputMethodSettingsFragment miscSettings.removePreference(aboutSettings); } } + if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { + // The about screen contains items that may be confusing in development-only versions. + miscSettings.removePreference(aboutSettings); + } final boolean showVoiceKeyOption = res.getBoolean( R.bool.config_enable_show_voice_key_option); |