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/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