PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port settings over to new metrics enum

Browse Source 
Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
This commit is contained in:
Chris Wren
2016-01-26 18:04:01 -05:00
parent 6a83d7537d
commit 9d1bfd1e8d
143 changed files with 328 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/AirplaneModeEnabler.java
View File

@@ -28,6 +28,7 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneStateIntentReceiver;
import com.android.internal.telephony.TelephonyProperties;
import com.android.settingslib.WirelessUtils;
@@ -122,7 +123,7 @@ public class AirplaneModeEnabler implements Preference.OnPreferenceChangeListene
// In ECM mode, do not update database at this point
} else {
Boolean value = (Boolean) newValue;
MetricsLogger.action(mContext, MetricsLogger.ACTION_AIRPLANE_TOGGLE, value);
MetricsLogger.action(mContext, MetricsEvent.ACTION_AIRPLANE_TOGGLE, value);
setAirplaneModeOn(value);
}
return true;

4
src/com/android/settings/ApnEditor.java
View File

@@ -41,7 +41,7 @@ import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import java.util.HashSet;
import java.util.Set;
@@ -255,7 +255,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
@Override
protected int getMetricsCategory() {
return MetricsLogger.APN_EDITOR;
return MetricsEvent.APN_EDITOR;
}
@Override

4
src/com/android/settings/ApnSettings.java
View File

@@ -51,7 +51,7 @@ import android.view.MenuItem;
import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.dataconnection.ApnSetting;
@@ -144,7 +144,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements
@Override
protected int getMetricsCategory() {
return MetricsLogger.APN;
return MetricsEvent.APN;
}
@Override

4
src/com/android/settings/ApplicationSettings.java
View File

@@ -24,7 +24,7 @@ import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
public class ApplicationSettings extends SettingsPreferenceFragment {
@@ -45,7 +45,7 @@ public class ApplicationSettings extends SettingsPreferenceFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.APPLICATION;
return MetricsEvent.APPLICATION;
}
@Override

4
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -43,7 +43,7 @@ import android.view.View;
import android.view.accessibility.AccessibilityManager;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreference;
@@ -130,7 +130,7 @@ public class ChooseLockGeneric extends SettingsActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.CHOOSE_LOCK_GENERIC;
return MetricsEvent.CHOOSE_LOCK_GENERIC;
}
@Override

4
src/com/android/settings/ChooseLockPassword.java
View File

@@ -43,7 +43,7 @@ import android.widget.Button;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import com.android.internal.logging.MetricsLogger;
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.PasswordEntryKeyboardHelper;
@@ -349,7 +349,7 @@ public class ChooseLockPassword extends SettingsActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.CHOOSE_LOCK_PASSWORD;
return MetricsEvent.CHOOSE_LOCK_PASSWORD;
}
@Override

4
src/com/android/settings/ChooseLockPattern.java
View File

@@ -29,7 +29,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
@@ -237,7 +237,7 @@ public class ChooseLockPattern extends SettingsActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.CHOOSE_LOCK_PATTERN;
return MetricsEvent.CHOOSE_LOCK_PATTERN;
}

4
src/com/android/settings/ConfirmLockPassword.java
View File

@@ -41,7 +41,7 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternChecker;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.TextViewInputDisabler;
@@ -242,7 +242,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.CONFIRM_LOCK_PASSWORD;
return MetricsEvent.CONFIRM_LOCK_PASSWORD;
}
@Override

4
src/com/android/settings/ConfirmLockPattern.java
View File

@@ -32,7 +32,7 @@ import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
import com.android.internal.widget.LockPatternChecker;
import com.android.internal.widget.LockPatternUtils;
@@ -200,7 +200,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.CONFIRM_LOCK_PATTERN;
return MetricsEvent.CONFIRM_LOCK_PATTERN;
}
@Override

4
src/com/android/settings/CryptKeeperConfirm.java
View File

@@ -33,7 +33,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import java.util.Locale;
@@ -44,7 +44,7 @@ public class CryptKeeperConfirm extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.CRYPT_KEEPER_CONFIRM;
return MetricsEvent.CRYPT_KEEPER_CONFIRM;
}
public static class Blank extends Activity {

4
src/com/android/settings/CryptKeeperSettings.java
View File

@@ -35,7 +35,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
public class CryptKeeperSettings extends InstrumentedFragment {
private static final String TAG = "CryptKeeper";
@@ -116,7 +116,7 @@ public class CryptKeeperSettings extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.CRYPT_KEEPER;
return MetricsEvent.CRYPT_KEEPER;
}
@Override

4
src/com/android/settings/DateTimeSettings.java
View File

@@ -37,7 +37,7 @@ import android.text.format.DateFormat;
import android.widget.DatePicker;
import android.widget.TimePicker;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -77,7 +77,7 @@ public class DateTimeSettings extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.DATE_TIME;
return MetricsEvent.DATE_TIME;
}
@Override

4
src/com/android/settings/DevelopmentSettings.java
View File

@@ -79,7 +79,7 @@ import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.app.LocalePicker;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.applications.BackgroundCheckSummary;
import com.android.settings.fuelgauge.InactiveApps;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -307,7 +307,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVELOPMENT;
return MetricsEvent.DEVELOPMENT;
}
@Override

5
src/com/android/settings/DeviceInfoSettings.java
View File

@@ -36,7 +36,7 @@ import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Index;
@@ -85,7 +85,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO;
return MetricsEvent.DEVICEINFO;
}
@Override
@@ -435,4 +435,3 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
};
}

5
src/com/android/settings/DisplaySettings.java
View File

