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

Commit b74a9a9c authored by jasonwshsu's avatar jasonwshsu
Browse files

Add Quick Settings shortcut option into Hearing Devices accessibility settings page 

* In Android V, we can add qs as one of the accessibility shortcut option to be more discoverable.

Bug: 338327560
Flag: EXEMPT bugfix
Test: atest A11yShortcutAutoAddableListTest AccessibilityQsShortcutsRepositoryImplForDeviceTest
Change-Id: I52f3b6d201a5886da4d8e9da15322a2f4cd5ab6b
parent 8eb3c0f4

core/java/com/android/internal/accessibility/AccessibilityShortcutController.java

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ public class AccessibilityShortcutController { 
    // The component name for the sub setting of Hearing aids in Accessibility settings

    public static final ComponentName ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME =

            new ComponentName("com.android.server.accessibility", "HearingAids");

    public static final ComponentName ACCESSIBILITY_HEARING_AIDS_TILE_COMPONENT_NAME =

            new ComponentName("com.android.server.accessibility", "HearingDevicesTile");



    public static final ComponentName COLOR_INVERSION_TILE_COMPONENT_NAME =

            new ComponentName("com.android.server.accessibility", "ColorInversionTile");

core/java/com/android/internal/accessibility/common/ShortcutConstants.java

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.internal.accessibility.common;



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

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

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

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

import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME;
@@ -160,6 +162,8 @@ public final class ShortcutConstants { 
            DALTONIZER_COMPONENT_NAME, DALTONIZER_TILE_COMPONENT_NAME,

            ONE_HANDED_COMPONENT_NAME, ONE_HANDED_TILE_COMPONENT_NAME,

            REDUCE_BRIGHT_COLORS_COMPONENT_NAME, REDUCE_BRIGHT_COLORS_TILE_SERVICE_COMPONENT_NAME,

            FONT_SIZE_COMPONENT_NAME, FONT_SIZE_TILE_COMPONENT_NAME

            FONT_SIZE_COMPONENT_NAME, FONT_SIZE_TILE_COMPONENT_NAME,

            ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME,

            ACCESSIBILITY_HEARING_AIDS_TILE_COMPONENT_NAME

    );

}

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/pipeline/domain/autoaddable/A11yShortcutAutoAddableListTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.systemui.SysuiTestCase 
import com.android.systemui.qs.pipeline.shared.TileSpec

import com.android.systemui.qs.tiles.ColorCorrectionTile

import com.android.systemui.qs.tiles.ColorInversionTile

import com.android.systemui.qs.tiles.HearingDevicesTile

import com.android.systemui.qs.tiles.OneHandedModeTile

import com.android.systemui.qs.tiles.ReduceBrightColorsTile

import com.android.systemui.util.mockito.mock
@@ -77,6 +78,10 @@ class A11yShortcutAutoAddableListTest : SysuiTestCase() { 
                    TileSpec.create(ReduceBrightColorsTile.TILE_SPEC),

                    AccessibilityShortcutController.REDUCE_BRIGHT_COLORS_COMPONENT_NAME

                ),

                factory.create(

                    TileSpec.create(HearingDevicesTile.TILE_SPEC),

                    AccessibilityShortcutController.ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME

                ),

            )



        val autoAddables = A11yShortcutAutoAddableList.getA11yShortcutAutoAddables(factory)

packages/SystemUI/src/com/android/systemui/accessibility/data/repository/AccessibilityQsShortcutsRepository.kt

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.qs.pipeline.shared.TileSpec 
import com.android.systemui.qs.tiles.ColorCorrectionTile

import com.android.systemui.qs.tiles.ColorInversionTile

import com.android.systemui.qs.tiles.FontScalingTile

import com.android.systemui.qs.tiles.HearingDevicesTile

import com.android.systemui.qs.tiles.OneHandedModeTile

import com.android.systemui.qs.tiles.ReduceBrightColorsTile

import javax.inject.Inject
@@ -74,6 +75,8 @@ constructor( 
                        .REDUCE_BRIGHT_COLORS_TILE_SERVICE_COMPONENT_NAME,

                FontScalingTile.TILE_SPEC to

                    AccessibilityShortcutController.FONT_SIZE_TILE_COMPONENT_NAME,

                HearingDevicesTile.TILE_SPEC to

                    AccessibilityShortcutController.ACCESSIBILITY_HEARING_AIDS_TILE_COMPONENT_NAME

            )

    }

packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/A11yShortcutAutoAddableList.kt

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.systemui.qs.pipeline.domain.model.AutoAddable 
import com.android.systemui.qs.pipeline.shared.TileSpec

import com.android.systemui.qs.tiles.ColorCorrectionTile

import com.android.systemui.qs.tiles.ColorInversionTile

import com.android.systemui.qs.tiles.HearingDevicesTile

import com.android.systemui.qs.tiles.OneHandedModeTile

import com.android.systemui.qs.tiles.ReduceBrightColorsTile
@@ -50,6 +51,10 @@ object A11yShortcutAutoAddableList { 
                    TileSpec.create(ReduceBrightColorsTile.TILE_SPEC),

                    AccessibilityShortcutController.REDUCE_BRIGHT_COLORS_COMPONENT_NAME

                ),

                factory.create(

                    TileSpec.create(HearingDevicesTile.TILE_SPEC),

                    AccessibilityShortcutController.ACCESSIBILITY_HEARING_AIDS_COMPONENT_NAME

                )

            )

        } else {

            emptySet()