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

Migrate all MetricsProto enums to SettingsEnums

Browse Source 
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
This commit is contained in:
Fan Zhang
2019-01-16 13:49:47 -08:00
parent dbaa5459b8
commit 31b210017b
502 changed files with 1184 additions and 1347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/security/ConfigureKeyGuardDialog.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.security;
import android.app.Activity;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
@@ -26,7 +27,6 @@ import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.CredentialStorage;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -44,7 +44,7 @@ public class ConfigureKeyGuardDialog extends InstrumentedDialogFragment
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.CONFIGURE_KEYGUARD_DIALOG;
return SettingsEnums.CONFIGURE_KEYGUARD_DIALOG;
}
@Override

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

@@ -18,6 +18,7 @@ package com.android.settings.security;
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -36,7 +37,6 @@ import android.widget.Button;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.CryptKeeperConfirm;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -123,7 +123,7 @@ public class CryptKeeperSettings extends InstrumentedPreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.CRYPT_KEEPER;
return SettingsEnums.CRYPT_KEEPER;
}
@Override

7
src/com/android/settings/security/EncryptionAndCredential.java
View File

@@ -16,14 +16,13 @@
package com.android.settings.security;
import static com.android.settings.security.EncryptionStatusPreferenceController
.PREF_KEY_ENCRYPTION_DETAIL_PAGE;
import static com.android.settings.security.EncryptionStatusPreferenceController.PREF_KEY_ENCRYPTION_DETAIL_PAGE;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -46,7 +45,7 @@ public class EncryptionAndCredential extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ENCRYPTION_AND_CREDENTIAL;
return SettingsEnums.ENCRYPTION_AND_CREDENTIAL;
}
@Override

5
src/com/android/settings/security/LockscreenDashboardFragment.java
View File

@@ -16,20 +16,19 @@
package com.android.settings.security;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import androidx.annotation.VisibleForTesting;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController;
import com.android.settings.display.AmbientDisplayNotificationsPreferenceController;
import com.android.settings.gestures.DoubleTapScreenPreferenceController;
import com.android.settings.gestures.PickupGesturePreferenceController;
import com.android.settings.gestures.WakeScreenGesturePreferenceController;
import com.android.settings.notification.LockScreenNotificationPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.security.screenlock.LockScreenPreferenceController;
@@ -70,7 +69,7 @@ public class LockscreenDashboardFragment extends DashboardFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.SETTINGS_LOCK_SCREEN_PREFERENCES;
return SettingsEnums.SETTINGS_LOCK_SCREEN_PREFERENCES;
}
@Override

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

@@ -16,6 +16,7 @@
package com.android.settings.security;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -32,7 +33,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -61,7 +61,7 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.SCREEN_PINNING;
return SettingsEnums.SCREEN_PINNING;
}
@Override

7
src/com/android/settings/security/SecuritySettings.java
View File

@@ -15,14 +15,13 @@
*/
package com.android.settings.security;
import static com.android.settings.security.EncryptionStatusPreferenceController
.PREF_KEY_ENCRYPTION_SECURITY_PAGE;
import static com.android.settings.security.EncryptionStatusPreferenceController.PREF_KEY_ENCRYPTION_SECURITY_PAGE;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.biometrics.face.FaceStatusPreferenceController;
import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController;
@@ -54,7 +53,7 @@ public class SecuritySettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SECURITY;
return SettingsEnums.SECURITY;
}
@Override

4
src/com/android/settings/security/UnificationConfirmationDialog.java
View File

@@ -17,13 +17,13 @@
package com.android.settings.security;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -74,6 +74,6 @@ public class UnificationConfirmationDialog extends InstrumentedDialogFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_UNIFICATION_CONFIRMATION;
return SettingsEnums.DIALOG_UNIFICATION_CONFIRMATION;
}
}

4
src/com/android/settings/security/screenlock/ScreenLockSettings.java
View File

@@ -16,13 +16,13 @@
package com.android.settings.security.screenlock;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserHandle;
import android.provider.SearchIndexableResource;
import androidx.fragment.app.Fragment;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -47,7 +47,7 @@ public class ScreenLockSettings extends DashboardFragment
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SCREEN_LOCK_SETTINGS;
return SettingsEnums.SCREEN_LOCK_SETTINGS;
}
@Override

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

@@ -16,10 +16,10 @@
package com.android.settings.security.trustagent;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -35,7 +35,7 @@ public class TrustAgentSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.TRUST_AGENT;
return SettingsEnums.TRUST_AGENT;
}
@Override

1
src/com/android/settings/security/trustagent/TrustAgentsExtendUnlockPreferenceController.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.security.trustagent;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import com.android.settings.core.TogglePreferenceController;

1
src/com/android/settings/security/trustagent/TrustLostLocksScreenPreferenceController.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.security.trustagent;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import com.android.settings.core.TogglePreferenceController;