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/AirplaneModeEnabler.java
View File

@@ -16,6 +16,7 @@
package com.android.settings;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.database.ContentObserver;
@@ -26,7 +27,6 @@ import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneStateIntentReceiver;
import com.android.internal.telephony.TelephonyProperties;
import com.android.settingslib.WirelessUtils;
@@ -129,7 +129,7 @@ public class AirplaneModeEnabler {
SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
// In ECM mode, do not update database at this point
} else {
mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_AIRPLANE_TOGGLE,
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_AIRPLANE_TOGGLE,
isAirplaneModeOn);
setAirplaneModeOn(isAirplaneModeOn);
}

1
src/com/android/settings/BandMode.java
View File

@@ -9,7 +9,6 @@ import android.os.Message;
import android.util.Log;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;

6
src/com/android/settings/BugreportPreference.java
View File

@@ -17,6 +17,7 @@
package com.android.settings;
import android.app.ActivityManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.os.RemoteException;
@@ -28,7 +29,6 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog.Builder;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.CustomDialogPreferenceCompat;
@@ -85,12 +85,12 @@ public class BugreportPreference extends CustomDialogPreferenceCompat {
if (mFullTitle.isChecked()) {
Log.v(TAG, "Taking full bugreport right away");
FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context,
MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_FULL);
SettingsEnums.ACTION_BUGREPORT_FROM_SETTINGS_FULL);
takeBugreport(ActivityManager.BUGREPORT_OPTION_FULL);
} else {
Log.v(TAG, "Taking interactive bugreport right away");
FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context,
MetricsEvent.ACTION_BUGREPORT_FROM_SETTINGS_INTERACTIVE);
SettingsEnums.ACTION_BUGREPORT_FROM_SETTINGS_INTERACTIVE);
takeBugreport(ActivityManager.BUGREPORT_OPTION_INTERACTIVE);
}
}

4
src/com/android/settings/CryptKeeperConfirm.java
View File

@@ -19,6 +19,7 @@ package com.android.settings;
import android.annotation.Nullable;
import android.app.Activity;
import android.app.StatusBarManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -34,7 +35,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.InstrumentedFragment;
@@ -46,7 +46,7 @@ public class CryptKeeperConfirm extends InstrumentedFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.CRYPT_KEEPER_CONFIRM;
return SettingsEnums.CRYPT_KEEPER_CONFIRM;
}
public static class Blank extends Activity {

4
src/com/android/settings/CustomListPreference.java
View File

@@ -17,6 +17,7 @@
package com.android.settings;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
@@ -30,7 +31,6 @@ import androidx.fragment.app.FragmentTransaction;
import androidx.preference.ListPreference;
import androidx.preference.ListPreferenceDialogFragmentCompat;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class CustomListPreference extends ListPreference {
@@ -221,7 +221,7 @@ public class CustomListPreference extends ListPreference {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_CUSTOM_LIST_CONFIRMATION;
return SettingsEnums.DIALOG_CUSTOM_LIST_CONFIRMATION;
}
}
}

8
src/com/android/settings/DateTimeSettings.java
View File

@@ -18,11 +18,11 @@ package com.android.settings;
import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.datetime.AutoTimeFormatPreferenceController;
@@ -54,7 +54,7 @@ public class DateTimeSettings extends DashboardFragment implements
@Override
public int getMetricsCategory() {
return MetricsEvent.DATE_TIME;
return SettingsEnums.DATE_TIME;
}
@Override
@@ -127,9 +127,9 @@ public class DateTimeSettings extends DashboardFragment implements
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case DatePreferenceController.DIALOG_DATEPICKER:
return MetricsEvent.DIALOG_DATE_PICKER;
return SettingsEnums.DIALOG_DATE_PICKER;
case TimePreferenceController.DIALOG_TIMEPICKER:
return MetricsEvent.DIALOG_TIME_PICKER;
return SettingsEnums.DIALOG_TIME_PICKER;
default:
return 0;
}

4
src/com/android/settings/DisplaySettings.java
View File

@@ -16,10 +16,10 @@
package com.android.settings;
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.dashboard.DashboardFragment;
import com.android.settings.display.BrightnessLevelPreferenceController;
import com.android.settings.display.CameraGesturePreferenceController;
@@ -49,7 +49,7 @@ public class DisplaySettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.DISPLAY;
return SettingsEnums.DISPLAY;
}
@Override

6
src/com/android/settings/EncryptionInterstitial.java
View File

@@ -20,6 +20,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.DialogInterface;
import android.content.Intent;
@@ -35,7 +36,6 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.password.ChooseLockSettingsHelper;
@@ -96,7 +96,7 @@ public class EncryptionInterstitial extends SettingsActivity {
@Override
public int getMetricsCategory() {
return MetricsEvent.ENCRYPTION;
return SettingsEnums.ENCRYPTION;
}
@Override
@@ -281,7 +281,7 @@ public class EncryptionInterstitial extends SettingsActivity {
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_ENCRYPTION_INTERSTITIAL_ACCESSIBILITY;
return SettingsEnums.DIALOG_ENCRYPTION_INTERSTITIAL_ACCESSIBILITY;
}
@Override

4
src/com/android/settings/IccLockSettings.java
View File

@@ -16,6 +16,7 @@
package com.android.settings;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -50,7 +51,6 @@ import android.widget.Toast;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
@@ -279,7 +279,7 @@ public class IccLockSettings extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.ICC_LOCK;
return SettingsEnums.ICC_LOCK;
}
@Override

4
src/com/android/settings/LegalSettings.java
View File

@@ -16,10 +16,10 @@
package com.android.settings;
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.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -35,7 +35,7 @@ public class LegalSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ABOUT_LEGAL_SETTINGS;
return SettingsEnums.ABOUT_LEGAL_SETTINGS;
}
@Override

1
src/com/android/settings/ManualDisplayActivity.java
View File

@@ -22,7 +22,6 @@ import android.content.Intent;
import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;

4
src/com/android/settings/MasterClear.java
View File

@@ -23,6 +23,7 @@ import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription;
import android.app.ActionBar;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
@@ -57,7 +58,6 @@ import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
@@ -565,6 +565,6 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
@Override
public int getMetricsCategory() {
return MetricsEvent.MASTER_CLEAR;
return SettingsEnums.MASTER_CLEAR;
}
}

4
src/com/android/settings/MasterClearConfirm.java
View File

@@ -22,6 +22,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.ActionBar;
import android.app.Activity;
import android.app.ProgressDialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@@ -39,7 +40,6 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -225,6 +225,6 @@ public class MasterClearConfirm extends InstrumentedFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.MASTER_CLEAR_CONFIRM;
return SettingsEnums.MASTER_CLEAR_CONFIRM;
}
}

6
src/com/android/settings/ProxySelector.java
View File

