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

9
src/com/android/settings/bluetooth/Utils.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.bluetooth;
import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
@@ -27,7 +28,6 @@ import android.widget.Toast;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.BluetoothUtils;
@@ -90,15 +90,10 @@ public final class Utils {
return dialog;
}
// TODO: wire this up to show connection errors...
static void showConnectingError(Context context, String name) {
showConnectingError(context, name, getLocalBtManager(context));
}
@VisibleForTesting
static void showConnectingError(Context context, String name, LocalBluetoothManager manager) {
FeatureFactory.getFactory(context).getMetricsFeatureProvider().visible(context,
MetricsEvent.VIEW_UNKNOWN, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR);
SettingsEnums.PAGE_UNKNOWN, SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT_ERROR);
showError(context, name, R.string.bluetooth_connecting_error_message, manager);
}