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

@@ -15,11 +15,11 @@
*/
package com.android.settings.connecteddevice;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.PackageManager;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.bluetooth.BluetoothFilesPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
@@ -46,7 +46,7 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.CONNECTION_DEVICE_ADVANCED;
return SettingsEnums.CONNECTION_DEVICE_ADVANCED;
}
@Override

4
src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
View File

@@ -15,12 +15,12 @@
*/
package com.android.settings.connecteddevice;
import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothManager;
import android.content.Context;
import android.os.Bundle;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController;
@@ -54,7 +54,7 @@ public class BluetoothDashboardFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.BLUETOOTH_FRAGMENT;
return SettingsEnums.BLUETOOTH_FRAGMENT;
}
@Override

4
src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
View File

@@ -15,12 +15,12 @@
*/
package com.android.settings.connecteddevice;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -44,7 +44,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.SETTINGS_CONNECTED_DEVICE_CATEGORY;
return SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY;
}
@Override

4
src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java
View File

@@ -15,10 +15,10 @@
*/
package com.android.settings.connecteddevice;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.res.Resources;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -54,7 +54,7 @@ public class PreviouslyConnectedDeviceDashboardFragment extends DashboardFragmen
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.PREVIOUSLY_CONNECTED_DEVICES;
return SettingsEnums.PREVIOUSLY_CONNECTED_DEVICES;
}
@Override

2
src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java
View File

@@ -18,8 +18,8 @@ package com.android.settings.connecteddevice;
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
public class TopLevelConnectedDevicesPreferenceController extends BasePreferenceController {

1
src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
View File

@@ -20,7 +20,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort;
import android.hardware.usb.UsbPortStatus;
import com.android.settingslib.core.lifecycle.LifecycleObserver;

5
src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
View File

@@ -18,16 +18,15 @@ package com.android.settings.connecteddevice.usb;
import static android.net.ConnectivityManager.TETHERING_USB;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.hardware.usb.UsbManager;
import android.net.ConnectivityManager;
import android.os.Bundle;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.widget.RadioButtonPickerFragment;
@@ -70,7 +69,7 @@ public class UsbDefaultFragment extends RadioButtonPickerFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.USB_DEFAULT;
return SettingsEnums.USB_DEFAULT;
}
@Override

1
src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
View File

@@ -21,7 +21,6 @@ import static android.hardware.usb.UsbPortStatus.DATA_ROLE_HOST;
import static android.hardware.usb.UsbPortStatus.DATA_ROLE_NONE;
import android.content.Context;
import android.hardware.usb.UsbPort;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;

4
src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.connecteddevice.usb;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.provider.SearchIndexableResource;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -56,7 +56,7 @@ public class UsbDetailsFragment extends DashboardFragment {
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.USB_DEVICE_DETAILS;
return SettingsEnums.USB_DEVICE_DETAILS;
}
@Override

1
src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
View File

@@ -21,7 +21,6 @@ import static android.net.ConnectivityManager.TETHERING_USB;
import android.content.Context;
import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort;
import android.net.ConnectivityManager;
import androidx.annotation.VisibleForTesting;

2
src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
View File

@@ -21,8 +21,6 @@ import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SINK;
import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SOURCE;
import android.content.Context;
import android.hardware.usb.UsbPort;
import android.hardware.usb.UsbPortStatus;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;