diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java index 950d52a04b5..b415ab638e9 100644 --- a/src/com/android/settings/AirplaneModeEnabler.java +++ b/src/com/android/settings/AirplaneModeEnabler.java @@ -26,9 +26,8 @@ import android.os.UserHandle; 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.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneStateIntentReceiver; import com.android.internal.telephony.TelephonyProperties; import com.android.settingslib.WirelessUtils; diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java index 3a1c831d0e2..116ce4cb4ff 100644 --- a/src/com/android/settings/ApnEditor.java +++ b/src/com/android/settings/ApnEditor.java @@ -51,7 +51,7 @@ import android.view.MenuItem; import android.view.View; import android.view.View.OnKeyListener; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.internal.util.ArrayUtils; diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java index 3dd772baf26..9b9cd85570d 100644 --- a/src/com/android/settings/ApnSettings.java +++ b/src/com/android/settings/ApnSettings.java @@ -53,7 +53,7 @@ import android.view.MotionEvent; import android.widget.TextView; import android.widget.Toast; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.dataconnection.ApnSetting; diff --git a/src/com/android/settings/ApplicationSettings.java b/src/com/android/settings/ApplicationSettings.java index 759cceacd25..15c6bc97466 100644 --- a/src/com/android/settings/ApplicationSettings.java +++ b/src/com/android/settings/ApplicationSettings.java @@ -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.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; public class ApplicationSettings extends SettingsPreferenceFragment { diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java index ace71c3a2f7..39c166c19f4 100644 --- a/src/com/android/settings/BugreportPreference.java +++ b/src/com/android/settings/BugreportPreference.java @@ -33,7 +33,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.internal.logging.nano.MetricsProto.MetricsEvent; public class BugreportPreference extends CustomDialogPreference { diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index d109eb1a2c8..862425bb9a4 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -49,7 +49,7 @@ import android.util.Log; import android.view.accessibility.AccessibilityManager; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.fingerprint.FingerprintEnrollBase; import com.android.settings.fingerprint.FingerprintEnrollFindSensor; diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java index 86696bb2802..a98efe4ddff 100644 --- a/src/com/android/settings/ChooseLockPassword.java +++ b/src/com/android/settings/ChooseLockPassword.java @@ -46,7 +46,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils.RequestThrottledException; import com.android.internal.widget.TextViewInputDisabler; diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java index 59fa2c7eb09..e796f385231 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -29,7 +29,7 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils.RequestThrottledException; diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java index 01e99022329..9126b7ac492 100644 --- a/src/com/android/settings/ConfirmLockPassword.java +++ b/src/com/android/settings/ConfirmLockPassword.java @@ -39,7 +39,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternChecker; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.TextViewInputDisabler; diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java index 34dad58f039..7d7bb83a160 100644 --- a/src/com/android/settings/ConfirmLockPattern.java +++ b/src/com/android/settings/ConfirmLockPattern.java @@ -31,7 +31,7 @@ import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient; import com.android.internal.widget.LockPatternChecker; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java index 25b92a6099b..1d9b3f075ec 100644 --- a/src/com/android/settings/CryptKeeperConfirm.java +++ b/src/com/android/settings/CryptKeeperConfirm.java @@ -33,7 +33,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import java.util.Locale; diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java index bef4cc0fb17..fdd3e4826da 100644 --- a/src/com/android/settings/CryptKeeperSettings.java +++ b/src/com/android/settings/CryptKeeperSettings.java @@ -35,7 +35,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; public class CryptKeeperSettings extends InstrumentedFragment { private static final String TAG = "CryptKeeper"; diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index 94589f08387..0d24fe0b4c9 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -38,7 +38,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.text.format.DateFormat; import android.widget.DatePicker; import android.widget.TimePicker; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index b39097b40be..2b9e2b2a752 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -82,7 +82,7 @@ import android.widget.Switch; import android.widget.Toast; import com.android.internal.app.LocalePicker; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.applications.BackgroundCheckSummary; import com.android.settings.fuelgauge.InactiveApps; import com.android.settings.search.BaseSearchIndexProvider; diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index de62f92ae3e..9d20829e840 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -36,7 +36,7 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Index; diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index f7b94433c25..4439fde7c5d 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -46,7 +46,7 @@ import android.util.Log; import com.android.internal.app.NightDisplayController; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.view.RotationPolicy; import com.android.settings.accessibility.ToggleFontSizePreferenceFragment; import com.android.settings.dashboard.SummaryLoader; diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java index 33278981b6b..9801530ec54 100644 --- a/src/com/android/settings/DreamSettings.java +++ b/src/com/android/settings/DreamSettings.java @@ -41,7 +41,7 @@ import android.widget.RadioButton; import android.widget.Switch; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.widget.SwitchBar; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.DreamInfo; diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index d34b456b05e..c6dc5f7b4f9 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -35,7 +35,7 @@ import android.view.accessibility.AccessibilityManager; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.utils.SettingsDividerItemDecoration; import com.android.setupwizardlib.GlifPreferenceLayout; diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java index 28b5484f6bf..27d1b57ddfa 100644 --- a/src/com/android/settings/HomeSettings.java +++ b/src/com/android/settings/HomeSettings.java @@ -50,7 +50,7 @@ import android.view.View.OnClickListener; import android.widget.ImageView; import android.widget.RadioButton; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Index; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index 9d7f10aa84d..42d0c56cccb 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -41,7 +41,7 @@ import android.widget.TabHost.TabContentFactory; import android.widget.TabHost.TabSpec; import android.widget.TabWidget; import android.widget.Toast; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneFactory; import com.android.internal.telephony.TelephonyIntents; diff --git a/src/com/android/settings/InstrumentedActivity.java b/src/com/android/settings/InstrumentedActivity.java index e4be6eaeff0..4821b88beef 100644 --- a/src/com/android/settings/InstrumentedActivity.java +++ b/src/com/android/settings/InstrumentedActivity.java @@ -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.MetricsProto.MetricsEvent} + * Categories are defined in {@link com.android.internal.logging.nano.MetricsProto.MetricsEvent} * or if there is no relevant existing category you may define one in * {@link com.android.settings.InstrumentedFragment}. */ diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java index 8bab2cf15f2..3897c33c053 100644 --- a/src/com/android/settings/InstrumentedFragment.java +++ b/src/com/android/settings/InstrumentedFragment.java @@ -34,7 +34,7 @@ public abstract class InstrumentedFragment extends PreferenceFragment { /** * Declare the view of this category. * - * Categories are defined in {@link com.android.internal.logging.MetricsProto.MetricsEvent} + * Categories are defined in {@link com.android.internal.logging.nano.MetricsProto.MetricsEvent} * or if there is no relevant existing category you may define one in * {@link com.android.settings.InstrumentedFragment}. */ diff --git a/src/com/android/settings/InstrumentedPreferenceFragment.java b/src/com/android/settings/InstrumentedPreferenceFragment.java index 243e0bcced5..9d9697beb77 100644 --- a/src/com/android/settings/InstrumentedPreferenceFragment.java +++ b/src/com/android/settings/InstrumentedPreferenceFragment.java @@ -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.MetricsProto.MetricsEvent} + * Categories are defined in {@link com.android.internal.logging.nano.MetricsProto.MetricsEvent} * or if there is no relevant existing category you may define one in * {@link com.android.settings.InstrumentedFragment}. */ diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java index d7323b91663..1625877240f 100644 --- a/src/com/android/settings/LegalSettings.java +++ b/src/com/android/settings/LegalSettings.java @@ -26,7 +26,7 @@ import android.os.Bundle; import android.provider.SearchIndexableResource; import android.support.v7.preference.PreferenceGroup; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index 540c93f28ed..d95ea0643d7 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -40,7 +40,7 @@ import android.widget.CheckBox; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.RestrictedLockUtils; import java.util.List; diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index 393b76a31f4..168265da0b5 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -32,7 +32,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.RestrictedLockUtils; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java index 396e5fa207f..0bcff203f0c 100644 --- a/src/com/android/settings/PrivacySettings.java +++ b/src/com/android/settings/PrivacySettings.java @@ -36,7 +36,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.PreferenceScreen; import android.util.Log; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java index 35242bc89d6..d6225a8897f 100644 --- a/src/com/android/settings/ProxySelector.java +++ b/src/com/android/settings/ProxySelector.java @@ -39,7 +39,7 @@ import android.widget.Button; import android.widget.EditText; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment; public class ProxySelector extends InstrumentedFragment implements DialogCreatable { diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index a2acc37222e..5ebbee51b5e 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -32,7 +32,7 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.Spinner; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java index ece64b43101..c22a5d25548 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -34,7 +34,7 @@ import android.widget.Button; import android.widget.Toast; import com.android.ims.ImsManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/ScreenPinningSettings.java b/src/com/android/settings/ScreenPinningSettings.java index fb28dfbfc15..42ea9752b23 100644 --- a/src/com/android/settings/ScreenPinningSettings.java +++ b/src/com/android/settings/ScreenPinningSettings.java @@ -31,7 +31,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Switch; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index d96f4594daf..247a16b8fda 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -52,7 +52,7 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo; import com.android.settings.fingerprint.FingerprintSettings; diff --git a/src/com/android/settings/SharedPreferencesLogger.java b/src/com/android/settings/SharedPreferencesLogger.java index af34f16ba73..a665a80a674 100644 --- a/src/com/android/settings/SharedPreferencesLogger.java +++ b/src/com/android/settings/SharedPreferencesLogger.java @@ -24,7 +24,7 @@ import android.content.pm.PackageManager; import android.os.AsyncTask; import android.text.TextUtils; import android.util.Log; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import java.util.Map; import java.util.Set; diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java index 264db52bf8c..a6b1206687d 100644 --- a/src/com/android/settings/TestingSettings.java +++ b/src/com/android/settings/TestingSettings.java @@ -20,7 +20,7 @@ import android.os.Bundle; import android.os.UserManager; import android.support.v7.preference.PreferenceScreen; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; public class TestingSettings extends SettingsPreferenceFragment { diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index 6b5a72159ea..9c9636fa6f9 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -40,7 +40,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.util.Log; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.datausage.DataSaverBackend; import com.android.settings.wifi.WifiApDialog; import com.android.settings.wifi.WifiApEnabler; diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/TrustAgentSettings.java index e5b6425fd91..70dd8920a65 100644 --- a/src/com/android/settings/TrustAgentSettings.java +++ b/src/com/android/settings/TrustAgentSettings.java @@ -32,7 +32,7 @@ import android.support.v7.preference.PreferenceGroup; import android.util.ArrayMap; import android.util.ArraySet; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index 92b7f6bc34f..646ff7a2781 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -58,7 +58,7 @@ import android.widget.TabHost; import android.widget.TextView; import com.android.internal.app.UnlaunchableAppActivity; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.ParcelableString; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java index c264ff7318d..04d4aea6bae 100644 --- a/src/com/android/settings/UserCredentialsSettings.java +++ b/src/com/android/settings/UserCredentialsSettings.java @@ -44,7 +44,7 @@ import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; diff --git a/src/com/android/settings/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java index d7ae5ef1bc9..44fe0c98274 100644 --- a/src/com/android/settings/WallpaperTypeSettings.java +++ b/src/com/android/settings/WallpaperTypeSettings.java @@ -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.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; diff --git a/src/com/android/settings/WebViewImplementation.java b/src/com/android/settings/WebViewImplementation.java index c949a39e35c..e1e7833e6f5 100644 --- a/src/com/android/settings/WebViewImplementation.java +++ b/src/com/android/settings/WebViewImplementation.java @@ -27,7 +27,7 @@ import android.os.UserManager; import android.util.Log; import android.webkit.IWebViewUpdateService; import android.webkit.WebViewProviderInfo; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import java.util.ArrayList; diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java index 3e9da17c65b..8d15bd4c666 100644 --- a/src/com/android/settings/WifiCallingSettings.java +++ b/src/com/android/settings/WifiCallingSettings.java @@ -40,7 +40,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.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.Phone; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index fc473fc0e42..589689e68f7 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -46,7 +46,7 @@ import android.text.TextUtils; import android.util.Log; import com.android.ims.ImsManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyProperties; import com.android.settings.nfc.NfcEnabler; diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 62671fa30e8..8e192cbb20b 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -41,7 +41,7 @@ import android.view.KeyEvent; import android.view.accessibility.AccessibilityManager; import com.android.internal.content.PackageMonitor; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.view.RotationPolicy; import com.android.internal.view.RotationPolicy.RotationPolicyListener; import com.android.settings.DialogCreatable; diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index f21e467fedf..c4151974fd6 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -27,7 +27,7 @@ import android.support.v7.preference.Preference; import android.text.TextUtils; import android.view.accessibility.AccessibilityManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.DialogCreatable; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java index db8a10b1e95..0a066cd1ef8 100644 --- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java +++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java @@ -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.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.SubtitleView; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java index 6e906774fe7..09055fb8c22 100644 --- a/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java @@ -17,7 +17,7 @@ package com.android.settings.accessibility; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; public class FontSizePreferenceFragmentForSetupWizard extends ToggleFontSizePreferenceFragment { diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index 196a4ab3729..afead5e30e4 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -45,7 +45,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.ConfirmDeviceCredentialActivity; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java index a1c8bc5656a..3d53598af4d 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -24,7 +24,7 @@ import android.view.View; import android.view.accessibility.AccessibilityManager; import android.widget.Switch; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SeekBarPreference; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index 6b4aece40d3..35c7b5e48a3 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -24,7 +24,7 @@ import android.view.View; import android.view.accessibility.AccessibilityManager; import android.widget.Switch; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java index f246204a2b4..39291aa2fcf 100644 --- a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java @@ -22,7 +22,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.provider.Settings; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.PreviewSeekBarPreferenceFragment; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java index 23811bbcbeb..44c30e01d15 100644 --- a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java @@ -18,7 +18,7 @@ package com.android.settings.accessibility; import android.provider.Settings; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.widget.ToggleSwitch; import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener; diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index e6a8c1e829c..f77482f9512 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -37,7 +37,7 @@ import android.widget.ImageView; import android.widget.MediaController; import android.widget.RelativeLayout.LayoutParams; import android.widget.VideoView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.ToggleSwitch; import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener; diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java index 135a78fa789..78650807e3e 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java @@ -19,7 +19,7 @@ package com.android.settings.accessibility; import android.os.Bundle; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard extends ToggleScreenMagnificationPreferenceFragment { diff --git a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java index 05e48d38379..f7725b7c454 100644 --- a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java @@ -19,7 +19,7 @@ package com.android.settings.accessibility; import android.os.Bundle; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; public class ToggleScreenReaderPreferenceFragmentForSetupWizard extends ToggleAccessibilityServicePreferenceFragment { diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java index bfc45a9f11d..3ade8e8270c 100644 --- a/src/com/android/settings/accounts/AccountSettings.java +++ b/src/com/android/settings/accounts/AccountSettings.java @@ -49,7 +49,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.DimmableIconPreference; import com.android.settings.R; diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 8ceb5e52f0d..e5990df11cd 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -54,7 +54,7 @@ import android.widget.TextView; import com.google.android.collect.Lists; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java index 2e3280bb133..95f13dbe6c7 100644 --- a/src/com/android/settings/accounts/ChooseAccountActivity.java +++ b/src/com/android/settings/accounts/ChooseAccountActivity.java @@ -36,7 +36,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceGroup; import android.util.Log; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.CharSequences; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java index 80d6bc14593..a9100da8864 100644 --- a/src/com/android/settings/accounts/ManageAccountsSettings.java +++ b/src/com/android/settings/accounts/ManageAccountsSettings.java @@ -46,7 +46,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.AccountPreference; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java index 9c7ae3996da..0e22ea86745 100644 --- a/src/com/android/settings/accounts/ManagedProfileSettings.java +++ b/src/com/android/settings/accounts/ManagedProfileSettings.java @@ -28,7 +28,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import android.util.Log; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java index f254d1925ff..3e17c7e4ee7 100644 --- a/src/com/android/settings/applications/AdvancedAppSettings.java +++ b/src/com/android/settings/applications/AdvancedAppSettings.java @@ -22,7 +22,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.provider.SearchIndexableResource; import android.support.v7.preference.Preference; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index 8f687217e56..7b15af1e7b9 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -34,7 +34,7 @@ import android.util.Log; import android.view.View; import android.view.View.OnClickListener; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/AppOpsDetails.java b/src/com/android/settings/applications/AppOpsDetails.java index 0a953c00532..605a05cf5d6 100644 --- a/src/com/android/settings/applications/AppOpsDetails.java +++ b/src/com/android/settings/applications/AppOpsDetails.java @@ -38,7 +38,7 @@ import android.widget.LinearLayout; import android.widget.Switch; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java index 7a2881cac77..c4e9e324113 100644 --- a/src/com/android/settings/applications/AppOpsSummary.java +++ b/src/com/android/settings/applications/AppOpsSummary.java @@ -28,7 +28,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java index 7c7d5a54103..fe4db43b1e2 100644 --- a/src/com/android/settings/applications/AppStorageSettings.java +++ b/src/com/android/settings/applications/AppStorageSettings.java @@ -44,7 +44,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.deviceinfo.StorageWizardMoveConfirm; diff --git a/src/com/android/settings/applications/BackgroundCheckSummary.java b/src/com/android/settings/applications/BackgroundCheckSummary.java index 553eab258bf..51e98a9041e 100644 --- a/src/com/android/settings/applications/BackgroundCheckSummary.java +++ b/src/com/android/settings/applications/BackgroundCheckSummary.java @@ -29,7 +29,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; diff --git a/src/com/android/settings/applications/ConfirmConvertToFbe.java b/src/com/android/settings/applications/ConfirmConvertToFbe.java index 76dcabcee1c..93330c92b77 100644 --- a/src/com/android/settings/applications/ConfirmConvertToFbe.java +++ b/src/com/android/settings/applications/ConfirmConvertToFbe.java @@ -23,7 +23,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java index c1e6576e3c7..e6a7a931b9f 100644 --- a/src/com/android/settings/applications/ConvertToFbe.java +++ b/src/com/android/settings/applications/ConvertToFbe.java @@ -24,8 +24,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.internal.logging.MetricsProto; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/applications/DrawOverlayDetails.java b/src/com/android/settings/applications/DrawOverlayDetails.java index 5e3be1aa0b7..a1edb465ef1 100644 --- a/src/com/android/settings/applications/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/DrawOverlayDetails.java @@ -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.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; import com.android.settings.applications.AppStateOverlayBridge.OverlayState; diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 977f0b01bb6..dd4b8c6f755 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -73,7 +73,7 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 1594e23af8e..4cafe12a071 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -52,7 +52,7 @@ import android.widget.FrameLayout; import android.widget.ListView; import android.widget.SectionIndexer; import android.widget.Spinner; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.AppHeader; import com.android.settings.InstrumentedFragment; import com.android.settings.R; diff --git a/src/com/android/settings/applications/ManageAssist.java b/src/com/android/settings/applications/ManageAssist.java index 9947aa2b17e..17b8edf8fbc 100644 --- a/src/com/android/settings/applications/ManageAssist.java +++ b/src/com/android/settings/applications/ManageAssist.java @@ -26,7 +26,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import com.android.internal.app.AssistUtils; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.voice.VoiceInputListPreference; diff --git a/src/com/android/settings/applications/ManageDomainUrls.java b/src/com/android/settings/applications/ManageDomainUrls.java index 4ffdbf4fd3e..d4d323c09a8 100644 --- a/src/com/android/settings/applications/ManageDomainUrls.java +++ b/src/com/android/settings/applications/ManageDomainUrls.java @@ -31,7 +31,7 @@ import android.support.v7.preference.PreferenceViewHolder; import android.util.ArraySet; import android.view.View; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/PremiumSmsAccess.java b/src/com/android/settings/applications/PremiumSmsAccess.java index c4bb1a80fd3..1ec3a151fa5 100644 --- a/src/com/android/settings/applications/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/PremiumSmsAccess.java @@ -25,7 +25,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceViewHolder; import android.view.View; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.internal.telephony.SmsUsageMonitor; import com.android.settings.DividerPreference; import com.android.settings.InstrumentedFragment; diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java index d538e292928..251829a6cce 100644 --- a/src/com/android/settings/applications/ProcessStatsDetail.java +++ b/src/com/android/settings/applications/ProcessStatsDetail.java @@ -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.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.AppHeader; import com.android.settings.CancellablePreference; import com.android.settings.CancellablePreference.OnCancelListener; diff --git a/src/com/android/settings/applications/ProcessStatsMemDetail.java b/src/com/android/settings/applications/ProcessStatsMemDetail.java index 6c7b90a346a..a880bbdb2ef 100644 --- a/src/com/android/settings/applications/ProcessStatsMemDetail.java +++ b/src/com/android/settings/applications/ProcessStatsMemDetail.java @@ -25,7 +25,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.android.internal.app.procstats.ProcessStats; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java index 01dbf09214f..7559339596e 100644 --- a/src/com/android/settings/applications/ProcessStatsSummary.java +++ b/src/com/android/settings/applications/ProcessStatsSummary.java @@ -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.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SummaryPreference; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java index fd0d7a7bdb1..b41d6bbeff1 100644 --- a/src/com/android/settings/applications/ProcessStatsUi.java +++ b/src/com/android/settings/applications/ProcessStatsUi.java @@ -28,7 +28,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.internal.app.procstats.ProcessStats; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.ProcStatsData.MemInfo; diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java index baf94577e89..fa842ac48eb 100644 --- a/src/com/android/settings/applications/RunningServiceDetails.java +++ b/src/com/android/settings/applications/RunningServiceDetails.java @@ -32,7 +32,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/RunningServices.java b/src/com/android/settings/applications/RunningServices.java index f50f3adc5fd..56742518dce 100644 --- a/src/com/android/settings/applications/RunningServices.java +++ b/src/com/android/settings/applications/RunningServices.java @@ -24,7 +24,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java index 812c8c36471..fe9237a5094 100644 --- a/src/com/android/settings/applications/SpecialAccessSettings.java +++ b/src/com/android/settings/applications/SpecialAccessSettings.java @@ -15,7 +15,7 @@ package com.android.settings.applications; import android.os.Bundle; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index ffe99ed3033..625a02f3709 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -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.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateUsageBridge.UsageState; diff --git a/src/com/android/settings/applications/VrListenerSettings.java b/src/com/android/settings/applications/VrListenerSettings.java index 571e85d4dee..aaa7529021a 100644 --- a/src/com/android/settings/applications/VrListenerSettings.java +++ b/src/com/android/settings/applications/VrListenerSettings.java @@ -18,7 +18,7 @@ package com.android.settings.applications; import android.provider.Settings; import android.service.vr.VrListenerService; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.utils.ManagedServiceSettings; diff --git a/src/com/android/settings/applications/WriteSettingsDetails.java b/src/com/android/settings/applications/WriteSettingsDetails.java index d310d2b5220..14657e1a772 100644 --- a/src/com/android/settings/applications/WriteSettingsDetails.java +++ b/src/com/android/settings/applications/WriteSettingsDetails.java @@ -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.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; import com.android.settings.applications.AppStateWriteSettingsBridge.WriteSettingsState; diff --git a/src/com/android/settings/backup/ToggleBackupSettingFragment.java b/src/com/android/settings/backup/ToggleBackupSettingFragment.java index ff409c500e9..bb633314366 100644 --- a/src/com/android/settings/backup/ToggleBackupSettingFragment.java +++ b/src/com/android/settings/backup/ToggleBackupSettingFragment.java @@ -16,7 +16,7 @@ import android.util.Log; import android.view.View; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java index d9de56dff29..d26929c4ef6 100644 --- a/src/com/android/settings/bluetooth/BluetoothEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java @@ -29,7 +29,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.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.Index; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index 71ebcb507d9..fe109dc4dd7 100644 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -41,7 +41,7 @@ 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.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.LinkifyUtils; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java index 09481ce203b..9a007ad0d2d 100644 --- a/src/com/android/settings/bluetooth/DevicePickerFragment.java +++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java @@ -27,7 +27,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java index 6b2e145dc36..68e41cd9846 100644 --- a/src/com/android/settings/dashboard/DashboardAdapter.java +++ b/src/com/android/settings/dashboard/DashboardAdapter.java @@ -34,7 +34,7 @@ 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.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/dashboard/DashboardContainerFragment.java b/src/com/android/settings/dashboard/DashboardContainerFragment.java index cd42f7dbaff..906980779bd 100644 --- a/src/com/android/settings/dashboard/DashboardContainerFragment.java +++ b/src/com/android/settings/dashboard/DashboardContainerFragment.java @@ -28,7 +28,7 @@ import android.view.View; import android.view.ViewGroup; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java index e10bbdcb461..861ea1ddce1 100644 --- a/src/com/android/settings/dashboard/DashboardSummary.java +++ b/src/com/android/settings/dashboard/DashboardSummary.java @@ -27,7 +27,7 @@ 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.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.Settings; diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java index 6f476a21c42..c3632a14da2 100644 --- a/src/com/android/settings/dashboard/SearchResultsSummary.java +++ b/src/com/android/settings/dashboard/SearchResultsSummary.java @@ -38,7 +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.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/dashboard/SupportFragment.java b/src/com/android/settings/dashboard/SupportFragment.java index 58f79a87876..907476e6c36 100644 --- a/src/com/android/settings/dashboard/SupportFragment.java +++ b/src/com/android/settings/dashboard/SupportFragment.java @@ -35,7 +35,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java index 9ef6988325a..1f4bc0e41e1 100644 --- a/src/com/android/settings/dashboard/SupportItemAdapter.java +++ b/src/com/android/settings/dashboard/SupportItemAdapter.java @@ -38,7 +38,7 @@ import android.widget.Spinner; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.overlay.SupportFeatureProvider; import com.android.settings.support.SupportDisclaimerDialogFragment; diff --git a/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java b/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java index 221b64c8ec8..b40baf59a9a 100644 --- a/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java +++ b/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.drawable.Icon; import android.net.ConnectivityManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings; import com.android.settingslib.WirelessUtils; diff --git a/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java b/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java index 8287abd9c22..2bc71b2b1c2 100644 --- a/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java +++ b/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java @@ -18,7 +18,7 @@ package com.android.settings.dashboard.conditional; import android.content.Intent; import android.graphics.drawable.Icon; import android.net.NetworkPolicyManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings; diff --git a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java b/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java index 86441175682..b3e3504d00d 100644 --- a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java +++ b/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java @@ -17,7 +17,7 @@ package com.android.settings.dashboard.conditional; import android.graphics.drawable.Icon; import android.os.PowerManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.fuelgauge.BatterySaverSettings; diff --git a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java index c28d9faf8d3..6156e39e251 100644 --- a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java +++ b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java @@ -16,7 +16,7 @@ import android.content.Intent; import android.graphics.drawable.Icon; import android.net.ConnectivityManager; import android.telephony.TelephonyManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.TelephonyIntents; import com.android.settings.R; import com.android.settings.Settings; diff --git a/src/com/android/settings/dashboard/conditional/Condition.java b/src/com/android/settings/dashboard/conditional/Condition.java index 0454fe8b72c..3589b84c944 100644 --- a/src/com/android/settings/dashboard/conditional/Condition.java +++ b/src/com/android/settings/dashboard/conditional/Condition.java @@ -21,7 +21,7 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Icon; import android.os.PersistableBundle; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import static android.content.pm.PackageManager.DONT_KILL_APP; diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java index a16de502d32..2e1b8b3777c 100644 --- a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java +++ b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java @@ -26,7 +26,7 @@ import android.view.ViewGroup.LayoutParams; import android.widget.Button; import android.widget.ImageView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardAdapter; diff --git a/src/com/android/settings/dashboard/conditional/DndCondition.java b/src/com/android/settings/dashboard/conditional/DndCondition.java index 49d67c270d3..f6f64fa162a 100644 --- a/src/com/android/settings/dashboard/conditional/DndCondition.java +++ b/src/com/android/settings/dashboard/conditional/DndCondition.java @@ -27,7 +27,7 @@ import android.provider.Settings; import android.provider.Settings.Global; import android.service.notification.ZenModeConfig; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; public class DndCondition extends Condition { diff --git a/src/com/android/settings/dashboard/conditional/HotspotCondition.java b/src/com/android/settings/dashboard/conditional/HotspotCondition.java index e440389127a..2f25da54b23 100644 --- a/src/com/android/settings/dashboard/conditional/HotspotCondition.java +++ b/src/com/android/settings/dashboard/conditional/HotspotCondition.java @@ -25,7 +25,7 @@ import android.net.wifi.WifiManager; import android.os.UserHandle; import android.os.UserManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.TetherSettings; import com.android.settings.Utils; diff --git a/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java b/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java index 132a0a410f1..11d6c0fc0d8 100644 --- a/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java +++ b/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java @@ -19,7 +19,7 @@ package com.android.settings.dashboard.conditional; import android.graphics.drawable.Icon; import com.android.internal.app.NightDisplayController; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.display.NightDisplaySettings; diff --git a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java b/src/com/android/settings/dashboard/conditional/WorkModeCondition.java index 7924eef2fb2..fb6b9c9717d 100644 --- a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java +++ b/src/com/android/settings/dashboard/conditional/WorkModeCondition.java @@ -22,7 +22,7 @@ import android.content.pm.UserInfo; import android.graphics.drawable.Icon; import android.os.UserHandle; import android.os.UserManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings; diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index 45fdc1d8170..c97859b8edc 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -41,7 +41,7 @@ import android.util.ArraySet; import android.util.Log; import android.view.View; import android.widget.AdapterView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.AppHeader; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index d755a7b8247..8c2518e5695 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -35,7 +35,7 @@ import android.widget.EditText; import android.widget.NumberPicker; import android.widget.Spinner; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.NetworkPolicyEditor; import com.android.settingslib.net.DataUsageController; diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java index 510d8a1bdfb..c1374070408 100644 --- a/src/com/android/settings/datausage/CellDataPreference.java +++ b/src/com/android/settings/datausage/CellDataPreference.java @@ -34,7 +34,7 @@ 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.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.CustomDialogPreference; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java index 15c4241fc0b..8e36b2c39f4 100644 --- a/src/com/android/settings/datausage/DataSaverBackend.java +++ b/src/com/android/settings/datausage/DataSaverBackend.java @@ -25,7 +25,7 @@ import android.util.Log; import android.util.SparseBooleanArray; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import java.util.ArrayList; diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java index ffd1fa52a05..b07481be4fe 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.java +++ b/src/com/android/settings/datausage/DataSaverSummary.java @@ -19,7 +19,7 @@ import android.os.Bundle; import android.support.v7.preference.Preference; import android.widget.Switch; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java index 7ac81f58bad..5e65a412b6a 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -46,7 +46,7 @@ import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; import android.widget.Spinner; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.AppItem; import com.android.settingslib.net.ChartData; diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java index eb43d47fda9..c27eba430d3 100644 --- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java +++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java @@ -28,7 +28,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceCategory; import android.telephony.TelephonyManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.search.BaseSearchIndexProvider; diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index af7b92c7e1a..7c6d1502422 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -41,7 +41,7 @@ import android.text.style.RelativeSizeSpan; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SummaryPreference; import com.android.settings.Utils; diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java index cab4551f1e1..be371ceeca9 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java @@ -25,7 +25,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.AppHeader; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index f9b1a579027..6cc50b80abd 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -38,7 +38,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.PreferenceScreen; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java index dc6d3d7a58e..75a7d9f4cb9 100644 --- a/src/com/android/settings/deviceinfo/ImeiInformation.java +++ b/src/com/android/settings/deviceinfo/ImeiInformation.java @@ -28,7 +28,7 @@ import android.text.Spanned; import android.text.TextUtils; import android.text.style.TtsSpan; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneFactory; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java index 9828f8c62b9..f251dbefb18 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java @@ -33,7 +33,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java index 7620b09a4db..03c6290eaa3 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java @@ -29,7 +29,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index 1eb409bdbe9..2e215cdb4e5 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -53,7 +53,7 @@ import android.view.MenuItem; import android.view.View; import android.widget.EditText; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings.StorageUseActivity; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java b/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java index 7032a1d4571..7e651ce3842 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeUnmount.java @@ -28,7 +28,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.deviceinfo.StorageSettings.UnmountTask; diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java index eee76734896..1c07fb3a442 100644 --- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java @@ -38,7 +38,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java index ad770830c52..8db92beaf8c 100644 --- a/src/com/android/settings/deviceinfo/SimStatus.java +++ b/src/com/android/settings/deviceinfo/SimStatus.java @@ -47,7 +47,7 @@ import android.widget.TabHost.TabContentFactory; import android.widget.TabHost.TabSpec; import android.widget.TabWidget; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.DefaultPhoneNotifier; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneFactory; diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java index 42e3d55a078..2b2aa8f9fae 100644 --- a/src/com/android/settings/deviceinfo/Status.java +++ b/src/com/android/settings/deviceinfo/Status.java @@ -38,7 +38,7 @@ import android.os.UserManager; import android.support.v7.preference.Preference; import android.text.TextUtils; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index 7757efce66a..8762f4cb785 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -44,7 +44,7 @@ import android.text.format.Formatter.BytesResult; import android.util.Log; import android.widget.Toast; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index 7eb1217619d..9e76788633a 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -26,7 +26,7 @@ import android.support.v7.preference.TwoStatePreference; import android.widget.TimePicker; import com.android.internal.app.NightDisplayController; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java index 8892f4dedc7..5b59a1706f2 100644 --- a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java @@ -17,7 +17,7 @@ package com.android.settings.display; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; public class ScreenZoomPreferenceFragmentForSetupWizard extends ScreenZoomSettings { diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java index 541357ad2a2..3ffe83cbdae 100644 --- a/src/com/android/settings/display/ScreenZoomSettings.java +++ b/src/com/android/settings/display/ScreenZoomSettings.java @@ -22,7 +22,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.view.Display; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.PreviewSeekBarPreferenceFragment; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java index b4146270972..30b8f49d7c1 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java @@ -41,7 +41,7 @@ import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java index dc2fe9e2526..18cab43b25f 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java @@ -21,7 +21,7 @@ import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; import android.os.UserHandle; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java index 7c9a237ff06..e41d4a8f5d0 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java @@ -24,7 +24,7 @@ import android.os.UserHandle; import android.view.View; import android.widget.Button; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; /** diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java index 627cb78eb41..1f2d497d6fa 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java @@ -28,7 +28,7 @@ import android.view.View; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockGeneric; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java index 6730327d2bb..6979fe9387b 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java @@ -25,7 +25,7 @@ import android.os.CancellationSignal; import android.os.Handler; import android.os.UserHandle; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.InstrumentedFragment; diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java index c1d5d7ebcbe..d62cc9e46da 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java @@ -61,7 +61,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.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockGeneric; import com.android.settings.ChooseLockSettingsHelper; import com.android.settingslib.HelpUtils; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java index 8bd495e77f6..03f98f962de 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java @@ -28,7 +28,7 @@ import android.os.Bundle; import android.view.View; import android.widget.Button; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SetupWizardUtils; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java index baf4fcd6ed7..2028ca44a20 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java @@ -20,7 +20,7 @@ import android.content.Intent; import android.content.res.Resources; import android.os.UserHandle; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; import com.android.settings.SetupWizardUtils; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java index f6602f3113b..004172d844b 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java @@ -22,7 +22,7 @@ import android.os.UserHandle; import android.view.View; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; import com.android.settings.SetupWizardUtils; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java index e7f4cfefc33..d6fdc016f3f 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java @@ -22,7 +22,7 @@ import android.os.UserHandle; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.SetupChooseLockGeneric; diff --git a/src/com/android/settings/fingerprint/SetupSkipDialog.java b/src/com/android/settings/fingerprint/SetupSkipDialog.java index c6e04d7d190..7315c3d5d5e 100644 --- a/src/com/android/settings/fingerprint/SetupSkipDialog.java +++ b/src/com/android/settings/fingerprint/SetupSkipDialog.java @@ -73,4 +73,4 @@ public class SetupSkipDialog extends DialogFragment implements DialogInterface.O public void show(FragmentManager manager) { show(manager, TAG_SKIP_DIALOG); } -} \ No newline at end of file +} diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java index e79f8ff138d..846b3df4565 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java @@ -26,7 +26,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java index e19f6837f54..b1f16850346 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java @@ -33,7 +33,7 @@ import android.provider.Settings.Global; import android.util.Log; import android.widget.Switch; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java index 0b63aa82be4..6cd0ac109ba 100644 --- a/src/com/android/settings/fuelgauge/InactiveApps.java +++ b/src/com/android/settings/fuelgauge/InactiveApps.java @@ -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.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index f091f6649e5..ec210fd3612 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -42,7 +42,7 @@ import android.util.Log; import android.view.View; import android.widget.Button; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatterySipper.DrainType; import com.android.internal.os.BatteryStatsHelper; diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 443b480431f..3be1b6e598c 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -34,7 +34,7 @@ import android.util.TypedValue; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatterySipper.DrainType; import com.android.internal.os.PowerProfile; diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index c03c5e11785..2feff419ffc 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -32,7 +32,7 @@ import android.view.View; import android.view.ViewGroup; import com.android.internal.hardware.AmbientDisplayConfiguration; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java index d35f8956f88..dd3fdae3bcb 100644 --- a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java @@ -33,7 +33,7 @@ import android.os.Bundle; import android.support.v7.preference.PreferenceScreen; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index dbcd9acdaec..c1b0be13c34 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -53,7 +53,7 @@ import android.view.textservice.TextServicesManager; import com.android.internal.app.LocaleHelper; import com.android.internal.app.LocalePicker; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings.KeyboardLayoutPickerActivity; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java index a196ccff159..a939d7e19e7 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java @@ -31,7 +31,7 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java index 02c40147a97..ec1fdb6c46c 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java @@ -27,7 +27,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.view.InputDevice; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment; import java.util.Arrays; diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java index 0d4e173f738..0239c0f1ed4 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment2.java @@ -30,7 +30,7 @@ import android.view.InputDevice; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodSubtype; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index 0f263f26102..3d3747ecfbe 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -44,7 +44,7 @@ import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; import com.android.internal.inputmethod.InputMethodUtils; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; import com.android.settings.Settings; diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java index de013e0586f..f55ef197801 100644 --- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java +++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java @@ -31,7 +31,7 @@ import android.view.textservice.SpellCheckerSubtype; import android.view.textservice.TextServicesManager; import android.widget.Switch; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java index 16a347658f6..ba41285ff5d 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java +++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java @@ -26,7 +26,7 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java index ed5b116ecc6..a39f8c6db42 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryList.java +++ b/src/com/android/settings/inputmethod/UserDictionaryList.java @@ -29,7 +29,7 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java index 3b36de6bcce..64f522bc7cb 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java @@ -26,7 +26,7 @@ import android.os.Bundle; import android.support.v7.preference.Preference; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index 281afa0ae4b..0bd91a5112a 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -33,7 +33,7 @@ import android.view.ViewGroup; import com.android.internal.app.LocalePicker; import com.android.internal.app.LocalePickerWithRegion; import com.android.internal.app.LocaleStore; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/location/LocationMode.java b/src/com/android/settings/location/LocationMode.java index b2669bcc266..e2f9c8321d7 100644 --- a/src/com/android/settings/location/LocationMode.java +++ b/src/com/android/settings/location/LocationMode.java @@ -19,7 +19,7 @@ package com.android.settings.location; import android.provider.Settings; import android.support.v7.preference.PreferenceScreen; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; /** diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 37a91732ac7..cd39332c143 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -37,7 +37,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.widget.Switch; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.DimmableIconPreference; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java index 863651c55cd..0d22e43d89e 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -21,7 +21,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index 31249e63280..f94c6d8303f 100644 --- a/src/com/android/settings/nfc/AndroidBeam.java +++ b/src/com/android/settings/nfc/AndroidBeam.java @@ -29,7 +29,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Switch; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.HelpUtils; import com.android.settings.InstrumentedFragment; import com.android.settings.R; diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index bd131ab1ab0..44b53ada679 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -29,7 +29,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.dashboard.SummaryLoader; diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index fd7a750111f..5b2eafa9d5e 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -29,7 +29,7 @@ import android.service.notification.NotificationListenerService.Ranking; import android.util.ArrayMap; import android.util.Log; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.AppHeader; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index 1bb55309954..ef7504be85e 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -30,7 +30,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.TwoStatePreference; import android.util.Log; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.RestrictedListPreference.RestrictedItem; diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java index d81bc0e7484..4c1ecff5802 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -29,7 +29,7 @@ import android.os.Bundle; import android.provider.Settings; import android.service.notification.NotificationListenerService; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.utils.ManagedServiceSettings; import com.android.settings.utils.ServiceListing; diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java index f0e78291c72..6d4eae7f1b9 100644 --- a/src/com/android/settings/notification/NotificationStation.java +++ b/src/com/android/settings/notification/NotificationStation.java @@ -44,7 +44,7 @@ import android.widget.DateTimeView; import android.widget.ImageView; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.CopyablePreference; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/notification/OtherSoundSettings.java b/src/com/android/settings/notification/OtherSoundSettings.java index 5fdb83a6127..7a7c554479f 100644 --- a/src/com/android/settings/notification/OtherSoundSettings.java +++ b/src/com/android/settings/notification/OtherSoundSettings.java @@ -34,7 +34,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import android.telephony.TelephonyManager; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java index ab5d834d271..6eb7cf1bc9b 100644 --- a/src/com/android/settings/notification/RedactionInterstitial.java +++ b/src/com/android/settings/notification/RedactionInterstitial.java @@ -32,7 +32,7 @@ import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RestrictedCheckBox; import com.android.settings.RestrictedRadioButton; diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index 30dd129a46a..292c33267bd 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -51,7 +51,7 @@ import android.support.v7.preference.TwoStatePreference; import android.text.TextUtils; import android.util.Log; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RingtonePreference; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index 638972e055a..7ef3775eb0a 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -44,7 +44,7 @@ import android.util.ArraySet; import android.view.View; import android.widget.Toast; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import java.util.ArrayList; diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index 1fdba616a61..7f6a54a679d 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -40,7 +40,7 @@ import android.support.v7.preference.PreferenceViewHolder; import android.view.View; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.utils.ManagedServiceSettings.Config; import com.android.settings.utils.ZenServiceListing; diff --git a/src/com/android/settings/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/ZenModeEventRuleSettings.java index c8efdb99eff..8f75475ca72 100644 --- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java @@ -31,7 +31,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.support.v7.preference.PreferenceScreen; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import java.util.ArrayList; diff --git a/src/com/android/settings/notification/ZenModePrioritySettings.java b/src/com/android/settings/notification/ZenModePrioritySettings.java index a61be968d80..679387139ed 100644 --- a/src/com/android/settings/notification/ZenModePrioritySettings.java +++ b/src/com/android/settings/notification/ZenModePrioritySettings.java @@ -28,7 +28,7 @@ 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.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java index d2515804f3d..b0764806b74 100644 --- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java +++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java @@ -40,7 +40,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.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java index ad54689c24d..cefdef93c64 100644 --- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java @@ -37,7 +37,7 @@ import android.text.format.DateFormat; import android.util.Log; import android.widget.TimePicker; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import java.text.SimpleDateFormat; diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 8cca84fbd1d..eadf9797cb4 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -25,7 +25,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java index 0a0acd18f92..6ca1db2fdf3 100644 --- a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java +++ b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java @@ -27,7 +27,7 @@ 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.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.R; diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java index dc7df52fc11..af4fa879884 100644 --- a/src/com/android/settings/print/PrintJobSettingsFragment.java +++ b/src/com/android/settings/print/PrintJobSettingsFragment.java @@ -33,7 +33,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java index db84a6f6b4f..5753db390c9 100644 --- a/src/com/android/settings/print/PrintServiceSettingsFragment.java +++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java @@ -58,7 +58,7 @@ import android.widget.SearchView; import android.widget.Switch; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index 49d254c41e1..453ed9fb3a3 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -50,7 +50,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.DialogCreatable; import com.android.settings.R; import com.android.settings.utils.ProfileSettingsPreferenceFragment; diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index ece39136b56..4cf4d03840c 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -35,7 +35,7 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.TelephonyProperties; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; diff --git a/src/com/android/settings/support/SupportDisclaimerDialogFragment.java b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java index 1df967306d9..efa7396d050 100644 --- a/src/com/android/settings/support/SupportDisclaimerDialogFragment.java +++ b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java @@ -32,7 +32,7 @@ import android.widget.CheckBox; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.SupportFeatureProvider; diff --git a/src/com/android/settings/support/SupportPhoneDialogFragment.java b/src/com/android/settings/support/SupportPhoneDialogFragment.java index 4dde547e0eb..0b9bc33b4c2 100644 --- a/src/com/android/settings/support/SupportPhoneDialogFragment.java +++ b/src/com/android/settings/support/SupportPhoneDialogFragment.java @@ -26,7 +26,7 @@ import android.view.View; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import java.util.Locale; diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index 8c345187b78..3dd3d1c6d84 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -33,7 +33,7 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Checkable; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SeekBarPreference; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java index b12df9f8878..973caa89f54 100644 --- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java +++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java @@ -33,7 +33,7 @@ import android.text.TextUtils; import android.util.Log; import android.util.Pair; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index f72bf9e97bf..29cdaf8e224 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -52,7 +52,7 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.Switch; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index 2a718854f47..957cf079733 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -26,7 +26,7 @@ import android.os.UserManager; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 4e0d8faa08d..5a516aba77d 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -54,7 +54,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.SimpleAdapter; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.ChooseLockGeneric; import com.android.settings.DimmableIconPreference; diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java index b306577f8fc..00c4d1f9401 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -33,7 +33,7 @@ import android.provider.Settings; import android.support.v7.preference.Preference; import android.util.Log; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.net.VpnConfig; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 0d968abc9b3..3c9a8ee3baa 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -48,7 +48,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnProfile; diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 0d6287128df..4ae968cde88 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -58,7 +58,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.android.internal.app.MediaRouteDialogPresenter; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java index 3b930e54841..dd24ba44b7e 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -31,7 +31,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.support.v7.preference.PreferenceScreen; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 81e70d621e2..b733aef3269 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -30,7 +30,7 @@ import android.support.v7.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java index 20faeb0b906..3810ed88a9a 100644 --- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java @@ -25,7 +25,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.util.Log; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.search.BaseSearchIndexProvider; diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index 6abf67d0eb8..15374c58505 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -27,7 +27,7 @@ import android.support.v7.preference.PreferenceScreen; import android.text.Editable; import android.widget.EditText; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index f064050b671..b2ab3a977bd 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -33,7 +33,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.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.Index; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/wifi/WifiInfo.java b/src/com/android/settings/wifi/WifiInfo.java index 373a58755ff..4d24452eeb4 100644 --- a/src/com/android/settings/wifi/WifiInfo.java +++ b/src/com/android/settings/wifi/WifiInfo.java @@ -18,7 +18,7 @@ package com.android.settings.wifi; import android.os.Bundle; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 7007d19e710..c3384a8fd1f 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -57,7 +57,7 @@ import android.widget.TextView.BufferType; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.LinkifyUtils; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index 25f99f11989..abb57e465a4 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -51,7 +51,7 @@ import android.view.MenuItem; import android.widget.EditText; import android.widget.Toast; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment;