PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8aa917c29aab30def405455d1465be64032335b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zoey Chen
2023-06-27 05:52:46 +00:00
committed by Automerger Merge Worker
parent ed83c055df ca617d8612
commit c3bd5c2059
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/regionalpreferences/NumberingSystemItemController.java
View File

@@ -153,7 +153,7 @@ public class NumberingSystemItemController extends BasePreferenceController {
private void handleLanguageSelect(Preference preference) { private void handleLanguageSelect(Preference preference) {
String selectedLanguage = preference.getKey(); String selectedLanguage = preference.getKey();
mMetricsFeatureProvider.action(mContext, mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES); SettingsEnums.ACTION_CHOOSE_LANGUAGE_FOR_NUMBERS_PREFERENCES, selectedLanguage);
final Bundle extra = new Bundle(); final Bundle extra = new Bundle();
extra.putString(RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE, extra.putString(RegionalPreferencesEntriesFragment.ARG_KEY_REGIONAL_PREFERENCE,
ARG_VALUE_NUMBERING_SYSTEM_SELECT); ARG_VALUE_NUMBERING_SYSTEM_SELECT);
@@ -177,7 +177,8 @@ public class NumberingSystemItemController extends BasePreferenceController {
saveNumberingSystemToLocale(Locale.forLanguageTag(mSelectedLanguage), saveNumberingSystemToLocale(Locale.forLanguageTag(mSelectedLanguage),
numberingSystem); numberingSystem);
mMetricsFeatureProvider.action(mContext, 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, // After updated locale to framework, this fragment will recreate,
// so it needs to update the argument of selected language. // so it needs to update the argument of selected language.
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();

7
src/com/android/settings/regionalpreferences/RegionalPreferenceListBasePreferenceController.java
View File

@@ -59,6 +59,8 @@ public abstract class RegionalPreferenceListBasePreferenceController extends
TickButtonPreference pref = new TickButtonPreference(mContext); TickButtonPreference pref = new TickButtonPreference(mContext);
mPreferenceCategory.addPreference(pref); mPreferenceCategory.addPreference(pref);
final String item = unitValues[i]; final String item = unitValues[i];
final String value = RegionalPreferencesDataUtils.getDefaultUnicodeExtensionData(
mContext, getExtensionTypes());
pref.setTitle(getPreferenceTitle(item)); pref.setTitle(getPreferenceTitle(item));
pref.setKey(item); pref.setKey(item);
pref.setOnPreferenceClickListener(clickedPref -> { pref.setOnPreferenceClickListener(clickedPref -> {
@@ -66,11 +68,10 @@ public abstract class RegionalPreferenceListBasePreferenceController extends
RegionalPreferencesDataUtils.savePreference(mContext, getExtensionTypes(), RegionalPreferencesDataUtils.savePreference(mContext, getExtensionTypes(),
item.equals(RegionalPreferencesDataUtils.DEFAULT_VALUE) item.equals(RegionalPreferencesDataUtils.DEFAULT_VALUE)
? null : item); ? null : item);
mMetricsFeatureProvider.action(mContext, getMetricsActionKey()); mMetricsFeatureProvider.action(mContext, getMetricsActionKey(),
getPreferenceTitle(value) + " > " + getPreferenceTitle(item));
return true; return true;
}); });
String value = RegionalPreferencesDataUtils.getDefaultUnicodeExtensionData(mContext,
getExtensionTypes());
pref.setSelected(!value.isEmpty() && item.equals(value)); pref.setSelected(!value.isEmpty() && item.equals(value));
} }
} }