Merge "Adjust settings for development-only versions" (14dd52b8) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -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) {
		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);

+6 −0

Original line number	Diff line number	Diff line
		@@ -466,6 +466,12 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
		presentFeedbackDialog(latinIME);
		}

		public void presentFeedbackDialogFromSettings() {
		if (mLatinIME != null) {
		presentFeedbackDialog(mLatinIME);
		}
		}

		public void presentFeedbackDialog(final LatinIME latinIME) {
		if (isMakingUserRecording()) {
		saveRecording();