diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index c132c89dc39..7a11053c571 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -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; diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java b/src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java index 69318f8d6af..778206bab6e 100644 --- a/src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java +++ b/src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java @@ -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. diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java index 5e9ac3a7ca4..48c7212fdba 100755 --- a/src/com/android/settings/bluetooth/Utils.java +++ b/src/com/android/settings/bluetooth/Utils.java @@ -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); } diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java index 427e33aab6e..c4ceb4add77 100644 --- a/src/com/android/settings/core/InstrumentedFragment.java +++ b/src/com/android/settings/core/InstrumentedFragment.java @@ -47,8 +47,4 @@ public abstract class InstrumentedFragment extends ObservableFragment implements mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity()); super.onResume(); } - - protected final VisibilityLoggerMixin getVisibilityLogger() { - return mVisibilityLoggerMixin; - } } diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java index f5f245fad66..8b592812ebc 100644 --- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java +++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java @@ -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. */ diff --git a/src/com/android/settings/core/instrumentation/SettingsEventLogWriter.java b/src/com/android/settings/core/instrumentation/SettingsEventLogWriter.java index a58555fe11f..4ffa2d0b393 100644 --- a/src/com/android/settings/core/instrumentation/SettingsEventLogWriter.java +++ b/src/com/android/settings/core/instrumentation/SettingsEventLogWriter.java @@ -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 diff --git a/src/com/android/settings/core/instrumentation/SettingsIntelligenceLogWriter.java b/src/com/android/settings/core/instrumentation/SettingsIntelligenceLogWriter.java index 9498732e528..62954eaa284 100644 --- a/src/com/android/settings/core/instrumentation/SettingsIntelligenceLogWriter.java +++ b/src/com/android/settings/core/instrumentation/SettingsIntelligenceLogWriter.java @@ -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 diff --git a/src/com/android/settings/core/instrumentation/StatsLogWriter.java b/src/com/android/settings/core/instrumentation/StatsLogWriter.java index bcdecf35de2..6e09b72e02f 100644 --- a/src/com/android/settings/core/instrumentation/StatsLogWriter.java +++ b/src/com/android/settings/core/instrumentation/StatsLogWriter.java @@ -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 diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java index 91b2e979f87..ccfb7320657 100644 --- a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java +++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java @@ -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); diff --git a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java index 1920019735c..25808b58a0a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/UtilsTest.java @@ -15,8 +15,6 @@ */ package com.android.settings.bluetooth; -import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -24,7 +22,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.bluetooth.BluetoothDevice; import android.content.Context; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -61,6 +58,6 @@ public class UtilsTest { Utils.showConnectingError(mContext, "testName", mock(LocalBluetoothManager.class)); verify(mMetricsFeatureProvider).visible(eq(mContext), anyInt(), - eq(MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR)); + eq(MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR), anyInt()); } } diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/SettingsEventLogWriterTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/SettingsEventLogWriterTest.java index ba2553de517..8f22df09c7a 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/SettingsEventLogWriterTest.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/SettingsEventLogWriterTest.java @@ -62,7 +62,7 @@ public class SettingsEventLogWriterTest { SettingsUIDeviceConfig.GENERIC_EVENT_LOGGING_ENABLED, "true", true); mWriter.visible(RuntimeEnvironment.application, SettingsEnums.PAGE_UNKNOWN, - SettingsEnums.SETTINGS_HOMEPAGE); + SettingsEnums.SETTINGS_HOMEPAGE, 0); assertThat(ShadowMetricsLogger.sActionLoggedCount).isEqualTo(1); } @@ -83,7 +83,7 @@ public class SettingsEventLogWriterTest { SettingsUIDeviceConfig.GENERIC_EVENT_LOGGING_ENABLED, "false", true); mWriter.visible(RuntimeEnvironment.application, SettingsEnums.PAGE_UNKNOWN, - SettingsEnums.SETTINGS_HOMEPAGE); + SettingsEnums.SETTINGS_HOMEPAGE, 0); assertThat(ShadowMetricsLogger.sActionLoggedCount).isEqualTo(0); }