Browse Source

Update package names to work with the proto3 compiler

Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
Tamas Berghammer 3 years ago
parent
commit
265d3c2a0c
100 changed files with 101 additions and 101 deletions
  1. 1
    1
      src/com/android/settings/AirplaneModeEnabler.java
  2. 1
    1
      src/com/android/settings/ApnEditor.java
  3. 1
    1
      src/com/android/settings/ApnSettings.java
  4. 1
    1
      src/com/android/settings/ApplicationSettings.java
  5. 1
    1
      src/com/android/settings/BugreportPreference.java
  6. 1
    1
      src/com/android/settings/ChooseLockGeneric.java
  7. 1
    1
      src/com/android/settings/ChooseLockPassword.java
  8. 1
    1
      src/com/android/settings/ChooseLockPattern.java
  9. 1
    1
      src/com/android/settings/ConfirmLockPassword.java
  10. 1
    1
      src/com/android/settings/ConfirmLockPattern.java
  11. 1
    1
      src/com/android/settings/CryptKeeperConfirm.java
  12. 1
    1
      src/com/android/settings/CryptKeeperSettings.java
  13. 1
    1
      src/com/android/settings/CustomListPreference.java
  14. 1
    1
      src/com/android/settings/DateTimeSettings.java
  15. 1
    1
      src/com/android/settings/DevelopmentSettings.java
  16. 1
    1
      src/com/android/settings/DeviceAdminSettings.java
  17. 1
    1
      src/com/android/settings/DeviceInfoSettings.java
  18. 1
    1
      src/com/android/settings/DisplaySettings.java
  19. 1
    1
      src/com/android/settings/DreamSettings.java
  20. 1
    1
      src/com/android/settings/EncryptionInterstitial.java
  21. 1
    1
      src/com/android/settings/HomeSettings.java
  22. 1
    1
      src/com/android/settings/IccLockSettings.java
  23. 1
    1
      src/com/android/settings/LegalSettings.java
  24. 1
    1
      src/com/android/settings/MasterClear.java
  25. 1
    1
      src/com/android/settings/MasterClearConfirm.java
  26. 1
    1
      src/com/android/settings/OwnerInfoSettings.java
  27. 1
    1
      src/com/android/settings/PrivacySettings.java
  28. 1
    1
      src/com/android/settings/ProxySelector.java
  29. 1
    1
      src/com/android/settings/ResetNetwork.java
  30. 1
    1
      src/com/android/settings/ResetNetworkConfirm.java
  31. 1
    1
      src/com/android/settings/ScreenPinningSettings.java
  32. 1
    1
      src/com/android/settings/SecuritySettings.java
  33. 1
    1
      src/com/android/settings/TestingSettings.java
  34. 1
    1
      src/com/android/settings/TetherSettings.java
  35. 1
    1
      src/com/android/settings/TrustAgentSettings.java
  36. 1
    1
      src/com/android/settings/TrustedCredentialsSettings.java
  37. 1
    1
      src/com/android/settings/UserCredentialsSettings.java
  38. 1
    1
      src/com/android/settings/UserDictionarySettings.java
  39. 1
    1
      src/com/android/settings/WallpaperTypeSettings.java
  40. 1
    1
      src/com/android/settings/WebViewImplementation.java
  41. 1
    1
      src/com/android/settings/WifiCallingSettings.java
  42. 1
    1
      src/com/android/settings/WirelessSettings.java
  43. 1
    1
      src/com/android/settings/ZonePicker.java
  44. 1
    1
      src/com/android/settings/accessibility/AccessibilitySettings.java
  45. 1
    1
      src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
  46. 1
    1
      src/com/android/settings/accessibility/CaptionPropertiesFragment.java
  47. 1
    1
      src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java
  48. 1
    1
      src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
  49. 1
    1
      src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
  50. 1
    1
      src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
  51. 1
    1
      src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
  52. 1
    1
      src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
  53. 1
    1
      src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
  54. 1
    1
      src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
  55. 1
    1
      src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
  56. 1
    1
      src/com/android/settings/accounts/AccountSettings.java
  57. 1
    1
      src/com/android/settings/accounts/AccountSyncSettings.java
  58. 1
    1
      src/com/android/settings/accounts/AutoSyncDataPreferenceController.java
  59. 1
    1
      src/com/android/settings/accounts/ChooseAccountActivity.java
  60. 1
    1
      src/com/android/settings/accounts/ManageAccountsSettings.java
  61. 1
    1
      src/com/android/settings/accounts/ManagedProfileSettings.java
  62. 2
    2
      src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
  63. 1
    1
      src/com/android/settings/applications/AdvancedAppSettings.java
  64. 1
    1
      src/com/android/settings/applications/AppInfoBase.java
  65. 1
    1
      src/com/android/settings/applications/AppLaunchSettings.java
  66. 1
    1
      src/com/android/settings/applications/AppOpsDetails.java
  67. 1
    1
      src/com/android/settings/applications/AppOpsSummary.java
  68. 1
    1
      src/com/android/settings/applications/AppStorageSettings.java
  69. 1
    1
      src/com/android/settings/applications/BackgroundCheckSummary.java
  70. 1
    1
      src/com/android/settings/applications/ConfirmConvertToFbe.java
  71. 2
    2
      src/com/android/settings/applications/ConvertToFbe.java
  72. 1
    1
      src/com/android/settings/applications/DrawOverlayDetails.java
  73. 1
    1
      src/com/android/settings/applications/InstalledAppDetails.java
  74. 1
    1
      src/com/android/settings/applications/ManageApplications.java
  75. 1
    1
      src/com/android/settings/applications/ManageAssist.java
  76. 1
    1
      src/com/android/settings/applications/ManageDomainUrls.java
  77. 1
    1
      src/com/android/settings/applications/PremiumSmsAccess.java
  78. 1
    1
      src/com/android/settings/applications/ProcessStatsDetail.java
  79. 1
    1
      src/com/android/settings/applications/ProcessStatsMemDetail.java
  80. 1
    1
      src/com/android/settings/applications/ProcessStatsSummary.java
  81. 1
    1
      src/com/android/settings/applications/ProcessStatsUi.java
  82. 1
    1
      src/com/android/settings/applications/RunningServiceDetails.java
  83. 1
    1
      src/com/android/settings/applications/RunningServices.java
  84. 1
    1
      src/com/android/settings/applications/SpecialAccessSettings.java
  85. 1
    1
      src/com/android/settings/applications/UsageAccessDetails.java
  86. 1
    1
      src/com/android/settings/applications/VrListenerSettings.java
  87. 1
    1
      src/com/android/settings/applications/WriteSettingsDetails.java
  88. 1
    1
      src/com/android/settings/backup/ToggleBackupSettingFragment.java
  89. 1
    1
      src/com/android/settings/bluetooth/BluetoothEnabler.java
  90. 1
    1
      src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
  91. 1
    1
      src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
  92. 1
    1
      src/com/android/settings/bluetooth/BluetoothSettings.java
  93. 1
    1
      src/com/android/settings/bluetooth/DevicePickerFragment.java
  94. 1
    1
      src/com/android/settings/bluetooth/DeviceProfilesSettings.java
  95. 1
    1
      src/com/android/settings/core/instrumentation/Instrumentable.java
  96. 1
    1
      src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
  97. 1
    1
      src/com/android/settings/dashboard/DashboardAdapter.java
  98. 1
    1
      src/com/android/settings/dashboard/DashboardContainerFragment.java
  99. 1
    1
      src/com/android/settings/dashboard/DashboardSummary.java
  100. 0
    0
      src/com/android/settings/dashboard/NoHomeDialogFragment.java