@@ -42,6 +42,7 @@ import android.text.TextUtils;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.view.RotationPolicy;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -100,7 +101,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
@Override
protected int getMetricsCategory() {
return MetricsLogger.DISPLAY;
return MetricsEvent.DISPLAY;
}
@Override
@@ -196,7 +197,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean locked = Integer.parseInt((String) newValue) != 0;
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_ROTATION_LOCK,
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_ROTATION_LOCK,
locked);
RotationPolicy.setRotationLock(activity, locked);
return true;

4
src/com/android/settings/DreamSettings.java
View File

@@ -41,7 +41,7 @@ import android.widget.RadioButton;
import android.widget.Switch;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.dream.DreamBackend;
import com.android.settingslib.dream.DreamBackend.DreamInfo;
@@ -77,7 +77,7 @@ public class DreamSettings extends SettingsPreferenceFragment implements
@Override
protected int getMetricsCategory() {
return MetricsLogger.DREAM;
return MetricsEvent.DREAM;
}
@Override

4
src/com/android/settings/EncryptionInterstitial.java
View File

@@ -35,7 +35,7 @@ import android.widget.Button;
import android.widget.RadioButton;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import java.util.List;
@@ -85,7 +85,7 @@ public class EncryptionInterstitial extends SettingsActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.ENCRYPTION;
return MetricsEvent.ENCRYPTION;
}
@Override

4
src/com/android/settings/HomeSettings.java
View File

@@ -50,7 +50,7 @@ import android.view.View.OnClickListener;
import android.widget.ImageView;
import android.widget.RadioButton;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Index;
import com.android.settings.search.Indexable;
@@ -246,7 +246,7 @@ public class HomeSettings extends SettingsPreferenceFragment implements Indexabl
@Override
protected int getMetricsCategory() {
return MetricsLogger.HOME;
return MetricsEvent.HOME;
}
@Override

4
src/com/android/settings/IccLockSettings.java
View File

@@ -41,7 +41,7 @@ import android.widget.TabHost.TabSpec;
import android.widget.TabWidget;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
import com.android.internal.telephony.TelephonyIntents;
@@ -241,7 +241,7 @@ public class IccLockSettings extends InstrumentedPreferenceActivity
@Override
protected int getMetricsCategory() {
return MetricsLogger.ICC_LOCK;
return MetricsEvent.ICC_LOCK;
}
@Override

2
src/com/android/settings/InstrumentedActivity.java
View File