@@ -19,6 +19,7 @@ package com.android.settings;
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.net.ConnectivityManager;
@@ -40,7 +41,6 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
import com.android.settings.core.InstrumentedFragment;
@@ -106,7 +106,7 @@ public class ProxySelector extends InstrumentedFragment implements DialogCreatab
@Override
public int getDialogMetricsCategory(int dialogId) {
return MetricsEvent.DIALOG_PROXY_SELECTOR_ERROR;
return SettingsEnums.DIALOG_PROXY_SELECTOR_ERROR;
}
private void showDialog(int dialogId) {
@@ -277,6 +277,6 @@ public class ProxySelector extends InstrumentedFragment implements DialogCreatab
@Override
public int getMetricsCategory() {
return MetricsEvent.PROXY_SELECTOR;
return SettingsEnums.PROXY_SELECTOR;
}
}

5
src/com/android/settings/ResetNetwork.java
View File

@@ -18,6 +18,7 @@ package com.android.settings;
import android.annotation.Nullable;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
@@ -41,14 +42,12 @@ import android.widget.CheckBox;
import android.widget.Spinner;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -263,6 +262,6 @@ public class ResetNetwork extends InstrumentedFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.RESET_NETWORK;
return SettingsEnums.RESET_NETWORK;
}
}

5
src/com/android/settings/ResetNetworkConfirm.java
View File