+ 1
- 1
src/com/android/settings/AirplaneModeEnabler.java View File

@@ -27,7 +27,7 @@ import android.provider.Settings;
27 27
 import android.support.v14.preference.SwitchPreference;
28 28
 import android.support.v7.preference.Preference;
29 29
 
30
-import com.android.internal.logging.MetricsProto.MetricsEvent;
30
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
31 31
 import com.android.internal.telephony.PhoneStateIntentReceiver;
32 32
 import com.android.internal.telephony.TelephonyProperties;
33 33
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;

+ 1
- 1
src/com/android/settings/ApnEditor.java View File

@@ -47,7 +47,7 @@ import android.view.MenuItem;
47 47
 import android.view.View;
48 48
 import android.view.View.OnKeyListener;
49 49
 
50
-import com.android.internal.logging.MetricsProto.MetricsEvent;
50
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
51 51
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
52 52
 import com.android.internal.telephony.PhoneConstants;
53 53
 import com.android.internal.util.ArrayUtils;

+ 1
- 1
src/com/android/settings/ApnSettings.java View File

@@ -53,7 +53,7 @@ import android.view.MotionEvent;
53 53
 import android.widget.TextView;
54 54
 import android.widget.Toast;
55 55
 
56
-import com.android.internal.logging.MetricsProto.MetricsEvent;
56
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
57 57
 import com.android.internal.telephony.PhoneConstants;
58 58
 import com.android.internal.telephony.TelephonyIntents;
59 59
 import com.android.internal.telephony.dataconnection.ApnSetting;

+ 1
- 1
src/com/android/settings/ApplicationSettings.java View File

@@ -24,7 +24,7 @@ import android.support.v7.preference.ListPreference;
24 24
 import android.support.v7.preference.Preference;
25 25
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
26 26
 
27
-import com.android.internal.logging.MetricsProto.MetricsEvent;
27
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
28 28
 
