Remove legacy tron logging instrumentation
Bug: b/179741060
Change-Id: I3c43774f829e8c90b0e1e851ca79bad49738a280
diff --git a/Settings/src/com/android/tv/settings/MainFragment.java b/Settings/src/com/android/tv/settings/MainFragment.java
index 7d291e6..8da1515 100644
--- a/Settings/src/com/android/tv/settings/MainFragment.java
+++ b/Settings/src/com/android/tv/settings/MainFragment.java
@@ -147,12 +147,6 @@
}
@Override
- public int getMetricsCategory() {
- // Do not log visibility.
- return METRICS_CATEGORY_UNKNOWN;
- }
-
- @Override
protected int getPreferenceScreenResId() {
switch (FlavorUtils.getFlavor(getContext())) {
case FLAVOR_CLASSIC:
diff --git a/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java b/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
index d289bc1..c588fc6 100644
--- a/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
+++ b/Settings/src/com/android/tv/settings/SettingsPreferenceFragment.java
@@ -49,9 +49,6 @@
import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settingslib.core.instrumentation.Instrumentable;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.tv.settings.overlay.FlavorUtils;
import com.android.tv.settings.util.SettingsPreferenceUtil;
@@ -64,11 +61,9 @@
* and allow for instrumentation.
*/
public abstract class SettingsPreferenceFragment extends LeanbackPreferenceFragmentCompat
- implements LifecycleOwner, Instrumentable,
+ implements LifecycleOwner,
TwoPanelSettingsFragment.PreviewableComponentCallback {
private final Lifecycle mLifecycle = new Lifecycle(this);
- private final VisibilityLoggerMixin mVisibilityLoggerMixin;
- protected MetricsFeatureProvider mMetricsFeatureProvider;
// Rename getLifecycle() to getSettingsLifecycle() as androidx Fragment has already implemented
// getLifecycle(), overriding here would cause unexpected crash in framework.
@@ -78,11 +73,6 @@
}
public SettingsPreferenceFragment() {
- mMetricsFeatureProvider = new MetricsFeatureProvider();
- // Mixin that logs visibility change for activity.
- mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
- mMetricsFeatureProvider);
- getSettingsLifecycle().addObserver(mVisibilityLoggerMixin);
}
@CallSuper
@@ -206,7 +196,6 @@
@CallSuper
@Override
public void onResume() {
- mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());
super.onResume();
mLifecycle.handleLifecycleEvent(ON_RESUME);
if (getCallbackFragment() instanceof TwoPanelSettingsFragment) {
diff --git a/Settings/src/com/android/tv/settings/TvSettingsActivity.java b/Settings/src/com/android/tv/settings/TvSettingsActivity.java
index a0eeb4f..0369556 100644
--- a/Settings/src/com/android/tv/settings/TvSettingsActivity.java
+++ b/Settings/src/com/android/tv/settings/TvSettingsActivity.java
@@ -34,8 +34,6 @@
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.instrumentation.SharedPreferencesLogger;
import com.android.tv.settings.overlay.FlavorUtils;
public abstract class TvSettingsActivity extends FragmentActivity {
@@ -201,21 +199,4 @@
}
}
}
-
- private String getMetricsTag() {
- String tag = getClass().getName();
- if (tag.startsWith("com.android.tv.settings.")) {
- tag = tag.replace("com.android.tv.settings.", "");
- }
- return tag;
- }
-
- @Override
- public SharedPreferences getSharedPreferences(String name, int mode) {
- if (name.equals(getPackageName() + "_preferences")) {
- return new SharedPreferencesLogger(this, getMetricsTag(),
- new MetricsFeatureProvider());
- }
- return super.getSharedPreferences(name, mode);
- }
}
diff --git a/Settings/src/com/android/tv/settings/about/AboutFragment.java b/Settings/src/com/android/tv/settings/about/AboutFragment.java
index d4a87c7..d0c5eba 100644
--- a/Settings/src/com/android/tv/settings/about/AboutFragment.java
+++ b/Settings/src/com/android/tv/settings/about/AboutFragment.java
@@ -48,7 +48,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settingslib.DeviceInfoUtils;
import com.android.settingslib.Utils;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
@@ -300,14 +299,10 @@
logEntrySelected(TvSettingsEnums.SYSTEM_ABOUT_BUILD);
// Don't enable developer options for secondary users.
if (!mUm.isAdminUser()) {
- mMetricsFeatureProvider.action(getContext(),
- MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF);
return true;
}
if (mUm.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES)) {
- mMetricsFeatureProvider.action(getContext(),
- MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF);
return true;
}
@@ -326,11 +321,6 @@
// Index.getInstance(
// getActivity().getApplicationContext()).updateFromClassNameResource(
// DevelopmentSettings.class.getName(), true, true);
- mMetricsFeatureProvider.action(
- getContext(), MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF,
- Pair.create(MetricsEvent
- .FIELD_SETTINGS_BUILD_NUMBER_DEVELOPER_MODE_ENABLED,
- 0));
} else if (mDevHitCountdown > 0
&& mDevHitCountdown < (TAPS_TO_BE_A_DEVELOPER - 2)) {
if (mDevHitToast != null) {
@@ -343,11 +333,6 @@
Toast.LENGTH_SHORT);
mDevHitToast.show();
}
- mMetricsFeatureProvider.action(
- getContext(), MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF,
- Pair.create(
- MetricsEvent.FIELD_SETTINGS_BUILD_NUMBER_DEVELOPER_MODE_ENABLED,
- 0));
} else if (mDevHitCountdown < 0) {
if (mDevHitToast != null) {
mDevHitToast.cancel();
@@ -355,11 +340,6 @@
mDevHitToast = Toast.makeText(getActivity(), R.string.show_dev_already,
Toast.LENGTH_LONG);
mDevHitToast.show();
- mMetricsFeatureProvider.action(
- getContext(), MetricsEvent.ACTION_SETTINGS_BUILD_NUMBER_PREF,
- Pair.create(
- MetricsEvent.FIELD_SETTINGS_BUILD_NUMBER_DEVELOPER_MODE_ENABLED,
- 1));
}
break;
case KEY_DEVICE_FEEDBACK:
@@ -443,11 +423,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsEvent.DEVICEINFO;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_ABOUT;
}
diff --git a/Settings/src/com/android/tv/settings/about/LegalFragment.java b/Settings/src/com/android/tv/settings/about/LegalFragment.java
index 99f4fc5..d957980 100644
--- a/Settings/src/com/android/tv/settings/about/LegalFragment.java
+++ b/Settings/src/com/android/tv/settings/about/LegalFragment.java
@@ -26,7 +26,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.PreferenceUtils;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -83,11 +82,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.ABOUT_LEGAL_SETTINGS;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_ABOUT_LEGAL_INFO;
}
diff --git a/Settings/src/com/android/tv/settings/about/StatusFragment.java b/Settings/src/com/android/tv/settings/about/StatusFragment.java
index cd92bbf..300a20f 100644
--- a/Settings/src/com/android/tv/settings/about/StatusFragment.java
+++ b/Settings/src/com/android/tv/settings/about/StatusFragment.java
@@ -21,7 +21,6 @@
import androidx.annotation.Keep;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
@@ -48,11 +47,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.DEVICEINFO_STATUS;
- }
-
- @Override
protected int getPreferenceScreenResId() {
return R.xml.device_info_status;
}
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java
index 52e9d9d..269fee1 100644
--- a/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityFragment.java
@@ -35,7 +35,6 @@
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -156,11 +155,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.ACCESSIBILITY;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_A11Y;
}
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceFragment.java
index aa9944d..af2992a 100644
--- a/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceFragment.java
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityServiceFragment.java
@@ -29,7 +29,6 @@
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -133,11 +132,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.ACCESSIBILITY_SERVICE;
- }
-
- @Override
protected int getPageId() {
// Partial matching of Service's Android componentName for logging a11y services.
String serviceName = getArguments().getString(ARG_SERVICE_NAME);
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutFragment.java
index c490698..961f5a7 100644
--- a/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutFragment.java
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutFragment.java
@@ -33,7 +33,6 @@
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -112,11 +111,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_A11Y_SHORTCUT;
}
diff --git a/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutServiceFragment.java b/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutServiceFragment.java
index fec4349..7cbc9f4 100644
--- a/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutServiceFragment.java
+++ b/Settings/src/com/android/tv/settings/accessibility/AccessibilityShortcutServiceFragment.java
@@ -32,7 +32,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.RadioPreference;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -128,11 +127,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.ACCESSIBILITY_SERVICE;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_A11Y_SHORTCUT_SERVICE;
}
diff --git a/Settings/src/com/android/tv/settings/accessories/AccessoriesFragment.java b/Settings/src/com/android/tv/settings/accessories/AccessoriesFragment.java
index 1211117..6ce3949 100644
--- a/Settings/src/com/android/tv/settings/accessories/AccessoriesFragment.java
+++ b/Settings/src/com/android/tv/settings/accessories/AccessoriesFragment.java
@@ -31,7 +31,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -60,11 +59,6 @@
mAddAccessory = findPreference(KEY_ADD_ACCESSORY);
}
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.BLUETOOTH;
- }
-
private void updateAccessories() {
PreferenceScreen preferenceScreen = getPreferenceScreen();
if (preferenceScreen == null) {
diff --git a/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java b/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
index 3bde6ff..be4181d 100644
--- a/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
+++ b/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
@@ -36,10 +36,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settingslib.core.instrumentation.Instrumentable;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.tv.settings.R;
@@ -49,18 +45,13 @@
* The screen in TV settings that shows when bluetooth searching/pairing is active.
*/
public class AddAccessoryPreferenceFragment extends BaseLeanbackPreferenceFragmentCompat implements
- LifecycleOwner, Instrumentable {
+ LifecycleOwner {
private SparseArray<Drawable> mResizedDrawables = new SparseArray<>();
private final Lifecycle mLifecycle = new Lifecycle(this);
- private final VisibilityLoggerMixin mVisibilityLoggerMixin;
public AddAccessoryPreferenceFragment() {
super();
- // Mixin that logs visibility change for activity.
- mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
- new MetricsFeatureProvider());
- getLifecycle().addObserver(mVisibilityLoggerMixin);
}
public static AddAccessoryPreferenceFragment newInstance() {
@@ -144,11 +135,6 @@
}
}
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.BLUETOOTH_PAIRING;
- }
-
@NonNull
@Override
public Lifecycle getLifecycle() {
diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothAccessoryFragment.java b/Settings/src/com/android/tv/settings/accessories/BluetoothAccessoryFragment.java
index da59d8e..3bbf476 100644
--- a/Settings/src/com/android/tv/settings/accessories/BluetoothAccessoryFragment.java
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothAccessoryFragment.java
@@ -41,8 +41,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -319,8 +317,6 @@
@Keep
public static class ChangeNameFragment extends GuidedStepSupportFragment {
- private final MetricsFeatureProvider mMetricsFeatureProvider = new MetricsFeatureProvider();
-
public static void prepareArgs(@NonNull Bundle args, String deviceName,
@DrawableRes int deviceImgId) {
args.putString(ARG_ACCESSORY_NAME, deviceName);
@@ -330,8 +326,6 @@
@Override
public void onStart() {
super.onStart();
- mMetricsFeatureProvider.action(getContext(),
- MetricsProto.MetricsEvent.ACTION_BLUETOOTH_RENAME);
}
@NonNull
@@ -405,8 +399,6 @@
private BluetoothDevice mDevice;
private BroadcastReceiver mBroadcastReceiver;
private final Handler mHandler = new Handler();
- private final MetricsFeatureProvider mMetricsFeatureProvider =
- new MetricsFeatureProvider();
private Runnable mBailoutRunnable = new Runnable() {
@Override
@@ -447,8 +439,6 @@
adapterIntentFilter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);
mBroadcastReceiver = new UnpairReceiver(this, mDevice);
getActivity().registerReceiver(mBroadcastReceiver, adapterIntentFilter);
- mMetricsFeatureProvider.action(getContext(),
- MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_PAIRED_DEVICE_FORGET);
}
@Override
@@ -530,9 +520,4 @@
}
}
}
-
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_PAIRED_DEVICE_PROFILE;
- }
}
diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothPairingDialog.java b/Settings/src/com/android/tv/settings/accessories/BluetoothPairingDialog.java
index 29aedab..af6447b 100644
--- a/Settings/src/com/android/tv/settings/accessories/BluetoothPairingDialog.java
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothPairingDialog.java
@@ -42,7 +42,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.dialog.old.Action;
import com.android.tv.settings.dialog.old.ActionFragment;
@@ -324,11 +323,6 @@
}
}
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.BLUETOOTH_DIALOG_FRAGMENT;
- }
-
public static class EntryDialogFragment extends Fragment {
private static final String ARG_DEVICE = "ConfirmationDialogFragment.DEVICE";
diff --git a/Settings/src/com/android/tv/settings/accounts/AccountSyncFragment.java b/Settings/src/com/android/tv/settings/accounts/AccountSyncFragment.java
index 2ae3942..1d746ef 100644
--- a/Settings/src/com/android/tv/settings/accounts/AccountSyncFragment.java
+++ b/Settings/src/com/android/tv/settings/accounts/AccountSyncFragment.java
@@ -43,7 +43,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.accounts.AuthenticatorHelper;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -427,11 +426,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.ACCOUNTS_ACCOUNT_SYNC;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.ACCOUNT_CLASSIC_REG_ACCOUNT;
}
diff --git a/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java b/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java
index f2605d6..7fc1459 100644
--- a/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java
+++ b/Settings/src/com/android/tv/settings/accounts/AccountsFragment.java
@@ -38,7 +38,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.accounts.AuthenticatorHelper;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -157,11 +156,6 @@
return SecurityFragment.isRestrictedProfileInEffect(getContext());
}
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.ACCOUNTS_MANAGE_ACCOUNTS;
- }
-
/**
* Set up the intent and visibility for the given preference based on the information from
* AccountManager.
@@ -233,8 +227,4 @@
return authImage;
}
- @Override
- protected int getPageId() {
- return TvSettingsEnums.ACCOUNT_CLASSIC;
- }
}
diff --git a/Settings/src/com/android/tv/settings/accounts/AccountsSliceFragment.java b/Settings/src/com/android/tv/settings/accounts/AccountsSliceFragment.java
index df57a66..d4b52fe 100644
--- a/Settings/src/com/android/tv/settings/accounts/AccountsSliceFragment.java
+++ b/Settings/src/com/android/tv/settings/accounts/AccountsSliceFragment.java
@@ -18,7 +18,6 @@
import androidx.annotation.Keep;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.twopanelsettings.slices.SliceFragment;
/**
@@ -27,9 +26,4 @@
*/
@Keep
public class AccountsSliceFragment extends SliceFragment {
-
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.ACCOUNTS_MANAGE_ACCOUNTS;
- }
}
diff --git a/Settings/src/com/android/tv/settings/autofill/AutofillPickerFragment.java b/Settings/src/com/android/tv/settings/autofill/AutofillPickerFragment.java
index eed5d20..b8c84fb 100644
--- a/Settings/src/com/android/tv/settings/autofill/AutofillPickerFragment.java
+++ b/Settings/src/com/android/tv/settings/autofill/AutofillPickerFragment.java
@@ -32,7 +32,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.tv.settings.R;
import com.android.tv.settings.RadioPreference;
@@ -220,9 +219,4 @@
});
dialog.show();
}
-
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.DEFAULT_AUTOFILL_PICKER;
- }
}
diff --git a/Settings/src/com/android/tv/settings/connectivity/AddWifiNetworkActivity.java b/Settings/src/com/android/tv/settings/connectivity/AddWifiNetworkActivity.java
index 2f8e408..b0c4a52 100644
--- a/Settings/src/com/android/tv/settings/connectivity/AddWifiNetworkActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/AddWifiNetworkActivity.java
@@ -22,7 +22,6 @@
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.ViewModelProviders;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.setup.AdvancedWifiOptionsFlow;
import com.android.tv.settings.connectivity.setup.ChooseSecurityState;
@@ -145,12 +144,6 @@
}
@Override
- public int getMetricsCategory() {
- // do not log visibility.
- return MetricsProto.MetricsEvent.ACTION_WIFI_ADD_NETWORK;
- }
-
- @Override
public void onBackPressed() {
mStateMachine.back();
}
diff --git a/Settings/src/com/android/tv/settings/connectivity/EditIpSettingsActivity.java b/Settings/src/com/android/tv/settings/connectivity/EditIpSettingsActivity.java
index 83a4452..e11ffc9 100644
--- a/Settings/src/com/android/tv/settings/connectivity/EditIpSettingsActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/EditIpSettingsActivity.java
@@ -25,7 +25,6 @@
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.ViewModelProviders;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.setup.AdvancedWifiOptionsFlow;
import com.android.tv.settings.connectivity.util.State;
@@ -98,11 +97,6 @@
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.DIALOG_WIFI_AP_EDIT;
- }
-
- @Override
public void onBackPressed() {
mStateMachine.back();
}
diff --git a/Settings/src/com/android/tv/settings/connectivity/EditProxySettingsActivity.java b/Settings/src/com/android/tv/settings/connectivity/EditProxySettingsActivity.java
index 9f1c90e..ed9ef82 100644
--- a/Settings/src/com/android/tv/settings/connectivity/EditProxySettingsActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/EditProxySettingsActivity.java
@@ -25,7 +25,6 @@
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.ViewModelProviders;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.setup.AdvancedWifiOptionsFlow;
import com.android.tv.settings.connectivity.util.State;
@@ -95,11 +94,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.DIALOG_WIFI_AP_EDIT;
- }
-
- @Override
public void onBackPressed() {
mStateMachine.back();
}
diff --git a/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java b/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java
index db23b56..a413ff2 100644
--- a/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/NetworkFragment.java
@@ -44,7 +44,6 @@
import androidx.preference.PreferenceManager;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.wifi.AccessPoint;
import com.android.tv.settings.MainFragment;
import com.android.tv.settings.R;
@@ -231,17 +230,6 @@
mConnectivityListener.setWifiEnabled(mEnableWifiPref.isChecked());
logToggleInteracted(
TvSettingsEnums.NETWORK_WIFI_ON_OFF, mEnableWifiPref.isChecked());
- if (mMetricsFeatureProvider != null) {
- if (mEnableWifiPref.isChecked()) {
- mMetricsFeatureProvider.action(getContext(),
- MetricsProto.MetricsEvent.ACTION_WIFI_ON);
- } else {
- // Log if user was connected at the time of switching off.
- mMetricsFeatureProvider.action(getContext(),
- MetricsProto.MetricsEvent.ACTION_WIFI_OFF,
- mConnectivityListener.isWifiConnected());
- }
- }
return true;
case KEY_WIFI_COLLAPSE:
final boolean collapse = !mWifiNetworksCategory.isCollapsed();
@@ -264,8 +252,6 @@
return true;
case KEY_WIFI_ADD:
logEntrySelected(TvSettingsEnums.NETWORK_ADD_NEW_NETWORK);
- mMetricsFeatureProvider.action(getActivity(),
- MetricsProto.MetricsEvent.ACTION_WIFI_ADD_NETWORK);
break;
}
return super.onPreferenceTreeClick(preference);
@@ -445,11 +431,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.SETTINGS_NETWORK_CATEGORY;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.NETWORK;
}
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java b/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java
index 3d4d396..5b51878 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiConnectionActivity.java
@@ -25,7 +25,6 @@
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.ViewModelProviders;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settingslib.wifi.AccessPoint;
import com.android.tv.settings.R;
import com.android.tv.settings.connectivity.setup.AddStartState;
@@ -219,8 +218,4 @@
updateView(newFragment, movingForward);
}
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.SETTINGS_TV_WIFI_ADD_KNOWN_CATEGORY;
- }
}
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java b/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
index a618ab4..c9eb877 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
@@ -35,8 +35,6 @@
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.wifi.AccessPoint;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -82,11 +80,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.WIFI_NETWORK_DETAILS;
- }
-
- @Override
public void onCreate(Bundle savedInstanceState) {
mConnectivityListener = new ConnectivityListener(
getContext(), this, getSettingsLifecycle());
@@ -270,7 +263,6 @@
public static class ForgetNetworkConfirmFragment extends GuidedStepSupportFragment {
private AccessPoint mAccessPoint;
- private final MetricsFeatureProvider mMetricsFeatureProvider = new MetricsFeatureProvider();
public static void prepareArgs(@NonNull Bundle args, AccessPoint accessPoint) {
final Bundle apBundle = new Bundle();
@@ -313,8 +305,6 @@
WifiManager wifiManager =
(WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
wifiManager.forget(mAccessPoint.getConfig().networkId, null);
- mMetricsFeatureProvider.action(
- getContext(), MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
}
getFragmentManager().popBackStack();
}
diff --git a/Settings/src/com/android/tv/settings/core/instrumentation/InstrumentedActivity.java b/Settings/src/com/android/tv/settings/core/instrumentation/InstrumentedActivity.java
index 3171ccd..ff5e3de 100644
--- a/Settings/src/com/android/tv/settings/core/instrumentation/InstrumentedActivity.java
+++ b/Settings/src/com/android/tv/settings/core/instrumentation/InstrumentedActivity.java
@@ -20,25 +20,14 @@
import androidx.fragment.app.FragmentActivity;
-import com.android.settingslib.core.instrumentation.Instrumentable;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
/**
* Instrumented activity that logs visibility state.
*/
-public abstract class InstrumentedActivity extends FragmentActivity implements Instrumentable {
-
- protected MetricsFeatureProvider mMetricsFeatureProvider;
- protected VisibilityLoggerMixin mVisibilityLoggerMixin;
+public abstract class InstrumentedActivity extends FragmentActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- // Mixin that logs visibility change for activity.
- mMetricsFeatureProvider = new MetricsFeatureProvider();
- mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
- mMetricsFeatureProvider);
- getLifecycle().addObserver(mVisibilityLoggerMixin);
}
}
diff --git a/Settings/src/com/android/tv/settings/device/DevicePrefFragment.java b/Settings/src/com/android/tv/settings/device/DevicePrefFragment.java
index 772bfc7..8c28252 100644
--- a/Settings/src/com/android/tv/settings/device/DevicePrefFragment.java
+++ b/Settings/src/com/android/tv/settings/device/DevicePrefFragment.java
@@ -49,7 +49,6 @@
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.tv.settings.LongClickPreference;
@@ -211,11 +210,6 @@
return false;
}
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.SETTINGS_TV_DEVICE_CATEGORY;
- }
-
public boolean getSoundEffectsEnabled() {
return Settings.System.getInt(getActivity().getContentResolver(),
Settings.System.SOUND_EFFECTS_ENABLED, 1) != 0;
diff --git a/Settings/src/com/android/tv/settings/device/StorageSummaryFragment.java b/Settings/src/com/android/tv/settings/device/StorageSummaryFragment.java
index 459c8dd..db06afa 100644
--- a/Settings/src/com/android/tv/settings/device/StorageSummaryFragment.java
+++ b/Settings/src/com/android/tv/settings/device/StorageSummaryFragment.java
@@ -36,7 +36,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
import com.android.tv.settings.device.storage.MissingStorageFragment;
@@ -348,11 +347,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.SETTINGS_STORAGE_CATEGORY;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_STORAGE;
}
diff --git a/Settings/src/com/android/tv/settings/device/apps/AllAppsFragment.java b/Settings/src/com/android/tv/settings/device/apps/AllAppsFragment.java
index 7982c5e..4111510 100644
--- a/Settings/src/com/android/tv/settings/device/apps/AllAppsFragment.java
+++ b/Settings/src/com/android/tv/settings/device/apps/AllAppsFragment.java
@@ -32,7 +32,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ApplicationsState;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -389,11 +388,6 @@
};
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.MANAGE_APPLICATIONS;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.APPS_ALL_APPS;
}
diff --git a/Settings/src/com/android/tv/settings/device/apps/AppManagementFragment.java b/Settings/src/com/android/tv/settings/device/apps/AppManagementFragment.java
index 153528f..38070f0 100644
--- a/Settings/src/com/android/tv/settings/device/apps/AppManagementFragment.java
+++ b/Settings/src/com/android/tv/settings/device/apps/AppManagementFragment.java
@@ -42,7 +42,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settingslib.applications.ApplicationsState;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -108,11 +107,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsEvent.APPLICATIONS_INSTALLED_APP_DETAILS;
- }
-
- @Override
public void onCreate(Bundle savedInstanceState) {
mPackageName = getArguments().getString(ARG_PACKAGE_NAME);
@@ -207,8 +201,6 @@
if (intent != null) {
try {
if (preference.equals(mUninstallPreference)) {
- mMetricsFeatureProvider.action(getContext(),
- MetricsEvent.ACTION_SETTINGS_UNINSTALL_APP);
startActivityForResult(intent, mUninstallPreference.canUninstall()
? REQUEST_UNINSTALL : REQUEST_UNINSTALL_UPDATES);
} else {
@@ -443,7 +435,6 @@
return;
}
- mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_SETTINGS_CLEAR_APP_DATA);
mClearDataPreference.setClearingData(true);
String spaceManagementActivityName = mEntry.info.manageSpaceActivityName;
if (spaceManagementActivityName != null) {
@@ -495,7 +486,6 @@
}
public void clearCache() {
- mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_SETTINGS_CLEAR_APP_CACHE);
mClearCachePreference.setClearingCache(true);
mPackageManager.deleteApplicationCacheFiles(mEntry.info.packageName,
new IPackageDataObserver.Stub() {
diff --git a/Settings/src/com/android/tv/settings/device/apps/AppsFragment.java b/Settings/src/com/android/tv/settings/device/apps/AppsFragment.java
index b68c471..42aa06f 100644
--- a/Settings/src/com/android/tv/settings/device/apps/AppsFragment.java
+++ b/Settings/src/com/android/tv/settings/device/apps/AppsFragment.java
@@ -28,7 +28,6 @@
import androidx.annotation.Keep;
import androidx.preference.Preference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.tv.settings.PreferenceControllerFragment;
import com.android.tv.settings.R;
@@ -87,11 +86,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.SETTINGS_APP_NOTIF_CATEGORY;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.APPS;
}
diff --git a/Settings/src/com/android/tv/settings/device/apps/EnableDisablePreference.java b/Settings/src/com/android/tv/settings/device/apps/EnableDisablePreference.java
index cd39655..44573ee 100644
--- a/Settings/src/com/android/tv/settings/device/apps/EnableDisablePreference.java
+++ b/Settings/src/com/android/tv/settings/device/apps/EnableDisablePreference.java
@@ -29,10 +29,8 @@
import androidx.annotation.NonNull;
import androidx.leanback.widget.GuidanceStylist;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settingslib.Utils;
import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.tv.settings.R;
import java.util.ArrayList;
@@ -139,8 +137,6 @@
args.putBoolean(ARG_ENABLE, enable);
}
- private final MetricsFeatureProvider mMetricsFeatureProvider = new MetricsFeatureProvider();
-
@NonNull
@Override
public GuidanceStylist.Guidance onCreateGuidance(Bundle savedInstanceState) {
@@ -158,9 +154,6 @@
@Override
public void onOk() {
boolean enable = getArguments().getBoolean(ARG_ENABLE);
- mMetricsFeatureProvider.action(getContext(), enable
- ? MetricsEvent.ACTION_SETTINGS_ENABLE_APP
- : MetricsEvent.ACTION_SETTINGS_DISABLE_APP);
getActivity().getPackageManager().setApplicationEnabledSetting(
getArguments().getString(ARG_PACKAGE_NAME), enable
? PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
diff --git a/Settings/src/com/android/tv/settings/device/apps/ForceStopPreference.java b/Settings/src/com/android/tv/settings/device/apps/ForceStopPreference.java
index 56b57ec..3841b37 100644
--- a/Settings/src/com/android/tv/settings/device/apps/ForceStopPreference.java
+++ b/Settings/src/com/android/tv/settings/device/apps/ForceStopPreference.java
@@ -33,9 +33,7 @@
import androidx.annotation.NonNull;
import androidx.leanback.widget.GuidanceStylist;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.tv.settings.R;
public class ForceStopPreference extends AppActionPreference {
@@ -86,9 +84,6 @@
public static class ConfirmationFragment extends AppActionPreference.ConfirmationFragment {
private static final String ARG_PACKAGE_NAME = "packageName";
- private final MetricsFeatureProvider mMetricsFeatureProvider =
- new MetricsFeatureProvider();
-
private static void prepareArgs(@NonNull Bundle args, String packageName) {
args.putString(ARG_PACKAGE_NAME, packageName);
}
@@ -107,8 +102,6 @@
@Override
public void onOk() {
String pkgName = getArguments().getString(ARG_PACKAGE_NAME);
- mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_APP_FORCE_STOP,
- pkgName);
ActivityManager am = (ActivityManager)
getActivity().getSystemService(Context.ACTIVITY_SERVICE);
am.forceStopPackage(pkgName);
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/AppUsageAccess.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/AppUsageAccess.java
index 68bcc2d..587b117 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/AppUsageAccess.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/AppUsageAccess.java
@@ -28,7 +28,6 @@
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ApplicationsState;
import com.android.tv.settings.R;
@@ -42,11 +41,6 @@
private AppOpsManager mAppOpsManager;
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.USAGE_ACCESS;
- }
-
- @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mAppOpsManager = getContext().getSystemService(AppOpsManager.class);
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/ExternalSources.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/ExternalSources.java
index e341702..ca55fd4 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/ExternalSources.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/ExternalSources.java
@@ -30,7 +30,6 @@
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ApplicationsState;
import com.android.tv.settings.R;
@@ -42,11 +41,6 @@
private AppOpsManager mAppOpsManager;
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.MANAGE_EXTERNAL_SOURCES;
- }
-
- @Override
public void onCreate(Bundle savedInstanceState) {
mAppOpsManager = getContext().getSystemService(AppOpsManager.class);
super.onCreate(savedInstanceState);
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java
index a168af2..101eaf4 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/HighPower.java
@@ -27,7 +27,6 @@
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
import com.android.tv.settings.R;
@@ -61,11 +60,6 @@
});
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.APPLICATIONS_HIGH_POWER_APPS;
- }
-
- @Override
public void onAttach(Context context) {
super.onAttach(context);
mPowerAllowlistBackend = PowerAllowlistBackend.getInstance(context);
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/NotificationAccess.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/NotificationAccess.java
index 11e850d..36d471a 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/NotificationAccess.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/NotificationAccess.java
@@ -36,7 +36,6 @@
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ServiceListing;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -61,11 +60,6 @@
private IconDrawableFactory mIconDrawableFactory;
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.NOTIFICATION_ACCESS;
- }
-
- @Override
public void onAttach(Context context) {
super.onAttach(context);
mPackageManager = context.getPackageManager();
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/PictureInPicture.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/PictureInPicture.java
index 2c21c32..7e425be 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/PictureInPicture.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/PictureInPicture.java
@@ -31,7 +31,6 @@
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ApplicationsState;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -151,11 +150,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.SETTINGS_MANAGE_PICTURE_IN_PICTURE;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.APPS_SPECIAL_APP_ACCESS_PICTURE_IN_PICTURE;
}
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/SpecialAppAccess.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/SpecialAppAccess.java
index 041064e..f4b52a2 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/SpecialAppAccess.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/SpecialAppAccess.java
@@ -26,7 +26,6 @@
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -49,11 +48,6 @@
updatePreferenceStates();
}
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.SPECIAL_ACCESS;
- }
-
@VisibleForTesting
void updatePreferenceStates() {
ActivityManager activityManager = (ActivityManager) getContext()
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/SystemAlertWindow.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/SystemAlertWindow.java
index 023fb41..3885d20 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/SystemAlertWindow.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/SystemAlertWindow.java
@@ -28,7 +28,6 @@
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ApplicationsState;
import com.android.tv.settings.R;
@@ -41,11 +40,6 @@
private AppOpsManager mAppOpsManager;
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
- }
-
- @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mAppOpsManager = getContext().getSystemService(AppOpsManager.class);
diff --git a/Settings/src/com/android/tv/settings/device/apps/specialaccess/WriteSettings.java b/Settings/src/com/android/tv/settings/device/apps/specialaccess/WriteSettings.java
index 23cfbfa..9f4f604 100644
--- a/Settings/src/com/android/tv/settings/device/apps/specialaccess/WriteSettings.java
+++ b/Settings/src/com/android/tv/settings/device/apps/specialaccess/WriteSettings.java
@@ -28,7 +28,6 @@
import androidx.preference.SwitchPreference;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.ApplicationsState;
import com.android.tv.settings.R;
@@ -41,11 +40,6 @@
private AppOpsManager mAppOpsManager;
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
- }
-
- @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mAppOpsManager = getContext().getSystemService(AppOpsManager.class);
diff --git a/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamFragment.java b/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamFragment.java
index e30f53d..172aff2 100644
--- a/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamFragment.java
+++ b/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamFragment.java
@@ -40,7 +40,6 @@
import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.dream.DreamBackend;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -250,11 +249,6 @@
}
}
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.DREAM;
- }
-
private class PackageReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
diff --git a/Settings/src/com/android/tv/settings/device/display/daydream/EnergySaverFragment.java b/Settings/src/com/android/tv/settings/device/display/daydream/EnergySaverFragment.java
index 3abc329..f0d236d 100644
--- a/Settings/src/com/android/tv/settings/device/display/daydream/EnergySaverFragment.java
+++ b/Settings/src/com/android/tv/settings/device/display/daydream/EnergySaverFragment.java
@@ -32,7 +32,6 @@
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
import com.android.tv.twopanelsettings.TwoPanelSettingsFragment;
@@ -105,11 +104,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.DREAM;
- }
-
- @Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
switch (preference.getKey()) {
case KEY_SLEEP_TIME:
diff --git a/Settings/src/com/android/tv/settings/device/displaysound/AdvancedDisplayFragment.java b/Settings/src/com/android/tv/settings/device/displaysound/AdvancedDisplayFragment.java
index 63aeb1c..e6d076c 100644
--- a/Settings/src/com/android/tv/settings/device/displaysound/AdvancedDisplayFragment.java
+++ b/Settings/src/com/android/tv/settings/device/displaysound/AdvancedDisplayFragment.java
@@ -29,7 +29,6 @@
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -41,11 +40,6 @@
private static final String KEY_GAME_MODE = "game_mode";
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.DISPLAY;
- }
-
- @Override
public void onCreatePreferences(Bundle bundle, String s) {
setPreferencesFromResource(R.xml.advanced_display, null);
SwitchPreference gameModePreference = findPreference(KEY_GAME_MODE);
diff --git a/Settings/src/com/android/tv/settings/device/displaysound/AdvancedVolumeFragment.java b/Settings/src/com/android/tv/settings/device/displaysound/AdvancedVolumeFragment.java
index a41d10f..8277e16 100644
--- a/Settings/src/com/android/tv/settings/device/displaysound/AdvancedVolumeFragment.java
+++ b/Settings/src/com/android/tv/settings/device/displaysound/AdvancedVolumeFragment.java
@@ -35,7 +35,6 @@
import androidx.preference.SwitchPreference;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.tv.settings.PreferenceControllerFragment;
import com.android.tv.settings.R;
@@ -298,11 +297,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.SOUND;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.DISPLAY_SOUND_ADVANCED_SOUNDS;
}
diff --git a/Settings/src/com/android/tv/settings/device/displaysound/DisplaySoundFragment.java b/Settings/src/com/android/tv/settings/device/displaysound/DisplaySoundFragment.java
index 1229582..c1115b4 100644
--- a/Settings/src/com/android/tv/settings/device/displaysound/DisplaySoundFragment.java
+++ b/Settings/src/com/android/tv/settings/device/displaysound/DisplaySoundFragment.java
@@ -137,11 +137,6 @@
}
@Override
- public int getMetricsCategory() {
- return 0;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.DISPLAY_SOUND;
}
diff --git a/Settings/src/com/android/tv/settings/device/displaysound/MatchContentFrameRateFragment.java b/Settings/src/com/android/tv/settings/device/displaysound/MatchContentFrameRateFragment.java
index 0107bb9..dd77ce3 100644
--- a/Settings/src/com/android/tv/settings/device/displaysound/MatchContentFrameRateFragment.java
+++ b/Settings/src/com/android/tv/settings/device/displaysound/MatchContentFrameRateFragment.java
@@ -123,11 +123,6 @@
return super.onPreferenceTreeClick(preference);
}
- @Override
- public int getMetricsCategory() {
- return 0;
- }
-
private String preferenceKeyFromSetting() {
int matchContentSetting = Settings.Secure.getInt(
getContext().getContentResolver(),
diff --git a/Settings/src/com/android/tv/settings/device/storage/StorageFragment.java b/Settings/src/com/android/tv/settings/device/storage/StorageFragment.java
index 64ae0ab..4e6cddc 100644
--- a/Settings/src/com/android/tv/settings/device/storage/StorageFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/StorageFragment.java
@@ -31,7 +31,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.deviceinfo.StorageMeasurement;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -291,11 +290,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.SETTINGS_STORAGE_CATEGORY;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_STORAGE_INTERNAL_STORAGE;
}
diff --git a/Settings/src/com/android/tv/settings/help/HelpFragment.java b/Settings/src/com/android/tv/settings/help/HelpFragment.java
index 4bb8744..d77b0cc 100644
--- a/Settings/src/com/android/tv/settings/help/HelpFragment.java
+++ b/Settings/src/com/android/tv/settings/help/HelpFragment.java
@@ -33,7 +33,6 @@
import androidx.leanback.widget.VerticalGridView;
import androidx.preference.Preference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.MainFragment;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -103,11 +102,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.ACTION_SETTING_HELP_AND_FEEDBACK;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.FEEDBACK;
}
diff --git a/Settings/src/com/android/tv/settings/inputmethod/AvailableVirtualKeyboardFragment.java b/Settings/src/com/android/tv/settings/inputmethod/AvailableVirtualKeyboardFragment.java
index 7cc7e0d..df8d7de 100644
--- a/Settings/src/com/android/tv/settings/inputmethod/AvailableVirtualKeyboardFragment.java
+++ b/Settings/src/com/android/tv/settings/inputmethod/AvailableVirtualKeyboardFragment.java
@@ -37,7 +37,6 @@
import androidx.annotation.Keep;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtilCompat;
import com.android.settingslib.inputmethod.InputMethodPreference;
import com.android.settingslib.inputmethod.InputMethodSettingValuesWrapper;
@@ -173,11 +172,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.ENABLE_VIRTUAL_KEYBOARDS;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_KEYBOARD_MANAGE_KEYBOARDS;
}
diff --git a/Settings/src/com/android/tv/settings/inputmethod/InputMethodAndSubtypeEnablerFragment.java b/Settings/src/com/android/tv/settings/inputmethod/InputMethodAndSubtypeEnablerFragment.java
index 12ac6ad..adc7c6d 100644
--- a/Settings/src/com/android/tv/settings/inputmethod/InputMethodAndSubtypeEnablerFragment.java
+++ b/Settings/src/com/android/tv/settings/inputmethod/InputMethodAndSubtypeEnablerFragment.java
@@ -23,7 +23,6 @@
import androidx.annotation.Keep;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeEnablerManagerCompat;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -97,9 +96,4 @@
super.onPause();
mManager.save(getContext(), this);
}
-
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.INPUTMETHOD_SUBTYPE_ENABLER;
- }
}
diff --git a/Settings/src/com/android/tv/settings/inputmethod/KeyboardFragment.java b/Settings/src/com/android/tv/settings/inputmethod/KeyboardFragment.java
index 2ab3213..2363bfb 100644
--- a/Settings/src/com/android/tv/settings/inputmethod/KeyboardFragment.java
+++ b/Settings/src/com/android/tv/settings/inputmethod/KeyboardFragment.java
@@ -35,7 +35,6 @@
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -284,11 +283,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.INPUTMETHOD_KEYBOARD;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_KEYBOARD;
}
diff --git a/Settings/src/com/android/tv/settings/privacy/PrivacyFragment.java b/Settings/src/com/android/tv/settings/privacy/PrivacyFragment.java
index ccb1229..cdfb558 100644
--- a/Settings/src/com/android/tv/settings/privacy/PrivacyFragment.java
+++ b/Settings/src/com/android/tv/settings/privacy/PrivacyFragment.java
@@ -30,7 +30,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
import com.android.tv.settings.overlay.FlavorUtils;
@@ -117,11 +116,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.PRIVACY;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.PRIVACY;
}
diff --git a/Settings/src/com/android/tv/settings/suggestions/SuggestionPreference.java b/Settings/src/com/android/tv/settings/suggestions/SuggestionPreference.java
index 0fb4bfc..d0b4e2a 100644
--- a/Settings/src/com/android/tv/settings/suggestions/SuggestionPreference.java
+++ b/Settings/src/com/android/tv/settings/suggestions/SuggestionPreference.java
@@ -28,8 +28,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
import com.android.tv.settings.R;
@@ -39,8 +37,6 @@
public class SuggestionPreference extends Preference {
public static final String SUGGESTION_PREFERENCE_KEY = "suggestion_pref_key";
private static final String TAG = "SuggestionPreference";
- private final MetricsFeatureProvider mMetricsFeatureProvider =
- new MetricsFeatureProvider();
private final Suggestion mSuggestion;
private final SuggestionControllerMixinCompat mSuggestionControllerMixin;
@@ -88,9 +84,6 @@
}
});
}
-
- mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- mId);
}
private void launchSuggestion() {
@@ -98,8 +91,6 @@
mSuggestion.getPendingIntent().send();
mSuggestionControllerMixin.launchSuggestion(mSuggestion);
logEntrySelected(TvSettingsEnums.SUGGESTED_SETTINGS);
- mMetricsFeatureProvider.action(getContext(),
- MetricsEvent.ACTION_SETTINGS_SUGGESTION, mId);
} catch (PendingIntent.CanceledException e) {
Log.w(TAG, "Failed to start suggestion " + mSuggestion.getTitle());
}
diff --git a/Settings/src/com/android/tv/settings/system/CaptionFragment.java b/Settings/src/com/android/tv/settings/system/CaptionFragment.java
index 03d86db..a48506f 100644
--- a/Settings/src/com/android/tv/settings/system/CaptionFragment.java
+++ b/Settings/src/com/android/tv/settings/system/CaptionFragment.java
@@ -32,7 +32,6 @@
import androidx.preference.TwoStatePreference;
import com.android.internal.app.LocalePicker;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.RadioPreference;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -270,11 +269,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.ACCESSIBILITY_CAPTION_PROPERTIES;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_A11Y_CAPTIONS;
}
diff --git a/Settings/src/com/android/tv/settings/system/DateTimeFragment.java b/Settings/src/com/android/tv/settings/system/DateTimeFragment.java
index 3495c3f..8e0f65e 100644
--- a/Settings/src/com/android/tv/settings/system/DateTimeFragment.java
+++ b/Settings/src/com/android/tv/settings/system/DateTimeFragment.java
@@ -36,7 +36,6 @@
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.datetime.ZoneGetter;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -244,11 +243,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.DATE_TIME;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_DATE_TIME;
}
diff --git a/Settings/src/com/android/tv/settings/system/InputOptionsFragment.java b/Settings/src/com/android/tv/settings/system/InputOptionsFragment.java
index a0e5991..5d65d77 100644
--- a/Settings/src/com/android/tv/settings/system/InputOptionsFragment.java
+++ b/Settings/src/com/android/tv/settings/system/InputOptionsFragment.java
@@ -27,7 +27,6 @@
import androidx.preference.PreferenceGroup;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.tv.settings.R;
import com.android.tv.settings.RadioPreference;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -193,9 +192,4 @@
public void onSetCustomName(CharSequence name) {
setInputName(name);
}
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.SETTINGS_TV_INPUT_OPTIONS_CATEGORY;
- }
}
diff --git a/Settings/src/com/android/tv/settings/system/InputsFragment.java b/Settings/src/com/android/tv/settings/system/InputsFragment.java
index b4cf413..2745d6c 100644
--- a/Settings/src/com/android/tv/settings/system/InputsFragment.java
+++ b/Settings/src/com/android/tv/settings/system/InputsFragment.java
@@ -29,7 +29,6 @@
import androidx.preference.PreferenceGroup;
import androidx.preference.TwoStatePreference;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -217,9 +216,4 @@
public static String makeInputPrefKey(TvInputInfo inputInfo) {
return "InputPref:" + inputInfo.getId();
}
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.SETTINGS_TV_INPUTS_CATEGORY;
- }
}
diff --git a/Settings/src/com/android/tv/settings/system/LanguageFragment.java b/Settings/src/com/android/tv/settings/system/LanguageFragment.java
index 11b4330..37a6f89 100644
--- a/Settings/src/com/android/tv/settings/system/LanguageFragment.java
+++ b/Settings/src/com/android/tv/settings/system/LanguageFragment.java
@@ -30,7 +30,6 @@
import androidx.preference.PreferenceScreen;
import com.android.internal.app.LocalePicker;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.tv.settings.R;
import com.android.tv.settings.RadioPreference;
@@ -136,11 +135,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.SETTINGS_LANGUAGE_CATEGORY;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_LANGUAGE;
}
diff --git a/Settings/src/com/android/tv/settings/system/LocationFragment.java b/Settings/src/com/android/tv/settings/system/LocationFragment.java
index 3c05b60..96b9589 100644
--- a/Settings/src/com/android/tv/settings/system/LocationFragment.java
+++ b/Settings/src/com/android/tv/settings/system/LocationFragment.java
@@ -40,7 +40,6 @@
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.location.RecentLocationApps;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -278,11 +277,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.LOCATION;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.PRIVACY_LOCATION;
}
diff --git a/Settings/src/com/android/tv/settings/system/SecurityFragment.java b/Settings/src/com/android/tv/settings/system/SecurityFragment.java
index 14c4577..c957d6d 100644
--- a/Settings/src/com/android/tv/settings/system/SecurityFragment.java
+++ b/Settings/src/com/android/tv/settings/system/SecurityFragment.java
@@ -47,7 +47,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
import com.android.tv.settings.dialog.PinDialogFragment;
@@ -474,11 +473,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.SECURITY;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.APPS_SECURITY_RESTRICTIONS;
}
diff --git a/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java b/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java
index d1e382d..75d59e2 100644
--- a/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java
+++ b/Settings/src/com/android/tv/settings/system/TextToSpeechFragment.java
@@ -37,7 +37,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -629,11 +628,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.TTS_TEXT_TO_SPEECH;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_A11Y_TTS;
}
diff --git a/Settings/src/com/android/tv/settings/system/TimeZoneFragment.java b/Settings/src/com/android/tv/settings/system/TimeZoneFragment.java
index c145cbf..721b9cc 100644
--- a/Settings/src/com/android/tv/settings/system/TimeZoneFragment.java
+++ b/Settings/src/com/android/tv/settings/system/TimeZoneFragment.java
@@ -32,7 +32,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.datetime.ZoneGetter;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -149,11 +148,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.ZONE_PICKER;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_DATE_TIME_SET_TIME_ZONE;
}
diff --git a/Settings/src/com/android/tv/settings/system/TtsEngineSettingsFragment.java b/Settings/src/com/android/tv/settings/system/TtsEngineSettingsFragment.java
index 9b4e30b..6139d4a 100644
--- a/Settings/src/com/android/tv/settings/system/TtsEngineSettingsFragment.java
+++ b/Settings/src/com/android/tv/settings/system/TtsEngineSettingsFragment.java
@@ -37,7 +37,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -398,11 +397,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.TTS_ENGINE_SETTINGS;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.SYSTEM_A11Y_TTS_ENGINE_CONFIG;
}
diff --git a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
index bc3cb16..c93ff37 100644
--- a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
+++ b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
@@ -66,7 +66,6 @@
import androidx.preference.SwitchPreference;
import com.android.internal.app.LocalePicker;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.core.ConfirmationDialogController;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.development.SystemPropPoker;
@@ -267,11 +266,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.DEVELOPMENT;
- }
-
- @Override
public void onCreate(Bundle icicle) {
if (icicle != null) {
diff --git a/Settings/src/com/android/tv/settings/system/development/InactiveApps.java b/Settings/src/com/android/tv/settings/system/development/InactiveApps.java
index 8af83e2..c5bd2cf 100644
--- a/Settings/src/com/android/tv/settings/system/development/InactiveApps.java
+++ b/Settings/src/com/android/tv/settings/system/development/InactiveApps.java
@@ -27,7 +27,6 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -97,9 +96,4 @@
updateSummary(preference);
return false;
}
-
- @Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.FUELGAUGE_INACTIVE_APPS;
- }
}
diff --git a/Settings/src/com/android/tv/settings/users/AppRestrictionsFragment.java b/Settings/src/com/android/tv/settings/users/AppRestrictionsFragment.java
index 73706f2..5aa891d 100644
--- a/Settings/src/com/android/tv/settings/users/AppRestrictionsFragment.java
+++ b/Settings/src/com/android/tv/settings/users/AppRestrictionsFragment.java
@@ -58,7 +58,6 @@
import androidx.preference.PreferenceViewHolder;
import androidx.preference.SwitchPreference;
-import com.android.internal.logging.nano.MetricsProto;
import com.android.settingslib.users.AppRestrictionsHelper;
import com.android.tv.settings.R;
import com.android.tv.settings.SettingsPreferenceFragment;
@@ -850,11 +849,6 @@
}
@Override
- public int getMetricsCategory() {
- return MetricsProto.MetricsEvent.USERS_APP_RESTRICTIONS;
- }
-
- @Override
protected int getPageId() {
return TvSettingsEnums.APPS_SECURITY_RESTRICTIONS_PROFILE_ALLOWED_APPS;
}
diff --git a/Settings/src/com/android/tv/settings/vendor/ChannelsAndInputFragment.java b/Settings/src/com/android/tv/settings/vendor/ChannelsAndInputFragment.java
index 27f4754..1e07654 100644
--- a/Settings/src/com/android/tv/settings/vendor/ChannelsAndInputFragment.java
+++ b/Settings/src/com/android/tv/settings/vendor/ChannelsAndInputFragment.java
@@ -30,9 +30,4 @@
public void onCreatePreferences(Bundle bundle, String s) {
setPreferencesFromResource(R.xml.channels_and_inputs_vendor, null);
}
-
- @Override
- public int getMetricsCategory() {
- return 0;
- }
}
diff --git a/Settings/src/com/android/tv/settings/vendor/DisplayPreviewFragment.java b/Settings/src/com/android/tv/settings/vendor/DisplayPreviewFragment.java
index 239309e..59dfcde 100644
--- a/Settings/src/com/android/tv/settings/vendor/DisplayPreviewFragment.java
+++ b/Settings/src/com/android/tv/settings/vendor/DisplayPreviewFragment.java
@@ -30,9 +30,4 @@
public void onCreatePreferences(Bundle bundle, String s) {
setPreferencesFromResource(R.xml.preview_display_vendor, null);
}
-
- @Override
- public int getMetricsCategory() {
- return 0;
- }
}
diff --git a/Settings/src/com/android/tv/settings/vendor/PowerAndEnergyFragment.java b/Settings/src/com/android/tv/settings/vendor/PowerAndEnergyFragment.java
index 11495d3..575aca7 100644
--- a/Settings/src/com/android/tv/settings/vendor/PowerAndEnergyFragment.java
+++ b/Settings/src/com/android/tv/settings/vendor/PowerAndEnergyFragment.java
@@ -30,9 +30,4 @@
public void onCreatePreferences(Bundle bundle, String s) {
setPreferencesFromResource(R.xml.power_and_energy_vendor, null);
}
-
- @Override
- public int getMetricsCategory() {
- return 0;
- }
}
diff --git a/Settings/src/com/android/tv/settings/vendor/ResetOptionsFragment.java b/Settings/src/com/android/tv/settings/vendor/ResetOptionsFragment.java
index 2edc014..a26c488 100644
--- a/Settings/src/com/android/tv/settings/vendor/ResetOptionsFragment.java
+++ b/Settings/src/com/android/tv/settings/vendor/ResetOptionsFragment.java
@@ -47,9 +47,4 @@
}
return super.onPreferenceTreeClick(preference);
}
-
- @Override
- public int getMetricsCategory() {
- return 0;
- }
}
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SettingsPreferenceFragment.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SettingsPreferenceFragment.java
index 11ac6a7..58ceda8 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SettingsPreferenceFragment.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SettingsPreferenceFragment.java
@@ -45,9 +45,6 @@
import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.settingslib.core.instrumentation.Instrumentable;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.tv.twopanelsettings.R;
import com.android.tv.twopanelsettings.SettingsPreferenceFragmentBase;
@@ -57,11 +54,9 @@
* A copy of SettingsPreferenceFragment in Settings.
*/
public abstract class SettingsPreferenceFragment extends SettingsPreferenceFragmentBase
- implements LifecycleOwner, Instrumentable,
+ implements LifecycleOwner,
TwoPanelSettingsFragment.PreviewableComponentCallback {
private final Lifecycle mLifecycle = new Lifecycle(this);
- private final VisibilityLoggerMixin mVisibilityLoggerMixin;
- protected MetricsFeatureProvider mMetricsFeatureProvider;
// Rename getLifecycle() to getSettingsLifecycle() as androidx Fragment has already implemented
// getLifecycle(), overriding here would cause unexpected crash in framework.
@@ -71,11 +66,6 @@
}
public SettingsPreferenceFragment() {
- mMetricsFeatureProvider = new MetricsFeatureProvider();
- // Mixin that logs visibility change for activity.
- mVisibilityLoggerMixin = new VisibilityLoggerMixin(getMetricsCategory(),
- mMetricsFeatureProvider);
- getSettingsLifecycle().addObserver(mVisibilityLoggerMixin);
}
@CallSuper
@@ -154,7 +144,6 @@
@CallSuper
@Override
public void onResume() {
- mVisibilityLoggerMixin.setSourceMetricsCategory(getActivity());
super.onResume();
mLifecycle.handleLifecycleEvent(ON_RESUME);
}
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java
index eeaaed8..2e8319c 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/SliceFragment.java
@@ -61,7 +61,6 @@
import androidx.slice.widget.ListContent;
import androidx.slice.widget.SliceContent;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.tv.twopanelsettings.R;
import com.android.tv.twopanelsettings.TwoPanelSettingsFragment;
import com.android.tv.twopanelsettings.TwoPanelSettingsFragment.SliceFragmentCallback;
@@ -200,11 +199,6 @@
}
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.VIEW_UNKNOWN;
- }
-
private boolean isUriValid(String uri) {
if (uri == null) {
return false;
