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

Commit 012028e3 authored by Fan Zhang's avatar Fan Zhang
Browse files

Misc logging changes

- log search result count, rank when clicking search result.
- log app package when default app is changed

Change-Id: Idd11bd67caba2beaa59c65839c40db8c71787388
Fix: 62072727
Test: make RunSettingsRoboTests
parent 3cad98f6
Loading
Loading
Loading
Loading
+13 −3
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ import android.app.DialogFragment;
import android.app.Fragment;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Pair;

import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.PackageManagerWrapper;
import com.android.settings.applications.PackageManagerWrapperImpl;
@@ -62,6 +62,16 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
        }
    }

    @Override
    protected void onRadioButtonConfirmed(String selectedKey) {
        mMetricsFeatureProvider.action(getContext(),
                MetricsEvent.ACTION_SETTINGS_UPDATE_DEFAULT_APP,
                selectedKey,
                Pair.create(MetricsEvent.FIELD_CONTEXT, getMetricsCategory()));

        super.onRadioButtonConfirmed(selectedKey);
    }

    @Override
    public void bindPreferenceExtra(RadioButtonPreference pref,
            String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
@@ -97,7 +107,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment

        @Override
        public int getMetricsCategory() {
            return MetricsProto.MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
            return MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
        }

        /**
+7 −11
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ public class InlineSwitchViewHolder extends SearchViewHolder {
        switchView = view.findViewById(R.id.switchView);
    }

    @Override
    public int getClickActionMetricName() {
        return MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_INLINE_RESULT;
    }

    @Override
    public void onBind(SearchFragment fragment, SearchResult result) {
        super.onBind(fragment, result);
@@ -49,19 +54,10 @@ public class InlineSwitchViewHolder extends SearchViewHolder {
        final InlineSwitchPayload payload = (InlineSwitchPayload) result.payload;
        switchView.setChecked(payload.getSwitchValue(mContext));
        switchView.setOnCheckedChangeListener((buttonView, isChecked) -> {
            final Pair<Integer, Object> name = Pair.create(
                    MetricsEvent.FIELD_SETTINGS_SEARCH_INLINE_RESULT_NAME, payload.settingsUri);
            final Pair<Integer, Object> value = Pair.create(
                    MetricsEvent.FIELD_SETTINGS_SEARCH_INLINE_RESULT_VALUE, isChecked
                            ? "checked"
                            : "not-checked");
            final Pair<Integer, Object> rank = Pair.create(
                    MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK, getAdapterPosition());
            mMetricsFeatureProvider.action(mContext,
                    MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_INLINE_RESULT,
                    name, value, rank);

            fragment.onSearchResultClicked();
                            ? 1L : 0L);
            fragment.onSearchResultClicked(this, payload.settingsUri, value);
            payload.setSwitchValue(mContext, isChecked);
        });
    }
+6 −8
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.settings.search;
import android.content.ComponentName;
import android.content.Intent;
import android.text.TextUtils;
import android.util.Pair;
import android.view.View;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -35,24 +34,23 @@ public class IntentSearchViewHolder extends SearchViewHolder {
        super(view);
    }

    @Override
    public int getClickActionMetricName() {
        return MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT;
    }

    @Override
    public void onBind(final SearchFragment fragment, final SearchResult result) {
        super.onBind(fragment, result);

        itemView.setOnClickListener(v -> {
            fragment.onSearchResultClicked();
            final Intent intent = result.payload.getIntent();
            final ComponentName cn = intent.getComponent();
            final Pair<Integer, Object> rank = Pair.create(
                    MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK, getAdapterPosition());
            String resultName = intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT);
            if (TextUtils.isEmpty(resultName) && cn != null) {
                resultName = cn.flattenToString();
            }
            mMetricsFeatureProvider.action(v.getContext(),
                    MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT,
                    resultName, rank);
            mSearchFeatureProvider.searchResultClicked(fragment.mQuery, result);
            fragment.onSearchResultClicked(this, resultName);
            fragment.startActivity(intent);
        });
    }
+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ package com.android.settings.search;
import android.view.View;
import android.widget.TextView;

import com.android.internal.logging.nano.MetricsProto;

public class SavedQueryViewHolder extends SearchViewHolder {

    public final TextView titleView;
@@ -31,6 +33,11 @@ public class SavedQueryViewHolder extends SearchViewHolder {
        removeButton = view.findViewById(android.R.id.icon);
    }

    @Override
    public int getClickActionMetricName() {
        return MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY;
    }

    @Override
    public void onBind(SearchFragment fragment, SearchResult result) {
        titleView.setText(result.title);
+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.settings.search;
import android.app.Activity;
import android.content.Context;
import android.view.Menu;

import android.view.View;

import com.android.settings.dashboard.SiteMapManager;

import java.util.List;
Loading