am 1a42236a: am 4b6756db: Merge "Remove unnecessary harmful finish() from SettingsActivity"

* commit '1a42236a8b22e0d3ca6f26704f052b8f83c991c5':
  Remove unnecessary harmful finish() from SettingsActivity
main
Tadashi G. Takaoka 2013-04-17 19:47:08 -07:00 committed by Android Git Automerger
commit 577dc18906
1 changed files with 2 additions and 7 deletions

View File

@ -16,7 +16,6 @@
package com.android.inputmethod.latin; package com.android.inputmethod.latin;
import android.app.Activity;
import android.app.backup.BackupManager; import android.app.backup.BackupManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@ -115,12 +114,8 @@ public final class SettingsFragment extends InputMethodSettingsFragment
if (FeedbackUtils.isFeedbackFormSupported()) { if (FeedbackUtils.isFeedbackFormSupported()) {
feedbackSettings.setOnPreferenceClickListener(new OnPreferenceClickListener() { feedbackSettings.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override @Override
public boolean onPreferenceClick(Preference arg0) { public boolean onPreferenceClick(final Preference pref) {
final Activity activity = getActivity(); FeedbackUtils.showFeedbackForm(getActivity());
FeedbackUtils.showFeedbackForm(activity);
if (!activity.isFinishing()) {
activity.finish();
}
return true; return true;
} }
}); });