@@ -27,7 +27,7 @@ public abstract class InstrumentedActivity extends Activity {
/**
* Declare the view of this category.
*
* Categories are defined in {@link com.android.internal.logging.MetricsLogger}
* 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}.
*/

2
src/com/android/settings/InstrumentedFragment.java
View File

@@ -47,7 +47,7 @@ public abstract class InstrumentedFragment extends PreferenceFragment {
/**
* Declare the view of this category.
*
* Categories are defined in {@link com.android.internal.logging.MetricsLogger}
* 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}.
*/

2
src/com/android/settings/InstrumentedPreferenceActivity.java
View File

@@ -25,7 +25,7 @@ public abstract class InstrumentedPreferenceActivity extends PreferenceActivity
/**
* Declare the view of this category.
*
* Categories are defined in {@link com.android.internal.logging.MetricsLogger}
* 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}.
*/

2
src/com/android/settings/InstrumentedPreferenceFragment.java
View File

@@ -27,7 +27,7 @@ public abstract class InstrumentedPreferenceFragment extends PreferenceFragment
/**
* Declare the view of this category.
*
* Categories are defined in {@link com.android.internal.logging.MetricsLogger}
* 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}.
*/

4
src/com/android/settings/LegalSettings.java
View File

@@ -26,7 +26,7 @@ import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.support.v7.preference.PreferenceGroup;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -60,7 +60,7 @@ public class LegalSettings extends SettingsPreferenceFragment implements Indexab
@Override
protected int getMetricsCategory() {
return MetricsLogger.ABOUT_LEGAL_SETTINGS;
return MetricsEvent.ABOUT_LEGAL_SETTINGS;
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

4
src/com/android/settings/MasterClear.java
View File

@@ -40,7 +40,7 @@ import android.widget.CheckBox;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import java.util.List;
@@ -294,6 +294,6 @@ public class MasterClear extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.MASTER_CLEAR;
return MetricsEvent.MASTER_CLEAR;
}
}

4
src/com/android/settings/MasterClearConfirm.java
View File

@@ -31,7 +31,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
/**
* Confirm and execute a reset of the device to a clean "just out of the box"
@@ -168,6 +168,6 @@ public class MasterClearConfirm extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.MASTER_CLEAR_CONFIRM;
return MetricsEvent.MASTER_CLEAR_CONFIRM;
}
}

4
src/com/android/settings/PrivacySettings.java
View File

@@ -34,7 +34,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -70,7 +70,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
@Override
protected int getMetricsCategory() {
return MetricsLogger.PRIVACY;
return MetricsEvent.PRIVACY;
}
@Override

4
src/com/android/settings/ProfileChallengePreferenceFragment.java
View File

@@ -41,7 +41,7 @@ import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.fingerprint.FingerprintEnrollIntroduction;
import com.android.settings.fingerprint.FingerprintSettings;
@@ -90,7 +90,7 @@ public class ProfileChallengePreferenceFragment extends SettingsPreferenceFragme
@Override
protected int getMetricsCategory() {
return MetricsLogger.PROFILE_CHALLENGE;
return MetricsEvent.PROFILE_CHALLENGE;
}
@Override

4
src/com/android/settings/ProxySelector.java
View File

@@ -39,7 +39,7 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
public class ProxySelector extends InstrumentedFragment implements DialogCreatable {
@@ -273,6 +273,6 @@ public class ProxySelector extends InstrumentedFragment implements DialogCreatab
@Override
protected int getMetricsCategory() {
return MetricsLogger.PROXY_SELECTOR;
return MetricsEvent.PROXY_SELECTOR;
}
}

4
src/com/android/settings/ResetNetwork.java
View File

@@ -31,7 +31,7 @@ import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.Spinner;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
import java.util.ArrayList;
@@ -193,6 +193,6 @@ public class ResetNetwork extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.RESET_NETWORK;
return MetricsEvent.RESET_NETWORK;
}
}

4
src/com/android/settings/ResetNetworkConfirm.java
View File

@@ -32,7 +32,7 @@ import android.widget.Button;
import android.widget.Toast;
import com.android.ims.ImsManager;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
/**
@@ -135,6 +135,6 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.RESET_NETWORK_CONFIRM;
return MetricsEvent.RESET_NETWORK_CONFIRM;
}
}

4
src/com/android/settings/ScreenPinningSettings.java
View File

@@ -30,7 +30,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.Switch;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -55,7 +55,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.SCREEN_PINNING;
return MetricsEvent.SCREEN_PINNING;
}
@Override

4
src/com/android/settings/SecuritySettings.java
View File

@@ -51,7 +51,7 @@ import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.RestrictedListPreference;
import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo;
@@ -149,7 +149,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.SECURITY;
return MetricsEvent.SECURITY;
}
@Override

4
src/com/android/settings/TetherSettings.java
View File

@@ -39,7 +39,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.wifi.WifiApDialog;
import com.android.settings.wifi.WifiApEnabler;
import com.android.settingslib.TetherUtil;
@@ -109,7 +109,7 @@ public class TetherSettings extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.TETHER;
return MetricsEvent.TETHER;
}
@Override

4
src/com/android/settings/TrustAgentSettings.java
View File

@@ -32,7 +32,7 @@ import android.support.v7.preference.PreferenceGroup;
import android.util.ArrayMap;
import android.util.ArraySet;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import java.util.List;
@@ -67,7 +67,7 @@ public class TrustAgentSettings extends SettingsPreferenceFragment implements
@Override
protected int getMetricsCategory() {
return MetricsLogger.TRUST_AGENT;
return MetricsEvent.TRUST_AGENT;
}
@Override

4
src/com/android/settings/TrustedCredentialsSettings.java
View File

@@ -50,7 +50,7 @@ import android.widget.Switch;
import android.widget.TabHost;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.ParcelableString;
import java.security.cert.CertificateEncodingException;
@@ -70,7 +70,7 @@ public class TrustedCredentialsSettings extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.TRUSTED_CREDENTIALS;
return MetricsEvent.TRUSTED_CREDENTIALS;
}
private enum Tab {

4
src/com/android/settings/WallpaperTypeSettings.java
View File

@@ -25,7 +25,7 @@ import android.os.Bundle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
@@ -37,7 +37,7 @@ public class WallpaperTypeSettings extends SettingsPreferenceFragment implements
@Override
protected int getMetricsCategory() {
return MetricsLogger.WALLPAPER_TYPE;
return MetricsEvent.WALLPAPER_TYPE;
}
@Override

3
src/com/android/settings/WifiCallingSettings.java
View File

@@ -37,6 +37,7 @@ import android.widget.TextView;
import com.android.ims.ImsConfig;
import com.android.ims.ImsManager;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.telephony.Phone;
import com.android.settings.widget.SwitchBar;
@@ -150,7 +151,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.WIFI_CALLING;
return MetricsEvent.WIFI_CALLING;
}
@Override

4
src/com/android/settings/WirelessSettings.java
View File

@@ -45,7 +45,7 @@ import android.text.TextUtils;
import android.util.Log;
import com.android.ims.ImsManager;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyProperties;
import com.android.settings.nfc.NfcEnabler;
@@ -205,7 +205,7 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
@Override
protected int getMetricsCategory() {
return MetricsLogger.WIRELESS;
return MetricsEvent.WIRELESS;
}
@Override

10
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -41,8 +41,9 @@ import android.text.TextUtils;
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
import android.view.accessibility.AccessibilityManager;
import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.view.RotationPolicy;
import com.android.internal.view.RotationPolicy.RotationPolicyListener;
import com.android.settings.DialogCreatable;
@@ -52,8 +53,9 @@ import com.android.settings.Utils;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.accessibility.AccessibilityUtils;
import java.util.ArrayList;
@@ -63,8 +65,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
/**
* Activity with the accessibility settings.
*/
@@ -207,7 +207,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY;
return MetricsEvent.ACCESSIBILITY;
}
@Override

4
src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
View File

@@ -27,7 +27,7 @@ import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.view.accessibility.AccessibilityManager;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto;
import com.android.settings.DialogCreatable;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -55,7 +55,7 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY;
return MetricsProto.MetricsEvent.ACCESSIBILITY;
}
@Override

4
src/com/android/settings/accessibility/CaptionPropertiesFragment.java
View File

@@ -35,7 +35,7 @@ import android.view.ViewGroup.LayoutParams;
import android.view.accessibility.CaptioningManager;
import android.view.accessibility.CaptioningManager.CaptionStyle;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.SubtitleView;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -98,7 +98,7 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY_CAPTION_PROPERTIES;
return MetricsEvent.ACCESSIBILITY_CAPTION_PROPERTIES;
}
@Override

4
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
View File

