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

Commit fc2b2c89 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adjust a11y announcement order for expanded notifs" into main

parents 2e445ad5 1bb386e6

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. -->