PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev am: 7ab852b48e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978662

Change-Id: I73a880ba338b997595638fb615d37745c86c595e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Hsu
2023-03-15 07:05:15 +00:00
committed by Automerger Merge Worker
parent 510b9b6b49 7ab852b48e
commit 42fc665f48
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ package com.android.settings.accessibility;
import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
import android.app.settings.SettingsEnums;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
@@ -72,8 +73,7 @@ public class AccessibilityHearingAidsFragment extends AccessibilityShortcutPrefe
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
// TODO(b/262839191): To be updated settings_enums.proto return SettingsEnums.ACCESSIBILITY_HEARING_AID_SETTINGS;
return 0;
} }
@Override @Override

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

@@ -16,6 +16,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import com.android.settings.R; import com.android.settings.R;
@@ -41,8 +42,7 @@ public class FlashNotificationsPreferenceFragment extends DashboardFragment {
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
// TODO: Flash notifications have to add SettingsEnums. return SettingsEnums.FLASH_NOTIFICATION_SETTINGS;
return 0;
} }
@Override @Override

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

@@ -16,6 +16,7 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothUuid; import android.bluetooth.BluetoothUuid;
import android.bluetooth.le.ScanFilter; import android.bluetooth.le.ScanFilter;
@@ -61,8 +62,7 @@ public class HearingDevicePairingDetail extends BluetoothDevicePairingDetailBase
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
// TODO(b/262839191): To be updated settings_enums.proto return SettingsEnums.HEARING_AID_PAIRING;
return 0;
} }
@Override @Override

4
src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFragment.java
View File

@@ -20,6 +20,7 @@ import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
import static com.android.settings.bluetooth.BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS; import static com.android.settings.bluetooth.BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS;
import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
@@ -73,8 +74,7 @@ public class BluetoothDetailsAudioRoutingFragment extends RestrictedDashboardFra
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
// TODO(b/262839191): To be updated settings_enums.proto return SettingsEnums.BLUETOOTH_AUDIO_ROUTING;
return 0;
} }
@Override @Override