From 6a2db7ee4d7c31bb2fcf34aa6c6b662c31c28681 Mon Sep 17 00:00:00 2001 From: jasonwshsu Date: Sun, 12 Mar 2023 20:20:31 +0800 Subject: [PATCH] Return getMetricsCategory() for each new page hearing aid and flash notifications in android U Bug: 262839191 Test: manual test Change-Id: I066f49a2537b798132b484f6eff0d0314a164138 --- .../accessibility/AccessibilityHearingAidsFragment.java | 4 ++-- .../accessibility/FlashNotificationsPreferenceFragment.java | 4 ++-- .../settings/accessibility/HearingDevicePairingDetail.java | 4 ++-- .../bluetooth/BluetoothDetailsAudioRoutingFragment.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java b/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java index 85783b73a77..4641a15f1de 100644 --- a/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java @@ -18,6 +18,7 @@ package com.android.settings.accessibility; import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; +import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.os.Bundle; @@ -72,8 +73,7 @@ public class AccessibilityHearingAidsFragment extends AccessibilityShortcutPrefe @Override public int getMetricsCategory() { - // TODO(b/262839191): To be updated settings_enums.proto - return 0; + return SettingsEnums.ACCESSIBILITY_HEARING_AID_SETTINGS; } @Override diff --git a/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragment.java b/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragment.java index f35d1a1b1a6..f7964742c96 100644 --- a/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragment.java +++ b/src/com/android/settings/accessibility/FlashNotificationsPreferenceFragment.java @@ -16,6 +16,7 @@ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.content.Context; import com.android.settings.R; @@ -41,8 +42,7 @@ public class FlashNotificationsPreferenceFragment extends DashboardFragment { @Override public int getMetricsCategory() { - // TODO: Flash notifications have to add SettingsEnums. - return 0; + return SettingsEnums.FLASH_NOTIFICATION_SETTINGS; } @Override diff --git a/src/com/android/settings/accessibility/HearingDevicePairingDetail.java b/src/com/android/settings/accessibility/HearingDevicePairingDetail.java index aa9b587d818..35997ddebb8 100644 --- a/src/com/android/settings/accessibility/HearingDevicePairingDetail.java +++ b/src/com/android/settings/accessibility/HearingDevicePairingDetail.java @@ -16,6 +16,7 @@ package com.android.settings.accessibility; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothUuid; import android.bluetooth.le.ScanFilter; @@ -61,8 +62,7 @@ public class HearingDevicePairingDetail extends BluetoothDevicePairingDetailBase @Override public int getMetricsCategory() { - // TODO(b/262839191): To be updated settings_enums.proto - return 0; + return SettingsEnums.HEARING_AID_PAIRING; } @Override diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFragment.java b/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFragment.java index ea890538d7d..453eae3224b 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFragment.java @@ -20,6 +20,7 @@ import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; import static com.android.settings.bluetooth.BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS; +import android.app.settings.SettingsEnums; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.util.Log; @@ -73,8 +74,7 @@ public class BluetoothDetailsAudioRoutingFragment extends RestrictedDashboardFra @Override public int getMetricsCategory() { - // TODO(b/262839191): To be updated settings_enums.proto - return 0; + return SettingsEnums.BLUETOOTH_AUDIO_ROUTING; } @Override