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

Commit a9fe2c0b authored by Olivier St-Onge's avatar Olivier St-Onge Committed by Android (Google) Code Review
Browse files

Merge changes I7d922ced,Iab930a8b into main 

* changes:
  Adjust Talkback strings used for placing tiles in edit mode
  Update Talkback string for edit mode button in QS footer
parents 98696ca2 e37ab1a2

packages/SystemUI/res/values/strings.xml

+5 −5
Original line number Original line Diff line number Diff line
@@ -2504,14 +2504,14 @@ 
    <!-- Accessibility description of action to remove QS tile on click. It will read as "Double-tap to remove tile" in screen readers [CHAR LIMIT=NONE] -->

    <!-- Accessibility description of action to remove QS tile on click. It will read as "Double-tap to remove tile" in screen readers [CHAR LIMIT=NONE] -->

    <string name="accessibility_qs_edit_remove_tile_action">remove tile</string>

    <string name="accessibility_qs_edit_remove_tile_action">remove tile</string>





    <!-- Accessibility action of action to add QS tile to end. It will read as "Double-tap to add tile to end" in screen readers [CHAR LIMIT=NONE] -->

    <!-- Accessibility action of action to add QS tile to end. It will read as "Double-tap to add tile to the last position" in screen readers [CHAR LIMIT=NONE] -->

    <string name="accessibility_qs_edit_tile_add_action">add tile to end</string>

    <string name="accessibility_qs_edit_tile_add_action">add tile to the last position</string>





    <!-- Accessibility action for context menu to move QS tile [CHAR LIMIT=NONE] -->

    <!-- Accessibility action for context menu to move QS tile [CHAR LIMIT=NONE] -->

    <string name="accessibility_qs_edit_tile_start_move">Move tile</string>

    <string name="accessibility_qs_edit_tile_start_move">Move tile</string>





    <!-- Accessibility action for context menu to add QS tile [CHAR LIMIT=NONE] -->

    <!-- Accessibility action for context menu to add QS tile to a position [CHAR LIMIT=NONE] -->

    <string name="accessibility_qs_edit_tile_start_add">Add tile</string>

    <string name="accessibility_qs_edit_tile_start_add">Add tile to desired position</string>





    <!-- Accessibility description when QS tile is to be moved, indicating the destination position [CHAR LIMIT=NONE] -->

    <!-- Accessibility description when QS tile is to be moved, indicating the destination position [CHAR LIMIT=NONE] -->

    <string name="accessibility_qs_edit_tile_move_to_position">Move to <xliff:g id="position" example="5">%1$d</xliff:g></string>

    <string name="accessibility_qs_edit_tile_move_to_position">Move to <xliff:g id="position" example="5">%1$d</xliff:g></string>
@@ -2564,7 +2564,7 @@ 
    <string name="accessibility_quick_settings_open_settings">Open <xliff:g name="page" example="Bluetooth">%s</xliff:g> settings.</string>

    <string name="accessibility_quick_settings_open_settings">Open <xliff:g name="page" example="Bluetooth">%s</xliff:g> settings.</string>





    <!-- accessibility label for button to edit quick settings [CHAR LIMIT=NONE] -->

    <!-- accessibility label for button to edit quick settings [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_edit">Edit order of settings.</string>

    <string name="accessibility_quick_settings_edit">Edit order of Quick Settings.</string>





    <!-- accessibility label for button to open power menu [CHAR LIMIT=NONE] -->

    <!-- accessibility label for button to open power menu [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_power_menu">Power menu</string>

    <string name="accessibility_quick_settings_power_menu">Power menu</string>

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/toolbar/EditModeButton.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ fun EditModeButton( 
        ) {

        ) {

            Icon(

            Icon(

                imageVector = Icons.Default.Edit,

                imageVector = Icons.Default.Edit,

                contentDescription = stringResource(id = R.string.qs_edit),

                contentDescription = stringResource(id = R.string.accessibility_quick_settings_edit),

            )

            )

        }

        }

    }

    }