@@ -41,7 +41,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.ConfirmDeviceCredentialActivity;
import com.android.settings.R;
@@ -75,7 +75,7 @@ public class ToggleAccessibilityServicePreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY_SERVICE;
return MetricsEvent.ACCESSIBILITY_SERVICE;
}
@Override

4
src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
View File

@@ -24,7 +24,7 @@ import android.view.View;
import android.view.accessibility.AccessibilityManager;
import android.widget.Switch;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.widget.SwitchBar;
@@ -38,7 +38,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY_TOGGLE_DALTONIZER;
return MetricsEvent.ACCESSIBILITY_TOGGLE_DALTONIZER;
}
@Override

4
src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
View File

@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
import android.provider.Settings;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.widget.ToggleSwitch;
import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
@@ -46,6 +46,6 @@ public class ToggleGlobalGesturePreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
}
}

5
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
View File

@@ -16,10 +16,9 @@
package com.android.settings.accessibility;
import android.os.Bundle;
import android.provider.Settings;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.widget.ToggleSwitch;
import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
@@ -71,6 +70,6 @@ public class ToggleScreenMagnificationPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION;
return MetricsEvent.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION;
}
}

6
src/com/android/settings/accounts/AccountSettings.java
View File

@@ -41,8 +41,8 @@ import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
@@ -51,7 +51,7 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AccessiblePreferenceCategory;
import com.android.settings.DimmableIconPreference;
import com.android.settings.R;
@@ -135,7 +135,7 @@ public class AccountSettings extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCOUNT;
return MetricsEvent.ACCOUNT;
}
@Override

11
src/com/android/settings/accounts/AccountSyncSettings.java
View File

@@ -28,13 +28,11 @@ import android.app.Dialog;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SyncAdapterType;
import android.content.SyncInfo;
import android.content.SyncStatusInfo;
import android.content.pm.ProviderInfo;
import android.content.pm.UserInfo;
import android.graphics.Color;
import android.os.Binder;
import android.os.Bundle;
import android.os.UserHandle;
@@ -49,15 +47,14 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.google.android.collect.Lists;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.ShowAdminSupportDetailsDialog;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.google.android.collect.Lists;
import java.io.IOException;
import java.util.ArrayList;
@@ -149,7 +146,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCOUNTS_ACCOUNT_SYNC;
return MetricsEvent.ACCOUNTS_ACCOUNT_SYNC;
}
@Override

7
src/com/android/settings/accounts/ChooseAccountActivity.java
View File

@@ -32,12 +32,13 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
import com.google.android.collect.Maps;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.CharSequences;
import com.android.settings.InstrumentedPreferenceActivity;
import com.android.settings.R;
import com.android.settings.Utils;
import com.google.android.collect.Maps;
import java.util.ArrayList;
import java.util.Collections;
@@ -89,7 +90,7 @@ public class ChooseAccountActivity extends InstrumentedPreferenceActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY;
return MetricsEvent.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY;
}
@Override

5
src/com/android/settings/accounts/ManageAccountsSettings.java
View File

@@ -45,7 +45,8 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AccountPreference;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -88,7 +89,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
@Override
protected int getMetricsCategory() {
return MetricsLogger.ACCOUNTS_MANAGE_ACCOUNTS;
return MetricsEvent.ACCOUNTS_MANAGE_ACCOUNTS;
}
@Override

4
src/com/android/settings/applications/AdvancedAppSettings.java
View File

@@ -21,7 +21,7 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v7.preference.Preference;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback;
@@ -72,7 +72,7 @@ public class AdvancedAppSettings extends SettingsPreferenceFragment implements
@Override
protected int getMetricsCategory() {
return MetricsLogger.APPLICATIONS_ADVANCED;
return MetricsEvent.APPLICATIONS_ADVANCED;
}
@Override

4
src/com/android/settings/applications/AppLaunchSettings.java
View File

@@ -34,7 +34,7 @@ import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -213,6 +213,6 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe
@Override
protected int getMetricsCategory() {
return MetricsLogger.APPLICATIONS_APP_LAUNCH;
return MetricsEvent.APPLICATIONS_APP_LAUNCH;
}
}

4
src/com/android/settings/applications/AppOpsDetails.java
View File

@@ -38,7 +38,7 @@ import android.widget.LinearLayout;
import android.widget.Switch;
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.R;
import com.android.settings.SettingsActivity;
@@ -181,7 +181,7 @@ public class AppOpsDetails extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.APP_OPS_DETAILS;
return MetricsEvent.APP_OPS_DETAILS;
}
@Override

4
src/com/android/settings/applications/AppOpsSummary.java
View File

