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

Commit c3bd5c20 authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

[Regional Preference] Add metric in Regional Preferences am: ca617d86 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23817103



Change-Id: I8aa917c29aab30def405455d1465be64032335b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed83c055 ca617d86

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

+3 −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);

                SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES, selectedLanguage);

        final Bundle extra = new Bundle();

        extra.putString(RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE,

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

                                numberingSystem);

                mMetricsFeatureProvider.action(mContext,

                        SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES);

                        SettingsEnums.ACTION_SET_NUMBERS_PREFERENCES,

                        updatedLocale.getDisplayName() + ": " + numberingSystem);

                // 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

+4 −3
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ public abstract class RegionalPreferenceListBasePreferenceController extends 
            TickButtonPreference pref = new TickButtonPreference(mContext);

            mPreferenceCategory.addPreference(pref);

            final String item = unitValues[i];

            final String value = RegionalPreferencesDataUtils.getDefaultUnicodeExtensionData(

                    mContext, getExtensionTypes());

            pref.setTitle(getPreferenceTitle(item));

            pref.setKey(item);

            pref.setOnPreferenceClickListener(clickedPref -> {
@@ -66,11 +68,10 @@ public abstract class RegionalPreferenceListBasePreferenceController extends 
                RegionalPreferencesDataUtils.savePreference(mContext, getExtensionTypes(),

                        item.equals(RegionalPreferencesDataUtils.DEFAULT_VALUE)

                                ? null : item);

                mMetricsFeatureProvider.action(mContext, getMetricsActionKey());

                mMetricsFeatureProvider.action(mContext, getMetricsActionKey(),

                        getPreferenceTitle(value) + " > " +  getPreferenceTitle(item));

                return true;

            });

            String value = RegionalPreferencesDataUtils.getDefaultUnicodeExtensionData(mContext,

                    getExtensionTypes());

            pref.setSelected(!value.isEmpty() && item.equals(value));

        }

    }