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

Misc logging changes

Browse Source 
- 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
This commit is contained in:
Fan Zhang
2017-05-25 15:58:08 -07:00
parent 3cad98f69e
commit 012028e3a3
20 changed files with 183 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
View File

@@ -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;
}
/**

18
src/com/android/settings/search/InlineSwitchViewHolder.java
View File

@@ -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);
});
}

14
src/com/android/settings/search/IntentSearchViewHolder.java
View File

@@ -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
src/com/android/settings/search/SavedQueryViewHolder.java
View File

@@ -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);

2
src/com/android/settings/search/SearchFeatureProvider.java
View File

@@ -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;

32
src/com/android/settings/search/SearchFragment.java
View File

@@ -28,6 +28,7 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -36,13 +37,15 @@ import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.SearchView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@@ -118,7 +121,7 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS;
return MetricsEvent.DASHBOARD_SEARCH_RESULTS;
}
@Override
@@ -191,7 +194,7 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
mMetricsFeatureProvider.histogram(activity, RESULT_CLICK_COUNT, mResultClickCount);
if (mNeverEnteredQuery) {
mMetricsFeatureProvider.action(activity,
MetricsProto.MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY);
MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY);
}
}
}
@@ -306,7 +309,26 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
requery();
}
public void onSearchResultClicked() {
public void onSearchResultClicked(SearchViewHolder result, String settingName,
Pair<Integer, Object>... logTaggedData) {
final List<Pair<Integer, Object>> taggedData = new ArrayList<>();
if (logTaggedData != null) {
taggedData.addAll(Arrays.asList(logTaggedData));
}
taggedData.add(Pair.create(
MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_COUNT,
mSearchAdapter.getItemCount()));
taggedData.add(Pair.create(
MetricsEvent.FIELD_SETTINGS_SERACH_RESULT_RANK,
result.getAdapterPosition()));
taggedData.add(Pair.create(
MetricsEvent.FIELD_SETTINGS_SERACH_QUERY_LENGTH,
TextUtils.isEmpty(mQuery) ? 0 : mQuery.length()));
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT,
settingName,
taggedData.toArray(new Pair[0]));
mSavedQueryController.saveQuery(mQuery);
mResultClickCount++;
}
@@ -314,7 +336,7 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
public void onSavedQueryClicked(CharSequence query) {
final String queryString = query.toString();
mMetricsFeatureProvider.action(getContext(),
MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY);
MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY);
mSearchView.setQuery(queryString, false /* submit */);
onQueryTextChange(queryString);
}

2
src/com/android/settings/search/SearchViewHolder.java
View File

@@ -59,6 +59,8 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
mPlaceholderSummary = view.getContext().getString(R.string.summary_placeholder);
}
public abstract int getClickActionMetricName();
public void onBind(SearchFragment fragment, SearchResult result) {
titleView.setText(result.title);
if (TextUtils.isEmpty(result.summary)