Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ab852b4 authored by Jason Hsu's avatar Jason Hsu Committed by Android (Google) Code Review
Browse files

Merge "Return getMetricsCategory() for each new page hearing aid and flash... 

Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev
parents 29bcb4d5 6a2db7ee

src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/accessibility/FlashNotificationsPreferenceFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/accessibility/HearingDevicePairingDetail.java

+2 −2
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/bluetooth/BluetoothDetailsAudioRoutingFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -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