@@ -28,7 +28,7 @@ import android.view.LayoutInflater;
import android.view.View;
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.R;
@@ -53,7 +53,7 @@ public class AppOpsSummary extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.APP_OPS_SUMMARY;
return MetricsEvent.APP_OPS_SUMMARY;
}
class MyPagerAdapter extends FragmentPagerAdapter implements ViewPager.OnPageChangeListener {

4
src/com/android/settings/applications/AppStorageSettings.java
View File

@@ -44,7 +44,7 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.deviceinfo.StorageWizardMoveConfirm;
@@ -592,7 +592,7 @@ public class AppStorageSettings extends AppInfoWithHeader
@Override
protected int getMetricsCategory() {
return MetricsLogger.APPLICATIONS_APP_STORAGE;
return MetricsEvent.APPLICATIONS_APP_STORAGE;
}
class ClearCacheObserver extends IPackageDataObserver.Stub {

4
src/com/android/settings/applications/BackgroundCheckSummary.java
View File

@@ -29,7 +29,7 @@ import android.view.LayoutInflater;
import android.view.View;
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.R;
@@ -39,7 +39,7 @@ public class BackgroundCheckSummary extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.BACKGROUND_CHECK_SUMMARY;
return MetricsEvent.BACKGROUND_CHECK_SUMMARY;
}
@Override

4
src/com/android/settings/applications/DrawOverlayDetails.java
View File

@@ -31,7 +31,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
import com.android.settings.applications.AppStateOverlayBridge.OverlayState;
@@ -152,7 +152,7 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc
@Override
protected int getMetricsCategory() {
return MetricsLogger.SYSTEM_ALERT_WINDOW_APPS;
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
}
public static CharSequence getSummary(Context context, AppEntry entry) {

4
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -64,7 +64,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.AppHeader;
@@ -290,7 +290,7 @@ public class InstalledAppDetails extends AppInfoBase
@Override
protected int getMetricsCategory() {
return MetricsLogger.APPLICATIONS_INSTALLED_APP_DETAILS;
return MetricsEvent.APPLICATIONS_INSTALLED_APP_DETAILS;
}
@Override

20
src/com/android/settings/applications/ManageApplications.java
View File

@@ -46,7 +46,7 @@ import android.widget.Filterable;
import android.widget.FrameLayout;
import android.widget.ListView;
import android.widget.Spinner;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AppHeader;
import com.android.settings.HelpUtils;
import com.android.settings.InstrumentedFragment;
@@ -376,23 +376,23 @@ public class ManageApplications extends InstrumentedFragment
protected int getMetricsCategory() {
switch (mListType) {
case LIST_TYPE_MAIN:
return MetricsLogger.MANAGE_APPLICATIONS;
return MetricsEvent.MANAGE_APPLICATIONS;
case LIST_TYPE_NOTIFICATION:
return MetricsLogger.MANAGE_APPLICATIONS_NOTIFICATIONS;
return MetricsEvent.MANAGE_APPLICATIONS_NOTIFICATIONS;
case LIST_TYPE_DOMAINS_URLS:
return MetricsLogger.MANAGE_DOMAIN_URLS;
return MetricsEvent.MANAGE_DOMAIN_URLS;
case LIST_TYPE_STORAGE:
return MetricsLogger.APPLICATIONS_STORAGE_APPS;
return MetricsEvent.APPLICATIONS_STORAGE_APPS;
case LIST_TYPE_USAGE_ACCESS:
return MetricsLogger.USAGE_ACCESS;
return MetricsEvent.USAGE_ACCESS;
case LIST_TYPE_HIGH_POWER:
return MetricsLogger.APPLICATIONS_HIGH_POWER_APPS;
return MetricsEvent.APPLICATIONS_HIGH_POWER_APPS;
case LIST_TYPE_OVERLAY:
return MetricsLogger.SYSTEM_ALERT_WINDOW_APPS;
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
case LIST_TYPE_WRITE_SETTINGS:
return MetricsLogger.SYSTEM_ALERT_WINDOW_APPS;
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
default:
return MetricsLogger.VIEW_UNKNOWN;
return MetricsEvent.VIEW_UNKNOWN;
}
}

4
src/com/android/settings/applications/ManageAssist.java
View File

@@ -25,7 +25,7 @@ import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.voice.VoiceInputListPreference;
@@ -71,7 +71,7 @@ public class ManageAssist extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.APPLICATIONS_MANAGE_ASSIST;
return MetricsEvent.APPLICATIONS_MANAGE_ASSIST;
}
@Override

4
src/com/android/settings/applications/ManageDefaultApps.java
View File

@@ -31,7 +31,7 @@ import android.text.TextUtils;
import android.util.Log;
import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -191,7 +191,7 @@ public class ManageDefaultApps extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.APPLICATIONS_DEFAULT_APPS;
return MetricsEvent.APPLICATIONS_DEFAULT_APPS;
}
@Override

4
src/com/android/settings/applications/ProcessStatsDetail.java
View File

@@ -40,7 +40,7 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.AppHeader;
import com.android.settings.CancellablePreference;
import com.android.settings.CancellablePreference.OnCancelListener;
@@ -122,7 +122,7 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.APPLICATIONS_PROCESS_STATS_DETAIL;
return MetricsEvent.APPLICATIONS_PROCESS_STATS_DETAIL;
}
@Override

4
src/com/android/settings/applications/ProcessStatsMemDetail.java
View File

@@ -25,7 +25,7 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.internal.app.ProcessStats;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
@@ -87,7 +87,7 @@ public class ProcessStatsMemDetail extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.APPLICATIONS_PROCESS_STATS_MEM_DETAIL;
return MetricsEvent.APPLICATIONS_PROCESS_STATS_MEM_DETAIL;
}
@Override

4
src/com/android/settings/applications/ProcessStatsSummary.java
View File

@@ -22,7 +22,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.text.format.Formatter;
import android.text.format.Formatter.BytesResult;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SummaryPreference;
import com.android.settings.Utils;
@@ -103,7 +103,7 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc
@Override
protected int getMetricsCategory() {
return MetricsLogger.PROCESS_STATS_SUMMARY;
return MetricsEvent.PROCESS_STATS_SUMMARY;
}
@Override

4
src/com/android/settings/applications/ProcessStatsUi.java
View File