@@ -18,6 +18,7 @@ package com.android.settings;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothManager;
import android.content.ContentResolver;
@@ -45,12 +46,10 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.ims.ImsManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.network.ApnSettings;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
/**
@@ -262,6 +261,6 @@ public class ResetNetworkConfirm extends InstrumentedFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.RESET_NETWORK_CONFIRM;
return SettingsEnums.RESET_NETWORK_CONFIRM;
}
}

1
src/com/android/settings/RestrictedSettingsFragment.java
View File

@@ -36,7 +36,6 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
/**

1
src/com/android/settings/SettingsLicenseActivity.java
View File

@@ -21,7 +21,6 @@ import android.content.ContentResolver;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;

2
src/com/android/settings/SetupWizardUtils.java
View File

@@ -19,8 +19,6 @@ package com.android.settings;
import android.content.Intent;
import android.sysprop.SetupWizardProperties;
import androidx.annotation.VisibleForTesting;
import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.util.ThemeHelper;

5
src/com/android/settings/TestingSettings.java
View File

@@ -16,13 +16,12 @@
package com.android.settings;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import android.os.UserManager;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
public class TestingSettings extends SettingsPreferenceFragment {
@Override
@@ -41,6 +40,6 @@ public class TestingSettings extends SettingsPreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.TESTING;
return SettingsEnums.TESTING;
}
}

4
src/com/android/settings/TetherSettings.java
View File

@@ -20,6 +20,7 @@ import static android.net.ConnectivityManager.TETHERING_BLUETOOTH;
import static android.net.ConnectivityManager.TETHERING_USB;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothProfile;
@@ -40,7 +41,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.datausage.DataSaverBackend;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -101,7 +101,7 @@ public class TetherSettings extends RestrictedSettingsFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.TETHER;
return SettingsEnums.TETHER;
}
public TetherSettings() {

4
src/com/android/settings/TrustedCredentialsSettings.java
View File

@@ -24,6 +24,7 @@ import android.annotation.UiThread;
import android.app.Activity;
import android.app.KeyguardManager;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
@@ -63,7 +64,6 @@ import android.widget.TextView;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.app.UnlaunchableAppActivity;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.InstrumentedFragment;
@@ -93,7 +93,7 @@ public class TrustedCredentialsSettings extends InstrumentedFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.TRUSTED_CREDENTIALS;
return SettingsEnums.TRUSTED_CREDENTIALS;
}
private enum Tab {

6
src/com/android/settings/UserCredentialsSettings.java
View File

@@ -19,6 +19,7 @@ package com.android.settings;
import android.annotation.LayoutRes;
import android.annotation.Nullable;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.os.AsyncTask;
@@ -48,7 +49,6 @@ import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.RestrictedLockUtils;
@@ -68,7 +68,7 @@ public class UserCredentialsSettings extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.USER_CREDENTIALS;
return SettingsEnums.USER_CREDENTIALS;
}
@Override
@@ -165,7 +165,7 @@ public class UserCredentialsSettings extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_USER_CREDENTIAL;
return SettingsEnums.DIALOG_USER_CREDENTIAL;
}
/**

7
src/com/android/settings/accessibility/AccessibilityContentTimeoutPreferenceFragment.java
View File

@@ -16,17 +16,16 @@
package com.android.settings.accessibility;
import android.provider.SearchIndexableResource;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.res.Resources;
import android.provider.SearchIndexableResource;
import androidx.preference.Preference;
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;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
@@ -71,7 +70,7 @@ public final class AccessibilityContentTimeoutPreferenceFragment extends Dashboa
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY;
return SettingsEnums.ACCESSIBILITY;
}
@Override

7
src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java
View File

@@ -16,17 +16,16 @@
package com.android.settings.accessibility;
import android.provider.SearchIndexableResource;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.res.Resources;
import android.provider.SearchIndexableResource;
import androidx.preference.Preference;
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;
import com.android.settings.search.Indexable;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
@@ -71,7 +70,7 @@ public final class AccessibilityControlTimeoutPreferenceFragment extends Dashboa
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY;
return SettingsEnums.ACCESSIBILITY;
}
@Override

4
src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothHearingAid;
@@ -33,7 +34,6 @@ import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
import com.android.settings.core.BasePreferenceController;
@@ -204,7 +204,7 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC
.setDestination(BluetoothDeviceDetailsFragment.class.getName())
.setArguments(args)
.setTitleRes(R.string.device_details_title)
.setSourceMetricsCategory(MetricsProto.MetricsEvent.ACCESSIBILITY)
.setSourceMetricsCategory(SettingsEnums.ACCESSIBILITY)
.launch();
}

3
src/com/android/settings/accessibility/AccessibilityServiceWarning.java
View File

@@ -30,8 +30,6 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
@@ -39,7 +37,6 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
import java.util.List;
import java.util.Locale;
/**

4
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -20,6 +20,7 @@ import static android.os.Vibrator.VibrationIntensity;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
@@ -50,7 +51,6 @@ import androidx.preference.SwitchPreference;
import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.view.RotationPolicy;
import com.android.internal.view.RotationPolicy.RotationPolicyListener;
import com.android.settings.R;
@@ -272,7 +272,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY;
return SettingsEnums.ACCESSIBILITY;
}
@Override

4
src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.accessibility;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.ServiceInfo;
@@ -26,7 +27,6 @@ import android.view.accessibility.AccessibilityManager;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -60,7 +60,7 @@ public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragm
@Override
public int getMetricsCategory() {
return MetricsEvent.SUW_ACCESSIBILITY;
return SettingsEnums.SUW_ACCESSIBILITY;
}
@Override

4
src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.accessibility;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.annotation.Nullable;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
@@ -32,7 +33,6 @@ import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -60,7 +60,7 @@ public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePrefer
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
return SettingsEnums.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
}
@Override

2
src/com/android/settings/accessibility/AccessibilityTimeoutController.java
View File

@@ -33,8 +33,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import com.google.common.primitives.Ints;
import java.lang.Integer;
import java.util.HashMap;
import java.util.Map;

4
src/com/android/settings/accessibility/CaptionPropertiesFragment.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Resources;
@@ -36,7 +37,6 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceCategory;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.SubtitleView;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -99,7 +99,7 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_CAPTION_PROPERTIES;
return SettingsEnums.ACCESSIBILITY_CAPTION_PROPERTIES;
}
@Override

6
src/com/android/settings/accessibility/HearingAidDialogFragment.java
View File

@@ -18,10 +18,10 @@ package com.android.settings.accessibility;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.DialogInterface;
import android.os.Bundle;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.bluetooth.BluetoothPairingDetail;
import com.android.settings.core.SubSettingLauncher;
@@ -53,13 +53,13 @@ public class HearingAidDialogFragment extends InstrumentedDialogFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_ACCESSIBILITY_HEARINGAID;
return SettingsEnums.DIALOG_ACCESSIBILITY_HEARINGAID;
}
private void launchBluetoothAddDeviceSetting() {
new SubSettingLauncher(getActivity())
.setDestination(BluetoothPairingDetail.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.ACCESSIBILITY)
.setSourceMetricsCategory(SettingsEnums.ACCESSIBILITY)
.launch();
}
}

4
src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.accessibility;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
@@ -30,7 +31,6 @@ import android.view.accessibility.AccessibilityManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
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;
@@ -62,7 +62,7 @@ public final class MagnificationPreferenceFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_SCREEN_MAGNIFICATION_SETTINGS;
return SettingsEnums.ACCESSIBILITY_SCREEN_MAGNIFICATION_SETTINGS;
}
@Override

4
src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java
View File

@@ -15,11 +15,11 @@
*/
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.media.AudioAttributes;
import android.os.Vibrator;
import android.provider.Settings;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
/**
@@ -28,7 +28,7 @@ import com.android.settings.R;
public class NotificationVibrationPreferenceFragment extends VibrationPreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_VIBRATION_NOTIFICATION;
return SettingsEnums.ACCESSIBILITY_VIBRATION_NOTIFICATION;
}
@Override

4
src/com/android/settings/accessibility/RingVibrationPreferenceFragment.java
View File

@@ -15,11 +15,11 @@
*/
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.media.AudioAttributes;
import android.os.Vibrator;
import android.provider.Settings;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
/**
@@ -28,7 +28,7 @@ import com.android.settings.R;
public class RingVibrationPreferenceFragment extends VibrationPreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_VIBRATION_RING;
return SettingsEnums.ACCESSIBILITY_VIBRATION_RING;
}
@Override

15
src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
View File

@@ -17,13 +17,12 @@ package com.android.settings.accessibility;
import static android.content.DialogInterface.BUTTON_POSITIVE;
import static com.android.internal.accessibility.AccessibilityShortcutController
.COLOR_INVERSION_COMPONENT_NAME;
import static com.android.internal.accessibility.AccessibilityShortcutController
.DALTONIZER_COMPONENT_NAME;
import static com.android.internal.accessibility.AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME;
import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
@@ -43,9 +42,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.accessibility.AccessibilityShortcutController
.ToggleableFrameworkFeatureInfo;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.accessibility.AccessibilityShortcutController.ToggleableFrameworkFeatureInfo;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.widget.RadioButtonPickerFragment;
@@ -64,7 +61,7 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
return SettingsEnums.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
}
@Override
@@ -169,7 +166,7 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
return SettingsEnums.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
}
@Override

8
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
View File

@@ -20,6 +20,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.ComponentName;
import android.content.DialogInterface;
import android.content.Intent;
@@ -37,7 +38,6 @@ import android.view.accessibility.AccessibilityManager;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.password.ConfirmDeviceCredentialActivity;
@@ -71,7 +71,7 @@ public class ToggleAccessibilityServicePreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_SERVICE;
return SettingsEnums.ACCESSIBILITY_SERVICE;
}
@Override
@@ -163,9 +163,9 @@ public class ToggleAccessibilityServicePreferenceFragment
@Override
public int getDialogMetricsCategory(int dialogId) {
if (dialogId == DIALOG_ID_ENABLE_WARNING) {
return MetricsEvent.DIALOG_ACCESSIBILITY_SERVICE_ENABLE;
return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_ENABLE;
} else {
return MetricsEvent.DIALOG_ACCESSIBILITY_SERVICE_DISABLE;
return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_DISABLE;
}
}

4
src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.res.Resources;
import android.os.Bundle;
@@ -26,7 +27,6 @@ import android.widget.Switch;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -109,7 +109,7 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_TOGGLE_AUTOCLICK;
return SettingsEnums.ACCESSIBILITY_TOGGLE_AUTOCLICK;
}
@Override

4
src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
@@ -26,7 +27,6 @@ import android.widget.Switch;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -47,7 +47,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_TOGGLE_DALTONIZER;
return SettingsEnums.ACCESSIBILITY_TOGGLE_DALTONIZER;
}
@Override

4
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Resources;
@@ -37,7 +38,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.widget.SwitchBar;
@@ -164,7 +164,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
@Override
public int getMetricsCategory() {
// TODO: Distinguish between magnification modes
return MetricsEvent.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION;
return SettingsEnums.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION;
}
@Override

7
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
View File

@@ -16,16 +16,15 @@
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard
extends ToggleScreenMagnificationPreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION;
return SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION;
}
@Override
@@ -36,7 +35,7 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard
if (mToggleSwitch.isChecked() != args.getBoolean(AccessibilitySettings.EXTRA_CHECKED)) {
// TODO: Distinguish between magnification modes
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION,
SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION,
mToggleSwitch.isChecked());
}
}

7
src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
View File

@@ -16,10 +16,9 @@
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
public class ToggleScreenReaderPreferenceFragmentForSetupWizard
extends ToggleAccessibilityServicePreferenceFragment {
@@ -33,7 +32,7 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard
@Override
public int getMetricsCategory() {
return MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER;
return SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER;
}
@Override
@@ -41,7 +40,7 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard
// Log the final choice in value if it's different from the previous value.
if (mToggleSwitch.isChecked() != mToggleSwitchWasInitiallyChecked) {
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER, mToggleSwitch.isChecked());
SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER, mToggleSwitch.isChecked());
}
super.onStop();

7
src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
View File

@@ -16,10 +16,9 @@
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
public class ToggleSelectToSpeakPreferenceFragmentForSetupWizard
extends ToggleAccessibilityServicePreferenceFragment {
@@ -33,7 +32,7 @@ public class ToggleSelectToSpeakPreferenceFragmentForSetupWizard
@Override
public int getMetricsCategory() {
return MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER;
return SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER;
}
@Override
@@ -41,7 +40,7 @@ public class ToggleSelectToSpeakPreferenceFragmentForSetupWizard
// Log the final choice in value if it's different from the previous value.
if (mToggleSwitch.isChecked() != mToggleSwitchWasInitiallyChecked) {
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.SUW_ACCESSIBILITY_TOGGLE_SELECT_TO_SPEAK,
SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SELECT_TO_SPEAK,
mToggleSwitch.isChecked());
}

4
src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java
View File

@@ -15,11 +15,11 @@
*/
package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.media.AudioAttributes;
import android.os.Vibrator;
import android.provider.Settings;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
/**
@@ -28,7 +28,7 @@ import com.android.settings.R;
public class TouchVibrationPreferenceFragment extends VibrationPreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_VIBRATION_TOUCH;
return SettingsEnums.ACCESSIBILITY_VIBRATION_TOUCH;
}
@Override

4
src/com/android/settings/accessibility/VibrationSettings.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.accessibility;
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;
@@ -38,7 +38,7 @@ public class VibrationSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_VIBRATION;
return SettingsEnums.ACCESSIBILITY_VIBRATION;
}
@Override

4
src/com/android/settings/accounts/AccountDashboardFragment.java
View File

@@ -17,10 +17,10 @@ package com.android.settings.accounts;
import static android.provider.Settings.EXTRA_AUTHORITIES;
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.SettingsPreferenceFragment;
import com.android.settings.dashboard.DashboardFragment;
@@ -43,7 +43,7 @@ public class AccountDashboardFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCOUNT;
return SettingsEnums.ACCOUNT;
}
@Override

4
src/com/android/settings/accounts/AccountDetailDashboardFragment.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.accounts;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.os.UserHandle;
@@ -26,7 +27,6 @@ import android.os.UserManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
@@ -113,7 +113,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCOUNT;
return SettingsEnums.ACCOUNT;
}
@Override

1
src/com/android/settings/accounts/AccountFeatureProvider.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.accounts;
import android.accounts.Account;
import android.content.Context;
import android.content.Intent;
public interface AccountFeatureProvider {
String getAccountType();

4
src/com/android/settings/accounts/AccountSyncPreferenceController.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.accounts;
import static android.content.Intent.EXTRA_USER;
import android.accounts.Account;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.SyncAdapterType;
@@ -29,7 +30,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
@@ -66,7 +66,7 @@ public class AccountSyncPreferenceController extends AbstractPreferenceControlle
new SubSettingLauncher(mContext)
.setDestination(AccountSyncSettings.class.getName())
.setArguments(args)
.setSourceMetricsCategory( MetricsProto.MetricsEvent.ACCOUNT)
.setSourceMetricsCategory( SettingsEnums.ACCOUNT)
.setTitleRes( R.string.account_sync_title)
.launch();

6
src/com/android/settings/accounts/AccountSyncSettings.java
View File

@@ -20,6 +20,7 @@ import android.accounts.Account;
import android.accounts.AccountManager;
import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
@@ -44,7 +45,6 @@ import android.view.MenuItem;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.widget.EntityHeaderController;
@@ -80,14 +80,14 @@ public class AccountSyncSettings extends AccountPreferenceBase {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCOUNTS_ACCOUNT_SYNC;
return SettingsEnums.ACCOUNTS_ACCOUNT_SYNC;
}
@Override
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case CANT_DO_ONETIME_SYNC_DIALOG:
return MetricsEvent.DIALOG_ACCOUNT_SYNC_CANNOT_ONETIME_SYNC;
return SettingsEnums.DIALOG_ACCOUNT_SYNC_CANNOT_ONETIME_SYNC;
default:
return 0;
}

4
src/com/android/settings/accounts/ChooseAccountFragment.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.accounts;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserHandle;
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.Utils;
import com.android.settings.dashboard.DashboardFragment;
@@ -43,7 +43,7 @@ public class ChooseAccountFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY;
return SettingsEnums.ACCOUNTS_CHOOSE_ACCOUNT_ACTIVITY;
}
@Override

6
src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java
View File

@@ -19,15 +19,13 @@ import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import com.android.settings.core.BasePreferenceController;
import androidx.preference.Preference;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.slices.SliceData;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import androidx.preference.Preference;
public class CrossProfileCalendarPreferenceController extends TogglePreferenceController {
private UserHandle mManagedUser;

4
src/com/android/settings/accounts/ManagedProfileSettings.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.accounts;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -26,7 +27,6 @@ import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
@@ -105,7 +105,7 @@ public class ManagedProfileSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.ACCOUNTS_WORK_PROFILE_SETTINGS;
return SettingsEnums.ACCOUNTS_WORK_PROFILE_SETTINGS;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

6
src/com/android/settings/accounts/RemoveAccountPreferenceController.java
View File

@@ -23,6 +23,7 @@ import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
import android.app.Activity;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@@ -37,7 +38,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -147,7 +147,7 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_ACCOUNT_SYNC_REMOVE;
return SettingsEnums.DIALOG_ACCOUNT_SYNC_REMOVE;
}
@Override
@@ -210,7 +210,7 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_ACCOUNT_SYNC_FAILED_REMOVAL;
return SettingsEnums.DIALOG_ACCOUNT_SYNC_FAILED_REMOVAL;
}
}

4
src/com/android/settings/accounts/RemoveUserFragment.java
View File

@@ -17,12 +17,12 @@
package com.android.settings.accounts;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.UserManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.users.UserDialogs;
@@ -53,6 +53,6 @@ public class RemoveUserFragment extends InstrumentedDialogFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_REMOVE_USER;
return SettingsEnums.DIALOG_REMOVE_USER;
}
}

4
src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
View File

@@ -18,12 +18,12 @@ package com.android.settings.applications;
import android.app.Activity;
import android.app.Application;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import androidx.fragment.app.Fragment;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.EmergencyBroadcastPreferenceController;
@@ -42,7 +42,7 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_APP_NOTIF_CATEGORY;
return SettingsEnums.SETTINGS_APP_NOTIF_CATEGORY;
}
@Override

4
src/com/android/settings/applications/AppInfoBase.java
View File

@@ -21,6 +21,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.Activity;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -41,7 +42,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.manageapplications.ManageApplications;
@@ -241,7 +241,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_APP_INFO_ACTION;
return SettingsEnums.DIALOG_APP_INFO_ACTION;
}
@Override

5
src/com/android/settings/applications/AppLaunchSettings.java
View File

@@ -19,8 +19,8 @@ package com.android.settings.applications;
import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS;
import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK;
import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER;
import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ApplicationInfo;
@@ -40,7 +40,6 @@ import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -224,6 +223,6 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe
@Override
public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_APP_LAUNCH;
return SettingsEnums.APPLICATIONS_APP_LAUNCH;
}
}

8
src/com/android/settings/applications/AppStorageSettings.java
View File

@@ -22,6 +22,7 @@ import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
import android.app.ActivityManager;
import android.app.AppGlobals;
import android.app.GrantedUriPermission;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@@ -49,7 +50,6 @@ import androidx.loader.content.Loader;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.deviceinfo.StorageWizardMoveConfirm;
@@ -198,7 +198,7 @@ public class AppStorageSettings extends AppInfoWithHeader
mClearCacheObserver = new ClearCacheObserver();
}
mMetricsFeatureProvider.action(getContext(),
MetricsEvent.ACTION_SETTINGS_CLEAR_APP_CACHE);
SettingsEnums.ACTION_SETTINGS_CLEAR_APP_CACHE);
mPm.deleteApplicationCacheFiles(mPackageName, mClearCacheObserver);
}
@@ -361,7 +361,7 @@ public class AppStorageSettings extends AppInfoWithHeader
* button for a system package
*/
private void initiateClearUserData() {
mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_SETTINGS_CLEAR_APP_DATA);
mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_SETTINGS_CLEAR_APP_DATA);
mButtonsPref.setButton1Enabled(false);
// Invoke uninstall or clear user data based on sysPackage
String packageName = mAppEntry.info.packageName;
@@ -602,7 +602,7 @@ public class AppStorageSettings extends AppInfoWithHeader
@Override
public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_APP_STORAGE;
return SettingsEnums.APPLICATIONS_APP_STORAGE;
}
class ClearCacheObserver extends IPackageDataObserver.Stub {

4
src/com/android/settings/applications/ConfirmConvertToFbe.java
View File

@@ -15,6 +15,7 @@
*/
package com.android.settings.applications;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -22,7 +23,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -50,6 +50,6 @@ public class ConfirmConvertToFbe extends SettingsPreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.CONVERT_FBE_CONFIRM;
return SettingsEnums.CONVERT_FBE_CONFIRM;
}
}

