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

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

[Panlingual] Change the metric's string in Languages am: 6358f613 am: 35920cd8 

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



Change-Id: I8f6f0e0c2553ffe213f9694983eab58c69358928
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8791bfce 35920cd8

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

+2 −2
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ class LocaleDragAndDropAdapter 
        if (fromPosition != toPosition) {

            FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()

                    .action(mContext, SettingsEnums.ACTION_REORDER_LANGUAGE,

                            mDragLocale.getLocale().getDisplayName() + " move to " + toPosition);

                            mDragLocale.getLocale().toLanguageTag() + " move to " + toPosition);

        }



        notifyItemChanged(fromPosition); // to update the numbers
@@ -259,7 +259,7 @@ class LocaleDragAndDropAdapter 
            if (localeInfo.getChecked()) {

                FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()

                        .action(mContext, SettingsEnums.ACTION_REMOVE_LANGUAGE,

                                localeInfo.getLocale().getDisplayName());

                                localeInfo.getLocale().toLanguageTag());

                mFeedItemList.remove(i);

            }

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View 
            mAdapter.addLocale(localeInfo);

            updateVisibilityOfRemoveMenu();

            mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_ADD_LANGUAGE,

                    localeInfo.getLocale().getDisplayName());

                    localeInfo.getLocale().toLanguageTag());

        } else if (requestCode == DIALOG_CONFIRM_SYSTEM_DEFAULT) {

            localeInfo = mAdapter.getFeedItemList().get(0);

            if (resultCode == Activity.RESULT_OK) {
@@ -232,7 +232,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View 
                    localeDialogFragment.show(mFragmentManager, TAG_DIALOG_NOT_AVAILABLE);

                    mMetricsFeatureProvider.action(getContext(),

                            SettingsEnums.ACTION_NOT_SUPPORTED_SYSTEM_LANGUAGE,

                            localeInfo.getLocale().getDisplayName());

                            localeInfo.getLocale().toLanguageTag());

                }

            } else {

                mAdapter.notifyListChanged(localeInfo);