Merge "Use Google Feedback"

This commit is contained in:
Kurt Partridge 2013-11-23 02:05:31 +00:00 committed by Android (Google) Code Review
commit 4f57a634d3

View file

@ -48,7 +48,6 @@ import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;
import com.android.inputmethod.latin.utils.ApplicationUtils; import com.android.inputmethod.latin.utils.ApplicationUtils;
import com.android.inputmethod.latin.utils.FeedbackUtils; import com.android.inputmethod.latin.utils.FeedbackUtils;
import com.android.inputmethod.latin.utils.SubtypeLocaleUtils; import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;
import com.android.inputmethod.research.ResearchLogger;
import com.android.inputmethodcommon.InputMethodSettingsFragment; import com.android.inputmethodcommon.InputMethodSettingsFragment;
import java.util.TreeSet; import java.util.TreeSet;
@ -143,12 +142,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment
feedbackSettings.setOnPreferenceClickListener(new OnPreferenceClickListener() { feedbackSettings.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override @Override
public boolean onPreferenceClick(final Preference pref) { public boolean onPreferenceClick(final Preference pref) {
if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) { FeedbackUtils.showFeedbackForm(getActivity());
// Use development-only feedback mechanism
ResearchLogger.getInstance().presentFeedbackDialogFromSettings();
} else {
FeedbackUtils.showFeedbackForm(getActivity());
}
return true; return true;
} }
}); });