Sync lastest lifecycle interface
Bug: 142938506 Test: rebuild Change-Id: I6a8d75e5a3ba8564cfb400a88d6582c962c965ee
This commit is contained in:
@@ -31,7 +31,6 @@ import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.accessibility.AccessibilityManager;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
|
@@ -25,7 +25,6 @@ import androidx.appcompat.app.AlertDialog;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
||||
import com.android.settings.notification.ZenAccessSettings;
|
||||
|
||||
/**
|
||||
* Warning dialog when allowing zen access warning about the privileges being granted.
|
||||
|
@@ -45,7 +45,7 @@ public final class Utils {
|
||||
private static final String TAG = "BluetoothUtils";
|
||||
|
||||
static final boolean V = BluetoothUtils.V; // verbose logging
|
||||
static final boolean D = BluetoothUtils.D; // regular logging
|
||||
static final boolean D = BluetoothUtils.D; // regular logging
|
||||
|
||||
private Utils() {
|
||||
}
|
||||
@@ -93,7 +93,8 @@ public final class Utils {
|
||||
@VisibleForTesting
|
||||
static void showConnectingError(Context context, String name, LocalBluetoothManager manager) {
|
||||
FeatureFactory.getFactory(context).getMetricsFeatureProvider().visible(context,
|
||||
SettingsEnums.PAGE_UNKNOWN, SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR);
|
||||
SettingsEnums.PAGE_UNKNOWN, SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR,
|
||||
0);
|
||||
showError(context, name, R.string.bluetooth_connecting_error_message, manager);
|
||||
}
|
||||
|
||||
|
@@ -47,8 +47,4 @@ public abstract class InstrumentedFragment extends ObservableFragment implements
|
||||
mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());
|
||||
super.onResume();
|
||||
}
|
||||
|
||||
protected final VisibilityLoggerMixin getVisibilityLogger() {
|
||||
return mVisibilityLoggerMixin;
|
||||
}
|
||||
}
|
||||
|
@@ -91,10 +91,6 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
|
||||
return getPreferenceManager().getContext();
|
||||
}
|
||||
|
||||
protected final VisibilityLoggerMixin getVisibilityLogger() {
|
||||
return mVisibilityLoggerMixin;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the res id for static preference xml for this fragment.
|
||||
*/
|
||||
|
@@ -25,11 +25,11 @@ import com.android.settingslib.core.instrumentation.EventLogWriter;
|
||||
public class SettingsEventLogWriter extends EventLogWriter {
|
||||
|
||||
@Override
|
||||
public void visible(Context context, int source, int category) {
|
||||
public void visible(Context context, int source, int category, int latency) {
|
||||
if (shouldDisableGenericEventLogging()) {
|
||||
return;
|
||||
}
|
||||
super.visible(context, source, category);
|
||||
super.visible(context, source, category, latency);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -61,12 +61,12 @@ public class SettingsIntelligenceLogWriter implements LogWriter {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void visible(Context context, int attribution, int pageId) {
|
||||
action(attribution /* attribution */,
|
||||
public void visible(Context context, int attribution, int pageId, int latency) {
|
||||
action(attribution /* from pageId */,
|
||||
SettingsEnums.PAGE_VISIBLE /* action */,
|
||||
pageId /* pageId */,
|
||||
pageId /* target pageId */,
|
||||
"" /* changedPreferenceKey */,
|
||||
0 /* changedPreferenceIntValue */);
|
||||
latency /* changedPreferenceIntValue */);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -26,13 +26,13 @@ import com.android.settingslib.core.instrumentation.LogWriter;
|
||||
public class StatsLogWriter implements LogWriter {
|
||||
|
||||
@Override
|
||||
public void visible(Context context, int attribution, int pageId) {
|
||||
public void visible(Context context, int attribution, int pageId, int latency) {
|
||||
StatsLog.write(StatsLog.SETTINGS_UI_CHANGED /* Atom name */,
|
||||
attribution,
|
||||
attribution, /* from pageId */
|
||||
SettingsEnums.PAGE_VISIBLE /* action */,
|
||||
pageId,
|
||||
pageId, /* target pageId */
|
||||
null /* changedPreferenceKey */,
|
||||
0 /* changedPreferenceIntValue */);
|
||||
latency /* changedPreferenceIntValue */);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -65,7 +65,7 @@ public class ConditionContextualCardRenderer implements ContextualCardRenderer {
|
||||
mContext).getMetricsFeatureProvider();
|
||||
|
||||
metricsFeatureProvider.visible(mContext, SettingsEnums.SETTINGS_HOMEPAGE,
|
||||
card.getMetricsConstant());
|
||||
card.getMetricsConstant(), 0);
|
||||
initializePrimaryClick(view, card, metricsFeatureProvider);
|
||||
initializeView(view, card);
|
||||
initializeActionButton(view, card, metricsFeatureProvider);
|
||||
|
Reference in New Issue
Block a user