@@ -28,7 +28,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import com.android.internal.app.ProcessStats;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.ProcStatsData.MemInfo;
@@ -92,7 +92,7 @@ public class ProcessStatsUi extends ProcessStatsBase {
@Override
protected int getMetricsCategory() {
return MetricsLogger.APPLICATIONS_PROCESS_STATS_UI;
return MetricsEvent.APPLICATIONS_PROCESS_STATS_UI;
}
@Override

4
src/com/android/settings/applications/RunningServiceDetails.java
View File

@@ -32,7 +32,7 @@ import android.view.ViewGroup;
import android.widget.Button;
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.R;
import com.android.settings.Utils;
@@ -535,7 +535,7 @@ public class RunningServiceDetails extends InstrumentedFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.RUNNING_SERVICE_DETAILS;
return MetricsEvent.RUNNING_SERVICE_DETAILS;
}
@Override

4
src/com/android/settings/applications/UsageAccessDetails.java
View File

@@ -33,7 +33,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppStateUsageBridge.UsageState;
@@ -163,7 +163,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc
@Override
protected int getMetricsCategory() {
return MetricsLogger.APPLICATIONS_USAGE_ACCESS_DETAIL;
return MetricsEvent.APPLICATIONS_USAGE_ACCESS_DETAIL;
}
}

4
src/com/android/settings/applications/WriteSettingsDetails.java
View File

