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

Commit f2d2c0a2 authored by jasonwshsu's avatar jasonwshsu
Browse files

Add Settings button to Hearing Devices page in Hearing Devices dialog 

Bug: 397314200
Test: check Settings button appear in the dialog
Flag: EXEMPT bugfix
Change-Id: Ic31ce010e1aaac9b6ee078af1b6ff9c605a76397
parent fd356738

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1036,6 +1036,8 @@ 
    <string name="hearing_devices_tools_label">Tools</string>

    <!-- QuickSettings: Tool name for hearing devices dialog related tools [CHAR LIMIT=40] [BACKUP_MESSAGE_ID=8916875614623730005]-->

    <string name="quick_settings_hearing_devices_live_caption_title">Live Caption</string>

    <!-- QuickSettings: Label for button to go to hearing devices settings page [CHAR_LIMIT=20] -->

    <string name="hearing_devices_settings_button">Settings</string>



    <!-- QuickSettings: Notes tile. The label of a quick settings tile for launching the default notes taking app. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_notes_label">Note</string>

packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java

+16 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.systemui.accessibility.hearingaid; 
import static android.view.View.GONE;

import static android.view.View.VISIBLE;



import static com.android.internal.accessibility.AccessibilityShortcutController.ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME;



import static java.util.Collections.emptyList;



import android.bluetooth.BluetoothHapClient;
@@ -263,6 +265,20 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, 
        dialog.setTitle(R.string.quick_settings_hearing_devices_dialog_title);

        dialog.setView(LayoutInflater.from(dialog.getContext()).inflate(

                R.layout.hearing_devices_tile_dialog, null));

        dialog.setNegativeButton(

                R.string.hearing_devices_settings_button,

                (dialogInterface, which) -> {

                    mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_SETTINGS_CLICK,

                            mLaunchSourceId);

                    final Intent intent = new Intent(Settings.ACTION_ACCESSIBILITY_DETAILS_SETTINGS)

                            .putExtra(Intent.EXTRA_COMPONENT_NAME,

                                    ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME.flattenToString());

                    mActivityStarter.postStartActivityDismissingKeyguard(intent, /* delay= */ 0,

                            mDialogTransitionAnimator.createActivityTransitionController(

                                    dialog));

                },

                /* dismissOnClick = */ true

        );

        dialog.setPositiveButton(

                R.string.quick_settings_done,

                /* onClick = */ null,

packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesUiEvent.kt

+3 −1
Original line number Diff line number Diff line
@@ -39,7 +39,9 @@ enum class HearingDevicesUiEvent(private val id: Int) : UiEventLogger.UiEventEnu 
    @UiEvent(doc = "Expand the ambient volume controls")

    HEARING_DEVICES_AMBIENT_EXPAND_CONTROLS(2153),

    @UiEvent(doc = "Collapse the ambient volume controls")

    HEARING_DEVICES_AMBIENT_COLLAPSE_CONTROLS(2154);

    HEARING_DEVICES_AMBIENT_COLLAPSE_CONTROLS(2154),

    @UiEvent(doc = "Click on the device settings to enter hearing devices page")

    HEARING_DEVICES_SETTINGS_CLICK(2172);



    override fun getId(): Int = this.id

}