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