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

6
src/com/android/settings/password/BiometricFragment.java
View File

@@ -27,13 +27,11 @@ import android.os.CancellationSignal;
import android.os.Handler;
import android.os.Looper;
import com.android.settings.core.InstrumentedFragment;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.settings.core.InstrumentedFragment;
import java.util.concurrent.Executor;
/**

6
src/com/android/settings/password/ChooseLockGeneric.java
View File

@@ -25,6 +25,7 @@ import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Activity;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.pm.UserInfo;
@@ -51,7 +52,6 @@ import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.EncryptionInterstitial;
import com.android.settings.EventLogTags;
@@ -157,7 +157,7 @@ public class ChooseLockGeneric extends SettingsActivity {
@Override
public int getMetricsCategory() {
return MetricsEvent.CHOOSE_LOCK_GENERIC;
return SettingsEnums.CHOOSE_LOCK_GENERIC;
}
@Override
@@ -1022,7 +1022,7 @@ public class ChooseLockGeneric extends SettingsActivity {
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_FRP;
return SettingsEnums.DIALOG_FRP;
}
}
}

4
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -25,6 +25,7 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COM
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.app.admin.PasswordMetrics;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources.Theme;
@@ -56,7 +57,6 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
import com.android.internal.widget.TextViewInputDisabler;
@@ -526,7 +526,7 @@ public class ChooseLockPassword extends SettingsActivity {
@Override
public int getMetricsCategory() {
return MetricsEvent.CHOOSE_LOCK_PASSWORD;
return SettingsEnums.CHOOSE_LOCK_PASSWORD;
}
@Override

4
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.password;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.res.ColorStateList;
@@ -34,7 +35,6 @@ import android.widget.TextView;
import androidx.fragment.app.Fragment;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
@@ -303,7 +303,7 @@ public class ChooseLockPattern extends SettingsActivity {
@Override
public int getMetricsCategory() {
return MetricsEvent.CHOOSE_LOCK_PATTERN;
return SettingsEnums.CHOOSE_LOCK_PATTERN;
}

1
src/com/android/settings/password/ChooseLockSettingsHelper.java
View File

@@ -29,7 +29,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.google.android.setupcompat.util.WizardManagerHelper;

4
src/com/android/settings/password/ChooseLockTypeDialogFragment.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.password;
import android.app.Activity;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
@@ -34,7 +35,6 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.fragment.app.Fragment;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -139,7 +139,7 @@ public class ChooseLockTypeDialogFragment extends InstrumentedDialogFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.SETTINGS_CHOOSE_LOCK_DIALOG;
return SettingsEnums.SETTINGS_CHOOSE_LOCK_DIALOG;
}
private static class ScreenLockAdapter extends ArrayAdapter<ScreenLockType> {

4
src/com/android/settings/password/ConfirmLockPassword.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.password;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
@@ -41,7 +42,6 @@ import android.widget.TextView.OnEditorActionListener;
import androidx.fragment.app.Fragment;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternChecker;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.TextViewInputDisabler;
@@ -274,7 +274,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
@Override
public int getMetricsCategory() {
return MetricsEvent.CONFIRM_LOCK_PASSWORD;
return SettingsEnums.CONFIRM_LOCK_PASSWORD;
}
@Override

4
src/com/android/settings/password/ConfirmLockPattern.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.password;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
@@ -31,7 +32,6 @@ 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.widget.LinearLayoutWithDefaultTouchRecepient;
import com.android.internal.widget.LockPatternChecker;
import com.android.internal.widget.LockPatternUtils;
@@ -200,7 +200,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
@Override
public int getMetricsCategory() {
return MetricsEvent.CONFIRM_LOCK_PATTERN;
return SettingsEnums.CONFIRM_LOCK_PATTERN;
}
@Override

4
src/com/android/settings/password/SetupSkipDialog.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.password;
import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -25,7 +26,6 @@ import androidx.annotation.NonNull;
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;
@@ -48,7 +48,7 @@ public class SetupSkipDialog extends InstrumentedDialogFragment
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_FINGERPRINT_SKIP_SETUP;
return SettingsEnums.DIALOG_FINGERPRINT_SKIP_SETUP;
}
@Override