Merge "Add metrics log for special cases in Lanugages & About page" into rvc-dev (cf654356) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java

+10 −9

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import com.android.settings.R;
		import com.android.settings.Settings;
		import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settingslib.search.Indexable;
		import com.android.settingslib.search.SearchIndexable;
		import com.android.settingslib.utils.ThreadUtils;

		@@ -85,14 +84,16 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
		mShowVirtualKeyboardSwitch = Preconditions.checkNotNull(
		(SwitchPreference) mKeyboardAssistanceCategory.findPreference(
		SHOW_VIRTUAL_KEYBOARD_SWITCH));
		findPreference(KEYBOARD_SHORTCUTS_HELPER).setOnPreferenceClickListener(
		new Preference.OnPreferenceClickListener() {
		}

		@Override
		public boolean onPreferenceClick(Preference preference) {
		public boolean onPreferenceTreeClick(Preference preference) {
		if (KEYBOARD_SHORTCUTS_HELPER.equals(preference.getKey())) {
		writePreferenceClickMetric(preference);
		toggleKeyboardShortcutsMenu();
		return true;
		}
		});
		return super.onPreferenceTreeClick(preference);
		}

		@Override

src/com/android/settings/inputmethod/SpellCheckersSettings.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.widget.Switch;
		import androidx.appcompat.app.AlertDialog;
		import androidx.preference.Preference;
		import androidx.preference.Preference.OnPreferenceChangeListener;
		import androidx.preference.Preference.OnPreferenceClickListener;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.R;
		@@ -41,7 +40,7 @@ import com.android.settings.widget.SwitchBar;
		import com.android.settings.widget.SwitchBar.OnSwitchChangeListener;

		public class SpellCheckersSettings extends SettingsPreferenceFragment
		implements OnSwitchChangeListener, OnPreferenceClickListener, OnPreferenceChangeListener {
		implements OnSwitchChangeListener, OnPreferenceChangeListener {
		private static final String TAG = SpellCheckersSettings.class.getSimpleName();
		private static final boolean DBG = false;

		@@ -67,7 +66,6 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment

		addPreferencesFromResource(R.xml.spellchecker_prefs);
		mSpellCheckerLanaguagePref = findPreference(KEY_SPELL_CHECKER_LANGUAGE);
		mSpellCheckerLanaguagePref.setOnPreferenceClickListener(this);

		mTsm = (TextServicesManager) getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE);
		mCurrentSci = mTsm.getCurrentSpellChecker();
		@@ -155,12 +153,13 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment
		}

		@Override
		public boolean onPreferenceClick(final Preference pref) {
		if (pref == mSpellCheckerLanaguagePref) {
		public boolean onPreferenceTreeClick(Preference preference) {
		if (KEY_SPELL_CHECKER_LANGUAGE.equals(preference.getKey())) {
		writePreferenceClickMetric(preference);
		showChooseLanguageDialog();
		return true;
		}
		return false;
		return super.onPreferenceTreeClick(preference);
		}

		@Override

src/com/android/settings/localepicker/LocaleListEditor.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import com.android.internal.app.LocalePicker;
		import com.android.internal.app.LocaleStore;
		import com.android.settings.R;
		import com.android.settings.RestrictedSettingsFragment;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settingslib.search.SearchIndexable;
		import com.android.settingslib.search.SearchIndexableRaw;
		@@ -300,6 +301,9 @@ public class LocaleListEditor extends RestrictedSettingsFragment {
		mAddLanguage.setOnClickListener(new View.OnClickListener() {
		@Override
		public void onClick(View v) {
		FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider()
		.logSettingsTileClick(INDEX_KEY_ADD_LANGUAGE, getMetricsCategory());

		final Intent intent = new Intent(getActivity(),
		LocalePickerWithRegionActivity.class);
		startActivityForResult(intent, REQUEST_LOCALE_PICKER);

src/com/android/settings/tts/TextToSpeechSettings.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ import com.android.settings.R;
		import com.android.settings.SettingsActivity;
		import com.android.settings.SettingsPreferenceFragment;
		import com.android.settings.Utils;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.widget.GearPreference;
		import com.android.settings.widget.SeekBarPreference;
		@@ -720,8 +721,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
		}

		private void updateTTSSetting(String key, int value) {
		Secure.putInt(
		getContentResolver(), key, value);
		Secure.putInt(getContentResolver(), key, value);
		final int managedProfileUserId =
		Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
		if (managedProfileUserId != UserHandle.USER_NULL) {
		@@ -799,6 +799,8 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
		} else {
		Log.e(TAG, "settingsIntent is null");
		}
		FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider()
		.logClickedPreference(p, getMetricsCategory());
		}
		}