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

Commit 90af0f0f authored by danielwbhuang's avatar danielwbhuang
Browse files

[PK settings] Remove metrics. 

Remove all metrics by the metrics concil team's comment.

Bug: 296544040
Test: manual
Change-Id: I6f5292c686d3eaac641c6e7f7631152b34a0085b
Merged-In: I6f5292c686d3eaac641c6e7f7631152b34a0085b
parent 67d5cb42

src/com/android/settings/inputmethod/ModifierKeysPickerDialogFragment.java

+0 −27
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG; 
import android.app.Activity;

import android.app.AlertDialog;

import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.Context;

import android.graphics.drawable.Drawable;

import android.hardware.input.InputManager;
@@ -48,7 +47,6 @@ import androidx.preference.Preference; 
import com.android.settings.R;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.Utils;

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



import java.util.ArrayList;

import java.util.Arrays;
@@ -70,7 +68,6 @@ public class ModifierKeysPickerDialogFragment extends DialogFragment { 
    private TextView mLeftBracket;

    private TextView mRightBracket;

    private ImageView mActionKeyIcon;

    private MetricsFeatureProvider mMetricsFeatureProvider;



    private List<int[]> mRemappableKeyList =

            new ArrayList<>(Arrays.asList(
@@ -94,7 +91,6 @@ public class ModifierKeysPickerDialogFragment extends DialogFragment { 
        super.onCreateDialog(savedInstanceState);



        mActivity = getActivity();

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

        FeatureFactory featureFactory = FeatureFactory.getFactory(mActivity);

        mFeatureProvider = featureFactory.getKeyboardSettingsFeatureProvider();

        InputManager inputManager = mActivity.getSystemService(InputManager.class);
@@ -143,7 +139,6 @@ public class ModifierKeysPickerDialogFragment extends DialogFragment { 
        doneButton.setOnClickListener(v -> {

            String selectedItem = modifierKeys.get(adapter.getCurrentItem());

            Spannable itemSummary;

            logMetricsForRemapping(selectedItem);

            if (selectedItem.equals(mKeyDefaultName)) {

                itemSummary = new SpannableString(

                        mActivity.getString(R.string.modifier_keys_default_summary));
@@ -194,28 +189,6 @@ public class ModifierKeysPickerDialogFragment extends DialogFragment { 
        return modifierKeyDialog;

    }



    private void logMetricsForRemapping(String selectedItem) {

        if (mKeyDefaultName.equals("Caps lock")) {

            mMetricsFeatureProvider.action(

                    mActivity, SettingsEnums.ACTION_FROM_CAPS_LOCK_TO, selectedItem);

        }



        if (mKeyDefaultName.equals("Ctrl")) {

            mMetricsFeatureProvider.action(

                    mActivity, SettingsEnums.ACTION_FROM_CTRL_TO, selectedItem);

        }



        if (mKeyDefaultName.equals("Action key")) {

            mMetricsFeatureProvider.action(

                    mActivity, SettingsEnums.ACTION_FROM_ACTION_KEY_TO, selectedItem);

        }



        if (mKeyDefaultName.equals("Alt")) {

            mMetricsFeatureProvider.action(

                    mActivity, SettingsEnums.ACTION_FROM_ALT_TO, selectedItem);

        }

    }



    private void setInitialFocusItem(

            List<String> modifierKeys, ModifierKeyAdapter adapter) {

        if (modifierKeys.indexOf(mKeyFocus) == -1) {

src/com/android/settings/inputmethod/ModifierKeysResetDialogFragment.java

+0 −7
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG; 
import android.app.Activity;

import android.app.AlertDialog;

import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.hardware.input.InputManager;

import android.os.Bundle;

import android.view.LayoutInflater;
@@ -32,8 +31,6 @@ import android.widget.Button; 
import androidx.fragment.app.DialogFragment;



import com.android.settings.R;

import com.android.settings.overlay.FeatureFactory;

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



public class ModifierKeysResetDialogFragment extends DialogFragment {
@@ -42,8 +39,6 @@ public class ModifierKeysResetDialogFragment extends DialogFragment { 
    private static final String MODIFIER_KEYS_META = "modifier_keys_meta";

    private static final String MODIFIER_KEYS_ALT = "modifier_keys_alt";



    private MetricsFeatureProvider mMetricsFeatureProvider;



    private String[] mKeys = {

            MODIFIER_KEYS_CAPS_LOCK,

            MODIFIER_KEYS_CTRL,
@@ -57,7 +52,6 @@ public class ModifierKeysResetDialogFragment extends DialogFragment { 
        super.onCreateDialog(savedInstanceState);



        Activity activity = getActivity();

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

        InputManager inputManager = activity.getSystemService(InputManager.class);

        View dialoglayout =

                LayoutInflater.from(activity).inflate(R.layout.modifier_key_reset_dialog, null);
@@ -67,7 +61,6 @@ public class ModifierKeysResetDialogFragment extends DialogFragment { 


        Button restoreButton = dialoglayout.findViewById(R.id.modifier_key_reset_restore_button);

        restoreButton.setOnClickListener(v -> {

            mMetricsFeatureProvider.action(activity, SettingsEnums.ACTION_CLEAR_REMAPPINGS);

            inputManager.clearAllModifierKeyRemappings();

            dismiss();

            activity.recreate();

src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java

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


package com.android.settings.inputmethod;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.hardware.input.InputDeviceIdentifier;

import android.hardware.input.InputManager;
@@ -31,9 +30,7 @@ import androidx.preference.PreferenceScreen; 


import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.TickButtonPreference;

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

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -56,16 +53,13 @@ public class NewKeyboardLayoutPickerController extends BasePreferenceController 
    private KeyboardLayout[] mKeyboardLayouts;

    private PreferenceScreen mScreen;

    private String mPreviousSelection;

    private String mFinalSelectedLayout;

    private String mLayout;

    private MetricsFeatureProvider mMetricsFeatureProvider;



    public NewKeyboardLayoutPickerController(Context context, String key) {

        super(context, key);

        mIm = context.getSystemService(InputManager.class);

        mInputDeviceId = -1;

        mPreferenceMap = new HashMap<>();

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

    }



    public void initialize(Fragment parent) {
@@ -80,7 +74,6 @@ public class NewKeyboardLayoutPickerController extends BasePreferenceController 
        mInputMethodSubtype =

                arguments.getParcelable(NewKeyboardSettingsUtils.EXTRA_INPUT_METHOD_SUBTYPE);

        mLayout = getSelectedLayoutLabel();

        mFinalSelectedLayout = mLayout;

        mKeyboardLayouts = mIm.getKeyboardLayoutListForInputDevice(

                mInputDeviceIdentifier, mUserId, mInputMethodInfo, mInputMethodSubtype);

        parent.getActivity().setTitle(mTitle);
@@ -99,11 +92,6 @@ public class NewKeyboardLayoutPickerController extends BasePreferenceController 


    @Override

    public void onStop() {

        if (!mLayout.equals(mFinalSelectedLayout)) {

            String change = "From:" + mLayout + ", to:" + mFinalSelectedLayout;

            mMetricsFeatureProvider.action(

                    mContext, SettingsEnums.ACTION_PK_LAYOUT_CHANGED, change);

        }

        mIm.unregisterInputDeviceListener(this);

        mInputDeviceId = -1;

    }
@@ -134,7 +122,6 @@ public class NewKeyboardLayoutPickerController extends BasePreferenceController 
        }

        setLayout(pref);

        mPreviousSelection = preference.getKey();

        mFinalSelectedLayout = pref.getTitle().toString();

        return true;

    }

src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java

+0 −9
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment 
                        SHOW_VIRTUAL_KEYBOARD_SWITCH));



        FeatureFactory featureFactory = FeatureFactory.getFactory(getContext());

        mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();

        mFeatureProvider = featureFactory.getKeyboardSettingsFeatureProvider();

        mSupportsFirmwareUpdate = mFeatureProvider.supportsFirmwareUpdate();

        if (mSupportsFirmwareUpdate) {
@@ -125,10 +124,6 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment 
                KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER);

        int intentFromWhere =

                activity.getIntent().getIntExtra(android.provider.Settings.EXTRA_ENTRYPOINT, -1);

        if (intentFromWhere != -1) {

            mMetricsFeatureProvider.action(

                    getContext(), SettingsEnums.ACTION_OPEN_PK_SETTINGS_FROM, intentFromWhere);

        }

        if (inputDeviceIdentifier != null) {

            mAutoInputDeviceIdentifier = inputDeviceIdentifier;

        }
@@ -259,10 +254,6 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment 
                        });

            }

            category.addPreference(pref);

            mMetricsFeatureProvider.action(

                    getContext(),

                    SettingsEnums.ACTION_USE_SPECIFIC_KEYBOARD,

                    hardKeyboardDeviceInfo.mDeviceName);

        }

        mKeyboardAssistanceCategory.setOrder(1);

        preferenceScreen.addPreference(mKeyboardAssistanceCategory);

src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java

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


package com.android.settings.inputmethod;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.util.FeatureFlagUtils;
@@ -24,8 +23,6 @@ import androidx.fragment.app.Fragment; 
import androidx.preference.PreferenceScreen;



import com.android.settings.core.BasePreferenceController;

import com.android.settings.overlay.FeatureFactory;

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

import com.android.settingslib.widget.ButtonPreference;



public class TouchGesturesButtonPreferenceController extends BasePreferenceController {
@@ -36,11 +33,9 @@ public class TouchGesturesButtonPreferenceController extends BasePreferenceContr 
    private static final String GESTURE_DIALOG_TAG = "GESTURE_DIALOG_TAG";



    private Fragment mParent;

    private MetricsFeatureProvider mMetricsFeatureProvider;



    public TouchGesturesButtonPreferenceController(Context context, String key) {

        super(context, key);

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

    }



    public void setFragment(Fragment parent) {
@@ -72,7 +67,6 @@ public class TouchGesturesButtonPreferenceController extends BasePreferenceContr 
    }



    private void showTouchpadGestureEducation() {

        mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_LEARN_TOUCHPAD_GESTURE_CLICK);

        TrackpadGestureDialogFragment fragment = new TrackpadGestureDialogFragment();

        fragment.setTargetFragment(mParent, 0);

        fragment.show(mParent.getActivity().getSupportFragmentManager(), GESTURE_DIALOG_TAG);