4
src/com/android/settings/applications/ConvertToFbe.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.applications;
import android.annotation.Nullable;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
@@ -25,7 +26,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.SubSettingLauncher;
@@ -90,6 +90,6 @@ public class ConvertToFbe extends InstrumentedFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.CONVERT_FBE;
return SettingsEnums.CONVERT_FBE;
}
}

4
src/com/android/settings/applications/DefaultAppSettings.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.applications;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.icu.text.ListFormatter;
import android.provider.SearchIndexableResource;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.assist.DefaultAssistPreferenceController;
import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
@@ -69,7 +69,7 @@ public class DefaultAppSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_ADVANCED;
return SettingsEnums.APPLICATIONS_ADVANCED;
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {

4
src/com/android/settings/applications/ProcessStatsDetail.java
View File

@@ -22,6 +22,7 @@ import android.app.Activity;
import android.app.ActivityManager;
import android.app.ActivityManager.RunningServiceInfo;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
@@ -47,7 +48,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.CancellablePreference;
import com.android.settings.CancellablePreference.OnCancelListener;
import com.android.settings.R;
@@ -146,7 +146,7 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_PROCESS_STATS_DETAIL;
return SettingsEnums.APPLICATIONS_PROCESS_STATS_DETAIL;
}
@Override

4
src/com/android/settings/applications/ProcessStatsSummary.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.applications;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.text.format.Formatter;
@@ -24,7 +25,6 @@ import android.text.format.Formatter.BytesResult;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SummaryPreference;
import com.android.settings.Utils;
@@ -102,7 +102,7 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc
@Override
public int getMetricsCategory() {
return MetricsEvent.PROCESS_STATS_SUMMARY;
return SettingsEnums.PROCESS_STATS_SUMMARY;
}
@Override

