diff options
219 files changed, 223 insertions, 223 deletions
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java index 56a4ca075e..4fc205d263 100644 --- a/src/com/android/settings/AirplaneModeEnabler.java +++ b/src/com/android/settings/AirplaneModeEnabler.java @@ -27,7 +27,7 @@ import android.provider.Settings; 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.internal.telephony.PhoneStateIntentReceiver; import com.android.internal.telephony.TelephonyProperties; import com.android.settings.core.instrumentation.MetricsFeatureProvider; diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java index bed20834a7..061c18a665 100644 --- a/src/com/android/settings/ApnEditor.java +++ b/src/com/android/settings/ApnEditor.java @@ -47,7 +47,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.settings.core.instrumentation.InstrumentedDialogFragment; 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 a32e421a01..c00bca4e74 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 f271339277..f005124bcd 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 e929d3d0f6..02f46144bf 100644 --- a/src/com/android/settings/BugreportPreference.java +++ b/src/com/android/settings/BugreportPreference.java @@ -28,7 +28,7 @@ import android.view.View; import android.widget.CheckedTextView; import android.widget.TextView; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.overlay.FeatureFactory; public class BugreportPreference extends CustomDialogPreference { diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 0e76890ac7..a01ecf794d 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -48,7 +48,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.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.fingerprint.FingerprintEnrollBase; diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java index 2d40f20da4..3c66b7ec39 100644 --- a/src/com/android/settings/ChooseLockPassword.java +++ b/src/com/android/settings/ChooseLockPassword.java @@ -47,7 +47,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 23768abe6a..d92e6aa9bc 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -30,7 +30,7 @@ import android.widget.LinearLayout; import android.widget.ScrollView; 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 5214449796..6b55add036 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 bb1324123b..a224ac86ea 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 8ab493e773..87189c8657 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 com.android.settings.core.InstrumentedFragment; diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java index 37846a31b8..cdeb55f7c8 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; import com.android.settings.core.InstrumentedFragment; public class CryptKeeperSettings extends InstrumentedFragment { diff --git a/src/com/android/settings/CustomListPreference.java b/src/com/android/settings/CustomListPreference.java index d251a65875..0549b60fd2 100644 --- a/src/com/android/settings/CustomListPreference.java +++ b/src/com/android/settings/CustomListPreference.java @@ -29,7 +29,7 @@ import android.support.v14.preference.ListPreferenceDialogFragment; import android.support.v7.preference.ListPreference; import android.util.AttributeSet; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; public class CustomListPreference extends ListPreference { diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index f33ca85c1f..cbe3cddca3 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -39,7 +39,7 @@ 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 a7801122e2..9062e63490 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -79,7 +79,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.applications.ProcessStatsPreferenceController; import com.android.settings.fuelgauge.InactiveApps; diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java index 2c98a40dc7..faf08e6b6a 100644 --- a/src/com/android/settings/DeviceAdminSettings.java +++ b/src/com/android/settings/DeviceAdminSettings.java @@ -48,7 +48,7 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.instrumentation.Instrumentable; import com.android.settings.core.instrumentation.VisibilityLoggerMixin; diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index 24091e28b1..ec3494772f 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -33,7 +33,7 @@ import android.support.v7.preference.PreferenceGroup; 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.dashboard.SummaryLoader; import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController; import com.android.settings.deviceinfo.BuildNumberPreferenceController; diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index d58f100d1e..356d5c5db7 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -21,7 +21,7 @@ import android.content.Context; import android.provider.SearchIndexableResource; import android.provider.Settings; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.PreferenceController; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.SummaryLoader; diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java index 6587097ddf..bb9e9783e8 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 81945dfc83..1b18b189d6 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 427e5246c6..9896d528e1 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 a0486562af..ef0f8b3b3e 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/LegalSettings.java b/src/com/android/settings/LegalSettings.java index de6e54804d..e40152a021 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 8483114ebc..b03b583375 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -41,7 +41,7 @@ import android.widget.ImageView; 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 2f466aa74c..bc230d1013 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/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java index c736e4ae32..7314da3e10 100644 --- a/src/com/android/settings/OwnerInfoSettings.java +++ b/src/com/android/settings/OwnerInfoSettings.java @@ -28,7 +28,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.EditText; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java index a55e81aa72..560b160b09 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 80de9da2ca..b272637e8c 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; import com.android.settings.core.InstrumentedFragment; diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index 8642708d17..8ac11cd4ea 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 032972d3f2..d220e739cc 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 24c2b1c368..d74a07fa15 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 eb79c25171..b029662fb4 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -51,7 +51,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.widget.LockPatternUtils; import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java index 0286da7c44..7adf133f7d 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 40c91cef46..0a0eed20f3 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 9cc516c4d4..1eb023d345 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 bae0a929cc..3f5748cff7 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -62,7 +62,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 df073d19d7..c4731822fb 100644 --- a/src/com/android/settings/UserCredentialsSettings.java +++ b/src/com/android/settings/UserCredentialsSettings.java @@ -48,7 +48,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.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java index f67635e192..313e737cba 100644 --- a/src/com/android/settings/UserDictionarySettings.java +++ b/src/com/android/settings/UserDictionarySettings.java @@ -37,7 +37,7 @@ import android.widget.SectionIndexer; import android.widget.SimpleCursorAdapter; import android.widget.TextView; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.instrumentation.VisibilityLoggerMixin; import com.android.settings.inputmethod.UserDictionaryAddWordContents; import com.android.settings.inputmethod.UserDictionarySettingsUtils; diff --git a/src/com/android/settings/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java index 25e6e09589..27a8bd6e3d 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 49e0eecf2c..349f5e93b8 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 com.android.settings.core.InstrumentedActivity; import java.util.ArrayList; diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java index e18f0221fd..196e4bdb46 100644 --- a/src/com/android/settings/WifiCallingSettings.java +++ b/src/com/android/settings/WifiCallingSettings.java @@ -39,7 +39,7 @@ import android.widget.TextView; import com.android.ims.ImsConfig; 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.Phone; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index cac964db69..6c613a5240 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -34,7 +34,7 @@ import android.support.v7.preference.PreferenceScreen; import android.telephony.TelephonyManager; import android.util.Log; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.network.AirplaneModePreferenceController; import com.android.settings.network.MobileNetworkPreferenceController; import com.android.settings.network.MobilePlanPreferenceController; diff --git a/src/com/android/settings/ZonePicker.java b/src/com/android/settings/ZonePicker.java index b1778c6fd8..5d8f15666a 100644 --- a/src/com/android/settings/ZonePicker.java +++ b/src/com/android/settings/ZonePicker.java @@ -31,7 +31,7 @@ import android.view.ViewGroup; import android.widget.ListView; import android.widget.SimpleAdapter; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.instrumentation.VisibilityLoggerMixin; import com.android.settings.core.instrumentation.Instrumentable; import com.android.settingslib.datetime.ZoneGetter; diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index a6c443f50d..f0c77fc83a 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -40,7 +40,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.R; diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index e2ae783d58..009fa5d353 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -25,7 +25,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.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 b062617f11..3606b8ebbe 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 0b64e96109..8dfb2b4992 100644 --- a/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java @@ -16,7 +16,7 @@ package com.android.settings.accessibility; -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 85358500de..3bd450b5c2 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 6b26376d03..6b2c6c8015 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 48eb46cfe7..381364180a 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 9cb04b6e95..293d2bfe56 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 86c5bbb407..5d95d7e0ed 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 1b3f236355..7b7e43fc2e 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 57983195c0..ab0790b798 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 f96219b7a6..9bd2598285 100644 --- a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java @@ -18,7 +18,7 @@ package com.android.settings.accessibility; import android.os.Bundle; -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 376aeef4b9..2396b1ddac 100644 --- a/src/com/android/settings/accounts/AccountSettings.java +++ b/src/com/android/settings/accounts/AccountSettings.java @@ -47,7 +47,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 ae06f9c5bd..dc31124d40 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -52,7 +52,7 @@ import android.view.ViewGroup; 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.R; import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/accounts/AutoSyncDataPreferenceController.java b/src/com/android/settings/accounts/AutoSyncDataPreferenceController.java index ba34b3b5c8..79776a04dd 100644 --- a/src/com/android/settings/accounts/AutoSyncDataPreferenceController.java +++ b/src/com/android/settings/accounts/AutoSyncDataPreferenceController.java @@ -30,7 +30,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.core.PreferenceController; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java index 50171c1ca7..ea39426f43 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 d788ca8256..b124824062 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 0c98f73a67..8c00be91a2 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/accounts/UserAndAccountDashboardFragment.java b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java index 642a63a860..8c48daf4c6 100644 --- a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java +++ b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java @@ -17,7 +17,7 @@ package com.android.settings.accounts; import android.content.Context; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.PreferenceController; import com.android.settings.dashboard.DashboardFragment; @@ -64,4 +64,4 @@ public class UserAndAccountDashboardFragment extends DashboardFragment { return controllers; } -}
\ No newline at end of file +} diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java index 827b6e8903..1a15d6f024 100644 --- a/src/com/android/settings/applications/AdvancedAppSettings.java +++ b/src/com/android/settings/applications/AdvancedAppSettings.java @@ -19,7 +19,7 @@ import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; -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.core.PreferenceController; diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java index 138fadf6f0..8ab730ae64 100644 --- a/src/com/android/settings/applications/AppInfoBase.java +++ b/src/com/android/settings/applications/AppInfoBase.java @@ -37,7 +37,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.Log; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.SettingsActivity; 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 5ebd0bd656..4a9ed3053a 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 5e2e65ab5e..697ffd8443 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.core.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 9e59019eae..ac0a856b21 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.core.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 604f0fffbe..e97a9ac3ee 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 41f1149125..1ff43c81e0 100644 --- a/src/com/android/settings/applications/BackgroundCheckSummary.java +++ b/src/com/android/settings/applications/BackgroundCheckSummary.java @@ -23,7 +23,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.core.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 7048c2f970..a243f04ae3 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 6399612d56..da5f90d104 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 335bb1651a..dfaa95f7f1 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 e7f89be264..add4301b9c 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -75,7 +75,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 7dee5f4148..18a52c0c3f 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -53,7 +53,7 @@ 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.R; import com.android.settings.Settings.AllApplicationsActivity; diff --git a/src/com/android/settings/applications/ManageAssist.java b/src/com/android/settings/applications/ManageAssist.java index 99e55a4794..37ae56fe62 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 a011fe47a2..4a64900e1a 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 4fe26499cb..fa97537cbc 100644 --- a/src/com/android/settings/applications/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/PremiumSmsAccess.java @@ -24,7 +24,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.R; diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java index 7a0760a7cc..89c6adef1c 100644 --- a/src/com/android/settings/applications/ProcessStatsDetail.java +++ b/src/com/android/settings/applications/ProcessStatsDetail.java @@ -43,7 +43,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.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 30babd2877..46a707bc38 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.core.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 9827f1f6ad..31ab0af123 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 724d832837..72238f61cd 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 38b8f37658..28a80296d5 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.core.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 21f235437d..736eafb1c9 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 1b0b7da1ba..31f461c7e1 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 38676acb97..2fa0253651 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 35c30d6eb1..08d1367b3c 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 c11fff61df..9f9016d3a0 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 ffa9e3c266..cd3471bb3c 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 18e3ed00df..e3791e9adb 100644 --- a/src/com/android/settings/bluetooth/BluetoothEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java @@ -27,7 +27,7 @@ import android.provider.Settings; import android.widget.Switch; 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.core.instrumentation.MetricsFeatureProvider; import com.android.settings.search.Index; diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java index 1ee068f8e7..5a3bc36b32 100644 --- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java @@ -40,7 +40,7 @@ import android.widget.Button; import android.widget.EditText; import android.widget.TextView; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java index abeb8625c9..3d786fbfa0 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java @@ -31,7 +31,7 @@ import android.widget.Button; import android.widget.CheckBox; 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.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index 9b222fa837..a967abf96b 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.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 066f5d209e..f250c9a132 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/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java index a2c6776e00..b9efbf83c7 100755 --- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java +++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java @@ -35,7 +35,7 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.bluetooth.CachedBluetoothDevice; diff --git a/src/com/android/settings/core/instrumentation/Instrumentable.java b/src/com/android/settings/core/instrumentation/Instrumentable.java index e48dbd7c65..f58e140b62 100644 --- a/src/com/android/settings/core/instrumentation/Instrumentable.java +++ b/src/com/android/settings/core/instrumentation/Instrumentable.java @@ -22,7 +22,7 @@ public interface Instrumentable { /** * Instrumented name for a view as defined in - * {@link com.android.internal.logging.MetricsProto.MetricsEvent}. + * {@link com.android.internal.logging.nano.MetricsProto.MetricsEvent}. */ int getMetricsCategory(); } diff --git a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java index 65b33df372..a5efcc1f95 100644 --- a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java +++ b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java @@ -22,7 +22,7 @@ import android.content.pm.PackageManager; import android.os.AsyncTask; import android.text.TextUtils; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.overlay.FeatureFactory; import java.util.Map; diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java index 6659ab45c9..136bec099b 100644 --- a/src/com/android/settings/dashboard/DashboardAdapter.java +++ b/src/com/android/settings/dashboard/DashboardAdapter.java @@ -34,7 +34,7 @@ import android.view.ViewGroup; 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.R; import com.android.settings.SettingsActivity; import com.android.settings.core.instrumentation.MetricsFeatureProvider; diff --git a/src/com/android/settings/dashboard/DashboardContainerFragment.java b/src/com/android/settings/dashboard/DashboardContainerFragment.java index 3477d90921..45c423f696 100644 --- a/src/com/android/settings/dashboard/DashboardContainerFragment.java +++ b/src/com/android/settings/dashboard/DashboardContainerFragment.java @@ -27,7 +27,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.core.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 754a7bb602..490808ae04 100644 --- a/src/com/android/settings/dashboard/DashboardSummary.java +++ b/src/com/android/settings/dashboard/DashboardSummary.java @@ -27,7 +27,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.R; import com.android.settings.Settings; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/dashboard/NoHomeDialogFragment.java b/src/com/android/settings/dashboard/NoHomeDialogFragment.java index b8ea9ea73d..e27570b950 100644 --- a/src/com/android/settings/dashboard/NoHomeDialogFragment.java +++ b/src/com/android/settings/dashboard/NoHomeDialogFragment.java @@ -22,7 +22,7 @@ import android.app.Dialog; import android.app.DialogFragment; import android.os.Bundle; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java index 1c73a8425f..7097485583 100644 --- a/src/com/android/settings/dashboard/SearchResultsSummary.java +++ b/src/com/android/settings/dashboard/SearchResultsSummary.java @@ -37,7 +37,7 @@ import android.widget.ListView; import android.widget.SearchView; 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.Utils; diff --git a/src/com/android/settings/dashboard/SupportFragment.java b/src/com/android/settings/dashboard/SupportFragment.java index c8fed8acf7..63983ce5f6 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.R; import com.android.settings.core.InstrumentedFragment; 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 f966668a85..517d8d006f 100644 --- a/src/com/android/settings/dashboard/SupportItemAdapter.java +++ b/src/com/android/settings/dashboard/SupportItemAdapter.java @@ -37,7 +37,7 @@ import android.widget.ImageView; import android.widget.Spinner; import android.widget.TextView; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.overlay.SupportFeatureProvider; diff --git a/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java b/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java index 221b64c8ec..b40baf59a9 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 8287abd9c2..2bc71b2b1c 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 8644117568..b3e3504d00 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 c28d9faf8d..6156e39e25 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 61889bec82..b184004993 100644 --- a/src/com/android/settings/dashboard/conditional/Condition.java +++ b/src/com/android/settings/dashboard/conditional/Condition.java @@ -22,7 +22,7 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Icon; import android.os.PersistableBundle; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java index 3d13fde357..c79cdf34d5 100644 --- a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java +++ b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java @@ -27,7 +27,7 @@ import android.view.ViewGroup.LayoutParams; import android.widget.Button; import android.widget.ImageView; -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; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/dashboard/conditional/DndCondition.java b/src/com/android/settings/dashboard/conditional/DndCondition.java index 49d67c270d..f6f64fa162 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 e440389127..2f25da54b2 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 132a0a410f..11d6c0fc0d 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 7924eef2fb..fb6b9c9717 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 d8b0849156..29bd5093f0 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.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.AppHeaderController; diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index ce020b190d..9b39840794 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -36,7 +36,7 @@ import android.widget.NumberPicker; import android.widget.Spinner; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.NetworkPolicyEditor; diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java index daf72f3eaf..0194178267 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.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 3b3ff9c5a1..7c291c6cd4 100644 --- a/src/com/android/settings/datausage/DataSaverBackend.java +++ b/src/com/android/settings/datausage/DataSaverBackend.java @@ -21,7 +21,7 @@ import android.os.Handler; import android.os.RemoteException; import android.util.SparseIntArray; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java index 90aab7b2db..b0304fc1d6 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 abe2a9f44b..36275b735c 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 12e7b876a1..94a44f8031 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 c99a4ab972..41dc78f227 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 df238b92fb..0839114dbb 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java @@ -27,7 +27,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.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.AppStateBaseBridge; diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index 861bbf8519..ff97e31843 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -31,7 +31,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener; import android.text.format.DateUtils; import android.text.format.Formatter; -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/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java index 960596c3cb..9d4602b55b 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 d7a57ca6ce..a8e119daa1 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; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java index de3e3d3888..c4ca880ba0 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.core.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 e29f4805e8..e57231e988 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 40b09e7ef8..0aa5b920f5 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 2973ecdba0..fccd44017a 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 469413a5d3..4444d486f7 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 1cbc78c5ca..930e185e3d 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 d9e02e8152..c537661270 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/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java index c42d692d4c..59a1866583 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java @@ -33,7 +33,7 @@ import android.util.Log; import android.view.View; import android.widget.Toast; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java index 567393e80c..ee940a3418 100644 --- a/src/com/android/settings/display/AutoRotatePreferenceController.java +++ b/src/com/android/settings/display/AutoRotatePreferenceController.java @@ -18,7 +18,7 @@ import android.content.res.Configuration; import android.support.v7.preference.DropDownPreference; import android.support.v7.preference.Preference; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.internal.view.RotationPolicy; import com.android.settings.R; import com.android.settings.core.PreferenceController; diff --git a/src/com/android/settings/display/DozePreferenceController.java b/src/com/android/settings/display/DozePreferenceController.java index 16b0e81aa8..ad72053bf3 100644 --- a/src/com/android/settings/display/DozePreferenceController.java +++ b/src/com/android/settings/display/DozePreferenceController.java @@ -26,7 +26,7 @@ import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.overlay.FeatureFactory; import static android.provider.Settings.Secure.DOZE_ENABLED; -import static com.android.internal.logging.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY; +import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY; public class DozePreferenceController extends PreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index b37e2e2149..1ff4297d3d 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 bfe4a779b7..82cb58d3cd 100644 --- a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java @@ -16,7 +16,7 @@ package com.android.settings.display; -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 af359f14eb..7538cd337f 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 fa108bb302..d2cac0910d 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java @@ -39,7 +39,7 @@ import android.view.animation.Interpolator; 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; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java index f2fda6b249..510e95380d 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.Utils; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java index 94d257087b..337916941a 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java @@ -23,7 +23,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.Utils; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java index 697c44a83a..bbaf54c2ae 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 24061b458b..c0c0d33a5c 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.Utils; import com.android.settings.core.InstrumentedFragment; diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java index 3c1be40d9a..58060f3c81 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java @@ -60,7 +60,7 @@ import android.widget.EditText; 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.settings.ChooseLockGeneric; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java index 90b281f54d..0e4501c798 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; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java index 2ff3a1a772..aff1028269 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 370e3fca5c..92ea5cb479 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 68ee0b6f14..546fc0e29e 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 9e9bb4c178..842e69c3c7 100644 --- a/src/com/android/settings/fingerprint/SetupSkipDialog.java +++ b/src/com/android/settings/fingerprint/SetupSkipDialog.java @@ -25,7 +25,7 @@ import android.content.DialogInterface; import android.os.Bundle; import android.support.annotation.NonNull; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java index f71884cc98..ef9415842d 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 0108dd096c..4dc8f87a0c 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/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java index c448756973..580c59f372 100644 --- a/src/com/android/settings/fuelgauge/HighPowerDetail.java +++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java @@ -30,7 +30,7 @@ import android.view.View; import android.widget.Checkable; import android.widget.TextView; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java index 00556d2ac1..f91a5c6902 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 b42547f139..003c7f684b 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -43,7 +43,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 cc0e245d76..3ed9bee24b 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 c68d922606..ff165196ad 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.SettingsPreferenceFragment; import com.android.settings.search.BaseSearchIndexProvider; diff --git a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java index afa9ed2fad..0dbab44d43 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 351f6b5470..c1788fd8b6 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.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.Settings.KeyboardLayoutPickerActivity; import com.android.settings.Utils; diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java index d1454cc421..a47daa15ca 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/KeyboardLayoutDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java index 24bdd61797..3a62d0ed80 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java @@ -40,7 +40,7 @@ import android.widget.CheckedTextView; import android.widget.RadioButton; import android.widget.TextView; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java index 09cc65e52e..80d353181b 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.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 f0fdc08139..5dd5ca13e0 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 f43173620d..e21ced1609 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 b16c3dbff5..65b40a3d3d 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.core.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 28ff2a67ce..b8e87efbcb 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 71755392b1..24c2ebcc7c 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 07bbe210d8..9590545c50 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 6d89509423..e50a0d9cba 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 f1fdea7c09..03aa155992 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 d4e133bc5a..fd5a7fd663 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/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index fca8ec72f4..cb75f0edf2 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -20,7 +20,7 @@ import android.app.Dialog; import android.content.Context; 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.core.PreferenceController; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index 6a36bde959..76b67e8f5a 100644 --- a/src/com/android/settings/nfc/AndroidBeam.java +++ b/src/com/android/settings/nfc/AndroidBeam.java @@ -27,7 +27,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.core.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 928534e50b..e617ef3249 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 8e47af5148..c38a72fc25 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -30,7 +30,7 @@ import android.support.v7.preference.PreferenceCategory; 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.settings.AppHeader; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java index 7f384a5fb4..1d2ef8cb3f 100644 --- a/src/com/android/settings/notification/ChannelNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelNotificationSettings.java @@ -27,7 +27,7 @@ import android.service.notification.NotificationListenerService.Ranking; import android.support.v7.preference.Preference; 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.RingtonePreference; diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index 1f322d0dab..59bd238f03 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -19,7 +19,7 @@ package com.android.settings.notification; import android.content.Context; 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.core.PreferenceController; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java index 4a3aac527c..b032358ba7 100644 --- a/src/com/android/settings/notification/NotificationAccessSettings.java +++ b/src/com/android/settings/notification/NotificationAccessSettings.java @@ -29,7 +29,7 @@ import android.provider.Settings; import android.service.notification.NotificationListenerService; 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.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.utils.ManagedServiceSettings; diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java index 68dd8da15b..e74a3d16a7 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 5fb635efcc..cf47cb5f45 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 baf335be6c..f4352570ff 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 7365995881..1ec3164243 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -60,7 +60,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.DefaultRingtonePreference; diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index 7312b1d090..f9b1c12bf2 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 com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index f897733fcd..495e4994ca 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -39,7 +39,7 @@ import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceViewHolder; 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.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 3b261c049e..336173492c 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 cfac1f52f0..f4d3f7414c 100644 --- a/src/com/android/settings/notification/ZenModePrioritySettings.java +++ b/src/com/android/settings/notification/ZenModePrioritySettings.java @@ -27,7 +27,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.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 8ebb4dcb06..5629b17333 100644 --- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java +++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java @@ -39,7 +39,7 @@ import android.view.View; import android.widget.Switch; 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.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 7a816c3fe8..72f6567ac6 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 com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index f2d9daa893..88df549d47 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 016e3818af..aa2784804c 100644 --- a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java +++ b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java @@ -24,7 +24,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; public class ZenModeVisualInterruptionSettings extends ZenModeSettingsBase { diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java index fcc0176e0b..349d9fccaa 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 0233914ef8..3e3582397b 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 8700c7b1bb..b0f698f87f 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.R; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.search.BaseSearchIndexProvider; diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 3a1bd758c7..3d6bfb162a 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 f7149f7988..8ab607f7ac 100644 --- a/src/com/android/settings/support/SupportDisclaimerDialogFragment.java +++ b/src/com/android/settings/support/SupportDisclaimerDialogFragment.java @@ -31,7 +31,7 @@ import android.view.View; import android.widget.CheckBox; import android.widget.TextView; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/support/SupportPhoneDialogFragment.java b/src/com/android/settings/support/SupportPhoneDialogFragment.java index c15070b452..8abdae06fc 100644 --- a/src/com/android/settings/support/SupportPhoneDialogFragment.java +++ b/src/com/android/settings/support/SupportPhoneDialogFragment.java @@ -24,7 +24,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index 2a57ac2f82..96a7f4ea94 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 655a781221..42222dfaf2 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 bbbd029476..609ed27732 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/RestrictedProfileSettings.java b/src/com/android/settings/users/RestrictedProfileSettings.java index 31722e25f7..99ae26df44 100644 --- a/src/com/android/settings/users/RestrictedProfileSettings.java +++ b/src/com/android/settings/users/RestrictedProfileSettings.java @@ -26,7 +26,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index 47f800731c..47aed02948 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -26,8 +26,8 @@ import android.os.UserManager; import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; -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.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 8cd039f5ff..9165be60e0 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/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java index 31158b72f4..eccda7918c 100644 --- a/src/com/android/settings/utils/ManagedServiceSettings.java +++ b/src/com/android/settings/utils/ManagedServiceSettings.java @@ -35,7 +35,7 @@ import android.support.v7.preference.PreferenceScreen; import android.view.View; import android.widget.TextView; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.notification.EmptyTextSettings; diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java index 4075c01e52..b24db4ed4c 100644 --- a/src/com/android/settings/vpn2/AppDialogFragment.java +++ b/src/com/android/settings/vpn2/AppDialogFragment.java @@ -31,7 +31,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.Log; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.internal.net.VpnConfig; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java index 68e0659c10..23901cea63 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -39,7 +39,7 @@ import android.text.TextUtils; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.net.VpnConfig; import com.android.internal.util.ArrayUtils; import com.android.settings.R; diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java index 9dbf752c06..86245d45d4 100644 --- a/src/com/android/settings/vpn2/ConfigDialogFragment.java +++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java @@ -33,7 +33,7 @@ import android.util.Log; import android.view.View; import android.widget.Toast; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; 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/vpn2/ConfirmLockdownFragment.java b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java index 4d643cfd87..246c2f2aa3 100644 --- a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java +++ b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java @@ -22,7 +22,7 @@ import android.app.DialogFragment; import android.content.DialogInterface; 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.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 7be69f9f6d..c2ed1c0da3 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.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.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 02f63ae967..c6bb7ae8b3 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 b0bdd77fb0..f7cc772012 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -28,7 +28,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.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index c230f1da12..ce27ba9b06 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -34,7 +34,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.AppListSwitchPreference; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java index 55f0b63642..a830dc01dc 100644 --- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java @@ -25,8 +25,8 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import android.util.Log; -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.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 2ac76ce5e4..1a5eb15972 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 d70d6ba4be..a05e4988e1 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -32,7 +32,7 @@ import android.provider.Settings; import android.widget.Switch; 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.core.instrumentation.MetricsFeatureProvider; import com.android.settings.search.Index; diff --git a/src/com/android/settings/wifi/WifiInfo.java b/src/com/android/settings/wifi/WifiInfo.java index 56e81a0cc5..3f57376f60 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/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java index 29ef79e902..2c0d0d5713 100644 --- a/src/com/android/settings/wifi/WifiScanModeActivity.java +++ b/src/com/android/settings/wifi/WifiScanModeActivity.java @@ -28,7 +28,7 @@ import android.net.wifi.WifiManager; import android.os.Bundle; import android.provider.Settings; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index bdb3779f85..1dd18bd01c 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; import android.widget.TextView.BufferType; import android.widget.Toast; -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/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java index 70370b2e89..f640b6e25a 100644 --- a/src/com/android/settings/wifi/WifiSetupActivity.java +++ b/src/com/android/settings/wifi/WifiSetupActivity.java @@ -32,7 +32,7 @@ import android.os.Bundle; import android.support.v14.preference.PreferenceFragment; import android.util.Log; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.ButtonBarHandler; import com.android.settings.R; import com.android.settings.SetupWizardUtils; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index 487090d387..977be7ea72 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; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java index f8797aae95..c3c1d6d7ee 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java @@ -17,7 +17,7 @@ package com.android.settings.dashboard.conditional; import android.content.Context; import android.graphics.drawable.Icon; -import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.nano.MetricsProto; import com.android.settings.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.core.instrumentation.MetricsFeatureProvider; |