diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java index 6ffe33fc483..d0c9ca2d8cb 100644 --- a/src/com/android/settings/ApnEditor.java +++ b/src/com/android/settings/ApnEditor.java @@ -253,7 +253,7 @@ public class ApnEditor extends SettingsPreferenceFragment } @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 3dd772baf26..9865fb24298 100644 --- a/src/com/android/settings/ApnSettings.java +++ b/src/com/android/settings/ApnSettings.java @@ -149,7 +149,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements } @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 759cceacd25..f2713392774 100644 --- a/src/com/android/settings/ApplicationSettings.java +++ b/src/com/android/settings/ApplicationSettings.java @@ -44,7 +44,7 @@ public class ApplicationSettings extends SettingsPreferenceFragment { 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 66f4925a2f8..2c5daf1a319 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -123,7 +123,7 @@ public class ChooseLockGeneric extends SettingsActivity { 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 a017e73e6fc..1a820f27edd 100644 --- a/src/com/android/settings/ChooseLockPassword.java +++ b/src/com/android/settings/ChooseLockPassword.java @@ -50,6 +50,7 @@ import com.android.internal.logging.MetricsProto.MetricsEvent; 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 @@ public class ChooseLockPassword extends SettingsActivity { } @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 ebfca0ee24b..42a941a67ee 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -36,6 +36,7 @@ import com.android.internal.widget.LockPatternUtils.RequestThrottledException; 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 @@ public class ChooseLockPattern extends SettingsActivity { }; @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 4797012178f..f22d2b0d0c9 100644 --- a/src/com/android/settings/ConfirmLockPassword.java +++ b/src/com/android/settings/ConfirmLockPassword.java @@ -251,7 +251,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { } @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 34dad58f039..4e2364d4f0a 100644 --- a/src/com/android/settings/ConfirmLockPattern.java +++ b/src/com/android/settings/ConfirmLockPattern.java @@ -194,7 +194,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { } @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 25b92a6099b..8ab493e773e 100644 --- a/src/com/android/settings/CryptKeeperConfirm.java +++ b/src/com/android/settings/CryptKeeperConfirm.java @@ -35,6 +35,7 @@ import android.widget.Button; 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 @@ public class CryptKeeperConfirm extends InstrumentedFragment { 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 bef4cc0fb17..37846a31b84 100644 --- a/src/com/android/settings/CryptKeeperSettings.java +++ b/src/com/android/settings/CryptKeeperSettings.java @@ -36,6 +36,7 @@ import android.view.ViewGroup; 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 @@ public class CryptKeeperSettings extends InstrumentedFragment { } @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 94589f08387..5d5d54ea4cf 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -83,7 +83,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment 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 4e5da6ebec1..a8fed7d1edb 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -332,7 +332,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment } @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 054ad41d892..aef4138c79c 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.IntentFilter; 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.ImageView; 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.Collection; 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 { public DeviceAdminInfo info; @@ -103,6 +106,11 @@ public class DeviceAdminSettings extends ListFragment { } }; + @Override + public int getMetricsCategory() { + return MetricsProto.MetricsEvent.DEVICE_ADMIN_SETTINGS; + } + @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); @@ -126,9 +134,11 @@ public class DeviceAdminSettings extends ListFragment { @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 @@ public class DeviceAdminSettings extends ListFragment { @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 dd8064fb45d..98b3982e797 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -86,7 +86,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 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 f7b94433c25..d35c11b39a0 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -102,7 +102,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 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 33278981b6b..2a7c852b470 100644 --- a/src/com/android/settings/DreamSettings.java +++ b/src/com/android/settings/DreamSettings.java @@ -76,7 +76,7 @@ public class DreamSettings extends SettingsPreferenceFragment implements } @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 d34b456b05e..a26d0dcad9e 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -92,7 +92,7 @@ public class EncryptionInterstitial extends SettingsActivity { 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 28b5484f6bf..427e5246c6e 100644 --- a/src/com/android/settings/HomeSettings.java +++ b/src/com/android/settings/HomeSettings.java @@ -245,7 +245,7 @@ public class HomeSettings extends SettingsPreferenceFragment implements Indexabl } @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 9d7f10aa84d..a0486562af0 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -256,7 +256,7 @@ public class IccLockSettings extends SettingsPreferenceFragment } @Override - protected int getMetricsCategory() { + public int getMetricsCategory() { return MetricsEvent.ICC_LOCK; } diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java index d7323b91663..de6e54804dc 100644 --- a/src/com/android/settings/LegalSettings.java +++ b/src/com/android/settings/LegalSettings.java @@ -59,7 +59,7 @@ public class LegalSettings extends SettingsPreferenceFragment implements Indexab } @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 540c93f28ed..4f7c53a0aa8 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -306,7 +306,7 @@ public class MasterClear extends OptionsMenuFragment { } @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 393b76a31f4..2f466aa74c0 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -177,7 +177,7 @@ public class MasterClearConfirm extends OptionsMenuFragment { } @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 2d05c969591..d1e3db2cb99 100644 --- a/src/com/android/settings/OptionsMenuFragment.java +++ b/src/com/android/settings/OptionsMenuFragment.java @@ -17,6 +17,8 @@ package com.android.settings; 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 2ef5f02dabb..00000000000 --- 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 396e5fa207f..a55e81aa72e 100644 --- a/src/com/android/settings/PrivacySettings.java +++ b/src/com/android/settings/PrivacySettings.java @@ -71,7 +71,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index 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 35242bc89d6..ae5dd8b98f3 100644 --- a/src/com/android/settings/ProxySelector.java +++ b/src/com/android/settings/ProxySelector.java @@ -41,6 +41,7 @@ import android.widget.TextView; 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 @@ public class ProxySelector extends InstrumentedFragment implements DialogCreatab }; @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 a2acc37222e..8642708d178 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -207,7 +207,7 @@ public class ResetNetwork extends OptionsMenuFragment { } @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 ece64b43101..032972d3f20 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -149,7 +149,7 @@ public class ResetNetworkConfirm extends OptionsMenuFragment { } @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 fb28dfbfc15..24c2b1c368e 100644 --- a/src/com/android/settings/ScreenPinningSettings.java +++ b/src/com/android/settings/ScreenPinningSettings.java @@ -55,7 +55,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment 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 d96f4594daf..300f3163e2a 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -153,7 +153,7 @@ public class SecuritySettings extends SettingsPreferenceFragment private String mCurrentProfilePassword; @Override - protected int getMetricsCategory() { + public int getMetricsCategory() { return MetricsEvent.SECURITY; } @@ -1011,7 +1011,7 @@ public class SecuritySettings extends SettingsPreferenceFragment 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 a79045a7e5b..cc87c056518 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -45,6 +45,7 @@ import android.view.ViewGroup; 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 264db52bf8c..0286da7c44f 100644 --- a/src/com/android/settings/TestingSettings.java +++ b/src/com/android/settings/TestingSettings.java @@ -39,7 +39,7 @@ public class TestingSettings extends SettingsPreferenceFragment { } @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 be73aab365f..f33aa572c51 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -119,7 +119,7 @@ public class TetherSettings extends RestrictedSettingsFragment 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 e5b6425fd91..9cc516c4d42 100644 --- a/src/com/android/settings/TrustAgentSettings.java +++ b/src/com/android/settings/TrustAgentSettings.java @@ -70,7 +70,7 @@ public class TrustAgentSettings extends SettingsPreferenceFragment implements } @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 f9efb977d75..4cefc74674f 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -91,7 +91,7 @@ public class TrustedCredentialsSettings extends OptionsMenuFragment 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 bbab0c53b21..8a75905a821 100644 --- a/src/com/android/settings/UserCredentialsSettings.java +++ b/src/com/android/settings/UserCredentialsSettings.java @@ -68,7 +68,7 @@ public class UserCredentialsSettings extends OptionsMenuFragment implements OnIt 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 bdeab922f3a..7d6b5cbfc40 100644 --- a/src/com/android/settings/UserDictionarySettings.java +++ b/src/com/android/settings/UserDictionarySettings.java @@ -37,13 +37,15 @@ import android.widget.SectionIndexer; 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,10 +69,17 @@ public class UserDictionarySettings extends ListFragment { 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) { @@ -116,6 +125,12 @@ public class UserDictionarySettings extends ListFragment { 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 @@ public class UserDictionarySettings extends ListFragment { 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 d7ae5ef1bc9..25e6e09589a 100644 --- a/src/com/android/settings/WallpaperTypeSettings.java +++ b/src/com/android/settings/WallpaperTypeSettings.java @@ -36,7 +36,7 @@ import java.util.List; 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 c949a39e35c..49e0eecf2cb 100644 --- a/src/com/android/settings/WebViewImplementation.java +++ b/src/com/android/settings/WebViewImplementation.java @@ -28,6 +28,7 @@ import android.util.Log; 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 @@ public class WebViewImplementation extends InstrumentedActivity implements } @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 7484b84804c..08bd3da55b3 100644 --- a/src/com/android/settings/WifiCallingSettings.java +++ b/src/com/android/settings/WifiCallingSettings.java @@ -191,7 +191,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment }; @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 7e3b8d8aed7..4017068990b 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -207,7 +207,7 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde } @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 b375fa84449..b91463fbff8 100644 --- a/src/com/android/settings/ZonePicker.java +++ b/src/com/android/settings/ZonePicker.java @@ -31,6 +31,9 @@ import android.view.ViewGroup; 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 @@ import java.util.TimeZone; * 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 @@ public class ZonePicker extends ListFragment { 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; @@ -132,6 +135,11 @@ public class ZonePicker extends ListFragment { return TimeZone.getTimeZone((String)((Map)item).get(ZoneGetter.KEY_ID)); } + @Override + public int getMetricsCategory() { + return MetricsProto.MetricsEvent.ZONE_PICKER; + } + @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); @@ -174,6 +182,12 @@ public class ZonePicker extends ListFragment { } } + @Override + public void onResume() { + super.onResume(); + mVisibilityLoggerMixin.onResume(getActivity()); + } + @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { @@ -225,6 +239,12 @@ public class ZonePicker extends ListFragment { } } + @Override + public void onPause() { + super.onPause(); + mVisibilityLoggerMixin.onPause(getActivity()); + } + private static class MyComparator implements Comparator> { private String mSortingKey; diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index c2c75190a97..a6c443f50d3 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -198,7 +198,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 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 ce072578a24..e2ae783d580 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -37,8 +37,6 @@ import java.util.List; 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 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm 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 db8a10b1e95..b062617f119 100644 --- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java +++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java @@ -97,7 +97,7 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment 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 6e906774fe7..fec3d375ef2 100644 --- a/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java @@ -23,7 +23,7 @@ public class FontSizePreferenceFragmentForSetupWizard 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 e37de68206d..a7254d5cd2a 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -78,7 +78,7 @@ public class ToggleAccessibilityServicePreferenceFragment 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 a1c8bc5656a..6b26376d039 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -100,7 +100,7 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr } @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 6b4aece40d3..48eb46cfe73 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -37,7 +37,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF 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 f246204a2b4..9cb04b6e951 100644 --- a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java @@ -73,7 +73,7 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr } @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 23811bbcbeb..86c5bbb407e 100644 --- a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java @@ -45,7 +45,7 @@ public class ToggleGlobalGesturePreferenceFragment } @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 e6a8c1e829c..1b3f2363551 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -178,7 +178,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends ToggleFeaturePr } @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 135a78fa789..c424c1ecf39 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java @@ -33,7 +33,7 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard } @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 05e48d38379..1ccae03f368 100644 --- a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java @@ -33,7 +33,7 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard } @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 51b75ab6dfb..c89e185e7b1 100644 --- a/src/com/android/settings/accounts/AccountSettings.java +++ b/src/com/android/settings/accounts/AccountSettings.java @@ -134,7 +134,7 @@ public class AccountSettings extends SettingsPreferenceFragment } @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 fc760e66506..48bc1bc127c 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -145,7 +145,7 @@ public class AccountSyncSettings extends AccountPreferenceBase { } @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 2e3280bb133..50171c1ca73 100644 --- a/src/com/android/settings/accounts/ChooseAccountActivity.java +++ b/src/com/android/settings/accounts/ChooseAccountActivity.java @@ -93,7 +93,7 @@ public class ChooseAccountActivity extends SettingsPreferenceFragment { } @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 80d6bc14593..d788ca8256c 100644 --- a/src/com/android/settings/accounts/ManageAccountsSettings.java +++ b/src/com/android/settings/accounts/ManageAccountsSettings.java @@ -88,7 +88,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase 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 9c7ae3996da..0c98f73a678 100644 --- a/src/com/android/settings/accounts/ManagedProfileSettings.java +++ b/src/com/android/settings/accounts/ManagedProfileSettings.java @@ -118,7 +118,7 @@ public class ManagedProfileSettings extends SettingsPreferenceFragment } @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 ffa22368743..b479404cb7d 100644 --- a/src/com/android/settings/applications/AdvancedAppSettings.java +++ b/src/com/android/settings/applications/AdvancedAppSettings.java @@ -77,7 +77,7 @@ public class AdvancedAppSettings extends SettingsPreferenceFragment implements } @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 8f687217e56..5ebd0bd6564 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -212,7 +212,7 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe } @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 0a953c00532..5e2e65ab5e7 100644 --- a/src/com/android/settings/applications/AppOpsDetails.java +++ b/src/com/android/settings/applications/AppOpsDetails.java @@ -39,7 +39,7 @@ import android.widget.Switch; 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 @@ public class AppOpsDetails extends InstrumentedFragment { } @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 7a2881cac77..9e59019eae7 100644 --- a/src/com/android/settings/applications/AppOpsSummary.java +++ b/src/com/android/settings/applications/AppOpsSummary.java @@ -29,7 +29,7 @@ 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 AppOpsSummary extends InstrumentedFragment { @@ -52,7 +52,7 @@ public class AppOpsSummary extends InstrumentedFragment { 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 357ec1e03a0..4d75152e477 100644 --- a/src/com/android/settings/applications/AppStorageSettings.java +++ b/src/com/android/settings/applications/AppStorageSettings.java @@ -604,7 +604,7 @@ public class AppStorageSettings extends AppInfoWithHeader } @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 553eab258bf..41f11491259 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 @@ public class BackgroundCheckSummary extends InstrumentedFragment { 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 76dcabcee1c..7048c2f9709 100644 --- a/src/com/android/settings/applications/ConfirmConvertToFbe.java +++ b/src/com/android/settings/applications/ConfirmConvertToFbe.java @@ -49,7 +49,7 @@ public class ConfirmConvertToFbe extends SettingsPreferenceFragment { } @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 c1e6576e3c7..6399612d56d 100644 --- a/src/com/android/settings/applications/ConvertToFbe.java +++ b/src/com/android/settings/applications/ConvertToFbe.java @@ -84,7 +84,7 @@ public class ConvertToFbe extends SettingsPreferenceFragment { } @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 5e3be1aa0b7..ade29238b42 100644 --- a/src/com/android/settings/applications/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/DrawOverlayDetails.java @@ -157,7 +157,7 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc } @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 1cf55a40a09..e81ff0b976d 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -326,7 +326,7 @@ public class InstalledAppDetails extends AppInfoBase } @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 dae5d7a6fd4..8589a07980e 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -54,7 +54,7 @@ import android.widget.SectionIndexer; 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 @@ public class ManageApplications extends InstrumentedFragment } @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 9947aa2b17e..924bad95e16 100644 --- a/src/com/android/settings/applications/ManageAssist.java +++ b/src/com/android/settings/applications/ManageAssist.java @@ -74,7 +74,7 @@ public class ManageAssist extends SettingsPreferenceFragment } @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 c4bb1a80fd3..4fe26499cbe 100644 --- a/src/com/android/settings/applications/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/PremiumSmsAccess.java @@ -18,7 +18,6 @@ import android.annotation.Nullable; 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 android.view.View; 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 @@ public class PremiumSmsAccess extends EmptyTextSettings implements Callback, Cal } @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 d538e292928..bc65a7fc978 100644 --- a/src/com/android/settings/applications/ProcessStatsDetail.java +++ b/src/com/android/settings/applications/ProcessStatsDetail.java @@ -125,7 +125,7 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment { } @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 6c7b90a346a..30babd28771 100644 --- a/src/com/android/settings/applications/ProcessStatsMemDetail.java +++ b/src/com/android/settings/applications/ProcessStatsMemDetail.java @@ -26,7 +26,7 @@ import android.widget.TextView; 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 @@ public class ProcessStatsMemDetail extends InstrumentedFragment { } @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 01dbf09214f..9827f1f6adf 100644 --- a/src/com/android/settings/applications/ProcessStatsSummary.java +++ b/src/com/android/settings/applications/ProcessStatsSummary.java @@ -98,7 +98,7 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc } @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 fd0d7a7bdb1..724d8328379 100644 --- a/src/com/android/settings/applications/ProcessStatsUi.java +++ b/src/com/android/settings/applications/ProcessStatsUi.java @@ -91,7 +91,7 @@ public class ProcessStatsUi extends ProcessStatsBase { } @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 baf94577e89..bfd275fe2e7 100644 --- a/src/com/android/settings/applications/RunningServiceDetails.java +++ b/src/com/android/settings/applications/RunningServiceDetails.java @@ -33,7 +33,7 @@ import android.widget.Button; 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 @@ public class RunningServiceDetails extends InstrumentedFragment } @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 f50f3adc5fd..21f235437df 100644 --- a/src/com/android/settings/applications/RunningServices.java +++ b/src/com/android/settings/applications/RunningServices.java @@ -108,7 +108,7 @@ public class RunningServices extends SettingsPreferenceFragment { } @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 812c8c36471..1b0b7da1ba1 100644 --- a/src/com/android/settings/applications/SpecialAccessSettings.java +++ b/src/com/android/settings/applications/SpecialAccessSettings.java @@ -27,7 +27,7 @@ public class SpecialAccessSettings extends SettingsPreferenceFragment { } @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 ffe99ed3033..38676acb97b 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -162,7 +162,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc } @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 571e85d4dee..35c30d6eb18 100644 --- a/src/com/android/settings/applications/VrListenerSettings.java +++ b/src/com/android/settings/applications/VrListenerSettings.java @@ -45,7 +45,7 @@ public class VrListenerSettings extends ManagedServiceSettings { } @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 d310d2b5220..f11ea2da041 100644 --- a/src/com/android/settings/applications/WriteSettingsDetails.java +++ b/src/com/android/settings/applications/WriteSettingsDetails.java @@ -153,7 +153,7 @@ public class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere } @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 ff409c500e9..ffa9e3c266f 100644 --- a/src/com/android/settings/backup/ToggleBackupSettingFragment.java +++ b/src/com/android/settings/backup/ToggleBackupSettingFragment.java @@ -192,7 +192,7 @@ public class ToggleBackupSettingFragment extends SettingsPreferenceFragment } @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 71ebcb507d9..99a2700a6fa 100644 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -133,7 +133,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem } @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 09481ce203b..3fbd7bd0c95 100644 --- a/src/com/android/settings/bluetooth/DevicePickerFragment.java +++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java @@ -85,7 +85,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment { } @Override - protected int getMetricsCategory() { + public int getMetricsCategory() { return MetricsEvent.BLUETOOTH_DEVICE_PICKER; } diff --git a/src/com/android/settings/InstrumentedActivity.java b/src/com/android/settings/core/InstrumentedActivity.java similarity index 55% rename from src/com/android/settings/InstrumentedActivity.java rename to src/com/android/settings/core/InstrumentedActivity.java index e4be6eaeff0..02808be338d 100644 --- a/src/com/android/settings/InstrumentedActivity.java +++ b/src/com/android/settings/core/InstrumentedActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 The Android Open Source Project + * 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. @@ -14,34 +14,29 @@ * limitations under the License. */ -package com.android.settings; +package com.android.settings.core; import android.app.Activity; -import com.android.internal.logging.MetricsLogger; +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 { - /** - * 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(); +public abstract class InstrumentedActivity extends Activity implements Instrumentable { + + private final VisibilityLoggerMixin mVisibilityLoggerMixin = new VisibilityLoggerMixin(this); @Override public void onResume() { super.onResume(); - MetricsLogger.visible(this, getMetricsCategory()); + mVisibilityLoggerMixin.onResume(this); } @Override public void onPause() { super.onPause(); - MetricsLogger.hidden(this, getMetricsCategory()); + mVisibilityLoggerMixin.onPause(this); } } diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/core/InstrumentedFragment.java similarity index 53% rename from src/com/android/settings/InstrumentedFragment.java rename to src/com/android/settings/core/InstrumentedFragment.java index 8bab2cf15f2..1efbdcf792e 100644 --- a/src/com/android/settings/InstrumentedFragment.java +++ b/src/com/android/settings/core/InstrumentedFragment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 The Android Open Source Project + * 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. @@ -14,31 +14,20 @@ * limitations under the License. */ -package com.android.settings; +package com.android.settings.core; import android.os.Bundle; import android.support.v14.preference.PreferenceFragment; -import com.android.internal.logging.MetricsLogger; +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 { - // Declare new temporary categories here, starting after this value. - public static final int UNDECLARED = 100000; +public abstract class InstrumentedFragment extends PreferenceFragment implements Instrumentable { - // 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(); + private final VisibilityLoggerMixin mVisibilityLoggerMixin = new VisibilityLoggerMixin(this); @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { @@ -47,12 +36,12 @@ public abstract class InstrumentedFragment extends PreferenceFragment { @Override public void onResume() { super.onResume(); - MetricsLogger.visible(getActivity(), getMetricsCategory()); + mVisibilityLoggerMixin.onResume(getActivity()); } @Override public void onPause() { super.onPause(); - MetricsLogger.hidden(getActivity(), getMetricsCategory()); + 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 00000000000..1ec5b94299f --- /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 00000000000..bd0bdf4029c --- /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 00000000000..3f315dfdc9a --- /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 00000000000..4e52478e1c9 --- /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 cd42f7dbaff..2b5e67e5ec7 100644 --- a/src/com/android/settings/dashboard/DashboardContainerFragment.java +++ b/src/com/android/settings/dashboard/DashboardContainerFragment.java @@ -29,7 +29,7 @@ import android.view.ViewGroup; 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 @@ public final class DashboardContainerFragment extends InstrumentedFragment { 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 77b1b117e9b..c9f5af6e16d 100644 --- a/src/com/android/settings/dashboard/DashboardSummary.java +++ b/src/com/android/settings/dashboard/DashboardSummary.java @@ -28,7 +28,7 @@ import android.view.ViewGroup; 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.Condition; 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 @@ public class DashboardSummary extends InstrumentedFragment private HashSet 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 38f17e3ef23..087ecade4ba 100644 --- a/src/com/android/settings/dashboard/SearchResultsSummary.java +++ b/src/com/android/settings/dashboard/SearchResultsSummary.java @@ -39,7 +39,7 @@ import android.widget.TextView; 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 @@ public class SearchResultsSummary extends InstrumentedFragment { } @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 58f79a87876..9773a50f823 100644 --- a/src/com/android/settings/dashboard/SupportFragment.java +++ b/src/com/android/settings/dashboard/SupportFragment.java @@ -36,7 +36,7 @@ import android.view.View; 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 @@ public final class SupportFragment extends InstrumentedFragment implements View. 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 84bac17a283..afe186bb700 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -357,7 +357,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen } @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 ac667598cc9..1936e5b7dda 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -139,7 +139,7 @@ public class BillingCycleSettings extends DataUsageBase implements } @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 ffd1fa52a05..90aab7b2db8 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.java +++ b/src/com/android/settings/datausage/DataSaverSummary.java @@ -100,7 +100,7 @@ public class DataSaverSummary extends SettingsPreferenceFragment } @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 7ac81f58bad..abe2a9f44bf 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -109,7 +109,7 @@ public class DataUsageList extends DataUsageBase { 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 eb43d47fda9..12e7b876a19 100644 --- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java +++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java @@ -61,7 +61,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme 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 6b3b874cc88..10e6bc50c05 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -257,7 +257,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs } @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 cab4551f1e1..2977eeab9a5 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java @@ -204,7 +204,7 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment } @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 9558d9ec251..0946f313023 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -169,7 +169,7 @@ public class AutomaticStorageManagerSettings extends SettingsPreferenceFragment } @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 dc6d3d7a58e..960596c3cb7 100644 --- a/src/com/android/settings/deviceinfo/ImeiInformation.java +++ b/src/com/android/settings/deviceinfo/ImeiInformation.java @@ -170,7 +170,7 @@ public class ImeiInformation extends SettingsPreferenceFragment { } @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 9828f8c62b9..2d408de1849 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java @@ -43,7 +43,7 @@ public class PrivateVolumeForget extends SettingsPreferenceFragment { 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 7620b09a4db..de3e3d38880 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java @@ -30,7 +30,7 @@ import android.widget.Button; 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 @@ public class PrivateVolumeFormat extends InstrumentedFragment { 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 2a84a93c01b..815e55901e7 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -145,7 +145,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { } @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 7032a1d4571..40b09e7ef8a 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java @@ -38,7 +38,7 @@ public class PrivateVolumeUnmount extends SettingsPreferenceFragment { 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 eee76734896..2973ecdba0b 100644 --- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java @@ -76,7 +76,7 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment { } @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 ad770830c52..469413a5d35 100644 --- a/src/com/android/settings/deviceinfo/SimStatus.java +++ b/src/com/android/settings/deviceinfo/SimStatus.java @@ -196,7 +196,7 @@ public class SimStatus extends SettingsPreferenceFragment { } @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 1ba3978dfeb..14173e85f86 100644 --- a/src/com/android/settings/deviceinfo/Status.java +++ b/src/com/android/settings/deviceinfo/Status.java @@ -213,7 +213,7 @@ public class Status extends SettingsPreferenceFragment { } @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 ee68311a868..05f5ef0d073 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -92,7 +92,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index 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 7eb1217619d..98352a76fc1 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -200,7 +200,7 @@ public class NightDisplaySettings extends SettingsPreferenceFragment } @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 8892f4dedc7..aa223fab3f9 100644 --- a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java @@ -23,7 +23,7 @@ public class ScreenZoomPreferenceFragmentForSetupWizard 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 541357ad2a2..af359f14ebd 100644 --- a/src/com/android/settings/display/ScreenZoomSettings.java +++ b/src/com/android/settings/display/ScreenZoomSettings.java @@ -94,7 +94,7 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment impleme } @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 2aef37bb7eb..65cc92e79e3 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java @@ -27,7 +27,7 @@ import android.widget.Button; 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 b4146270972..adc7a995562 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java @@ -423,7 +423,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase }; @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 dc2fe9e2526..33768c50d28 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java @@ -194,7 +194,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase { } @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 7c9a237ff06..75557a0f8db 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java @@ -69,7 +69,7 @@ public class FingerprintEnrollFinish extends FingerprintEnrollBase { } @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 23755fdf5db..40b4b87fa0b 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java @@ -152,7 +152,7 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase } @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 6730327d2bb..9b574b6d07a 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java @@ -27,7 +27,7 @@ import android.os.UserHandle; 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 @@ public class FingerprintEnrollSidecar extends InstrumentedFragment { }; @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 6fd2d14d51c..86629033f27 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java @@ -274,7 +274,7 @@ public class FingerprintSettings extends SubSettings { } @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 8bd495e77f6..7e95a9a4484 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java @@ -69,7 +69,7 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling } @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 baf4fcd6ed7..2ff3a1a7723 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java @@ -50,7 +50,7 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso } @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 f6602f3113b..370e3fca5ca 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java @@ -58,7 +58,7 @@ public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish { } @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 e7f4cfefc33..68ee0b6f148 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java @@ -89,7 +89,7 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu } @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 e79f8ff138d..f71884cc986 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java @@ -119,7 +119,7 @@ public class BatteryHistoryDetail extends SettingsPreferenceFragment { } @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 e19f6837f54..0108dd096c4 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java @@ -65,7 +65,7 @@ public class BatterySaverSettings extends SettingsPreferenceFragment 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 0b63aa82be4..00556d2ac1b 100644 --- a/src/com/android/settings/fuelgauge/InactiveApps.java +++ b/src/com/android/settings/fuelgauge/InactiveApps.java @@ -37,7 +37,7 @@ public class InactiveApps extends SettingsPreferenceFragment implements OnPrefer 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 f091f6649e5..e306d31d2a8 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -359,7 +359,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi } @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 443b480431f..cc0e245d76c 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -90,7 +90,7 @@ public class PowerUsageSummary extends PowerUsageBase { } @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 8f028b6163c..3c6301c8b5d 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -141,7 +141,7 @@ public class GestureSettings extends SettingsPreferenceFragment implements } @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 d35f8956f88..afa9ed2fada 100644 --- a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java @@ -85,7 +85,7 @@ public final class AvailableVirtualKeyboardFragment extends SettingsPreferenceFr } @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 dbcd9acdaec..515a80fa8c8 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -108,7 +108,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment 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 a196ccff159..d1454cc4216 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java @@ -54,7 +54,7 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment 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 02c40147a97..1b51c3c8dec 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java @@ -50,7 +50,7 @@ public class KeyboardLayoutPickerFragment extends SettingsPreferenceFragment 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 0d4e173f738..2e43a57b2c6 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java @@ -71,7 +71,7 @@ public final class KeyboardLayoutPickerFragment2 extends SettingsPreferenceFragm 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 0f263f26102..bca656a0fc0 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -189,7 +189,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment } @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 de013e0586f..f43173620d3 100644 --- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java +++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java @@ -55,7 +55,7 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment 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 16a347658f6..b16c3dbff56 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java +++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java @@ -27,7 +27,7 @@ import android.widget.AdapterView; 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 @@ public class UserDictionaryAddWordFragment extends InstrumentedFragment } @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 ed5b116ecc6..28ff2a67ce2 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryList.java +++ b/src/com/android/settings/inputmethod/UserDictionaryList.java @@ -44,7 +44,7 @@ public class UserDictionaryList extends SettingsPreferenceFragment { 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 3b36de6bcce..71755392b14 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java @@ -66,7 +66,7 @@ public final class VirtualKeyboardFragment extends SettingsPreferenceFragment { } @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 281afa0ae4b..07bbe210d85 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -58,7 +58,7 @@ public class LocaleListEditor extends SettingsPreferenceFragment 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 b2669bcc266..6d895094232 100644 --- a/src/com/android/settings/location/LocationMode.java +++ b/src/com/android/settings/location/LocationMode.java @@ -43,7 +43,7 @@ public class LocationMode extends LocationSettingsBase 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 37a91732ac7..f1fdea7c097 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -113,7 +113,7 @@ public class LocationSettings extends LocationSettingsBase 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 863651c55cd..d4e133bc5a2 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -33,7 +33,7 @@ public class ScanningSettings extends SettingsPreferenceFragment { 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 31249e63280..6a36bde959a 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 android.widget.Switch; 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 @@ public class AndroidBeam extends InstrumentedFragment } @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 bd131ab1ab0..928534e50b3 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -42,7 +42,7 @@ public class PaymentSettings extends SettingsPreferenceFragment { 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 e7f15e56a65..2b8daeb9ba3 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -60,7 +60,7 @@ public class AppNotificationSettings extends NotificationSettingsBase { } @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 1bb55309954..3f53ec923ab 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -66,7 +66,7 @@ public class ConfigureNotificationSettings extends SettingsPreferenceFragment { 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 d81bc0e7484..78e90c84053 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -60,7 +60,7 @@ public class NotificationAccessSettings extends ManagedServiceSettings { } @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 be6c63f5e68..68dd8da15bd 100644 --- a/src/com/android/settings/notification/NotificationStation.java +++ b/src/com/android/settings/notification/NotificationStation.java @@ -167,7 +167,7 @@ public class NotificationStation extends SettingsPreferenceFragment { } @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 c538a7be0fc..9e3e585cd36 100644 --- a/src/com/android/settings/notification/OtherSoundSettings.java +++ b/src/com/android/settings/notification/OtherSoundSettings.java @@ -188,7 +188,7 @@ public class OtherSoundSettings extends SettingsPreferenceFragment implements In 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 ab5d834d271..4e1475be855 100644 --- a/src/com/android/settings/notification/RedactionInterstitial.java +++ b/src/com/android/settings/notification/RedactionInterstitial.java @@ -90,7 +90,7 @@ public class RedactionInterstitial extends SettingsActivity { 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 f06cf412494..a80e31d3c41 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -123,7 +123,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements Indexab 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 638972e055a..b0e8e9b6d98 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -61,7 +61,7 @@ public class ZenAccessSettings extends EmptyTextSettings { 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 1fdba616a61..dbead5aa431 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -182,7 +182,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { } @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 c8efdb99eff..3b261c049e7 100644 --- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java @@ -160,7 +160,7 @@ public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase { } @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 a61be968d80..4705d4dc72c 100644 --- a/src/com/android/settings/notification/ZenModePrioritySettings.java +++ b/src/com/android/settings/notification/ZenModePrioritySettings.java @@ -181,7 +181,7 @@ public class ZenModePrioritySettings extends ZenModeSettingsBase implements Inde } @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 ad54689c24d..d2dcdf8b59a 100644 --- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java @@ -198,7 +198,7 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase { } @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 8cca84fbd1d..f2d9daa8939 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -58,7 +58,7 @@ public class ZenModeSettings extends ZenModeSettingsBase { } @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 0a0acd18f92..35f3ab69db7 100644 --- a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java +++ b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java @@ -86,7 +86,7 @@ public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase { } @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 dc7df52fc11..fcc0176e0bf 100644 --- a/src/com/android/settings/print/PrintJobSettingsFragment.java +++ b/src/com/android/settings/print/PrintJobSettingsFragment.java @@ -67,7 +67,7 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { 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 d16f24d2a3e..716cc6fd453 100644 --- a/src/com/android/settings/print/PrintServiceSettingsFragment.java +++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java @@ -124,7 +124,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 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 98659c74c74..8700c7b1bbb 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -94,7 +94,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment 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 ece39136b56..3a1bd758c71 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -80,7 +80,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable } @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 8c345187b78..2a57ac2f82b 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -177,7 +177,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements }; @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 b12df9f8878..655a781221a 100644 --- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java +++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java @@ -100,7 +100,7 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem } @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 63d688a99a3..7c8c968c6b9 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -242,7 +242,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen } @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 2a718854f47..65f55cb514f 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -67,7 +67,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment 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 018ce61670e..c55c5ce5a09 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -187,7 +187,7 @@ public class UserSettings extends SettingsPreferenceFragment }; @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 d69d6193e14..e9dd4fd75f9 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -154,7 +154,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment } @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 afffc97f1ed..7be69f9f6db 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -107,7 +107,7 @@ public class VpnSettings extends RestrictedSettingsFragment implements } @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 0d6287128df..02f63ae9672 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -115,7 +115,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { } @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 6f23b4fa7c0..f53f59ab658 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -48,7 +48,7 @@ public class AdvancedWifiSettings extends RestrictedSettingsFragment { } @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 aa790808a92..fadb9c5d445 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -242,7 +242,7 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment } @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 20faeb0b906..ea92b7f2ac4 100644 --- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java @@ -59,7 +59,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment 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 6abf67d0eb8..2ac76ce5e45 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -85,7 +85,7 @@ public class WifiAPITest extends SettingsPreferenceFragment implements } @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 373a58755ff..56e81a0cc58 100644 --- a/src/com/android/settings/wifi/WifiInfo.java +++ b/src/com/android/settings/wifi/WifiInfo.java @@ -35,7 +35,7 @@ public class WifiInfo extends SettingsPreferenceFragment { } @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 357b9c781b9..e29ec049fc3 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -355,7 +355,7 @@ public class WifiSettings extends RestrictedSettingsFragment } @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 25f99f11989..ddf7dfee418 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -491,7 +491,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment } @Override - protected int getMetricsCategory() { + public int getMetricsCategory() { return MetricsEvent.WIFI_P2P; } diff --git a/tests/unit/src/com/android/settings/core/instrumentation/MetricsFactoryTest.java b/tests/unit/src/com/android/settings/core/instrumentation/MetricsFactoryTest.java new file mode 100644 index 00000000000..7802b8697a5 --- /dev/null +++ b/tests/unit/src/com/android/settings/core/instrumentation/MetricsFactoryTest.java @@ -0,0 +1,44 @@ +/* + * 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.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.assertTrue; + +@RunWith(AndroidJUnit4.class) +@SmallTest +public class MetricsFactoryTest { + + @Test + public void factoryShouldReuseCachedInstance() { + MetricsFactory factory1 = MetricsFactory.get(); + MetricsFactory factory2 = MetricsFactory.get(); + assertTrue(factory1 == factory2); + } + + @Test + public void factoryShouldCacheLogger() { + MetricsFactory factory = MetricsFactory.get(); + EventLogWriter logger1 = factory.getLogger(); + EventLogWriter logger2 = factory.getLogger(); + assertTrue(logger1 == logger2); + } +} diff --git a/tests/unit/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java b/tests/unit/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java new file mode 100644 index 00000000000..e7932295519 --- /dev/null +++ b/tests/unit/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java @@ -0,0 +1,70 @@ +/* + * 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 android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +@RunWith(AndroidJUnit4.class) +@SmallTest +public class VisibilityLoggerMixinTest { + + @Mock + private EventLogWriter mLogger; + private VisibilityLoggerMixin mMixin; + + @Before + public void init() { + MockitoAnnotations.initMocks(this); + mMixin = new VisibilityLoggerMixin(new TestInstrumentable(), mLogger); + } + + @Test + public void shouldLogVisibleOnResume() { + mMixin.onResume(null); + verify(mLogger, times(1)) + .visible(any(Context.class), eq(TestInstrumentable.TEST_METRIC)); + } + + @Test + public void shouldLogHideOnPause() { + mMixin.onPause(null); + verify(mLogger, times(1)) + .hidden(any(Context.class), eq(TestInstrumentable.TEST_METRIC)); + } + + private final class TestInstrumentable implements Instrumentable { + + public static final int TEST_METRIC = 12345; + + @Override + public int getMetricsCategory() { + return TEST_METRIC; + } + } +}