Log visibility change for all fragments.
Bug: 30681771
Test: SettingsUnitTests
Refactor visibility logging from InstrumentedFragment into a mixin. And
apply mixin in remaining fragments.
Change-Id: Ibbb59904336254a3e4bb9e8c7d0b36e5a6bc2622
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 6ffe33f..d0c9ca2 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -253,7 +253,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APN_EDITOR;
}
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 3dd772b..9865fb2 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -149,7 +149,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APN;
}
diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java
index 759ccea..f271339 100644
--- a/src/com/android/settings/ApplicationSettings.java
+++ b/src/com/android/settings/ApplicationSettings.java
@@ -44,7 +44,7 @@
private ListPreference mInstallLocation;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APPLICATION;
}
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 66f4925..2c5daf1 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -123,7 +123,7 @@
protected boolean mForFingerprint = false;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.CHOOSE_LOCK_GENERIC;
}
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index a017e73..1a820f2 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -50,6 +50,7 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
import com.android.internal.widget.TextViewInputDisabler;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.notification.RedactionInterstitial;
import com.android.settings.password.PasswordRequirementAdapter;
import com.android.setupwizardlib.GlifLayout;
@@ -437,7 +438,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.CHOOSE_LOCK_PASSWORD;
}
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index ebfca0e..42a941a 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -36,6 +36,7 @@
import com.android.internal.widget.LockPatternView;
import com.android.internal.widget.LockPatternView.Cell;
import com.android.internal.widget.LockPatternView.DisplayMode;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.notification.RedactionInterstitial;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.collect.Lists;
@@ -240,7 +241,7 @@
};
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.CHOOSE_LOCK_PATTERN;
}
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 4797012..f22d2b0 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -251,7 +251,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.CONFIRM_LOCK_PASSWORD;
}
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 34dad58..4e2364d 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -194,7 +194,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.CONFIRM_LOCK_PATTERN;
}
diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java
index 25b92a6..8ab493e 100644
--- a/src/com/android/settings/CryptKeeperConfirm.java
+++ b/src/com/android/settings/CryptKeeperConfirm.java
@@ -35,6 +35,7 @@
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.InstrumentedFragment;
import java.util.Locale;
@@ -43,7 +44,7 @@
private static final String TAG = "CryptKeeperConfirm";
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.CRYPT_KEEPER_CONFIRM;
}
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index bef4cc0..37846a3 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -36,6 +36,7 @@
import android.widget.Button;
import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.core.InstrumentedFragment;
public class CryptKeeperSettings extends InstrumentedFragment {
private static final String TAG = "CryptKeeper";
@@ -115,7 +116,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.CRYPT_KEEPER;
}
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 94589f0..5d5d54e 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -83,7 +83,7 @@
private Preference mDatePref;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DATE_TIME;
}
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 4e5da6e..a8fed7d 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -332,7 +332,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DEVELOPMENT;
}
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index 054ad41..aef4138 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -17,7 +17,6 @@
package com.android.settings;
import android.app.Activity;
-import android.app.AlertDialog;
import android.app.AppGlobals;
import android.app.ListFragment;
import android.app.admin.DeviceAdminInfo;
@@ -31,7 +30,6 @@
import android.content.pm.ActivityInfo;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
@@ -50,6 +48,10 @@
import android.widget.ListView;
import android.widget.TextView;
+import com.android.internal.logging.MetricsProto;
+import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
+import com.android.settings.core.instrumentation.Instrumentable;
+
import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
@@ -58,13 +60,14 @@
import java.util.Collections;
import java.util.List;
-public class DeviceAdminSettings extends ListFragment {
+public class DeviceAdminSettings extends ListFragment implements Instrumentable {
static final String TAG = "DeviceAdminSettings";
+ private final VisibilityLoggerMixin mVisibilityLoggerMixin =
+ new VisibilityLoggerMixin(this);
private DevicePolicyManager mDPM;
private UserManager mUm;
-
private static class DeviceAdminListItem implements Comparable<DeviceAdminListItem> {
public DeviceAdminInfo info;
@@ -104,6 +107,11 @@
};
@Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.DEVICE_ADMIN_SETTINGS;
+ }
+
+ @Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
}
@@ -126,9 +134,11 @@
@Override
public void onResume() {
super.onResume();
+ final Activity activity = getActivity();
+ mVisibilityLoggerMixin.onResume(activity);
IntentFilter filter = new IntentFilter();
filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
- getActivity().registerReceiverAsUser(
+ activity.registerReceiverAsUser(
mBroadcastReceiver, UserHandle.ALL, filter, null, null);
final ComponentName deviceOwnerComponent = mDPM.getDeviceOwnerComponentOnAnyUser();
@@ -146,7 +156,9 @@
@Override
public void onPause() {
- getActivity().unregisterReceiver(mBroadcastReceiver);
+ final Activity activity = getActivity();
+ activity.unregisterReceiver(mBroadcastReceiver);
+ mVisibilityLoggerMixin.onPause(activity);
super.onPause();
}
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index dd8064f..98b3982 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -86,7 +86,7 @@
private boolean mDebuggingFeaturesDisallowedBySystem;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DEVICEINFO;
}
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index f7b9443..d35c11b 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -102,7 +102,7 @@
private SwitchPreference mCameraGesturePreference;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DISPLAY;
}
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 3327898..2a7c852 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -76,7 +76,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DREAM;
}
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index d34b456..a26d0dc 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -92,7 +92,7 @@
private int mRequestedPasswordQuality;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ENCRYPTION;
}
diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java
index 28b5484..427e524 100644
--- a/src/com/android/settings/HomeSettings.java
+++ b/src/com/android/settings/HomeSettings.java
@@ -245,7 +245,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.HOME;
}
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 9d7f10a..a048656 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -256,7 +256,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ICC_LOCK;
}
diff --git a/src/com/android/settings/InstrumentedActivity.java b/src/com/android/settings/InstrumentedActivity.java
deleted file mode 100644
index e4be6ea..0000000
--- a/src/com/android/settings/InstrumentedActivity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.Activity;
-
-import com.android.internal.logging.MetricsLogger;
-
-/**
- * Instrumented activity that logs visibility state.
- */
-public abstract class InstrumentedActivity extends Activity {
- /**
- * Declare the view of this category.
- *
- * Categories are defined in {@link com.android.internal.logging.MetricsProto.MetricsEvent}
- * or if there is no relevant existing category you may define one in
- * {@link com.android.settings.InstrumentedFragment}.
- */
- protected abstract int getMetricsCategory();
-
- @Override
- public void onResume() {
- super.onResume();
- MetricsLogger.visible(this, getMetricsCategory());
- }
-
- @Override
- public void onPause() {
- super.onPause();
- MetricsLogger.hidden(this, getMetricsCategory());
- }
-}
diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java
deleted file mode 100644
index 8bab2cf..0000000
--- a/src/com/android/settings/InstrumentedFragment.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.os.Bundle;
-import android.support.v14.preference.PreferenceFragment;
-
-import com.android.internal.logging.MetricsLogger;
-
-/**
- * Instrumented fragment that logs visibility state.
- */
-public abstract class InstrumentedFragment extends PreferenceFragment {
- // Declare new temporary categories here, starting after this value.
- public static final int UNDECLARED = 100000;
-
- // Used by PreferenceActivity for the dummy fragment it adds, no useful data here.
- public static final int PREFERENCE_ACTIVITY_FRAGMENT = UNDECLARED + 1;
-
- /**
- * Declare the view of this category.
- *
- * Categories are defined in {@link com.android.internal.logging.MetricsProto.MetricsEvent}
- * or if there is no relevant existing category you may define one in
- * {@link com.android.settings.InstrumentedFragment}.
- */
- protected abstract int getMetricsCategory();
-
- @Override
- public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- }
-
- @Override
- public void onResume() {
- super.onResume();
- MetricsLogger.visible(getActivity(), getMetricsCategory());
- }
-
- @Override
- public void onPause() {
- super.onPause();
- MetricsLogger.hidden(getActivity(), getMetricsCategory());
- }
-}
diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java
index d7323b9..de6e548 100644
--- a/src/com/android/settings/LegalSettings.java
+++ b/src/com/android/settings/LegalSettings.java
@@ -59,7 +59,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ABOUT_LEGAL_SETTINGS;
}
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 540c93f..4f7c53a 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -306,7 +306,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.MASTER_CLEAR;
}
}
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 393b76a..2f466aa 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -177,7 +177,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.MASTER_CLEAR_CONFIRM;
}
}
diff --git a/src/com/android/settings/OptionsMenuFragment.java b/src/com/android/settings/OptionsMenuFragment.java
index 2d05c96..d1e3db2 100644
--- a/src/com/android/settings/OptionsMenuFragment.java
+++ b/src/com/android/settings/OptionsMenuFragment.java
@@ -17,6 +17,8 @@
import android.os.Bundle;
+import com.android.settings.core.InstrumentedFragment;
+
/**
* Base class for a fragment that has the options menu.
* SettingsPreferenceFragment automatically sets this, but some activities do not use
diff --git a/src/com/android/settings/PinnedHeaderListFragment.java b/src/com/android/settings/PinnedHeaderListFragment.java
deleted file mode 100644
index 2ef5f02..0000000
--- a/src/com/android/settings/PinnedHeaderListFragment.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.ListFragment;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * A ListFragment with a pinned header
- */
-public class PinnedHeaderListFragment extends ListFragment {
-
- public PinnedHeaderListFragment() {
- super();
- }
-
- /**
- * Set the pinned header view. This can only be done when the ListView is already created.
- *
- * @param pinnedHeaderView the view to be used for the pinned header view.
- */
- public void setPinnedHeaderView(View pinnedHeaderView) {
- ((ViewGroup) getListView().getParent()).addView(pinnedHeaderView, 0);
- }
-
- /**
- * Clear the pinned header view. This can only be done when the ListView is already created.
- */
- public void clearPinnedHeaderView() {
- ((ViewGroup) getListView().getParent()).removeViewAt(0);
- }
-}
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 396e5fa..a55e81a 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -71,7 +71,7 @@
private boolean mEnabled;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.PRIVACY;
}
diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index 35242bc..ae5dd8b 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -41,6 +41,7 @@
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
+import com.android.settings.core.InstrumentedFragment;
public class ProxySelector extends InstrumentedFragment implements DialogCreatable {
private static final String TAG = "ProxySelector";
@@ -272,7 +273,7 @@
};
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.PROXY_SELECTOR;
}
}
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index a2acc37..8642708 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -207,7 +207,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.RESET_NETWORK;
}
}
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index ece64b4..032972d 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -149,7 +149,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.RESET_NETWORK_CONFIRM;
}
}
diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java
index fb28dfb..24c2b1c 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java
@@ -55,7 +55,7 @@
private LockPatternUtils mLockPatternUtils;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SCREEN_PINNING;
}
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index d96f459..300f316 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -153,7 +153,7 @@
private String mCurrentProfilePassword;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SECURITY;
}
@@ -1011,7 +1011,7 @@
private DevicePolicyManager mDPM;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SECURITY;
}
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index a79045a..cc87c05 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -45,6 +45,7 @@
import android.widget.Button;
import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settingslib.HelpUtils;
import java.util.UUID;
diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java
index 264db52..0286da7 100644
--- a/src/com/android/settings/TestingSettings.java
+++ b/src/com/android/settings/TestingSettings.java
@@ -39,7 +39,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.TESTING;
}
}
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index be73aab..f33aa57 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -119,7 +119,7 @@
private Preference mDataSaverFooter;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.TETHER;
}
diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java
index e5b6425..9cc516c 100644
--- a/src/com/android/settings/TrustAgentSettings.java
+++ b/src/com/android/settings/TrustAgentSettings.java
@@ -70,7 +70,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.TRUST_AGENT;
}
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index f9efb97..4cefc74 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -91,7 +91,7 @@
private static final int REQUEST_CONFIRM_CREDENTIALS = 1;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.TRUSTED_CREDENTIALS;
}
diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java
index bbab0c5..8a75905 100644
--- a/src/com/android/settings/UserCredentialsSettings.java
+++ b/src/com/android/settings/UserCredentialsSettings.java
@@ -68,7 +68,7 @@
private ListView mListView;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.USER_CREDENTIALS;
}
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index bdeab92..7d6b5cb 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -37,13 +37,15 @@
import android.widget.SimpleCursorAdapter;
import android.widget.TextView;
+import com.android.internal.logging.MetricsProto;
+import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
import com.android.settings.inputmethod.UserDictionaryAddWordContents;
import com.android.settings.inputmethod.UserDictionarySettingsUtils;
+import com.android.settings.core.instrumentation.Instrumentable;
import java.util.Locale;
-public class UserDictionarySettings extends ListFragment {
- private static final String TAG = "UserDictionarySettings";
+public class UserDictionarySettings extends ListFragment implements Instrumentable {
private static final String[] QUERY_PROJECTION = {
UserDictionary.Words._ID, UserDictionary.Words.WORD, UserDictionary.Words.SHORTCUT
@@ -67,11 +69,18 @@
private static final int OPTIONS_MENU_ADD = Menu.FIRST;
- private Cursor mCursor;
+ private final VisibilityLoggerMixin mVisibilityLoggerMixin =
+ new VisibilityLoggerMixin(this);
+ private Cursor mCursor;
protected String mLocale;
@Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.USER_DICTIONARY_SETTINGS;
+ }
+
+ @Override
public View onCreateView(
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(
@@ -116,6 +125,12 @@
UserDictionarySettingsUtils.getLocaleDisplayName(getActivity(), mLocale));
}
+ @Override
+ public void onResume() {
+ super.onResume();
+ mVisibilityLoggerMixin.onResume(getActivity());
+ }
+
private Cursor createCursor(final String locale) {
// Locale can be any of:
// - The string representation of a locale, as returned by Locale#toString()
@@ -174,6 +189,12 @@
return false;
}
+ @Override
+ public void onPause() {
+ super.onPause();
+ mVisibilityLoggerMixin.onPause(getActivity());
+ }
+
/**
* Add or edit a word. If editingWord is null, it's an add; otherwise, it's an edit.
* @param editingWord the word to edit, or null if it's an add.
diff --git a/src/com/android/settings/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java
index d7ae5ef..25e6e09 100644
--- a/src/com/android/settings/WallpaperTypeSettings.java
+++ b/src/com/android/settings/WallpaperTypeSettings.java
@@ -36,7 +36,7 @@
public class WallpaperTypeSettings extends SettingsPreferenceFragment implements Indexable {
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.WALLPAPER_TYPE;
}
diff --git a/src/com/android/settings/WebViewImplementation.java b/src/com/android/settings/WebViewImplementation.java
index c949a39..49e0eec 100644
--- a/src/com/android/settings/WebViewImplementation.java
+++ b/src/com/android/settings/WebViewImplementation.java
@@ -28,6 +28,7 @@
import android.webkit.IWebViewUpdateService;
import android.webkit.WebViewProviderInfo;
import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.settings.core.InstrumentedActivity;
import java.util.ArrayList;
@@ -97,7 +98,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.WEBVIEW_IMPLEMENTATION;
}
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 7484b84..08bd3da 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -191,7 +191,7 @@
};
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.WIFI_CALLING;
}
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 7e3b8d8..4017068 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -207,7 +207,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.WIRELESS;
}
diff --git a/src/com/android/settings/ZonePicker.java b/src/com/android/settings/ZonePicker.java
index b375fa8..b91463f 100644
--- a/src/com/android/settings/ZonePicker.java
+++ b/src/com/android/settings/ZonePicker.java
@@ -31,6 +31,9 @@
import android.widget.ListView;
import android.widget.SimpleAdapter;
+import com.android.internal.logging.MetricsProto;
+import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
+import com.android.settings.core.instrumentation.Instrumentable;
import com.android.settingslib.datetime.ZoneGetter;
import java.util.Collections;
@@ -46,8 +49,7 @@
* the time zone. Pressing Back without choosing from the list will not
* result in a change in the time zone setting.
*/
-public class ZonePicker extends ListFragment {
- private static final String TAG = "ZonePicker";
+public class ZonePicker extends ListFragment implements Instrumentable {
public interface ZoneSelectionListener {
// You can add any argument if you really need it...
@@ -56,6 +58,7 @@
private static final int MENU_TIMEZONE = Menu.FIRST+1;
private static final int MENU_ALPHABETICAL = Menu.FIRST;
+ private final VisibilityLoggerMixin mVisibilityLoggerMixin = new VisibilityLoggerMixin(this);
private boolean mSortedByTimezone;
@@ -133,6 +136,11 @@
}
@Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.ZONE_PICKER;
+ }
+
+ @Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@@ -175,6 +183,12 @@
}
@Override
+ public void onResume() {
+ super.onResume();
+ mVisibilityLoggerMixin.onResume(getActivity());
+ }
+
+ @Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
@@ -225,6 +239,12 @@
}
}
+ @Override
+ public void onPause() {
+ super.onPause();
+ mVisibilityLoggerMixin.onPause(getActivity());
+ }
+
private static class MyComparator implements Comparator<Map<?, ?>> {
private String mSortingKey;
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index c2c7519..a6c443f 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -198,7 +198,7 @@
private DevicePolicyManager mDpm;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY;
}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
index ce07257..e2ae783 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
@@ -37,8 +37,6 @@
public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragment
implements Preference.OnPreferenceChangeListener {
- private static final String TAG = AccessibilitySettingsForSetupWizard.class.getSimpleName();
-
// Preferences.
private static final String DISPLAY_MAGNIFICATION_PREFERENCE =
"screen_magnification_preference";
@@ -50,7 +48,7 @@
private Preference mScreenReaderPreference;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SUW_ACCESSIBILITY;
}
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index db8a10b..b062617 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -97,7 +97,7 @@
private boolean mShowingCustom;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_CAPTION_PROPERTIES;
}
diff --git a/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java
index 6e90677..fec3d37 100644
--- a/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java
@@ -23,7 +23,7 @@
extends ToggleFontSizePreferenceFragment {
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SUW_ACCESSIBILITY_FONT_SIZE;
}
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index e37de68..a7254d5 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -78,7 +78,7 @@
private int mShownDialogId;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_SERVICE;
}
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index a1c8bc5..6b26376 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -100,7 +100,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_TOGGLE_AUTOCLICK;
}
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 6b4aece..48eb46c 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -37,7 +37,7 @@
private ListPreference mType;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_TOGGLE_DALTONIZER;
}
diff --git a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
index f246204..9cb04b6 100644
--- a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
@@ -73,7 +73,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_FONT_SIZE;
}
diff --git a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
index 23811bb..86c5bbb 100644
--- a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
@@ -45,7 +45,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
}
}
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index e6a8c1e..1b3f236 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -178,7 +178,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION;
}
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
index 135a78f..c424c1e 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
@@ -33,7 +33,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION;
}
diff --git a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
index 05e48d3..1ccae03 100644
--- a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
@@ -33,7 +33,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER;
}
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
index 51b75ab..c89e185 100644
--- a/src/com/android/settings/accounts/AccountSettings.java
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -134,7 +134,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ACCOUNT;
}
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index fc760e6..48bc1bc 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -145,7 +145,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ACCOUNTS_ACCOUNT_SYNC;
}
diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java
index 2e3280b..50171c1 100644
--- a/src/com/android/settings/accounts/ChooseAccountActivity.java
+++ b/src/com/android/settings/accounts/ChooseAccountActivity.java
@@ -93,7 +93,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY;
}
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 80d6bc1..d788ca8 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -88,7 +88,7 @@
private Account mFirstAccount;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ACCOUNTS_MANAGE_ACCOUNTS;
}
diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java
index 9c7ae39..0c98f73 100644
--- a/src/com/android/settings/accounts/ManagedProfileSettings.java
+++ b/src/com/android/settings/accounts/ManagedProfileSettings.java
@@ -118,7 +118,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsProto.MetricsEvent.ACCOUNTS_WORK_PROFILE_SETTINGS;
}
diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java
index ffa2236..b479404 100644
--- a/src/com/android/settings/applications/AdvancedAppSettings.java
+++ b/src/com/android/settings/applications/AdvancedAppSettings.java
@@ -77,7 +77,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_ADVANCED;
}
diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java
index 8f68721..5ebd0bd 100644
--- a/src/com/android/settings/applications/AppLaunchSettings.java
+++ b/src/com/android/settings/applications/AppLaunchSettings.java
@@ -212,7 +212,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_APP_LAUNCH;
}
}
diff --git a/src/com/android/settings/applications/AppOpsDetails.java b/src/com/android/settings/applications/AppOpsDetails.java
index 0a953c0..5e2e65a 100644
--- a/src/com/android/settings/applications/AppOpsDetails.java
+++ b/src/com/android/settings/applications/AppOpsDetails.java
@@ -39,7 +39,7 @@
import android.widget.TextView;
import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
@@ -180,7 +180,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APP_OPS_DETAILS;
}
diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
index 7a2881c..9e59019 100644
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -29,7 +29,7 @@
import android.view.ViewGroup;
import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
public class AppOpsSummary extends InstrumentedFragment {
@@ -52,7 +52,7 @@
int mCurPos;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APP_OPS_SUMMARY;
}
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 357ec1e..4d75152 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -604,7 +604,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_APP_STORAGE;
}
diff --git a/src/com/android/settings/applications/BackgroundCheckSummary.java b/src/com/android/settings/applications/BackgroundCheckSummary.java
index 553eab2..41f1149 100644
--- a/src/com/android/settings/applications/BackgroundCheckSummary.java
+++ b/src/com/android/settings/applications/BackgroundCheckSummary.java
@@ -16,21 +16,15 @@
package com.android.settings.applications;
-import android.app.Fragment;
-import android.app.FragmentManager;
import android.app.FragmentTransaction;
-import android.content.res.TypedArray;
import android.os.Bundle;
import android.preference.PreferenceFrameLayout;
-import android.support.v13.app.FragmentPagerAdapter;
-import android.support.v4.view.PagerTabStrip;
-import android.support.v4.view.ViewPager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
public class BackgroundCheckSummary extends InstrumentedFragment {
@@ -38,7 +32,7 @@
private LayoutInflater mInflater;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.BACKGROUND_CHECK_SUMMARY;
}
diff --git a/src/com/android/settings/applications/ConfirmConvertToFbe.java b/src/com/android/settings/applications/ConfirmConvertToFbe.java
index 76dcabc..7048c2f 100644
--- a/src/com/android/settings/applications/ConfirmConvertToFbe.java
+++ b/src/com/android/settings/applications/ConfirmConvertToFbe.java
@@ -49,7 +49,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.CONVERT_FBE_CONFIRM;
}
}
diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java
index c1e6576..6399612 100644
--- a/src/com/android/settings/applications/ConvertToFbe.java
+++ b/src/com/android/settings/applications/ConvertToFbe.java
@@ -84,7 +84,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.CONVERT_FBE;
}
}
diff --git a/src/com/android/settings/applications/DrawOverlayDetails.java b/src/com/android/settings/applications/DrawOverlayDetails.java
index 5e3be1a..ade2923 100644
--- a/src/com/android/settings/applications/DrawOverlayDetails.java
+++ b/src/com/android/settings/applications/DrawOverlayDetails.java
@@ -157,7 +157,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
}
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 1cf55a4..e81ff0b 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -326,7 +326,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_INSTALLED_APP_DETAILS;
}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index dae5d7a..8589a07 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -54,7 +54,7 @@
import android.widget.Spinner;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AppHeader;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.Settings.AllApplicationsActivity;
import com.android.settings.Settings.DomainsURLsAppListActivity;
@@ -409,7 +409,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
switch (mListType) {
case LIST_TYPE_MAIN:
return MetricsEvent.MANAGE_APPLICATIONS;
diff --git a/src/com/android/settings/applications/ManageAssist.java b/src/com/android/settings/applications/ManageAssist.java
index 9947aa2..924bad9 100644
--- a/src/com/android/settings/applications/ManageAssist.java
+++ b/src/com/android/settings/applications/ManageAssist.java
@@ -74,7 +74,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_MANAGE_ASSIST;
}
diff --git a/src/com/android/settings/applications/PremiumSmsAccess.java b/src/com/android/settings/applications/PremiumSmsAccess.java
index c4bb1a8..4fe2649 100644
--- a/src/com/android/settings/applications/PremiumSmsAccess.java
+++ b/src/com/android/settings/applications/PremiumSmsAccess.java
@@ -18,7 +18,6 @@
import android.app.Application;
import android.content.Context;
import android.os.Bundle;
-import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.DropDownPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
@@ -28,7 +27,6 @@
import com.android.internal.logging.MetricsProto;
import com.android.internal.telephony.SmsUsageMonitor;
import com.android.settings.DividerPreference;
-import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.applications.AppStateBaseBridge.Callback;
import com.android.settings.applications.AppStateSmsPremBridge.SmsState;
@@ -76,7 +74,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsProto.MetricsEvent.PREMIUM_SMS_ACCESS;
}
diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java
index d538e29..bc65a7f 100644
--- a/src/com/android/settings/applications/ProcessStatsDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -125,7 +125,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_PROCESS_STATS_DETAIL;
}
diff --git a/src/com/android/settings/applications/ProcessStatsMemDetail.java b/src/com/android/settings/applications/ProcessStatsMemDetail.java
index 6c7b90a..30babd2 100644
--- a/src/com/android/settings/applications/ProcessStatsMemDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsMemDetail.java
@@ -26,7 +26,7 @@
import com.android.internal.app.procstats.ProcessStats;
import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
import static com.android.settings.Utils.prepareCustomPreferencesList;
@@ -86,7 +86,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_PROCESS_STATS_MEM_DETAIL;
}
diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java
index 01dbf09..9827f1f 100644
--- a/src/com/android/settings/applications/ProcessStatsSummary.java
+++ b/src/com/android/settings/applications/ProcessStatsSummary.java
@@ -98,7 +98,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.PROCESS_STATS_SUMMARY;
}
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index fd0d7a7..724d832 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -91,7 +91,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_PROCESS_STATS_UI;
}
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index baf9457..bfd275f 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -33,7 +33,7 @@
import android.widget.TextView;
import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -534,7 +534,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.RUNNING_SERVICE_DETAILS;
}
diff --git a/src/com/android/settings/applications/RunningServices.java b/src/com/android/settings/applications/RunningServices.java
index f50f3ad..21f2354 100644
--- a/src/com/android/settings/applications/RunningServices.java
+++ b/src/com/android/settings/applications/RunningServices.java
@@ -108,7 +108,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.RUNNING_SERVICES;
}
diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java
index 812c8c3..1b0b7da 100644
--- a/src/com/android/settings/applications/SpecialAccessSettings.java
+++ b/src/com/android/settings/applications/SpecialAccessSettings.java
@@ -27,7 +27,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SPECIAL_ACCESS;
}
}
diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java
index ffe99ed..38676ac 100644
--- a/src/com/android/settings/applications/UsageAccessDetails.java
+++ b/src/com/android/settings/applications/UsageAccessDetails.java
@@ -162,7 +162,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_USAGE_ACCESS_DETAIL;
}
diff --git a/src/com/android/settings/applications/VrListenerSettings.java b/src/com/android/settings/applications/VrListenerSettings.java
index 571e85d..35c30d6 100644
--- a/src/com/android/settings/applications/VrListenerSettings.java
+++ b/src/com/android/settings/applications/VrListenerSettings.java
@@ -45,7 +45,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.VR_MANAGE_LISTENERS;
}
}
diff --git a/src/com/android/settings/applications/WriteSettingsDetails.java b/src/com/android/settings/applications/WriteSettingsDetails.java
index d310d2b..f11ea2d 100644
--- a/src/com/android/settings/applications/WriteSettingsDetails.java
+++ b/src/com/android/settings/applications/WriteSettingsDetails.java
@@ -153,7 +153,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
}
diff --git a/src/com/android/settings/backup/ToggleBackupSettingFragment.java b/src/com/android/settings/backup/ToggleBackupSettingFragment.java
index ff409c5..ffa9e3c 100644
--- a/src/com/android/settings/backup/ToggleBackupSettingFragment.java
+++ b/src/com/android/settings/backup/ToggleBackupSettingFragment.java
@@ -192,7 +192,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.PRIVACY;
}
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 71ebcb5..99a2700 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -133,7 +133,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.BLUETOOTH;
}
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 09481ce..3fbd7bd 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -85,7 +85,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.BLUETOOTH_DEVICE_PICKER;
}
diff --git a/src/com/android/settings/core/InstrumentedActivity.java b/src/com/android/settings/core/InstrumentedActivity.java
new file mode 100644
index 0000000..02808be
--- /dev/null
+++ b/src/com/android/settings/core/InstrumentedActivity.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.core;
+
+import android.app.Activity;
+
+import com.android.settings.core.instrumentation.Instrumentable;
+import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
+
+/**
+ * Instrumented activity that logs visibility state.
+ */
+public abstract class InstrumentedActivity extends Activity implements Instrumentable {
+
+ private final VisibilityLoggerMixin mVisibilityLoggerMixin = new VisibilityLoggerMixin(this);
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ mVisibilityLoggerMixin.onResume(this);
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ mVisibilityLoggerMixin.onPause(this);
+ }
+}
diff --git a/src/com/android/settings/core/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java
new file mode 100644
index 0000000..1efbdcf
--- /dev/null
+++ b/src/com/android/settings/core/InstrumentedFragment.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.core;
+
+import android.os.Bundle;
+import android.support.v14.preference.PreferenceFragment;
+
+import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
+import com.android.settings.core.instrumentation.Instrumentable;
+
+/**
+ * Instrumented fragment that logs visibility state.
+ */
+public abstract class InstrumentedFragment extends PreferenceFragment implements Instrumentable {
+
+ private final VisibilityLoggerMixin mVisibilityLoggerMixin = new VisibilityLoggerMixin(this);
+
+ @Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ mVisibilityLoggerMixin.onResume(getActivity());
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ mVisibilityLoggerMixin.onPause(getActivity());
+ }
+}
diff --git a/src/com/android/settings/core/instrumentation/EventLogWriter.java b/src/com/android/settings/core/instrumentation/EventLogWriter.java
new file mode 100644
index 0000000..1ec5b94
--- /dev/null
+++ b/src/com/android/settings/core/instrumentation/EventLogWriter.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.core.instrumentation;
+
+import android.content.Context;
+
+import com.android.internal.logging.MetricsLogger;
+
+/**
+ * Pass-through Metrics logger for {@link MetricsLogger}.
+ */
+public class EventLogWriter {
+
+ public void visible(Context context, int category) {
+ MetricsLogger.visible(context, category);
+ }
+
+ public void hidden(Context context, int category) {
+ MetricsLogger.hidden(context, category);
+ }
+
+ public void action(Context context, int category) {
+ MetricsLogger.action(context, category, "");
+ }
+
+ public void action(Context context, int category, int value) {
+ MetricsLogger.action(context, category, Integer.toString(value));
+ }
+
+ public void action(Context context, int category, boolean value) {
+ MetricsLogger.action(context, category, Boolean.toString(value));
+ }
+
+ public void action(Context context, int category, String pkg) {
+ MetricsLogger.action(context, category, pkg);
+ }
+
+ public void count(Context context, String name, int value) {
+ MetricsLogger.count(context, name, value);
+ }
+
+ public void histogram(Context context, String name, int bucket) {
+ MetricsLogger.histogram(context, name, bucket);
+ }
+}
diff --git a/src/com/android/settings/core/instrumentation/Instrumentable.java b/src/com/android/settings/core/instrumentation/Instrumentable.java
new file mode 100644
index 0000000..bd0bdf4
--- /dev/null
+++ b/src/com/android/settings/core/instrumentation/Instrumentable.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.core.instrumentation;
+
+public interface Instrumentable {
+
+ /**
+ * Instrumented name for a view as defined in
+ * {@link com.android.internal.logging.MetricsProto.MetricsEvent}.
+ */
+ int getMetricsCategory();
+}
diff --git a/src/com/android/settings/core/instrumentation/MetricsFactory.java b/src/com/android/settings/core/instrumentation/MetricsFactory.java
new file mode 100644
index 0000000..3f315df
--- /dev/null
+++ b/src/com/android/settings/core/instrumentation/MetricsFactory.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.core.instrumentation;
+
+public class MetricsFactory {
+
+ private static MetricsFactory sInstance;
+
+ private EventLogWriter mLogger;
+
+ public static MetricsFactory get() {
+ if (sInstance == null) {
+ sInstance = new MetricsFactory();
+ }
+ return sInstance;
+ }
+
+ public EventLogWriter getLogger() {
+ if (mLogger == null) {
+ mLogger = new EventLogWriter();
+ }
+ return mLogger;
+ }
+}
diff --git a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
new file mode 100644
index 0000000..4e52478
--- /dev/null
+++ b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.core.instrumentation;
+
+import android.content.Context;
+
+/**
+ * Logs visibility change of a fragment.
+ */
+public class VisibilityLoggerMixin {
+
+ private final Instrumentable mInstrumentable;
+ private final EventLogWriter mEventLogWriter;
+
+ public VisibilityLoggerMixin(Instrumentable instrumentable) {
+ this(instrumentable, MetricsFactory.get().getLogger());
+ }
+
+ public VisibilityLoggerMixin(Instrumentable instrumentable, EventLogWriter eventLogWriter) {
+ mInstrumentable = instrumentable;
+ mEventLogWriter = eventLogWriter;
+ }
+
+ public void onResume(Context context) {
+ mEventLogWriter.visible(context, mInstrumentable.getMetricsCategory());
+ }
+
+ public void onPause(Context context) {
+ mEventLogWriter.hidden(context, mInstrumentable.getMetricsCategory());
+ }
+}
diff --git a/src/com/android/settings/dashboard/DashboardContainerFragment.java b/src/com/android/settings/dashboard/DashboardContainerFragment.java
index cd42f7d..2b5e67e 100644
--- a/src/com/android/settings/dashboard/DashboardContainerFragment.java
+++ b/src/com/android/settings/dashboard/DashboardContainerFragment.java
@@ -29,7 +29,7 @@
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.overlay.FeatureFactory;
@@ -55,7 +55,7 @@
private DashboardViewPagerAdapter mPagerAdapter;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DASHBOARD_CONTAINER;
}
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 77b1b11..c9f5af6 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -28,7 +28,7 @@
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.SettingsActivity;
@@ -36,7 +36,6 @@
import com.android.settings.dashboard.conditional.ConditionAdapterUtils;
import com.android.settings.dashboard.conditional.ConditionManager;
import com.android.settings.dashboard.conditional.FocusRecyclerView;
-import com.android.settingslib.HelpUtils;
import com.android.settingslib.SuggestionParser;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.SettingsDrawerActivity;
@@ -78,7 +77,7 @@
private HashSet<String> mSuggestionsHiddenLogged;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DASHBOARD_SUMMARY;
}
diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java
index 38f17e3..087ecad 100644
--- a/src/com/android/settings/dashboard/SearchResultsSummary.java
+++ b/src/com/android/settings/dashboard/SearchResultsSummary.java
@@ -39,7 +39,7 @@
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
@@ -250,7 +250,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DASHBOARD_SEARCH_RESULTS;
}
diff --git a/src/com/android/settings/dashboard/SupportFragment.java b/src/com/android/settings/dashboard/SupportFragment.java
index 58f79a8..9773a50 100644
--- a/src/com/android/settings/dashboard/SupportFragment.java
+++ b/src/com/android/settings/dashboard/SupportFragment.java
@@ -36,7 +36,7 @@
import android.view.ViewGroup;
import com.android.internal.logging.MetricsProto;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.overlay.SupportFeatureProvider;
@@ -77,7 +77,7 @@
private ConnectivityManager mConnectivityManager;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SUPPORT_FRAGMENT;
}
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 84bac17..afe186b 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -357,7 +357,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.APP_DATA_USAGE;
}
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 10a0ac072..01e43f3 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -137,7 +137,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.BILLING_CYCLE;
}
diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java
index ffd1fa5..90aab7b 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.java
+++ b/src/com/android/settings/datausage/DataSaverSummary.java
@@ -100,7 +100,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DATA_SAVER_SUMMARY;
}
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index 7ac81f5..abe2a9f 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -109,7 +109,7 @@
private View mHeader;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DATA_USAGE_LIST;
}
diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
index eb43d47..12e7b87 100644
--- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
@@ -61,7 +61,7 @@
private Preference mWifiDisabled;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NET_DATA_USAGE_METERED;
}
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index 6b3b874..10e6bc5 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -257,7 +257,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DATA_USAGE_SUMMARY;
}
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
index cab4551..2977eea 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
@@ -204,7 +204,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DATA_USAGE_UNRESTRICTED_ACCESS;
}
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index 9558d9e..0946f31 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -169,7 +169,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.STORAGE_MANAGER_SETTINGS;
}
diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java
index dc6d3d7..960596c 100644
--- a/src/com/android/settings/deviceinfo/ImeiInformation.java
+++ b/src/com/android/settings/deviceinfo/ImeiInformation.java
@@ -170,7 +170,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DEVICEINFO_IMEI_INFORMATION;
}
}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java
index 9828f8c..2d408de 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java
@@ -43,7 +43,7 @@
private VolumeRecord mRecord;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DEVICEINFO_STORAGE;
}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
index 7620b09..de3e3d3 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
@@ -30,7 +30,7 @@
import android.widget.TextView;
import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
public class PrivateVolumeFormat extends InstrumentedFragment {
@@ -38,7 +38,7 @@
private DiskInfo mDisk;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DEVICEINFO_STORAGE;
}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 2a84a93..815e559 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -145,7 +145,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DEVICEINFO_STORAGE;
}
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java b/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java
index 7032a1d..40b09e7 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java
@@ -38,7 +38,7 @@
private DiskInfo mDisk;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DEVICEINFO_STORAGE;
}
diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
index eee7673..2973ecd 100644
--- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
@@ -76,7 +76,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DEVICEINFO_STORAGE;
}
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index ad77083..469413a 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -196,7 +196,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DEVICEINFO_SIM_STATUS;
}
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 1ba3978..14173e8 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -213,7 +213,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DEVICEINFO_STATUS;
}
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index ee68311..05f5ef0 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -92,7 +92,7 @@
private static long sTotalInternalStorage;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DEVICEINFO_STORAGE;
}
diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java
index 7eb1217..98352a7 100644
--- a/src/com/android/settings/display/NightDisplaySettings.java
+++ b/src/com/android/settings/display/NightDisplaySettings.java
@@ -200,7 +200,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NIGHT_DISPLAY_SETTINGS;
}
}
diff --git a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java
index 8892f4d..aa223fa 100644
--- a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java
@@ -23,7 +23,7 @@
extends ScreenZoomSettings {
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SUW_ACCESSIBILITY_DISPLAY_SIZE;
}
diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java
index 541357a..af359f1 100644
--- a/src/com/android/settings/display/ScreenZoomSettings.java
+++ b/src/com/android/settings/display/ScreenZoomSettings.java
@@ -94,7 +94,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.DISPLAY_SCREEN_ZOOM;
}
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
index 2aef37b..65cc92e 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
@@ -27,7 +27,7 @@
import android.widget.TextView;
import com.android.settings.ChooseLockSettingsHelper;
-import com.android.settings.InstrumentedActivity;
+import com.android.settings.core.InstrumentedActivity;
import com.android.settings.R;
import com.android.setupwizardlib.GlifLayout;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index b414627..adc7a99 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -423,7 +423,7 @@
};
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_ENROLLING;
}
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
index dc2fe9e..33768c5 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -194,7 +194,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_FIND_SENSOR;
}
}
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
index 7c9a237..75557a0 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
@@ -69,7 +69,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_ENROLL_FINISH;
}
}
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index 23755fd..40b4b87 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -152,7 +152,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_ENROLL_INTRO;
}
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
index 6730327..9b574b6 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
@@ -27,7 +27,7 @@
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockSettingsHelper;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
/**
* Sidecar fragment to handle the state around fingerprint enrollment.
@@ -154,7 +154,7 @@
};
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_ENROLL_SIDECAR;
}
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java
index 6fd2d14..8662903 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -274,7 +274,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT;
}
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
index 8bd495e..7e95a9a 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
@@ -69,7 +69,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_ENROLLING_SETUP;
}
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
index baf4fcd..2ff3a1a 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -50,7 +50,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_FIND_SENSOR_SETUP;
}
}
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
index f6602f3..370e3fc 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
@@ -58,7 +58,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_ENROLL_FINISH_SETUP;
}
}
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
index e7f4cfe..68ee0b6 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -89,7 +89,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FINGERPRINT_ENROLL_INTRO_SETUP;
}
}
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
index e79f8ff..f71884c 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
@@ -119,7 +119,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FUELGAUGE_BATTERY_HISTORY_DETAIL;
}
}
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index e19f683..0108dd0 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -65,7 +65,7 @@
private PowerManager mPowerManager;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FUELGAUGE_BATTERY_SAVER;
}
diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java
index 0b63aa8..00556d2 100644
--- a/src/com/android/settings/fuelgauge/InactiveApps.java
+++ b/src/com/android/settings/fuelgauge/InactiveApps.java
@@ -37,7 +37,7 @@
private UsageStatsManager mUsageStats;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FUELGAUGE_INACTIVE_APPS;
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index f091f66..e306d31 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -359,7 +359,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FUELGAUGE_POWER_USAGE_DETAIL;
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 443b480..cc0e245 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -90,7 +90,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.FUELGAUGE_POWER_USAGE_SUMMARY;
}
diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java
index 8f028b6..3c6301c 100644
--- a/src/com/android/settings/gestures/GestureSettings.java
+++ b/src/com/android/settings/gestures/GestureSettings.java
@@ -141,7 +141,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SETTINGS_GESTURES;
}
diff --git a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
index d35f895..afa9ed2 100644
--- a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
@@ -85,7 +85,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.ENABLE_VIRTUAL_KEYBOARDS;
}
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index dbcd9ac..515a80f 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -108,7 +108,7 @@
private DevicePolicyManager mDpm;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.INPUTMETHOD_LANGUAGE;
}
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index a196ccf..d1454cc 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -54,7 +54,7 @@
private Collator mCollator;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.INPUTMETHOD_SUBTYPE_ENABLER;
}
diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
index 02c4014..1b51c3c 100644
--- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java
@@ -50,7 +50,7 @@
public static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier";
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.INPUTMETHOD_KEYBOARD;
}
diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java
index 0d4e173..2e43a57 100644
--- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java
@@ -71,7 +71,7 @@
public static final String EXTRA_INPUT_METHOD_SUBTYPE = "input_method_subtype";
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.INPUTMETHOD_KEYBOARD;
}
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index 0f263f2..bca656a 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -189,7 +189,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.PHYSICAL_KEYBOARDS;
}
diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
index de013e0..f431736 100644
--- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java
+++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
@@ -55,7 +55,7 @@
private TextServicesManager mTsm;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.INPUTMETHOD_SPELL_CHECKERS;
}
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
index 16a3476..b16c3db 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
@@ -27,7 +27,7 @@
import android.widget.ArrayAdapter;
import com.android.internal.logging.MetricsProto.MetricsEvent;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.inputmethod.UserDictionaryAddWordContents.LocaleRenderer;
@@ -110,7 +110,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.INPUTMETHOD_USER_DICTIONARY_ADD_WORD;
}
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
index ed5b116..28ff2a6 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -44,7 +44,7 @@
private String mLocale;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.INPUTMETHOD_USER_DICTIONARY;
}
diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
index 3b36de6..7175539 100644
--- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
@@ -66,7 +66,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.VIRTUAL_KEYBOARDS;
}
diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java
index 281afa0..07bbe21 100644
--- a/src/com/android/settings/localepicker/LocaleListEditor.java
+++ b/src/com/android/settings/localepicker/LocaleListEditor.java
@@ -58,7 +58,7 @@
private boolean mShowingRemoveDialog;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.USER_LOCALE_LIST;
}
diff --git a/src/com/android/settings/location/LocationMode.java b/src/com/android/settings/location/LocationMode.java
index b2669bc..6d89509 100644
--- a/src/com/android/settings/location/LocationMode.java
+++ b/src/com/android/settings/location/LocationMode.java
@@ -43,7 +43,7 @@
private RadioButtonPreference mSensorsOnly;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.LOCATION_MODE;
}
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 37a9173..f1fdea7 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -113,7 +113,7 @@
private UserManager mUm;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.LOCATION;
}
diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java
index 863651c..d4e133b 100644
--- a/src/com/android/settings/location/ScanningSettings.java
+++ b/src/com/android/settings/location/ScanningSettings.java
@@ -33,7 +33,7 @@
private static final String KEY_BLUETOOTH_SCAN_ALWAYS_AVAILABLE = "bluetooth_always_scanning";
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.LOCATION_SCANNING;
}
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index 31249e6..6a36bde 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -16,8 +16,6 @@
package com.android.settings.nfc;
-import android.app.ActionBar;
-import android.content.Context;
import android.nfc.NfcAdapter;
import android.os.Bundle;
import android.os.UserHandle;
@@ -31,7 +29,7 @@
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settingslib.HelpUtils;
-import com.android.settings.InstrumentedFragment;
+import com.android.settings.core.InstrumentedFragment;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.ShowAdminSupportDetailsDialog;
@@ -129,7 +127,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NFC_BEAM;
}
}
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index bd131ab..928534e 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -42,7 +42,7 @@
private PaymentBackend mPaymentBackend;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NFC_PAYMENT;
}
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index e7f15e5..2b8daeb 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -60,7 +60,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NOTIFICATION_APP_NOTIFICATION;
}
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index 1bb5530..3f53ec9 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -66,7 +66,7 @@
private int mProfileChallengeUserId;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.CONFIGURE_NOTIFICATION;
}
diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
index d81bc0e..78e90c8 100644
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java
@@ -60,7 +60,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NOTIFICATION_ACCESS;
}
diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java
index be6c63f..68dd8da 100644
--- a/src/com/android/settings/notification/NotificationStation.java
+++ b/src/com/android/settings/notification/NotificationStation.java
@@ -167,7 +167,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NOTIFICATION_STATION;
}
diff --git a/src/com/android/settings/notification/OtherSoundSettings.java b/src/com/android/settings/notification/OtherSoundSettings.java
index c538a7b..9e3e585 100644
--- a/src/com/android/settings/notification/OtherSoundSettings.java
+++ b/src/com/android/settings/notification/OtherSoundSettings.java
@@ -188,7 +188,7 @@
private Context mContext;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NOTIFICATION_OTHER_SOUND;
}
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index ab5d834..4e1475b 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -90,7 +90,7 @@
private int mUserId;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NOTIFICATION_REDACTION;
}
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index f06cf41..a80e31d 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -123,7 +123,7 @@
private RingtonePreference mRequestPreference;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SOUND;
}
diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java
index 638972e..b0e8e9b 100644
--- a/src/com/android/settings/notification/ZenAccessSettings.java
+++ b/src/com/android/settings/notification/ZenAccessSettings.java
@@ -61,7 +61,7 @@
private NotificationManager mNoMan;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NOTIFICATION_ZEN_MODE_ACCESS;
}
diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java
index 1fdba61..dbead5a 100644
--- a/src/com/android/settings/notification/ZenModeAutomationSettings.java
+++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java
@@ -182,7 +182,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NOTIFICATION_ZEN_MODE_AUTOMATION;
}
diff --git a/src/com/android/settings/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/ZenModeEventRuleSettings.java
index c8efdb9..3b261c0 100644
--- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java
+++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java
@@ -160,7 +160,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NOTIFICATION_ZEN_MODE_EVENT_RULE;
}
diff --git a/src/com/android/settings/notification/ZenModePrioritySettings.java b/src/com/android/settings/notification/ZenModePrioritySettings.java
index a61be96..4705d4d 100644
--- a/src/com/android/settings/notification/ZenModePrioritySettings.java
+++ b/src/com/android/settings/notification/ZenModePrioritySettings.java
@@ -181,7 +181,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NOTIFICATION_ZEN_MODE_PRIORITY;
}
diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
index 1c5027e..961d17a 100644
--- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
+++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
@@ -199,7 +199,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NOTIFICATION_ZEN_MODE_SCHEDULE_RULE;
}
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 8cca84f..f2d9daa 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -58,7 +58,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NOTIFICATION_ZEN_MODE;
}
diff --git a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
index 0a0acd1..35f3ab6 100644
--- a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
+++ b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
@@ -86,7 +86,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.NOTIFICATION_ZEN_MODE_VISUAL_INTERRUPTIONS;
}
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index dc7df52..fcc0176 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -67,7 +67,7 @@
private PrintJobId mPrintJobId;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.PRINT_JOB_SETTINGS;
}
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index d16f24d..716cc6f 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -124,7 +124,7 @@
private SearchView mSearchView;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.PRINT_SERVICE_SETTINGS;
}
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 98659c7..8700c7b 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -94,7 +94,7 @@
private Button mAddNewServiceButton;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.PRINT_SETTINGS;
}
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index ece3913..3a1bd75 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -80,7 +80,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.SIM;
}
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 8c34518..2a57ac2 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -177,7 +177,7 @@
};
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.TTS_TEXT_TO_SPEECH;
}
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index b12df9f..655a781 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -100,7 +100,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.TTS_ENGINE_SETTINGS;
}
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 63d688a..7c8c968 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -242,7 +242,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.USERS_APP_RESTRICTIONS;
}
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 2a71885..65f55cb 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -67,7 +67,7 @@
private Bundle mDefaultGuestRestrictions;
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.USER_DETAILS;
}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 018ce61..c55c5ce 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -187,7 +187,7 @@
};
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.USER;
}
diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index d69d619..e9dd4fd 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -154,7 +154,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.VPN;
}
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index afffc97..7be69f9 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -107,7 +107,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.VPN;
}
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 0d62871..02f63ae 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -115,7 +115,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.WFD_WIFI_DISPLAY;
}
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index 6f23b4f..f53f59a 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -48,7 +48,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.WIFI_ADVANCED;
}
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index aa79080..fadb9c5 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -242,7 +242,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.CONFIGURE_WIFI;
}
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index 20faeb0..ea92b7f 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -59,7 +59,7 @@
private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.WIFI_SAVED_ACCESS_POINTS;
}
diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java
index 6abf67d..2ac76ce5 100644
--- a/src/com/android/settings/wifi/WifiAPITest.java
+++ b/src/com/android/settings/wifi/WifiAPITest.java
@@ -85,7 +85,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.TESTING;
}
diff --git a/src/com/android/settings/wifi/WifiInfo.java b/src/com/android/settings/wifi/WifiInfo.java
index 373a587..56e81a0 100644
--- a/src/com/android/settings/wifi/WifiInfo.java
+++ b/src/com/android/settings/wifi/WifiInfo.java
@@ -35,7 +35,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.TESTING;
}
}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 1ce214b..37768ba 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -351,7 +351,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.WIFI;
}
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 25f99f1..ddf7dfe 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -491,7 +491,7 @@
}
@Override
- protected int getMetricsCategory() {
+ public int getMetricsCategory() {
return MetricsEvent.WIFI_P2P;
}