4
src/com/android/settings/applications/ProcessStatsUi.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.applications;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Bundle;
@@ -29,7 +30,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import com.android.internal.app.procstats.ProcessStats;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.ProcStatsData.MemInfo;
@@ -93,7 +93,7 @@ public class ProcessStatsUi extends ProcessStatsBase {
@Override
public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_PROCESS_STATS_UI;
return SettingsEnums.APPLICATIONS_PROCESS_STATS_UI;
}
@Override

6
src/com/android/settings/applications/RecentAppsPreferenceController.java
View File

@@ -16,10 +16,8 @@
package com.android.settings.applications;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
.SETTINGS_APP_NOTIF_CATEGORY;
import android.app.Application;
import android.app.settings.SettingsEnums;
import android.app.usage.UsageStats;
import android.app.usage.UsageStatsManager;
import android.content.Context;
@@ -251,7 +249,7 @@ public class RecentAppsPreferenceController extends AbstractPreferenceController
pref.setOnPreferenceClickListener(preference -> {
AppInfoBase.startAppInfoFragment(AppInfoDashboardFragment.class,
R.string.application_info_label, pkgName, appEntry.info.uid, mHost,
1001 /*RequestCode*/, SETTINGS_APP_NOTIF_CATEGORY);
1001 /*RequestCode*/, SettingsEnums.SETTINGS_APP_NOTIF_CATEGORY);
return true;
});
if (!rebindPref) {

6
src/com/android/settings/applications/RunningServiceDetails.java
View File

@@ -5,6 +5,7 @@ import android.app.ActivityManager;
import android.app.ApplicationErrorReport;
import android.app.Dialog;
import android.app.PendingIntent;
import android.app.settings.SettingsEnums;
import android.content.ActivityNotFoundException;
import android.content.ComponentName;
import android.content.Context;
@@ -32,7 +33,6 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment;
@@ -535,7 +535,7 @@ public class RunningServiceDetails extends InstrumentedFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.RUNNING_SERVICE_DETAILS;
return SettingsEnums.RUNNING_SERVICE_DETAILS;
}
@Override
@@ -608,7 +608,7 @@ public class RunningServiceDetails extends InstrumentedFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_RUNNIGN_SERVICE;
return SettingsEnums.DIALOG_RUNNIGN_SERVICE;
}
}

4
src/com/android/settings/applications/RunningServices.java
View File