29 29
 public class ApplicationSettings extends SettingsPreferenceFragment {
30 30
 

+ 1
- 1
src/com/android/settings/BugreportPreference.java View File

@@ -28,7 +28,7 @@ import android.view.View;
28 28
 import android.widget.CheckedTextView;
29 29
 import android.widget.TextView;
30 30
 
31
-import com.android.internal.logging.MetricsProto.MetricsEvent;
31
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
32 32
 import com.android.settings.overlay.FeatureFactory;
33 33
 
34 34
 public class BugreportPreference extends CustomDialogPreference {

+ 1
- 1
src/com/android/settings/ChooseLockGeneric.java View File

@@ -48,7 +48,7 @@ import android.util.Log;
48 48
 import android.view.accessibility.AccessibilityManager;
49 49
 import android.widget.TextView;
50 50
 
51
-import com.android.internal.logging.MetricsProto.MetricsEvent;
51
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
52 52
 import com.android.internal.widget.LockPatternUtils;
53 53
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
54 54
 import com.android.settings.fingerprint.FingerprintEnrollBase;

+ 1
- 1
src/com/android/settings/ChooseLockPassword.java View File

@@ -47,7 +47,7 @@ import android.widget.LinearLayout;
47 47
 import android.widget.TextView;
48 48
 import android.widget.TextView.OnEditorActionListener;
49 49
 
50
-import com.android.internal.logging.MetricsProto.MetricsEvent;
50
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
51 51
 import com.android.internal.widget.LockPatternUtils;
52 52
 import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
53 53
 import com.android.internal.widget.TextViewInputDisabler;

+ 1
- 1
src/com/android/settings/ChooseLockPattern.java View File

@@ -30,7 +30,7 @@ import android.widget.LinearLayout;
30 30
 import android.widget.ScrollView;
31 31
 import android.widget.TextView;
32 32
 
33
-import com.android.internal.logging.MetricsProto.MetricsEvent;
33
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
34 34
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
35 35
 import com.android.internal.widget.LockPatternUtils;
36 36
 import com.android.internal.widget.LockPatternUtils.RequestThrottledException;

+ 1
- 1
src/com/android/settings/ConfirmLockPassword.java View File

@@ -39,7 +39,7 @@ import android.view.inputmethod.InputMethodManager;
39 39
 import android.widget.TextView;
40 40
 import android.widget.TextView.OnEditorActionListener;
41 41
 
42
-import com.android.internal.logging.MetricsProto.MetricsEvent;
42
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
43 43
 import com.android.internal.widget.LockPatternChecker;
44 44
 import com.android.internal.widget.LockPatternUtils;
45 45
 import com.android.internal.widget.TextViewInputDisabler;

+ 1
- 1
src/com/android/settings/ConfirmLockPattern.java View File

@@ -31,7 +31,7 @@ import android.view.animation.AnimationUtils;
31 31
 import android.view.animation.Interpolator;
32 32
 import android.widget.TextView;
33 33
 
34
-import com.android.internal.logging.MetricsProto.MetricsEvent;
34
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
35 35
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
36 36
 import com.android.internal.widget.LockPatternChecker;
37 37
 import com.android.internal.widget.LockPatternUtils;

+ 1
- 1
src/com/android/settings/CryptKeeperConfirm.java View File

@@ -33,7 +33,7 @@ import android.view.View;
33 33
 import android.view.ViewGroup;
34 34
 import android.widget.Button;
35 35
 
36
-import com.android.internal.logging.MetricsProto.MetricsEvent;
36
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
37 37
 import com.android.internal.widget.LockPatternUtils;
38 38
 import com.android.settings.core.InstrumentedFragment;
39 39
 

+ 1
- 1
src/com/android/settings/CryptKeeperSettings.java View File

@@ -35,7 +35,7 @@ import android.view.View;
35 35
 import android.view.ViewGroup;
36 36
 import android.widget.Button;
37 37
 
38
-import com.android.internal.logging.MetricsProto.MetricsEvent;
38
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
39 39
 import com.android.settings.core.InstrumentedFragment;
40 40
 
41 41
 public class CryptKeeperSettings extends InstrumentedFragment {

+ 1
- 1
src/com/android/settings/CustomListPreference.java View File

@@ -29,7 +29,7 @@ import android.support.v14.preference.ListPreferenceDialogFragment;
29 29
 import android.support.v7.preference.ListPreference;
30 30
 import android.util.AttributeSet;
31 31
 
32
-import com.android.internal.logging.MetricsProto;
32
+import com.android.internal.logging.nano.MetricsProto;
33 33
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
34 34
 
35 35
 public class CustomListPreference extends ListPreference {

+ 1
- 1
src/com/android/settings/DateTimeSettings.java View File

@@ -39,7 +39,7 @@ import android.text.format.DateFormat;
39 39
 import android.widget.DatePicker;
40 40
 import android.widget.TimePicker;
41 41
 
42
-import com.android.internal.logging.MetricsProto.MetricsEvent;
42
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
43 43
 import com.android.settings.dashboard.SummaryLoader;
44 44
 import com.android.settings.search.BaseSearchIndexProvider;
45 45
 import com.android.settings.search.Indexable;

+ 1
- 1
src/com/android/settings/DevelopmentSettings.java View File

@@ -79,7 +79,7 @@ import android.widget.Switch;
79 79
 import android.widget.Toast;
80 80
 
81 81
 import com.android.internal.app.LocalePicker;
82
-import com.android.internal.logging.MetricsProto.MetricsEvent;
82
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
83 83
 import com.android.settings.applications.BackgroundCheckSummary;
84 84
 import com.android.settings.applications.ProcessStatsPreferenceController;
85 85
 import com.android.settings.fuelgauge.InactiveApps;

+ 1
- 1
src/com/android/settings/DeviceAdminSettings.java View File

@@ -48,7 +48,7 @@ import android.widget.ImageView;
48 48
 import android.widget.ListView;
49 49
 import android.widget.TextView;
50 50
 
51
-import com.android.internal.logging.MetricsProto;
51
+import com.android.internal.logging.nano.MetricsProto;
52 52
 import com.android.settings.core.instrumentation.Instrumentable;
53 53
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
54 54
 

+ 1
- 1
src/com/android/settings/DeviceInfoSettings.java View File

@@ -33,7 +33,7 @@ import android.support.v7.preference.PreferenceGroup;
33 33
 import android.text.TextUtils;
34 34
 import android.util.Log;
35 35
 
36
-import com.android.internal.logging.MetricsProto.MetricsEvent;
36
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
37 37
 import com.android.settings.dashboard.SummaryLoader;
38 38
 import com.android.settings.deviceinfo.AdditionalSystemUpdatePreferenceController;
39 39
 import com.android.settings.deviceinfo.BuildNumberPreferenceController;

+ 1
- 1
src/com/android/settings/DisplaySettings.java View File

@@ -21,7 +21,7 @@ import android.content.Context;
21 21
 import android.provider.SearchIndexableResource;
22 22
 import android.provider.Settings;
23 23
 
24
-import com.android.internal.logging.MetricsProto.MetricsEvent;
24
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
25 25
 import com.android.settings.core.PreferenceController;
26 26
 import com.android.settings.dashboard.DashboardFragment;
27 27
 import com.android.settings.dashboard.SummaryLoader;

+ 1
- 1
src/com/android/settings/DreamSettings.java View File

@@ -41,7 +41,7 @@ import android.widget.RadioButton;
41 41
 import android.widget.Switch;
42 42
 import android.widget.TextView;
43 43
 
44
-import com.android.internal.logging.MetricsProto.MetricsEvent;
44
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
45 45
 import com.android.settings.widget.SwitchBar;
46 46
 import com.android.settingslib.dream.DreamBackend;
47 47
 import com.android.settingslib.dream.DreamBackend.DreamInfo;

+ 1
- 1
src/com/android/settings/EncryptionInterstitial.java View File

@@ -35,7 +35,7 @@ import android.view.accessibility.AccessibilityManager;
35 35
 import android.widget.LinearLayout;
36 36
 import android.widget.TextView;
37 37
 
38
-import com.android.internal.logging.MetricsProto.MetricsEvent;
38
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
39 39
 import com.android.settings.utils.SettingsDividerItemDecoration;
40 40
 import com.android.setupwizardlib.GlifPreferenceLayout;
41 41
 

+ 1
- 1
src/com/android/settings/HomeSettings.java View File

@@ -50,7 +50,7 @@ import android.view.View.OnClickListener;
50 50
 import android.widget.ImageView;
51 51
 import android.widget.RadioButton;
52 52
 
53
-import com.android.internal.logging.MetricsProto.MetricsEvent;
53
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
54 54
 import com.android.settings.search.BaseSearchIndexProvider;
55 55
 import com.android.settings.search.Index;
56 56
 import com.android.settings.search.Indexable;

+ 1
- 1
src/com/android/settings/IccLockSettings.java View File

@@ -41,7 +41,7 @@ import android.widget.TabHost.TabContentFactory;
41 41
 import android.widget.TabHost.TabSpec;
42 42
 import android.widget.TabWidget;
43 43
 import android.widget.Toast;
44
-import com.android.internal.logging.MetricsProto.MetricsEvent;
44
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
45 45
 import com.android.internal.telephony.Phone;
46 46
 import com.android.internal.telephony.PhoneFactory;
47 47
 import com.android.internal.telephony.TelephonyIntents;

+ 1
- 1
src/com/android/settings/LegalSettings.java View File

@@ -26,7 +26,7 @@ import android.os.Bundle;
26 26
 import android.provider.SearchIndexableResource;
27 27
 import android.support.v7.preference.PreferenceGroup;
28 28
 
29
-import com.android.internal.logging.MetricsProto.MetricsEvent;
29
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
30 30
 import com.android.settings.search.BaseSearchIndexProvider;
31 31
 import com.android.settings.search.Indexable;
32 32
 

+ 1
- 1
src/com/android/settings/MasterClear.java View File

@@ -41,7 +41,7 @@ import android.widget.ImageView;
41 41
 import android.widget.LinearLayout;
42 42
 import android.widget.TextView;
43 43
 
44
-import com.android.internal.logging.MetricsProto.MetricsEvent;
44
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
45 45
 import com.android.settingslib.RestrictedLockUtils;
46 46
 
47 47
 import java.util.List;

+ 1
- 1
src/com/android/settings/MasterClearConfirm.java View File

@@ -32,7 +32,7 @@ import android.view.ViewGroup;
32 32
 import android.widget.Button;
33 33
 import android.widget.TextView;
34 34
 
35
-import com.android.internal.logging.MetricsProto.MetricsEvent;
35
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
36 36
 import com.android.settingslib.RestrictedLockUtils;
37 37
 
38 38
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

+ 1
- 1
src/com/android/settings/OwnerInfoSettings.java View File

@@ -28,7 +28,7 @@ import android.view.LayoutInflater;
28 28
 import android.view.View;
29 29
 import android.widget.EditText;
30 30
 
31
-import com.android.internal.logging.MetricsProto;
31
+import com.android.internal.logging.nano.MetricsProto;
32 32
 import com.android.internal.widget.LockPatternUtils;
33 33
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
34 34
 

+ 1
- 1
src/com/android/settings/PrivacySettings.java View File

@@ -36,7 +36,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
36 36
 import android.support.v7.preference.PreferenceScreen;
37 37
 import android.util.Log;
38 38
 
39
-import com.android.internal.logging.MetricsProto.MetricsEvent;
39
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
40 40
 import com.android.settings.dashboard.SummaryLoader;
41 41
 import com.android.settings.search.BaseSearchIndexProvider;
42 42
 import com.android.settings.search.Indexable;

+ 1
- 1
src/com/android/settings/ProxySelector.java View File

@@ -39,7 +39,7 @@ import android.widget.Button;
39 39
 import android.widget.EditText;
40 40
 import android.widget.TextView;
41 41
 
42
-import com.android.internal.logging.MetricsProto.MetricsEvent;
42
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
43 43
 import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
44 44
 import com.android.settings.core.InstrumentedFragment;
45 45
 

+ 1
- 1
src/com/android/settings/ResetNetwork.java View File

@@ -32,7 +32,7 @@ import android.widget.ArrayAdapter;
32 32
 import android.widget.Button;
33 33
 import android.widget.Spinner;
34 34
 
35
-import com.android.internal.logging.MetricsProto.MetricsEvent;
35
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
36 36
 import com.android.internal.telephony.PhoneConstants;
37 37
 import com.android.settingslib.RestrictedLockUtils;
38 38
 

+ 1
- 1
src/com/android/settings/ResetNetworkConfirm.java View File

@@ -34,7 +34,7 @@ import android.widget.Button;
34 34
 import android.widget.Toast;
35 35
 
36 36
 import com.android.ims.ImsManager;
37
-import com.android.internal.logging.MetricsProto.MetricsEvent;
37
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
38 38
 import com.android.internal.telephony.PhoneConstants;
39 39
 import com.android.settingslib.RestrictedLockUtils;
40 40
 

+ 1
- 1
src/com/android/settings/ScreenPinningSettings.java View File

@@ -31,7 +31,7 @@ import android.view.View;
31 31
 import android.view.ViewGroup;
32 32
 import android.widget.Switch;
33 33
 
34
-import com.android.internal.logging.MetricsProto.MetricsEvent;
34
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
35 35
 import com.android.internal.widget.LockPatternUtils;
36 36
 import com.android.settings.search.BaseSearchIndexProvider;
37 37
 import com.android.settings.search.Indexable;

+ 1
- 1
src/com/android/settings/SecuritySettings.java View File

@@ -51,7 +51,7 @@ import android.telephony.TelephonyManager;
51 51
 import android.text.TextUtils;
52 52
 import android.util.Log;
53 53
 
54
-import com.android.internal.logging.MetricsProto.MetricsEvent;
54
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
55 55
 import com.android.internal.widget.LockPatternUtils;
56 56
 import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo;
57 57
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

+ 1
- 1
src/com/android/settings/TestingSettings.java View File

@@ -20,7 +20,7 @@ import android.os.Bundle;
20 20
 import android.os.UserManager;
21 21
 import android.support.v7.preference.PreferenceScreen;
22 22
 
23
-import com.android.internal.logging.MetricsProto.MetricsEvent;
23
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
24 24
 
25 25
 public class TestingSettings extends SettingsPreferenceFragment {
26 26
 

+ 1
- 1
src/com/android/settings/TetherSettings.java View File

@@ -40,7 +40,7 @@ import android.support.v7.preference.Preference;
40 40
 import android.support.v7.preference.PreferenceScreen;
41 41
 import android.util.Log;
42 42
 
43
-import com.android.internal.logging.MetricsProto.MetricsEvent;
43
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
44 44
 import com.android.settings.datausage.DataSaverBackend;
45 45
 import com.android.settings.wifi.WifiApDialog;
46 46
 import com.android.settings.wifi.WifiApEnabler;

+ 1
- 1
src/com/android/settings/TrustAgentSettings.java View File

@@ -32,7 +32,7 @@ import android.support.v7.preference.PreferenceGroup;
32 32
 import android.util.ArrayMap;
33 33
 import android.util.ArraySet;
34 34
 
35
-import com.android.internal.logging.MetricsProto.MetricsEvent;
35
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
36 36
 import com.android.internal.widget.LockPatternUtils;
37 37
 import com.android.settingslib.RestrictedLockUtils;
38 38
 import com.android.settingslib.RestrictedSwitchPreference;

+ 1
- 1
src/com/android/settings/TrustedCredentialsSettings.java View File

@@ -62,7 +62,7 @@ import android.widget.TabHost;
62 62
 import android.widget.TextView;
63 63
 
64 64
 import com.android.internal.app.UnlaunchableAppActivity;
65
-import com.android.internal.logging.MetricsProto.MetricsEvent;
65
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
66 66
 import com.android.internal.util.ParcelableString;
67 67
 import com.android.internal.widget.LockPatternUtils;
68 68
 

+ 1
- 1
src/com/android/settings/UserCredentialsSettings.java View File

@@ -48,7 +48,7 @@ import android.widget.ArrayAdapter;
48 48
 import android.widget.ListView;
49 49
 import android.widget.TextView;
50 50
 
51
-import com.android.internal.logging.MetricsProto.MetricsEvent;
51
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
52 52
 import com.android.internal.widget.LockPatternUtils;
53 53
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
54 54
 import com.android.settingslib.RestrictedLockUtils;

+ 1
- 1
src/com/android/settings/UserDictionarySettings.java View File

@@ -37,7 +37,7 @@ import android.widget.SectionIndexer;
37 37
 import android.widget.SimpleCursorAdapter;
38 38
 import android.widget.TextView;
39 39
 
40
-import com.android.internal.logging.MetricsProto;
40
+import com.android.internal.logging.nano.MetricsProto;
41 41
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
42 42
 import com.android.settings.inputmethod.UserDictionaryAddWordContents;
43 43
 import com.android.settings.inputmethod.UserDictionarySettingsUtils;

+ 1
- 1
src/com/android/settings/WallpaperTypeSettings.java View File

@@ -25,7 +25,7 @@ import android.os.Bundle;
25 25
 import android.support.v7.preference.Preference;
26 26
 import android.support.v7.preference.PreferenceScreen;
27 27
 
28
-import com.android.internal.logging.MetricsProto.MetricsEvent;
28
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
29 29
 import com.android.settings.search.BaseSearchIndexProvider;
30 30
 import com.android.settings.search.Indexable;
31 31
 import com.android.settings.search.SearchIndexableRaw;

+ 1
- 1
src/com/android/settings/WebViewImplementation.java View File

@@ -27,7 +27,7 @@ import android.os.UserManager;
27 27
 import android.util.Log;
28 28
 import android.webkit.IWebViewUpdateService;
29 29
 import android.webkit.WebViewProviderInfo;
30
-import com.android.internal.logging.MetricsProto.MetricsEvent;
30
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
31 31
 import com.android.settings.core.InstrumentedActivity;
32 32
 
33 33
 import java.util.ArrayList;

+ 1
- 1
src/com/android/settings/WifiCallingSettings.java View File

@@ -39,7 +39,7 @@ import android.widget.TextView;
39 39
 
40 40
 import com.android.ims.ImsConfig;
41 41
 import com.android.ims.ImsManager;
42
-import com.android.internal.logging.MetricsProto.MetricsEvent;
42
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
43 43
 import com.android.internal.telephony.Phone;
44 44
 import com.android.settings.widget.SwitchBar;
45 45
 

+ 1
- 1
src/com/android/settings/WirelessSettings.java View File

@@ -34,7 +34,7 @@ import android.support.v7.preference.PreferenceScreen;
34 34
 import android.telephony.TelephonyManager;
35 35
 import android.util.Log;
36 36
 
37
-import com.android.internal.logging.MetricsProto.MetricsEvent;
37
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
38 38
 import com.android.settings.network.AirplaneModePreferenceController;
39 39
 import com.android.settings.network.MobileNetworkPreferenceController;
40 40
 import com.android.settings.network.MobilePlanPreferenceController;

+ 1
- 1
src/com/android/settings/ZonePicker.java View File

@@ -31,7 +31,7 @@ import android.view.ViewGroup;
31 31
 import android.widget.ListView;
32 32
 import android.widget.SimpleAdapter;
33 33
 
34
-import com.android.internal.logging.MetricsProto;
34
+import com.android.internal.logging.nano.MetricsProto;
35 35
 import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
36 36
 import com.android.settings.core.instrumentation.Instrumentable;
37 37
 import com.android.settingslib.datetime.ZoneGetter;

+ 1
- 1
src/com/android/settings/accessibility/AccessibilitySettings.java View File

@@ -40,7 +40,7 @@ import android.view.KeyEvent;
40 40
 import android.view.accessibility.AccessibilityManager;
41 41
 
42 42
 import com.android.internal.content.PackageMonitor;
43
-import com.android.internal.logging.MetricsProto.MetricsEvent;
43
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
44 44
 import com.android.internal.view.RotationPolicy;
45 45
 import com.android.internal.view.RotationPolicy.RotationPolicyListener;
46 46
 import com.android.settings.R;

+ 1
- 1
src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java View File

@@ -25,7 +25,7 @@ import android.support.v7.preference.Preference;
25 25
 import android.text.TextUtils;
26 26
 import android.view.accessibility.AccessibilityManager;
27 27
 
28
-import com.android.internal.logging.MetricsProto.MetricsEvent;
28
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
29 29
 import com.android.settings.R;
30 30
 import com.android.settings.SettingsPreferenceFragment;
31 31
 

+ 1
- 1
src/com/android/settings/accessibility/CaptionPropertiesFragment.java View File

@@ -35,7 +35,7 @@ import android.view.ViewGroup.LayoutParams;
35 35
 import android.view.accessibility.CaptioningManager;
36 36
 import android.view.accessibility.CaptioningManager.CaptionStyle;
37 37
 
38
-import com.android.internal.logging.MetricsProto.MetricsEvent;
38
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
39 39
 import com.android.internal.widget.SubtitleView;
40 40
 import com.android.settings.R;
41 41
 import com.android.settings.SettingsActivity;

+ 1
- 1
src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java View File

@@ -16,7 +16,7 @@
16 16
 
17 17
 package com.android.settings.accessibility;
18 18
 
19
-import com.android.internal.logging.MetricsProto.MetricsEvent;
19
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
20 20
 
21 21
 public class FontSizePreferenceFragmentForSetupWizard
22 22
         extends ToggleFontSizePreferenceFragment {

+ 1
- 1
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java View File

@@ -45,7 +45,7 @@ import android.widget.LinearLayout;
45 45
 import android.widget.TextView;
46 46
 import android.widget.Toast;
47 47
 
48
-import com.android.internal.logging.MetricsProto.MetricsEvent;
48
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
49 49
 import com.android.internal.widget.LockPatternUtils;
50 50
 import com.android.settings.ConfirmDeviceCredentialActivity;
51 51
 import com.android.settings.R;

+ 1
- 1
src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java View File

@@ -24,7 +24,7 @@ import android.view.View;
24 24
 import android.view.accessibility.AccessibilityManager;
25 25
 import android.widget.Switch;
26 26
 
27
-import com.android.internal.logging.MetricsProto.MetricsEvent;
27
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
28 28
 import com.android.settings.R;
29 29
 import com.android.settings.SeekBarPreference;
30 30
 import com.android.settings.widget.SwitchBar;

+ 1
- 1
src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java View File

@@ -24,7 +24,7 @@ import android.view.View;
24 24
 import android.view.accessibility.AccessibilityManager;
25 25
 import android.widget.Switch;
26 26
 
27
-import com.android.internal.logging.MetricsProto.MetricsEvent;
27
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
28 28
 import com.android.settings.R;
29 29
 import com.android.settings.widget.SwitchBar;
30 30
 

+ 1
- 1
src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java View File

@@ -22,7 +22,7 @@ import android.content.res.Configuration;
22 22
 import android.content.res.Resources;
23 23
 import android.os.Bundle;
24 24
 import android.provider.Settings;
25
-import com.android.internal.logging.MetricsProto.MetricsEvent;
25
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
26 26
 import com.android.settings.PreviewSeekBarPreferenceFragment;
27 27
 import com.android.settings.R;
28 28
 

+ 1
- 1
src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java View File

@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
18 18
 
19 19
 import android.provider.Settings;
20 20
 
21
-import com.android.internal.logging.MetricsProto.MetricsEvent;
21
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
22 22
 import com.android.settings.widget.ToggleSwitch;
23 23
 import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
24 24
 

+ 1
- 1
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java View File

@@ -37,7 +37,7 @@ import android.widget.ImageView;
37 37
 import android.widget.MediaController;
38 38
 import android.widget.RelativeLayout.LayoutParams;
39 39
 import android.widget.VideoView;
40
-import com.android.internal.logging.MetricsProto.MetricsEvent;
40
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
41 41
 import com.android.settings.R;
42 42
 import com.android.settings.widget.ToggleSwitch;
43 43
 import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;

+ 1
- 1
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java View File

@@ -19,7 +19,7 @@ package com.android.settings.accessibility;
19 19
 import android.os.Bundle;
20 20
 
21 21
 import com.android.internal.logging.MetricsLogger;
22
-import com.android.internal.logging.MetricsProto.MetricsEvent;
22
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
23 23
 
24 24
 public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard
25 25
         extends ToggleScreenMagnificationPreferenceFragment {

+ 1
- 1
src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java View File

@@ -18,7 +18,7 @@ package com.android.settings.accessibility;
18 18
 
19 19
 import android.os.Bundle;
20 20
 
21
-import com.android.internal.logging.MetricsProto.MetricsEvent;
21
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
22 22
 
23 23
 public class ToggleScreenReaderPreferenceFragmentForSetupWizard
24 24
         extends ToggleAccessibilityServicePreferenceFragment {

+ 1
- 1
src/com/android/settings/accounts/AccountSettings.java View File

@@ -47,7 +47,7 @@ import android.view.Menu;
47 47
 import android.view.MenuInflater;
48 48
 import android.view.MenuItem;
49 49
 
50
-import com.android.internal.logging.MetricsProto.MetricsEvent;
50
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
51 51
 import com.android.settings.AccessiblePreferenceCategory;
52 52
 import com.android.settings.DimmableIconPreference;
53 53
 import com.android.settings.R;

+ 1
- 1
src/com/android/settings/accounts/AccountSyncSettings.java View File

@@ -52,7 +52,7 @@ import android.view.ViewGroup;
52 52
 import android.widget.ImageView;
53 53
 import android.widget.TextView;
54 54
 
55
-import com.android.internal.logging.MetricsProto.MetricsEvent;
55
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
56 56
 import com.android.settings.R;
57 57
 import com.android.settings.Utils;
58 58
 import com.android.settingslib.RestrictedLockUtils;

+ 1
- 1
src/com/android/settings/accounts/AutoSyncDataPreferenceController.java View File

@@ -30,7 +30,7 @@ import android.support.v14.preference.SwitchPreference;
30 30
 import android.support.v7.preference.Preference;
31 31
 
32 32
 import android.util.Log;
33
-import com.android.internal.logging.MetricsProto;
33
+import com.android.internal.logging.nano.MetricsProto;
34 34
 import com.android.settings.R;
35 35
 import com.android.settings.core.PreferenceController;
36 36
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

+ 1
- 1
src/com/android/settings/accounts/ChooseAccountActivity.java View File

@@ -36,7 +36,7 @@ import android.support.v7.preference.Preference;
36 36
 import android.support.v7.preference.PreferenceGroup;
37 37
 import android.util.Log;
38 38
 
39
-import com.android.internal.logging.MetricsProto.MetricsEvent;
39
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
40 40
 import com.android.internal.util.CharSequences;
41 41
 import com.android.settings.R;
42 42
 import com.android.settings.SettingsPreferenceFragment;

+ 1
- 1
src/com/android/settings/accounts/ManageAccountsSettings.java View File

@@ -46,7 +46,7 @@ import android.view.View;
46 46
 import android.view.ViewGroup;
47 47
 import android.widget.TextView;
48 48
 
49
-import com.android.internal.logging.MetricsProto.MetricsEvent;
49
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
50 50
 import com.android.settings.AccountPreference;
51 51
 import com.android.settings.R;
52 52
 import com.android.settings.SettingsActivity;

+ 1
- 1
src/com/android/settings/accounts/ManagedProfileSettings.java View File

@@ -28,7 +28,7 @@ import android.support.v14.preference.SwitchPreference;
28 28
 import android.support.v7.preference.Preference;
29 29
 import android.util.Log;
30 30
 
31
-import com.android.internal.logging.MetricsProto;
31
+import com.android.internal.logging.nano.MetricsProto;
32 32
 import com.android.settings.R;
33 33
 import com.android.settings.SettingsPreferenceFragment;
34 34
 import com.android.settingslib.RestrictedLockUtils;

+ 2
- 2
src/com/android/settings/accounts/UserAndAccountDashboardFragment.java View File

@@ -17,7 +17,7 @@ package com.android.settings.accounts;
17 17
 
18 18
 import android.content.Context;
19 19
 
20
-import com.android.internal.logging.MetricsProto.MetricsEvent;
20
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
21 21
 import com.android.settings.R;
22 22
 import com.android.settings.core.PreferenceController;
23 23
 import com.android.settings.dashboard.DashboardFragment;
@@ -64,4 +64,4 @@ public class UserAndAccountDashboardFragment extends DashboardFragment {
64 64
         return controllers;
65 65
     }
66 66
 
67
-}
67
+}

+ 1
- 1
src/com/android/settings/applications/AdvancedAppSettings.java View File

@@ -19,7 +19,7 @@ import android.content.Context;
19 19
 import android.os.Bundle;
20 20
 import android.provider.SearchIndexableResource;
21 21
 
22
-import com.android.internal.logging.MetricsProto.MetricsEvent;
22
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
23 23
 import com.android.settings.R;
24 24
 import com.android.settings.Utils;
25 25
 import com.android.settings.core.PreferenceController;

+ 1
- 1
src/com/android/settings/applications/AppInfoBase.java View File

@@ -37,7 +37,7 @@ import android.os.UserHandle;
37 37
 import android.os.UserManager;
38 38
 import android.util.Log;
39 39
 
40
-import com.android.internal.logging.MetricsProto;
40
+import com.android.internal.logging.nano.MetricsProto;
41 41
 import com.android.settings.SettingsActivity;
42 42
 import com.android.settings.SettingsPreferenceFragment;
43 43
 import com.android.settings.Utils;

+ 1
- 1
src/com/android/settings/applications/AppLaunchSettings.java View File

@@ -34,7 +34,7 @@ import android.util.Log;
34 34
 import android.view.View;
35 35
 import android.view.View.OnClickListener;
36 36
 
37
-import com.android.internal.logging.MetricsProto.MetricsEvent;
37
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
38 38
 import com.android.settings.R;
39 39
 import com.android.settings.Utils;
40 40
 

+ 1
- 1
src/com/android/settings/applications/AppOpsDetails.java View File

@@ -38,7 +38,7 @@ import android.widget.LinearLayout;
38 38
 import android.widget.Switch;
39 39
 import android.widget.TextView;
40 40
 
41
-import com.android.internal.logging.MetricsProto.MetricsEvent;
41
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
42 42
 import com.android.settings.core.InstrumentedFragment;
43 43
 import com.android.settings.R;
44 44
 import com.android.settings.SettingsActivity;

+ 1
- 1
src/com/android/settings/applications/AppOpsSummary.java View File

@@ -28,7 +28,7 @@ import android.view.LayoutInflater;
28 28
 import android.view.View;
29 29
 import android.view.ViewGroup;
30 30
 
31
-import com.android.internal.logging.MetricsProto.MetricsEvent;
31
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
32 32
 import com.android.settings.core.InstrumentedFragment;
33 33
 import com.android.settings.R;
34 34
 

+ 1
- 1
src/com/android/settings/applications/AppStorageSettings.java View File

@@ -44,7 +44,7 @@ import android.view.View;
44 44
 import android.view.View.OnClickListener;
45 45
 import android.widget.Button;
46 46
 
47
-import com.android.internal.logging.MetricsProto.MetricsEvent;
47
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
48 48
 import com.android.settings.R;
49 49
 import com.android.settings.Utils;
50 50
 import com.android.settings.deviceinfo.StorageWizardMoveConfirm;

+ 1
- 1
src/com/android/settings/applications/BackgroundCheckSummary.java View File

@@ -23,7 +23,7 @@ import android.view.LayoutInflater;
23 23
 import android.view.View;
24 24
 import android.view.ViewGroup;
25 25
 
26
-import com.android.internal.logging.MetricsProto.MetricsEvent;
26
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
27 27
 import com.android.settings.core.InstrumentedFragment;
28 28
 import com.android.settings.R;
29 29
 

+ 1
- 1
src/com/android/settings/applications/ConfirmConvertToFbe.java View File

@@ -23,7 +23,7 @@ import android.view.View;
23 23
 import android.view.ViewGroup;
24 24
 import android.widget.Button;
25 25
 
26
-import com.android.internal.logging.MetricsProto.MetricsEvent;
26
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
27 27
 import com.android.settings.R;
28 28
 import com.android.settings.SettingsPreferenceFragment;
29 29
 

+ 2
- 2
src/com/android/settings/applications/ConvertToFbe.java View File

@@ -24,8 +24,8 @@ import android.view.View;
24 24
 import android.view.ViewGroup;
25 25
 import android.widget.Button;
26 26
 
27
-import com.android.internal.logging.MetricsProto;
28
-import com.android.internal.logging.MetricsProto.MetricsEvent;
27
+import com.android.internal.logging.nano.MetricsProto;
28
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
29 29
 import com.android.settings.ChooseLockSettingsHelper;
30 30
 import com.android.settings.R;
31 31
 import com.android.settings.SettingsActivity;

+ 1
- 1
src/com/android/settings/applications/DrawOverlayDetails.java View File

@@ -31,7 +31,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
31 31
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
32 32
 import android.util.Log;
33 33
 
34
-import com.android.internal.logging.MetricsProto.MetricsEvent;
34
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
35 35
 import com.android.settings.R;
36 36
 import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
37 37
 import com.android.settings.applications.AppStateOverlayBridge.OverlayState;

+ 1
- 1
src/com/android/settings/applications/InstalledAppDetails.java View File

@@ -75,7 +75,7 @@ import android.widget.Button;
75 75
 import android.widget.ImageView;
76 76
 import android.widget.TextView;
77 77
 
78
-import com.android.internal.logging.MetricsProto.MetricsEvent;
78
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
79 79
 import com.android.internal.os.BatterySipper;
80 80
 import com.android.internal.os.BatteryStatsHelper;
81 81
 import com.android.internal.widget.LockPatternUtils;

+ 1
- 1
src/com/android/settings/applications/ManageApplications.java View File

@@ -53,7 +53,7 @@ import android.widget.ListView;
53 53
 import android.widget.SectionIndexer;
54 54
 import android.widget.Spinner;
55 55
 
56
-import com.android.internal.logging.MetricsProto.MetricsEvent;
56
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
57 57
 import com.android.settings.AppHeader;
58 58
 import com.android.settings.R;
59 59
 import com.android.settings.Settings.AllApplicationsActivity;

+ 1
- 1
src/com/android/settings/applications/ManageAssist.java View File

@@ -26,7 +26,7 @@ import android.support.v14.preference.SwitchPreference;
26 26
 import android.support.v7.preference.Preference;
27 27
 
28 28
 import com.android.internal.app.AssistUtils;
29
-import com.android.internal.logging.MetricsProto.MetricsEvent;
29
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
30 30
 import com.android.settings.R;
31 31
 import com.android.settings.SettingsPreferenceFragment;
32 32
 import com.android.settings.voice.VoiceInputListPreference;

+ 1
- 1
src/com/android/settings/applications/ManageDomainUrls.java View File

@@ -31,7 +31,7 @@ import android.support.v7.preference.PreferenceViewHolder;
31 31
 import android.util.ArraySet;
32 32
 import android.view.View;
33 33
 
34
-import com.android.internal.logging.MetricsProto.MetricsEvent;
34
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
35 35
 import com.android.settings.R;
36 36
 import com.android.settings.SettingsPreferenceFragment;
37 37
 import com.android.settings.Utils;

+ 1
- 1
src/com/android/settings/applications/PremiumSmsAccess.java View File

@@ -24,7 +24,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
24 24
 import android.support.v7.preference.PreferenceScreen;
25 25
 import android.support.v7.preference.PreferenceViewHolder;
26 26
 import android.view.View;
27
-import com.android.internal.logging.MetricsProto;
27
+import com.android.internal.logging.nano.MetricsProto;
28 28
 import com.android.internal.telephony.SmsUsageMonitor;
29 29
 import com.android.settings.DividerPreference;
30 30
 import com.android.settings.R;

+ 1
- 1
src/com/android/settings/applications/ProcessStatsDetail.java View File

@@ -43,7 +43,7 @@ import android.view.MenuInflater;
43 43
 import android.view.MenuItem;
44 44
 import android.view.View;
45 45
 
46
-import com.android.internal.logging.MetricsProto.MetricsEvent;
46
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
47 47
 import com.android.settings.AppHeader;
48 48
 import com.android.settings.CancellablePreference;
49 49
 import com.android.settings.CancellablePreference.OnCancelListener;

+ 1
- 1
src/com/android/settings/applications/ProcessStatsMemDetail.java View File

@@ -25,7 +25,7 @@ import android.widget.ProgressBar;
25 25
 import android.widget.TextView;
26 26
 
27 27
 import com.android.internal.app.procstats.ProcessStats;
28
-import com.android.internal.logging.MetricsProto.MetricsEvent;
28
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
29 29
 import com.android.settings.core.InstrumentedFragment;
30 30
 import com.android.settings.R;
31 31
 

+ 1
- 1
src/com/android/settings/applications/ProcessStatsSummary.java View File

@@ -22,7 +22,7 @@ import android.support.v7.preference.Preference;
22 22
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
23 23
 import android.text.format.Formatter;
24 24
 import android.text.format.Formatter.BytesResult;
25
-import com.android.internal.logging.MetricsProto.MetricsEvent;
25
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
26 26
 import com.android.settings.R;
27 27
 import com.android.settings.SummaryPreference;
28 28
 import com.android.settings.Utils;

+ 1
- 1
src/com/android/settings/applications/ProcessStatsUi.java View File

@@ -28,7 +28,7 @@ import android.view.MenuInflater;
28 28
 import android.view.MenuItem;
29 29
 
30 30
 import com.android.internal.app.procstats.ProcessStats;
31
-import com.android.internal.logging.MetricsProto.MetricsEvent;
31
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
32 32
 import com.android.settings.R;
33 33
 import com.android.settings.SettingsActivity;
34 34
 import com.android.settings.applications.ProcStatsData.MemInfo;

+ 1
- 1
src/com/android/settings/applications/RunningServiceDetails.java View File

@@ -32,7 +32,7 @@ import android.view.ViewGroup;
32 32
 import android.widget.Button;
33 33
 import android.widget.TextView;
34 34
 
35
-import com.android.internal.logging.MetricsProto.MetricsEvent;
35
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
36 36
 import com.android.settings.core.InstrumentedFragment;
37 37
 import com.android.settings.R;
38 38
 import com.android.settings.Utils;

+ 1
- 1
src/com/android/settings/applications/RunningServices.java View File

@@ -24,7 +24,7 @@ import android.view.MenuItem;
24 24
 import android.view.View;
25 25
 import android.view.ViewGroup;
26 26
 
27
-import com.android.internal.logging.MetricsProto.MetricsEvent;
27
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
28 28
 import com.android.settings.R;
29 29
 import com.android.settings.SettingsPreferenceFragment;
30 30
 import com.android.settings.Utils;

+ 1
- 1
src/com/android/settings/applications/SpecialAccessSettings.java View File

@@ -15,7 +15,7 @@
15 15
 package com.android.settings.applications;
16 16
 
17 17
 import android.os.Bundle;
18
-import com.android.internal.logging.MetricsProto.MetricsEvent;
18
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
19 19
 import com.android.settings.R;
20 20
 import com.android.settings.SettingsPreferenceFragment;
21 21
 

+ 1
- 1
src/com/android/settings/applications/UsageAccessDetails.java View File

@@ -33,7 +33,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
33 33
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
34 34
 import android.util.Log;
35 35
 
36
-import com.android.internal.logging.MetricsProto.MetricsEvent;
36
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
37 37
 import com.android.settings.R;
38 38
 import com.android.settings.applications.AppStateUsageBridge.UsageState;
39 39
 

+ 1
- 1
src/com/android/settings/applications/VrListenerSettings.java View File

@@ -18,7 +18,7 @@ package com.android.settings.applications;
18 18
 import android.provider.Settings;
19 19
 import android.service.vr.VrListenerService;
20 20
 
21
-import com.android.internal.logging.MetricsProto.MetricsEvent;
21
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
22 22
 import com.android.settings.R;
23 23
 import com.android.settings.utils.ManagedServiceSettings;
24 24
 

+ 1
- 1
src/com/android/settings/applications/WriteSettingsDetails.java View File

@@ -31,7 +31,7 @@ import android.support.v7.preference.Preference.OnPreferenceChangeListener;
31 31
 import android.support.v7.preference.Preference.OnPreferenceClickListener;
32 32
 import android.util.Log;
33 33
 
34
-import com.android.internal.logging.MetricsProto.MetricsEvent;
34
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
35 35
 import com.android.settings.R;
36 36
 import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
37 37
 import com.android.settings.applications.AppStateWriteSettingsBridge.WriteSettingsState;

+ 1
- 1
src/com/android/settings/backup/ToggleBackupSettingFragment.java View File

@@ -16,7 +16,7 @@ import android.util.Log;
16 16
 import android.view.View;
17 17
 import android.widget.TextView;
18 18
 
19
-import com.android.internal.logging.MetricsProto.MetricsEvent;
19
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
20 20
 import com.android.settings.R;
21 21
 import com.android.settings.SettingsActivity;
22 22
 import com.android.settings.SettingsPreferenceFragment;

+ 1
- 1
src/com/android/settings/bluetooth/BluetoothEnabler.java View File

@@ -27,7 +27,7 @@ import android.provider.Settings;
27 27
 import android.widget.Switch;
28 28
 import android.widget.Toast;
29 29
 
30
-import com.android.internal.logging.MetricsProto.MetricsEvent;
30
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
31 31
 import com.android.settings.R;
32 32
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
33 33
 import com.android.settings.search.Index;

+ 1
- 1
src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java View File

@@ -40,7 +40,7 @@ import android.widget.Button;
40 40
 import android.widget.EditText;
41 41
 import android.widget.TextView;
42 42
 
43
-import com.android.internal.logging.MetricsProto;
43
+import com.android.internal.logging.nano.MetricsProto;
44 44
 import com.android.settings.R;
45 45
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
46 46
 import com.android.settingslib.bluetooth.LocalBluetoothAdapter;

+ 1
- 1
src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java View File

@@ -31,7 +31,7 @@ import android.widget.Button;
31 31
 import android.widget.CheckBox;
32 32
 import android.widget.EditText;
33 33
 import android.widget.TextView;
34
-import com.android.internal.logging.MetricsProto.MetricsEvent;
34
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
35 35
 import com.android.settings.R;
36 36
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
37 37
 

+ 1
- 1
src/com/android/settings/bluetooth/BluetoothSettings.java View File

@@ -41,7 +41,7 @@ import android.view.MenuItem;
41 41
 import android.view.View;
42 42
 import android.widget.TextView;
43 43
 
44
-import com.android.internal.logging.MetricsProto.MetricsEvent;
44
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
45 45
 import com.android.settings.LinkifyUtils;
46 46
 import com.android.settings.R;
47 47
 import com.android.settings.SettingsActivity;

+ 1
- 1
src/com/android/settings/bluetooth/DevicePickerFragment.java View File

@@ -27,7 +27,7 @@ import android.view.Menu;
27 27
 import android.view.MenuInflater;
28 28
 import android.view.MenuItem;
29 29
 
30
-import com.android.internal.logging.MetricsProto.MetricsEvent;
30
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
31 31
 import com.android.settings.R;
32 32
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
33 33
 

+ 1
- 1
src/com/android/settings/bluetooth/DeviceProfilesSettings.java View File

@@ -35,7 +35,7 @@ import android.widget.CheckBox;
35 35
 import android.widget.EditText;
36 36
 import android.widget.TextView;
37 37
 
38
-import com.android.internal.logging.MetricsProto;
38
+import com.android.internal.logging.nano.MetricsProto;
39 39
 import com.android.settings.R;
40 40
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
41 41
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;

+ 1
- 1
src/com/android/settings/core/instrumentation/Instrumentable.java View File

@@ -22,7 +22,7 @@ public interface Instrumentable {
22 22
 
23 23
     /**
24 24
      * Instrumented name for a view as defined in
25
-     * {@link com.android.internal.logging.MetricsProto.MetricsEvent}.
25
+     * {@link com.android.internal.logging.nano.MetricsProto.MetricsEvent}.
26 26
      */
27 27
     int getMetricsCategory();
28 28
 }

+ 1
- 1
src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java View File

@@ -22,7 +22,7 @@ import android.content.pm.PackageManager;
22 22
 import android.os.AsyncTask;
23 23
 import android.text.TextUtils;
24 24
 
25
-import com.android.internal.logging.MetricsProto.MetricsEvent;
25
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
26 26
 import com.android.settings.overlay.FeatureFactory;
27 27
 
28 28
 import java.util.Map;

+ 1
- 1
src/com/android/settings/dashboard/DashboardAdapter.java View File

@@ -34,7 +34,7 @@ import android.view.ViewGroup;
34 34
 import android.widget.ImageView;
35 35
 import android.widget.TextView;
36 36
 
37
-import com.android.internal.logging.MetricsProto.MetricsEvent;
37
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
38 38
 import com.android.settings.R;
39 39
 import com.android.settings.SettingsActivity;
40 40
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;

+ 1
- 1
src/com/android/settings/dashboard/DashboardContainerFragment.java View File

@@ -27,7 +27,7 @@ import android.view.LayoutInflater;
27 27
 import android.view.View;
28 28
 import android.view.ViewGroup;
29 29
 
30
-import com.android.internal.logging.MetricsProto;
30
+import com.android.internal.logging.nano.MetricsProto;
31 31
 import com.android.settings.core.InstrumentedFragment;
32 32
 import com.android.settings.R;
33 33
 import com.android.settings.SettingsActivity;

+ 1
- 1
src/com/android/settings/dashboard/DashboardSummary.java View File

@@ -27,7 +27,7 @@ import android.view.LayoutInflater;
27 27
 import android.view.View;
28 28
 import android.view.ViewGroup;
29 29
 
30
-import com.android.internal.logging.MetricsProto.MetricsEvent;
30
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
31 31
 import com.android.settings.R;
32 32
 import com.android.settings.Settings;
33 33
 import com.android.settings.SettingsActivity;

+ 0
- 0
src/com/android/settings/dashboard/NoHomeDialogFragment.java View File


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