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

Commit ffc4bc77 authored by Yining Liu's avatar Yining Liu
Browse files

Fix the order of talkback focus for ConversationLayout when expanded 

Talkback can now correctly focus the collapse button before going to the action list when expanded. To know why mExpandButton is dynamically placed, check commit: 54fe9ad2

Bug: 237505828
Test: Visual, see the STEPS TO REPRODUCE section of bug 237505828, the focus order of talkback should be collapse button then actions.
Change-Id: Id0cf8730b00e0e7636a163fb5d51e37e8e0a3e84
parent 23a112e9

core/java/com/android/internal/widget/ConversationLayout.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -111,6 +111,7 @@ public class ConversationLayout extends FrameLayout 
    private Icon mLargeIcon;

    private Icon mLargeIcon;

    private View mExpandButtonContainer;

    private View mExpandButtonContainer;

    private ViewGroup mExpandButtonAndContentContainer;

    private ViewGroup mExpandButtonAndContentContainer;

    private ViewGroup mExpandButtonContainerA11yContainer;

    private NotificationExpandButton mExpandButton;

    private NotificationExpandButton mExpandButton;

    private MessagingLinearLayout mImageMessageContainer;

    private MessagingLinearLayout mImageMessageContainer;

    private int mBadgeProtrusion;

    private int mBadgeProtrusion;
@@ -234,6 +235,8 @@ public class ConversationLayout extends FrameLayout 
        });

        });

        mConversationText = findViewById(R.id.conversation_text);

        mConversationText = findViewById(R.id.conversation_text);

        mExpandButtonContainer = findViewById(R.id.expand_button_container);

        mExpandButtonContainer = findViewById(R.id.expand_button_container);

        mExpandButtonContainerA11yContainer =

                findViewById(R.id.expand_button_a11y_container);

        mConversationHeader = findViewById(R.id.conversation_header);

        mConversationHeader = findViewById(R.id.conversation_header);

        mContentContainer = findViewById(R.id.notification_action_list_margin_target);

        mContentContainer = findViewById(R.id.notification_action_list_margin_target);

        mExpandButtonAndContentContainer = findViewById(R.id.expand_button_and_content_container);

        mExpandButtonAndContentContainer = findViewById(R.id.expand_button_and_content_container);
@@ -1091,7 +1094,7 @@ public class ConversationLayout extends FrameLayout 
            newContainer = mExpandButtonAndContentContainer;

            newContainer = mExpandButtonAndContentContainer;

        } else {

        } else {

            buttonGravity = Gravity.CENTER_HORIZONTAL | Gravity.TOP;

            buttonGravity = Gravity.CENTER_HORIZONTAL | Gravity.TOP;

            newContainer = this;

            newContainer = mExpandButtonContainerA11yContainer;

        }

        }

        mExpandButton.setExpanded(!mIsCollapsed);

        mExpandButton.setExpanded(!mIsCollapsed);

core/res/res/layout/notification_template_material_conversation.xml

+48 −31
Original line number Original line Diff line number Diff line
@@ -89,8 +89,24 @@ 
        <include layout="@layout/notification_material_action_list" />

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

    </com.android.internal.widget.RemeasuringLinearLayout>

    </com.android.internal.widget.RemeasuringLinearLayout>





    <!--This is dynamically placed between here and at the end of the layout. It starts here since

    <!--expand_button_a11y_container ensures talkback focus order is correct when view is expanded.

        only FrameLayout layout params have gravity-->

    The -1px of marginTop and 1px of paddingTop make sure expand_button_a11y_container is prior to

    its sibling view in accessibility focus order.

    {see android.view.ViewGroup.addChildrenForAccessibility()}

    expand_button_container will be moved under expand_button_and_content_container when collapsed,

    this dynamic movement ensures message can flow under expand button when expanded-->

    <FrameLayout

        android:id="@+id/expand_button_a11y_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="end|top"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:layout_marginTop="-1px"

        android:paddingTop="1px"

        >

        <!--expand_button_container is dynamically placed between here and at the end of the

        layout. It starts here since only FrameLayout layout params have gravity-->

        <FrameLayout

        <FrameLayout

            android:id="@+id/expand_button_container"

            android:id="@+id/expand_button_container"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"
@@ -98,9 +114,9 @@ 
            android:layout_gravity="end|top"

            android:layout_gravity="end|top"

            android:clipChildren="false"

            android:clipChildren="false"

            android:clipToPadding="false">

            android:clipToPadding="false">

        <!--This layout makes sure that we can nicely center the expand content in the

            <!--expand_button_touch_container makes sure that we can nicely center the expand

            collapsed layout while the parent makes sure that we're never laid out bigger

            content in the collapsed layout while the parent makes sure that we're never laid out

            than the messaging content.-->

            bigger than the messaging content.-->

            <LinearLayout

            <LinearLayout

                android:id="@+id/expand_button_touch_container"

                android:id="@+id/expand_button_touch_container"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"
@@ -130,4 +146,5 @@ 
                    />

                    />

            </LinearLayout>

            </LinearLayout>

        </FrameLayout>

        </FrameLayout>

    </FrameLayout>

</com.android.internal.widget.ConversationLayout>
 
</com.android.internal.widget.ConversationLayout>

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -4279,6 +4279,7 @@ 
  <java-symbol type="id" name="conversation_icon_badge_ring" />

  <java-symbol type="id" name="conversation_icon_badge_ring" />

  <java-symbol type="id" name="conversation_icon_badge_bg" />

  <java-symbol type="id" name="conversation_icon_badge_bg" />

  <java-symbol type="id" name="expand_button_container" />

  <java-symbol type="id" name="expand_button_container" />

  <java-symbol type="id" name="expand_button_a11y_container" />

  <java-symbol type="id" name="expand_button_touch_container" />

  <java-symbol type="id" name="expand_button_touch_container" />

  <java-symbol type="id" name="messaging_group_content_container" />

  <java-symbol type="id" name="messaging_group_content_container" />

  <java-symbol type="id" name="expand_button_and_content_container" />

  <java-symbol type="id" name="expand_button_and_content_container" />