@@ -15,6 +15,7 @@
*/
package com.android.settings.applications;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -23,7 +24,6 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.widget.LoadingViewController;
@@ -110,7 +110,7 @@ public class RunningServices extends SettingsPreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.RUNNING_SERVICES;
return SettingsEnums.RUNNING_SERVICES;
}
private final Runnable mRunningProcessesAvail = new Runnable() {

8
src/com/android/settings/applications/UsageAccessDetails.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.applications;
import android.app.AppOpsManager;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -32,7 +33,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppStateUsageBridge.UsageState;
import com.android.settings.overlay.FeatureFactory;
@@ -112,8 +112,8 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc
@VisibleForTesting
void logSpecialPermissionChange(boolean newState, String packageName) {
int logCategory = newState ? MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_ALLOW
: MetricsEvent.APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY;
int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_USAGE_VIEW_ALLOW
: SettingsEnums.APP_SPECIAL_PERMISSION_USAGE_VIEW_DENY;
final MetricsFeatureProvider metricsFeatureProvider =
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider();
metricsFeatureProvider.action(
@@ -163,7 +163,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc
@Override
public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_USAGE_ACCESS_DETAIL;
return SettingsEnums.APPLICATIONS_USAGE_ACCESS_DETAIL;
}
}

16
src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.applications.appinfo;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -44,7 +45,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
@@ -218,7 +218,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
uninstallDaIntent.putExtra(DeviceAdminAdd.EXTRA_DEVICE_ADMIN_PACKAGE_NAME,
packageName);
mMetricsFeatureProvider.action(mActivity,
MetricsProto.MetricsEvent.ACTION_SETTINGS_UNINSTALL_DEVICE_ADMIN);
SettingsEnums.ACTION_SETTINGS_UNINSTALL_DEVICE_ADMIN);
mFragment.startActivityForResult(uninstallDaIntent, mRequestRemoveDeviceAdmin);
return;
}
@@ -244,8 +244,8 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
mMetricsFeatureProvider.action(
mActivity,
mAppEntry.info.enabled
? MetricsProto.MetricsEvent.ACTION_SETTINGS_DISABLE_APP
: MetricsProto.MetricsEvent.ACTION_SETTINGS_ENABLE_APP);
? SettingsEnums.ACTION_SETTINGS_DISABLE_APP
: SettingsEnums.ACTION_SETTINGS_ENABLE_APP);
AsyncTask.execute(new DisableChangerRunnable(mPm, mAppEntry.info.packageName,
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT));
}
@@ -288,13 +288,13 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
switch (id) {
case ButtonActionDialogFragment.DialogType.DISABLE:
mMetricsFeatureProvider.action(mActivity,
MetricsProto.MetricsEvent.ACTION_SETTINGS_DISABLE_APP);
SettingsEnums.ACTION_SETTINGS_DISABLE_APP);
AsyncTask.execute(new DisableChangerRunnable(mPm, mAppEntry.info.packageName,
PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER));
break;
case ButtonActionDialogFragment.DialogType.SPECIAL_DISABLE:
mMetricsFeatureProvider.action(mActivity,
MetricsProto.MetricsEvent.ACTION_SETTINGS_DISABLE_APP);
SettingsEnums.ACTION_SETTINGS_DISABLE_APP);
uninstallPkg(mAppEntry.info.packageName, false, true);
break;
case ButtonActionDialogFragment.DialogType.FORCE_STOP:
@@ -524,7 +524,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers);
mMetricsFeatureProvider.action(
mActivity, MetricsProto.MetricsEvent.ACTION_SETTINGS_UNINSTALL_APP);
mActivity, SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP);
mFragment.startActivityForResult(uninstallIntent, mRequestUninstall);
mDisableAfterUninstall = andDisable;
}
@@ -533,7 +533,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
void forceStopPackage(String pkgName) {
mMetricsFeatureProvider.action(
mMetricsFeatureProvider.getAttribution(mActivity),
MetricsProto.MetricsEvent.ACTION_APP_FORCE_STOP,
SettingsEnums.ACTION_APP_FORCE_STOP,
mFragment.getMetricsCategory(),
pkgName,
0);

9
src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
View File

@@ -20,6 +20,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
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;
@@ -41,13 +42,11 @@ import android.view.MenuItem;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.applications.specialaccess.pictureinpicture
.PictureInPictureDetailPreferenceController;
import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetailPreferenceController;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -209,7 +208,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_INSTALLED_APP_DETAILS;
return SettingsEnums.APPLICATIONS_INSTALLED_APP_DETAILS;
}
@Override
@@ -459,7 +458,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
final Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageURI);
uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers);
mMetricsFeatureProvider.action(
getContext(), MetricsEvent.ACTION_SETTINGS_UNINSTALL_APP);
getContext(), SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP);
startActivityForResult(uninstallIntent, REQUEST_UNINSTALL);
}

4
src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.applications.appinfo;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
@@ -63,7 +61,7 @@ public class AppSettingPreferenceController extends AppInfoPreferenceControllerB
}
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()
.action(SettingsEnums.PAGE_UNKNOWN,
ACTION_OPEN_APP_SETTING,
SettingsEnums.ACTION_OPEN_APP_SETTING,
mParent.getMetricsCategory(),
null, 0);
mContext.startActivity(intent);

4
src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.applications.appinfo;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
@@ -24,7 +25,6 @@ import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -74,7 +74,7 @@ public class ButtonActionDialogFragment extends InstrumentedDialogFragment imple
public int getMetricsCategory() {
//TODO(35810915): update the metrics label because for now this fragment will be shown
// in two screens
return MetricsProto.MetricsEvent.DIALOG_APP_INFO_ACTION;
return SettingsEnums.DIALOG_APP_INFO_ACTION;
}
@Override

4
src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
View File

@@ -15,6 +15,7 @@
package com.android.settings.applications.appinfo;
import android.app.role.RoleManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -23,7 +24,6 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.util.CollectionUtils;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -90,7 +90,7 @@ public abstract class DefaultAppShortcutPreferenceControllerBase extends BasePre
.setDestination(DefaultAppSettings.class.getName())
.setArguments(bundle)
.setTitleRes(R.string.configure_apps)
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN)
.setSourceMetricsCategory(SettingsEnums.PAGE_UNKNOWN)
.launch();
}
return true;

8
src/com/android/settings/applications/appinfo/DrawOverlayDetails.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.applications.appinfo;
import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
import android.app.AppOpsManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -34,7 +35,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
@@ -128,8 +128,8 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc
@VisibleForTesting
void logSpecialPermissionChange(boolean newState, String packageName) {
int logCategory = newState ? MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_ALLOW
: MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_DENY;
int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_APPDRAW_ALLOW
: SettingsEnums.APP_SPECIAL_PERMISSION_APPDRAW_DENY;
final MetricsFeatureProvider metricsFeatureProvider =
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider();
metricsFeatureProvider.action(
@@ -163,7 +163,7 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc
@Override
public int getMetricsCategory() {
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
return SettingsEnums.SYSTEM_ALERT_WINDOW_APPS;
}
public static CharSequence getSummary(Context context, AppEntry entry) {

4
src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
View File

@@ -19,6 +19,7 @@ import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
import android.app.AppOpsManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.os.UserHandle;
@@ -28,7 +29,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.applications.AppInfoWithHeader;
@@ -143,6 +143,6 @@ public class ExternalSourcesDetails extends AppInfoWithHeader
@Override
public int getMetricsCategory() {
return MetricsEvent.MANAGE_EXTERNAL_SOURCES;
return SettingsEnums.MANAGE_EXTERNAL_SOURCES;
}
}

6
src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.applications.appinfo;
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.PackageManager;
@@ -24,7 +25,6 @@ import android.os.UserHandle;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
@@ -49,7 +49,7 @@ public class InstantAppButtonDialogFragment extends InstrumentedDialogFragment i
@Override
public int getMetricsCategory() {
return MetricsEvent.DIALOG_APP_INFO_ACTION;
return SettingsEnums.DIALOG_APP_INFO_ACTION;
}
@Override
@@ -64,7 +64,7 @@ public class InstantAppButtonDialogFragment extends InstrumentedDialogFragment i
final Context context = getContext();
final PackageManager packageManager = context.getPackageManager();
FeatureFactory.getFactory(context).getMetricsFeatureProvider()
.action(context, MetricsEvent.ACTION_SETTINGS_CLEAR_INSTANT_APP, mPackageName);
.action(context, SettingsEnums.ACTION_SETTINGS_CLEAR_INSTANT_APP, mPackageName);
packageManager.deletePackageAsUser(mPackageName, null, 0, UserHandle.myUserId());
}

8
src/com/android/settings/applications/appinfo/WriteSettingsDetails.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.applications.appinfo;
import android.app.AppOpsManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -29,7 +30,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
@@ -101,8 +101,8 @@ public class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere
}
void logSpecialPermissionChange(boolean newState, String packageName) {
int logCategory = newState ? MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW
: MetricsEvent.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY;
int logCategory = newState ? SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_ALLOW
: SettingsEnums.APP_SPECIAL_PERMISSION_SETTINGS_CHANGE_DENY;
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
logCategory, packageName);
}
@@ -139,7 +139,7 @@ public class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere
@Override
public int getMetricsCategory() {
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
return SettingsEnums.SYSTEM_ALERT_WINDOW_APPS;
}
public static CharSequence getSummary(Context context, AppEntry entry) {

4
src/com/android/settings/applications/appops/BackgroundCheckSummary.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.appops;
import android.annotation.Nullable;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
import android.preference.PreferenceFrameLayout;
import android.view.LayoutInflater;
@@ -25,7 +26,6 @@ import android.view.ViewGroup;
import androidx.fragment.app.FragmentTransaction;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -35,7 +35,7 @@ public class BackgroundCheckSummary extends InstrumentedPreferenceFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.BACKGROUND_CHECK_SUMMARY;
return SettingsEnums.BACKGROUND_CHECK_SUMMARY;
}
@Override

