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

Commit 61167501 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[Regional Preference] Need to remove the metrics by the metrics concil... 

Merge "[Regional Preference] Need to remove the metrics by the metrics concil team's comment." into udc-qpr-dev
parents ef6ac74a 40d482ed

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

+0 −2
Original line number Diff line number Diff line
@@ -204,8 +204,6 @@ public class LocaleDialogFragment extends InstrumentedDialogFragment { 
                bundle.putInt(ARG_DIALOG_TYPE, DIALOG_CONFIRM_SYSTEM_DEFAULT);

                intent.putExtras(bundle);

                mParent.onActivityResult(DIALOG_CONFIRM_SYSTEM_DEFAULT, result, intent);

                mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_CHANGE_LANGUAGE,

                        changed);

            }

            mShouldKeepDialog = false;

        }

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

+0 −14
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.localepicker;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.graphics.Canvas;

import android.os.Bundle;
@@ -39,7 +38,6 @@ import androidx.recyclerview.widget.RecyclerView; 
import com.android.internal.app.LocalePicker;

import com.android.internal.app.LocaleStore;

import com.android.settings.R;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.shortcut.ShortcutsUpdateTask;



import java.text.NumberFormat;
@@ -53,7 +51,6 @@ class LocaleDragAndDropAdapter 
    private static final String TAG = "LocaleDragAndDropAdapter";

    private static final String CFGKEY_SELECTED_LOCALES = "selectedLocales";

    private static final String CFGKEY_DRAG_LOCALE = "dragLocales";

    private static final String CFGKEY_DRAG_LOCALES_TO_POSITION = "dragLocales_end";



    private final Context mContext;

    private final ItemTouchHelper mItemTouchHelper;
@@ -61,7 +58,6 @@ class LocaleDragAndDropAdapter 
    private List<LocaleStore.LocaleInfo> mFeedItemList;

    private List<LocaleStore.LocaleInfo> mCacheItemList;

    private RecyclerView mParentView = null;

    private LocaleListEditor mParent;

    private boolean mRemoveMode = false;

    private boolean mDragEnabled = true;

    private NumberFormat mNumberFormatter = NumberFormat.getNumberInstance();
@@ -94,7 +90,6 @@ class LocaleDragAndDropAdapter 


    LocaleDragAndDropAdapter(LocaleListEditor parent, List<LocaleStore.LocaleInfo> feedItemList) {

        mFeedItemList = feedItemList;

        mParent = parent;

        mCacheItemList = new ArrayList<>(feedItemList);

        mContext = parent.getContext();
@@ -230,12 +225,6 @@ class LocaleDragAndDropAdapter 
                    "Negative position in onItemMove %d -> %d", fromPosition, toPosition));

        }



        if (fromPosition != toPosition) {

            FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()

                    .action(mContext, SettingsEnums.ACTION_REORDER_LANGUAGE,

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

        }



        notifyItemChanged(fromPosition); // to update the numbers

        notifyItemChanged(toPosition);

        notifyItemMoved(fromPosition, toPosition);
@@ -274,9 +263,6 @@ class LocaleDragAndDropAdapter 
        for (int i = itemCount - 1; i >= 0; i--) {

            localeInfo = mFeedItemList.get(i);

            if (localeInfo.getChecked()) {

                FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()

                        .action(mContext, SettingsEnums.ACTION_REMOVE_LANGUAGE,

                                localeInfo.getLocale().toLanguageTag());

                mFeedItemList.remove(i);

            }

        }

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

+0 −7
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.localepicker;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.content.Intent;

import android.util.Log;
@@ -25,10 +24,8 @@ import androidx.annotation.VisibleForTesting; 
import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.HelpUtils;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.widget.FooterPreference;



/**
@@ -39,11 +36,8 @@ public class LocaleHelperPreferenceController extends AbstractPreferenceControll 


    private static final String KEY_FOOTER_LANGUAGE_PICKER = "footer_languages_picker";



    private final MetricsFeatureProvider mMetricsFeatureProvider;



    public LocaleHelperPreferenceController(Context context) {

        super(context);

        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();

    }



    @Override
@@ -78,7 +72,6 @@ public class LocaleHelperPreferenceController extends AbstractPreferenceControll 
                mContext.getString(R.string.link_locale_picker_footer_learn_more),

                mContext.getClass().getName());

        if (intent != null) {

            mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_LANGUAGES_LEARN_MORE);

            mContext.startActivity(intent);

        } else {

            Log.w(TAG, "HelpIntent is null");

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

+0 −2
Original line number Diff line number Diff line
@@ -202,8 +202,6 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View 
            localeInfo = mayAppendUnicodeTags(localeInfo, preferencesTags);

            mAdapter.addLocale(localeInfo);

            updateVisibilityOfRemoveMenu();

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

                    localeInfo.getLocale().toLanguageTag());

        } else if (requestCode == DIALOG_CONFIRM_SYSTEM_DEFAULT) {

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

            if (resultCode == Activity.RESULT_OK) {

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

+0 −6
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.regionalpreferences;



import android.app.settings.SettingsEnums;

import android.content.Context;



import com.android.settings.R;
@@ -58,9 +57,4 @@ public class FirstDayOfWeekItemListController extends 
    protected String[] getUnitValues() {

        return mContext.getResources().getStringArray(R.array.first_day_of_week);

    }



    @Override

    protected int getMetricsActionKey() {

        return SettingsEnums.ACTION_SET_FIRST_DAY_OF_WEEK;

    }

}