@@ -31,7 +31,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
import com.android.settings.applications.AppStateWriteSettingsBridge.WriteSettingsState;
@@ -154,7 +154,7 @@ public class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere
@Override
protected int getMetricsCategory() {
return MetricsLogger.SYSTEM_ALERT_WINDOW_APPS;
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
}
public static CharSequence getSummary(Context context, AppEntry entry) {

4
src/com/android/settings/backup/ToggleBackupSettingFragment.java
View File

@@ -16,7 +16,7 @@ import android.util.Log;
import android.view.View;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -193,7 +193,7 @@ public class ToggleBackupSettingFragment extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.PRIVACY;
return MetricsEvent.PRIVACY;
}
/**

3
src/com/android/settings/bluetooth/BluetoothEnabler.java
View File

@@ -28,6 +28,7 @@ import android.widget.Switch;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.Index;
import com.android.settings.widget.SwitchBar;
@@ -185,7 +186,7 @@ public final class BluetoothEnabler implements SwitchBar.OnSwitchChangeListener
switchView.setChecked(false);
}
MetricsLogger.action(mContext, MetricsLogger.ACTION_BLUETOOTH_TOGGLE, isChecked);
MetricsLogger.action(mContext, MetricsEvent.ACTION_BLUETOOTH_TOGGLE, isChecked);
if (mLocalAdapter != null) {
mLocalAdapter.setBluetoothEnabled(isChecked);

10
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

@@ -40,7 +40,9 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.LinkifyUtils;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -126,7 +128,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
@Override
protected int getMetricsCategory() {
return MetricsLogger.BLUETOOTH;
return MetricsEvent.BLUETOOTH;
}
@Override
@@ -222,19 +224,19 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
switch (item.getItemId()) {
case MENU_ID_SCAN:
if (mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON) {
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_BLUETOOTH_SCAN);
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_BLUETOOTH_SCAN);
startScanning();
}
return true;
case MENU_ID_RENAME_DEVICE:
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_BLUETOOTH_RENAME);
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_BLUETOOTH_RENAME);
new BluetoothNameDialogFragment().show(
getFragmentManager(), "rename device");
return true;
case MENU_ID_SHOW_RECEIVED:
MetricsLogger.action(getActivity(), MetricsLogger.ACTION_BLUETOOTH_FILES);
MetricsLogger.action(getActivity(), MetricsEvent.ACTION_BLUETOOTH_FILES);
Intent intent = new Intent(BTOPP_ACTION_OPEN_RECEIVED_FILES);
getActivity().sendBroadcast(intent);
return true;

4
src/com/android/settings/bluetooth/DevicePickerFragment.java
View File

@@ -27,7 +27,7 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -86,7 +86,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.BLUETOOTH_DEVICE_PICKER;
return MetricsEvent.BLUETOOTH_DEVICE_PICKER;
}
@Override

4
src/com/android/settings/dashboard/DashboardSummary.java
View File

@@ -25,7 +25,7 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.HelpUtils;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
@@ -66,7 +66,7 @@ public class DashboardSummary extends InstrumentedFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.DASHBOARD_SUMMARY;
return MetricsEvent.DASHBOARD_SUMMARY;
}
@Override

5
src/com/android/settings/dashboard/SearchResultsSummary.java
View File

@@ -38,6 +38,7 @@ import android.widget.SearchView;
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.R;
import com.android.settings.SettingsActivity;
@@ -84,7 +85,7 @@ public class SearchResultsSummary extends InstrumentedFragment {
@Override
protected void onPostExecute(Cursor cursor) {
if (!isCancelled()) {
MetricsLogger.action(getContext(), MetricsLogger.ACTION_SEARCH_RESULTS,
MetricsLogger.action(getContext(), MetricsEvent.ACTION_SEARCH_RESULTS,
cursor.getCount());
setResultsCursor(cursor);
setResultsVisibility(cursor.getCount() > 0);
@@ -250,7 +251,7 @@ public class SearchResultsSummary extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DASHBOARD_SEARCH_RESULTS;
return MetricsEvent.DASHBOARD_SEARCH_RESULTS;
}
@Override

4
src/com/android/settings/datausage/CellDataPreference.java
View File

@@ -31,7 +31,9 @@ import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import android.widget.Checkable;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.CustomDialogPreference;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -109,7 +111,7 @@ public class CellDataPreference extends CustomDialogPreference implements Templa
@Override
protected void performClick(View view) {
super.performClick(view);
MetricsLogger.action(getContext(), MetricsLogger.ACTION_CELL_DATA_TOGGLE, !mChecked);
MetricsLogger.action(getContext(), MetricsEvent.ACTION_CELL_DATA_TOGGLE, !mChecked);
if (mChecked) {
// disabling data; show confirmation dialog which eventually
// calls setMobileDataEnabled() once user confirms.

4
src/com/android/settings/datausage/DataUsageMeteredSettings.java
View File

@@ -27,7 +27,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.telephony.TelephonyManager;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -61,7 +61,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme
@Override
protected int getMetricsCategory() {
return MetricsLogger.NET_DATA_USAGE_METERED;
return MetricsEvent.NET_DATA_USAGE_METERED;
}
@Override

4
src/com/android/settings/datausage/DataUsageSummary.java
View File

@@ -35,7 +35,7 @@ import android.text.format.Formatter;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SummaryPreference;
import com.android.settings.Utils;
@@ -215,7 +215,7 @@ public class DataUsageSummary extends DataUsageBase implements Indexable {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DATA_USAGE_SUMMARY;
return MetricsEvent.DATA_USAGE_SUMMARY;
}
/**

4
src/com/android/settings/deviceinfo/ImeiInformation.java
View File

@@ -23,7 +23,7 @@ import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.PhoneFactory;
@@ -152,6 +152,6 @@ public class ImeiInformation extends InstrumentedPreferenceActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_IMEI_INFORMATION;
return MetricsEvent.DEVICEINFO_IMEI_INFORMATION;
}
}

4
src/com/android/settings/deviceinfo/PrivateVolumeForget.java
View File

@@ -33,7 +33,7 @@ import android.view.ViewGroup;
import android.widget.Button;
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.R;
@@ -44,7 +44,7 @@ public class PrivateVolumeForget extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STORAGE;
return MetricsEvent.DEVICEINFO_STORAGE;
}
@Override

4
src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
View File

@@ -29,7 +29,7 @@ import android.view.ViewGroup;
import android.widget.Button;
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.R;
@@ -39,7 +39,7 @@ public class PrivateVolumeFormat extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STORAGE;
return MetricsEvent.DEVICEINFO_STORAGE;
}
@Override

4
src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
View File

@@ -52,7 +52,7 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Settings.StorageUseActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -130,7 +130,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STORAGE;
return MetricsEvent.DEVICEINFO_STORAGE;
}
@Override

4
src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java
View File

@@ -28,7 +28,7 @@ import android.view.ViewGroup;
import android.widget.Button;
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.R;
import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
@@ -39,7 +39,7 @@ public class PrivateVolumeUnmount extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STORAGE;
return MetricsEvent.DEVICEINFO_STORAGE;
}
@Override

4
src/com/android/settings/deviceinfo/PublicVolumeSettings.java
View File

@@ -38,7 +38,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.Preconditions;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -77,7 +77,7 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STORAGE;
return MetricsEvent.DEVICEINFO_STORAGE;
}
@Override

4
src/com/android/settings/deviceinfo/SimStatus.java
View File

@@ -44,7 +44,7 @@ import android.widget.TabHost.TabContentFactory;
import android.widget.TabHost.TabSpec;
import android.widget.TabWidget;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.telephony.DefaultPhoneNotifier;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
@@ -166,7 +166,7 @@ public class SimStatus extends InstrumentedPreferenceActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_SIM_STATUS;
return MetricsEvent.DEVICEINFO_SIM_STATUS;
}
@Override

4
src/com/android/settings/deviceinfo/Status.java
View File

@@ -35,7 +35,7 @@ import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.text.TextUtils;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.ArrayUtils;
import com.android.settings.InstrumentedPreferenceActivity;
import com.android.settings.R;
@@ -211,7 +211,7 @@ public class Status extends InstrumentedPreferenceActivity {
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STATUS;
return MetricsEvent.DEVICEINFO_STATUS;
}
@Override

4
src/com/android/settings/deviceinfo/StorageSettings.java
View File

@@ -42,7 +42,7 @@ import android.text.format.Formatter;
import android.text.format.Formatter.BytesResult;
import android.util.Log;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.dashboard.SummaryLoader;
@@ -89,7 +89,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
@Override
protected int getMetricsCategory() {
return MetricsLogger.DEVICEINFO_STORAGE;
return MetricsEvent.DEVICEINFO_STORAGE;
}
@Override

4
src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -41,7 +41,7 @@ import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R;
@@ -409,7 +409,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
@Override
protected int getMetricsCategory() {
return MetricsLogger.FINGERPRINT_ENROLLING;
return MetricsEvent.FINGERPRINT_ENROLLING;
}
public static class IconTouchDialog extends DialogFragment {

4
src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -21,7 +21,7 @@ import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
import android.os.UserHandle;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R;
import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener;
@@ -195,6 +195,6 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
@Override
protected int getMetricsCategory() {
return MetricsLogger.FINGERPRINT_FIND_SENSOR;
return MetricsEvent.FINGERPRINT_FIND_SENSOR;
}
}

4
src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
View File

@@ -24,7 +24,7 @@ import android.os.UserHandle;
import android.view.View;
import android.widget.Button;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
/**
@@ -70,6 +70,6 @@ public class FingerprintEnrollFinish extends FingerprintEnrollBase {
@Override
protected int getMetricsCategory() {
return MetricsLogger.FINGERPRINT_ENROLL_FINISH;
return MetricsEvent.FINGERPRINT_ENROLL_FINISH;
}
}

4
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -23,7 +23,7 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.view.View;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockGeneric;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.HelpUtils;
@@ -137,6 +137,6 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
@Override
protected int getMetricsCategory() {
return MetricsLogger.FINGERPRINT_ENROLL_INTRO;
return MetricsEvent.FINGERPRINT_ENROLL_INTRO;
}
}

4
src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
View File

@@ -25,7 +25,7 @@ import android.os.CancellationSignal;
import android.os.Handler;
import android.os.UserHandle;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.InstrumentedFragment;
@@ -155,7 +155,7 @@ public class FingerprintEnrollSidecar extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.FINGERPRINT_ENROLL_SIDECAR;
return MetricsEvent.FINGERPRINT_ENROLL_SIDECAR;
}
public interface Listener {

7
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -59,6 +59,7 @@ import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockGeneric;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.HelpUtils;
@@ -271,7 +272,7 @@ public class FingerprintSettings extends SubSettings {
@Override
protected int getMetricsCategory() {
return MetricsLogger.FINGERPRINT;
return MetricsEvent.FINGERPRINT;
}
@Override
@@ -589,7 +590,7 @@ public class FingerprintSettings extends SubSettings {
Log.v(TAG, "rename " + name + " to " + newName);
}
MetricsLogger.action(getContext(),
MetricsLogger.ACTION_FINGERPRINT_RENAME,
MetricsEvent.ACTION_FINGERPRINT_RENAME,
mFp.getFingerId());
FingerprintSettingsFragment parent
= (FingerprintSettingsFragment)
@@ -633,7 +634,7 @@ public class FingerprintSettings extends SubSettings {
private void onDeleteClick(DialogInterface dialog) {
if (DEBUG) Log.v(TAG, "Removing fpId=" + mFp.getFingerId());
MetricsLogger.action(getContext(), MetricsLogger.ACTION_FINGERPRINT_DELETE,
MetricsLogger.action(getContext(), MetricsEvent.ACTION_FINGERPRINT_DELETE,
mFp.getFingerId());
FingerprintSettingsFragment parent
= (FingerprintSettingsFragment) getTargetFragment();

4
src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
View File

@@ -28,7 +28,7 @@ import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.setupwizardlib.util.SystemBarHelper;
@@ -84,7 +84,7 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
@Override
protected int getMetricsCategory() {
return MetricsLogger.FINGERPRINT_ENROLLING_SETUP;
return MetricsEvent.FINGERPRINT_ENROLLING_SETUP;
}
public static class SkipDialog extends DialogFragment {

4
src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
View File

@@ -22,7 +22,7 @@ import android.os.UserHandle;
import android.view.View;
import android.widget.Button;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
@@ -83,6 +83,6 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso
@Override
protected int getMetricsCategory() {
return MetricsLogger.FINGERPRINT_FIND_SENSOR_SETUP;
return MetricsEvent.FINGERPRINT_FIND_SENSOR_SETUP;
}
}

4
src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
View File

@@ -23,7 +23,7 @@ import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
@@ -86,6 +86,6 @@ public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish
@Override
protected int getMetricsCategory() {
return MetricsLogger.FINGERPRINT_ENROLL_FINISH_SETUP;
return MetricsEvent.FINGERPRINT_ENROLL_FINISH_SETUP;
}
}

4
src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
View File

@@ -21,7 +21,7 @@ import android.content.res.Resources;
import android.view.View;
import android.widget.Button;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SetupChooseLockGeneric;
import com.android.settings.SetupWizardUtils;
@@ -79,6 +79,6 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
@Override
protected int getMetricsCategory() {
return MetricsLogger.FINGERPRINT_ENROLL_INTRO_SETUP;
return MetricsEvent.FINGERPRINT_ENROLL_INTRO_SETUP;
}
}

4
src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
View File

@@ -23,7 +23,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.InstrumentedFragment;
import com.android.settings.R;
@@ -54,6 +54,6 @@ public class BatteryHistoryDetail extends InstrumentedFragment {
@Override
protected int getMetricsCategory() {
return MetricsLogger.FUELGAUGE_BATTERY_HISTORY_DETAIL;
return MetricsEvent.FUELGAUGE_BATTERY_HISTORY_DETAIL;
}
}

4
src/com/android/settings/fuelgauge/BatterySaverSettings.java
View File

@@ -32,7 +32,7 @@ import android.provider.Settings.Global;
import android.util.Log;
import android.widget.Switch;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -65,7 +65,7 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
@Override
protected int getMetricsCategory() {
return MetricsLogger.FUELGAUGE_BATTERY_SAVER;
return MetricsEvent.FUELGAUGE_BATTERY_SAVER;
}
@Override

4
src/com/android/settings/fuelgauge/InactiveApps.java
View File

@@ -26,7 +26,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceGroup;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -38,7 +38,7 @@ public class InactiveApps extends SettingsPreferenceFragment implements OnPrefer
@Override
protected int getMetricsCategory() {
return MetricsLogger.FUELGAUGE_INACTIVE_APPS;
return MetricsEvent.FUELGAUGE_INACTIVE_APPS;
}
@Override

4
src/com/android/settings/fuelgauge/PowerUsageDetail.java
View File

@@ -42,7 +42,7 @@ import android.util.Log;
import android.view.View;
import android.widget.Button;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatterySipper.DrainType;
import com.android.internal.os.BatteryStatsHelper;
@@ -360,7 +360,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
@Override
protected int getMetricsCategory() {
return MetricsLogger.FUELGAUGE_POWER_USAGE_DETAIL;
return MetricsEvent.FUELGAUGE_POWER_USAGE_DETAIL;
}
@Override

Some files were not shown because too many files have changed in this diff Show More