4
src/com/android/settings/applications/assist/DefaultAssistPicker.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications.assist;
import android.app.ActivityManager;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -32,7 +33,6 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.internal.app.AssistUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -57,7 +57,7 @@ public class DefaultAssistPicker extends DefaultAppPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_ASSIST_PICKER;
return SettingsEnums.DEFAULT_ASSIST_PICKER;
}
@Override

4
src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.applications.assist;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -24,7 +25,6 @@ import android.provider.Settings;
import android.text.TextUtils;
import com.android.internal.app.AssistUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -40,7 +40,7 @@ public class DefaultVoiceInputPicker extends DefaultAppPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_VOICE_INPUT_PICKER;
return SettingsEnums.DEFAULT_VOICE_INPUT_PICKER;
}
@Override

4
src/com/android/settings/applications/assist/ManageAssist.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.applications.assist;
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.gestures.AssistGestureSettingsPreferenceController;
@@ -59,7 +59,7 @@ public class ManageAssist extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.APPLICATIONS_MANAGE_ASSIST;
return SettingsEnums.APPLICATIONS_MANAGE_ASSIST;
}
@Override

4
src/com/android/settings/applications/defaultapps/AutofillPicker.java
View File

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

5
src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
View File

@@ -29,7 +29,6 @@ import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.fuelgauge.BatteryUtils;
@@ -71,7 +70,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
protected void onRadioButtonConfirmed(String selectedKey) {
mMetricsFeatureProvider.action(
mMetricsFeatureProvider.getAttribution(getActivity()),
MetricsEvent.ACTION_SETTINGS_UPDATE_DEFAULT_APP,
SettingsEnums.ACTION_SETTINGS_UPDATE_DEFAULT_APP,
getMetricsCategory(),
selectedKey,
0 /* value */);
@@ -113,7 +112,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
@Override
public int getMetricsCategory() {
return MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
return SettingsEnums.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
}
/**

4
src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.applications.defaultapps;
import android.Manifest;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
@@ -38,7 +39,6 @@ import android.util.Log;
import androidx.preference.Preference;
import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.utils.ThreadUtils;
@@ -114,7 +114,7 @@ public class DefaultAutofillPicker extends DefaultAppPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_AUTOFILL_PICKER;
return SettingsEnums.DEFAULT_AUTOFILL_PICKER;
}
@Override

4
src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.applications.defaultapps;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -39,7 +39,7 @@ public class DefaultBrowserPicker extends DefaultAppPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_BROWSER_PICKER;
return SettingsEnums.DEFAULT_BROWSER_PICKER;
}
@Override

4
src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.applications.defaultapps;
import android.app.settings.SettingsEnums;
import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -25,7 +26,6 @@ import android.content.pm.ResolveInfo;
import android.provider.Settings;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -38,7 +38,7 @@ public class DefaultEmergencyPicker extends DefaultAppPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_EMERGENCY_APP_PICKER;
return SettingsEnums.DEFAULT_EMERGENCY_APP_PICKER;
}
@Override

4
src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.applications.defaultapps;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -28,7 +29,6 @@ import android.content.pm.UserInfo;
import android.os.Build;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -52,7 +52,7 @@ public class DefaultHomePicker extends DefaultAppPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_HOME_PICKER;
return SettingsEnums.DEFAULT_HOME_PICKER;
}
@Override

4
src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java
View File

@@ -16,13 +16,13 @@
package com.android.settings.applications.defaultapps;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.PackageManager;
import android.telecom.DefaultDialerManager;
import android.telecom.TelecomManager;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -35,7 +35,7 @@ public class DefaultPhonePicker extends DefaultAppPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_PHONE_PICKER;
return SettingsEnums.DEFAULT_PHONE_PICKER;
}
@Override

4
src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.applications.defaultapps;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.telephony.SmsApplication;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -38,7 +38,7 @@ public class DefaultSmsPicker extends DefaultAppPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_SMS_PICKER;
return SettingsEnums.DEFAULT_SMS_PICKER;
}
@Override

63
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -18,32 +18,22 @@ package com.android.settings.applications.manageapplications;
import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_ALL;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_BLOCKED;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_DISABLED;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_ENABLED;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_FREQUENT;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_INSTANT;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_PERSONAL;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_POWER_WHITELIST;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_POWER_WHITELIST_ALL;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_RECENT;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_WORK;
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL;
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_BLOCKED;
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_DISABLED;
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ENABLED;
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_FREQUENT;
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTANT;
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_PERSONAL;
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST;
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST_ALL;
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_RECENT;
import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WORK;
import android.annotation.Nullable;
import android.annotation.StringRes;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.app.usage.IUsageStatsManager;
import android.content.Context;
import android.content.Intent;
@@ -78,7 +68,6 @@ import androidx.annotation.WorkerThread;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.Settings.GamesStorageActivity;
@@ -453,34 +442,34 @@ public class ManageApplications extends InstrumentedFragment
public int getMetricsCategory() {
switch (mListType) {
case LIST_TYPE_MAIN:
return MetricsEvent.MANAGE_APPLICATIONS;
return SettingsEnums.MANAGE_APPLICATIONS;
case LIST_TYPE_NOTIFICATION:
return MetricsEvent.MANAGE_APPLICATIONS_NOTIFICATIONS;
return SettingsEnums.MANAGE_APPLICATIONS_NOTIFICATIONS;
case LIST_TYPE_STORAGE:
if (mStorageType == STORAGE_TYPE_MUSIC) {
return MetricsEvent.APPLICATIONS_STORAGE_MUSIC;
return SettingsEnums.APPLICATIONS_STORAGE_MUSIC;
}
return MetricsEvent.APPLICATIONS_STORAGE_APPS;
return SettingsEnums.APPLICATIONS_STORAGE_APPS;
case LIST_TYPE_GAMES:
return MetricsEvent.APPLICATIONS_STORAGE_GAMES;
return SettingsEnums.APPLICATIONS_STORAGE_GAMES;
case LIST_TYPE_MOVIES:
return MetricsEvent.APPLICATIONS_STORAGE_MOVIES;
return SettingsEnums.APPLICATIONS_STORAGE_MOVIES;
case LIST_TYPE_PHOTOGRAPHY:
return MetricsEvent.APPLICATIONS_STORAGE_PHOTOS;
return SettingsEnums.APPLICATIONS_STORAGE_PHOTOS;
case LIST_TYPE_USAGE_ACCESS:
return MetricsEvent.USAGE_ACCESS;
return SettingsEnums.USAGE_ACCESS;
case LIST_TYPE_HIGH_POWER:
return MetricsEvent.APPLICATIONS_HIGH_POWER_APPS;
return SettingsEnums.APPLICATIONS_HIGH_POWER_APPS;
case LIST_TYPE_OVERLAY:
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
return SettingsEnums.SYSTEM_ALERT_WINDOW_APPS;
case LIST_TYPE_WRITE_SETTINGS:
return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
return SettingsEnums.SYSTEM_ALERT_WINDOW_APPS;
case LIST_TYPE_MANAGE_SOURCES:
return MetricsEvent.MANAGE_EXTERNAL_SOURCES;
return SettingsEnums.MANAGE_EXTERNAL_SOURCES;
case LIST_TYPE_WIFI_ACCESS:
return MetricsEvent.CONFIGURE_WIFI;
return SettingsEnums.CONFIGURE_WIFI;
default:
return MetricsEvent.VIEW_UNKNOWN;
return SettingsEnums.PAGE_UNKNOWN;
}
}

4
src/com/android/settings/applications/managedomainurls/ManageDomainUrls.java
View File

@@ -18,10 +18,10 @@ package com.android.settings.applications.managedomainurls;
import static com.android.settingslib.search.SearchIndexable.MOBILE;
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;
@@ -58,7 +58,7 @@ public class ManageDomainUrls extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.MANAGE_DOMAIN_URLS;
return SettingsEnums.MANAGE_DOMAIN_URLS;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

4
src/com/android/settings/applications/specialaccess/SpecialAccessSettings.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.applications.specialaccess;
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;
@@ -46,7 +46,7 @@ public class SpecialAccessSettings extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsEvent.SPECIAL_ACCESS;
return SettingsEnums.SPECIAL_ACCESS;
}
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

5
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
View File

@@ -60,7 +60,6 @@ import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.EventLogTags;
import com.android.settings.R;
import com.android.settings.fuelgauge.BatteryUtils;
@@ -488,8 +487,8 @@ public class DeviceAdminAdd extends Activity {
}
void logSpecialPermissionChange(boolean allow, String packageName) {
int logCategory = allow ? MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_ADMIN_ALLOW :
MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_ADMIN_DENY;
int logCategory = allow ? SettingsEnums.APP_SPECIAL_PERMISSION_ADMIN_ALLOW :
SettingsEnums.APP_SPECIAL_PERMISSION_ADMIN_DENY;
FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(
SettingsEnums.PAGE_UNKNOWN,
logCategory,

4
src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminSettings.java
View File

@@ -16,10 +16,10 @@
package com.android.settings.applications.specialaccess.deviceadmin;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -34,7 +34,7 @@ public class DeviceAdminSettings extends DashboardFragment {
static final String TAG = "DeviceAdminSettings";
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEVICE_ADMIN_SETTINGS;
return SettingsEnums.DEVICE_ADMIN_SETTINGS;
}
@Override

12
src/com/android/settings/applications/specialaccess/financialapps/FinancialAppsController.java
View File

@@ -15,8 +15,8 @@
*/
package com.android.settings.applications.specialaccess.financialapps;
import static android.Manifest.permission.SMS_FINANCIAL_TRANSACTIONS;
import static android.Manifest.permission.READ_SMS;
import static android.Manifest.permission.SMS_FINANCIAL_TRANSACTIONS;
import android.app.AppOpsManager;
import android.content.Context;
@@ -24,20 +24,18 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.SwitchPreference;
import java.util.ArrayList;
import java.util.List;

8
src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java
View File

@@ -20,6 +20,7 @@ import static android.app.AppOpsManager.MODE_ERRORED;
import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE;
import android.app.AppOpsManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
@@ -29,7 +30,6 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settings.overlay.FeatureFactory;
@@ -84,7 +84,7 @@ public class PictureInPictureDetails extends AppInfoWithHeader
@Override
public int getMetricsCategory() {
return MetricsEvent.SETTINGS_MANAGE_PICTURE_IN_PICTURE;
return SettingsEnums.SETTINGS_MANAGE_PICTURE_IN_PICTURE;
}
/**
@@ -121,8 +121,8 @@ public class PictureInPictureDetails extends AppInfoWithHeader
@VisibleForTesting
void logSpecialPermissionChange(boolean newState, String packageName) {
int logCategory = newState
? MetricsEvent.APP_PICTURE_IN_PICTURE_ALLOW
: MetricsEvent.APP_PICTURE_IN_PICTURE_DENY;
? SettingsEnums.APP_PICTURE_IN_PICTURE_ALLOW
: SettingsEnums.APP_PICTURE_IN_PICTURE_DENY;
final MetricsFeatureProvider metricsFeatureProvider =
FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider();
metricsFeatureProvider.action(

4
src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.applications.specialaccess.pictureinpicture;
import static android.content.pm.PackageManager.GET_ACTIVITIES;
import android.annotation.Nullable;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
@@ -37,7 +38,6 @@ import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -192,7 +192,7 @@ public class PictureInPictureSettings extends EmptyTextSettings {
@Override
public int getMetricsCategory() {
return MetricsEvent.SETTINGS_MANAGE_PICTURE_IN_PICTURE;
return SettingsEnums.SETTINGS_MANAGE_PICTURE_IN_PICTURE;
}
/**

10
src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.applications.specialaccess.premiumsms;
import android.annotation.Nullable;
import android.app.Application;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
@@ -30,7 +31,6 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.telephony.SmsUsageMonitor;
import com.android.settings.R;
import com.android.settings.applications.AppStateBaseBridge.Callback;
@@ -99,7 +99,7 @@ public class PremiumSmsAccess extends EmptyTextSettings
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.PREMIUM_SMS_ACCESS;
return SettingsEnums.PREMIUM_SMS_ACCESS;
}
@Override
@@ -116,13 +116,13 @@ public class PremiumSmsAccess extends EmptyTextSettings
int category = SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
switch (smsState) {
case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ASK_USER:
category = MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ASK;
category = SettingsEnums.APP_SPECIAL_PERMISSION_PREMIUM_SMS_ASK;
break;
case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_NEVER_ALLOW:
category = MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_PREMIUM_SMS_DENY;
category = SettingsEnums.APP_SPECIAL_PERMISSION_PREMIUM_SMS_DENY;
break;
case SmsUsageMonitor.PREMIUM_SMS_PERMISSION_ALWAYS_ALLOW:
category = MetricsProto.MetricsEvent.
category = SettingsEnums.
APP_SPECIAL_PERMISSION_PREMIUM_SMS_ALWAYS_ALLOW;
break;
}

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