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

Commit 1bb386e6 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Adjust a11y announcement order for expanded notifs 

This ensures that the app name and top line content is read before the
actual content of the notification.

This was not needed for base and progress, as they have slightly
different hierarchies. It also doesn't quite work for the old media
style, but hopefully there shouldn't really be any of those
notifications in the wild.

Fix: 425757452
Test: manual
Flag: EXEMPT bugfix
Change-Id: Ia7d9f6c5e315816176ce8e32c650dcc61a20cbbc
parent 4ceb4847

core/res/res/layout/notification_2025_template_expanded_big_picture.xml

+2 −0
Original line number Diff line number Diff line
@@ -28,11 +28,13 @@ 
    <include layout="@layout/notification_2025_right_icon" />



    <LinearLayout

        android:id="@+id/notification_main_column_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="top"

        android:clipToPadding="false"

        android:orientation="vertical"

        android:importantForAccessibility="yes"

        >



        <!-- Note: the top margin is being set in code based on the estimated space needed for

core/res/res/layout/notification_2025_template_expanded_big_text.xml

+2 −0
Original line number Diff line number Diff line
@@ -26,11 +26,13 @@ 
    <include layout="@layout/notification_2025_template_header" />



    <com.android.internal.widget.RemeasuringLinearLayout

        android:id="@+id/notification_main_column_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="top"

        android:clipToPadding="false"

        android:orientation="vertical"

        android:importantForAccessibility="yes"

        >



        <!-- Note: the top margin is being set in code based on the estimated space needed for

core/res/res/layout/notification_2025_template_expanded_call.xml

+4 −1
Original line number Diff line number Diff line
@@ -30,11 +30,14 @@ 
    <include layout="@layout/notification_2025_conversation_header"/>



    <com.android.internal.widget.RemeasuringLinearLayout

        android:id="@+id/notification_main_column_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="top"

        android:clipChildren="false"

        android:orientation="vertical">

        android:orientation="vertical"

        android:importantForAccessibility="yes"

        >



        <!-- Note: the top margin is being set in code based on the estimated space needed for

        the header text. -->

core/res/res/layout/notification_2025_template_expanded_conversation.xml

+8 −5
Original line number Diff line number Diff line
@@ -29,11 +29,14 @@ 
    <include layout="@layout/notification_2025_conversation_header"/>



    <com.android.internal.widget.RemeasuringLinearLayout

        android:id="@+id/notification_main_column_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="top"

        android:clipChildren="false"

            android:orientation="vertical">

        android:orientation="vertical"

        android:importantForAccessibility="yes"

        >



        <!-- Note: the top margin is being set in code based on the estimated space needed for

        the header text. -->

core/res/res/layout/notification_2025_template_expanded_inbox.xml

+8 −5
Original line number Diff line number Diff line
@@ -24,11 +24,14 @@ 
    >

    <include layout="@layout/notification_2025_template_header" />

    <LinearLayout

        android:id="@+id/notification_main_column_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="top"

        android:clipToPadding="false"

            android:orientation="vertical">

        android:orientation="vertical"

        android:importantForAccessibility="yes"

        >



        <!-- Note: the top margin is being set in code based on the estimated space needed for

        the header text. -->