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

Merge "Introduce InteractionJankMonitor into Settings" into sc-dev am: 5b6cb52c50 am: dca2e6903c am: 807289d6ce

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

Change-Id: I8b67bf064171fcc95263cb00ed1ccfa91b522def
This commit is contained in:
Yanting Yang
2021-05-21 13:16:42 +00:00
committed by Automerger Merge Worker
parent 74b862f2ce 807289d6ce
commit 6c28d1a6f1
5 changed files with 85 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/com/android/settings/core/InstrumentedPreferenceFragment.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.core;
import static com.android.internal.jank.InteractionJankMonitor.CUJ_SETTINGS_PAGE_SCROLL;
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
@@ -24,7 +26,9 @@ import android.util.Log;
import androidx.annotation.XmlRes;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.jank.InteractionJankMonitor;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.survey.SurveyMixin;
import com.android.settingslib.core.instrumentation.Instrumentable;
@@ -47,6 +51,7 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
protected final int PLACEHOLDER_METRIC = 10000;
private VisibilityLoggerMixin mVisibilityLoggerMixin;
private RecyclerView.OnScrollListener mOnScrollListener;
@Override
public void onAttach(Context context) {
@@ -62,9 +67,25 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
@Override
public void onResume() {
mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());
// Add scroll listener to trace interaction jank.
final RecyclerView recyclerView = getListView();
if (recyclerView != null) {
mOnScrollListener = new OnScrollListener(getClass().getName());
recyclerView.addOnScrollListener(mOnScrollListener);
}
super.onResume();
}
@Override
public void onPause() {
final RecyclerView recyclerView = getListView();
if (mOnScrollListener != null) {
recyclerView.removeOnScrollListener(mOnScrollListener);
mOnScrollListener = null;
}
super.onPause();
}
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
final int resId = getPreferenceScreenResId();
@@ -123,4 +144,26 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
}
}
private static final class OnScrollListener extends RecyclerView.OnScrollListener {
private final InteractionJankMonitor mMonitor = InteractionJankMonitor.getInstance();
private final String mClassName;
private OnScrollListener(String className) {
mClassName = className;
}
@Override
public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
switch (newState) {
case RecyclerView.SCROLL_STATE_DRAGGING:
// TODO: Update API with tag parameter (class name).
mMonitor.begin(recyclerView, CUJ_SETTINGS_PAGE_SCROLL);
break;
case RecyclerView.SCROLL_STATE_IDLE:
mMonitor.end(CUJ_SETTINGS_PAGE_SCROLL);
break;
default:
}
}
}
}