Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4939a4b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev

parents 38b99012 48996e04

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

+1 −4
Original line number Diff line number Diff line
@@ -168,15 +168,12 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment { 
            if (mResultReceiver != null && mDialogType == DIALOG_CONFIRM_SYSTEM_DEFAULT) {

                Bundle bundle = new Bundle();

                bundle.putInt(ARG_DIALOG_TYPE, DIALOG_CONFIRM_SYSTEM_DEFAULT);

                boolean changed = false;

                if (which == DialogInterface.BUTTON_POSITIVE) {

                    changed = true;

                    mResultReceiver.send(Activity.RESULT_OK, bundle);

                } else if (which == DialogInterface.BUTTON_NEGATIVE) {

                    mResultReceiver.send(Activity.RESULT_CANCELED, bundle);

                }

                mMetricsFeatureProvider.action(mContext,

                        SettingsEnums.ACTION_CHANGE_LANGUAGE, changed);

                mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_CHANGE_LANGUAGE);

            }

        }

src/com/android/settings/regionalpreferences/NumberingSystemItemController.java

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class NumberingSystemItemController extends BasePreferenceController { 
    private void handleLanguageSelect(Preference preference) {

        String selectedLanguage = preference.getKey();

        mMetricsFeatureProvider.action(mContext,

                SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES, selectedLanguage);

                SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES);

        final Bundle extra = new Bundle();

        extra.putString(RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE,

                ARG_VALUE_NUMBERING_SYSTEM_SELECT);
@@ -177,7 +177,7 @@ public class NumberingSystemItemController extends BasePreferenceController { 
                        saveNumberingSystemToLocale(Locale.forLanguageTag(mSelectedLanguage),

                                numberingSystem);

                mMetricsFeatureProvider.action(mContext,

                        SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES, numberingSystem);

                        SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES);

                // After updated locale to framework, this fragment will recreate,

                // so it needs to update the argument of selected language.

                Bundle bundle = new Bundle();

src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public abstract class RegionalPreferenceListBasePreferenceController extends 
            pref.setOnPreferenceClickListener(clickedPref -> {

                setSelected(pref);

                RegionalPreferencesDataUtils.savePreference(mContext, getExtensionTypes(), item);

                mMetricsFeatureProvider.action(mContext, getMetricsActionKey(), item);

                mMetricsFeatureProvider.action(mContext, getMetricsActionKey());

                return true;

            });

            String value = RegionalPreferencesDataUtils.getDefaultUnicodeExtensionData(mContext,