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

Commit 7f64be03 authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Manage button a11y local actions prompt" into rvc-dev

parents c59312aa 670fa809

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+14 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.view.Gravity; 
import android.view.View;

import android.view.WindowInsets;

import android.view.WindowManager;

import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.LinearLayout;



import com.android.internal.policy.ScreenDecorationsUtils;
@@ -456,6 +457,19 @@ public class BubbleExpandedView extends LinearLayout { 
            mSettingsIcon.setContentDescription(getResources().getString(

                    R.string.bubbles_settings_button_description, bubble.getAppName()));



            mSettingsIcon.setAccessibilityDelegate(

                    new AccessibilityDelegate() {

                        @Override

                        public void onInitializeAccessibilityNodeInfo(View host,

                                AccessibilityNodeInfo info) {

                            super.onInitializeAccessibilityNodeInfo(host, info);

                            // On focus, have TalkBack say

                            // "Actions available. Use swipe up then right to view."

                            // in addition to the default "double tap to activate".

                            mStackView.setupLocalMenu(info);

                        }

                    });



            if (isNew) {

                mPendingIntent = mBubble.getBubbleIntent();

                if (mPendingIntent != null || mBubble.getShortcutInfo() != null) {

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+10 −9
Original line number Diff line number Diff line
@@ -1076,26 +1076,27 @@ public class BubbleStackView extends FrameLayout 
    @Override

    public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfoInternal(info);

        setupLocalMenu(info);

    }



    void setupLocalMenu(AccessibilityNodeInfo info) {

        Resources res = mContext.getResources();



        // Custom actions.

        // Custom local actions.

        AccessibilityAction moveTopLeft = new AccessibilityAction(R.id.action_move_top_left,

                getContext().getResources()

                        .getString(R.string.bubble_accessibility_action_move_top_left));

                res.getString(R.string.bubble_accessibility_action_move_top_left));

        info.addAction(moveTopLeft);



        AccessibilityAction moveTopRight = new AccessibilityAction(R.id.action_move_top_right,

                getContext().getResources()

                        .getString(R.string.bubble_accessibility_action_move_top_right));

                res.getString(R.string.bubble_accessibility_action_move_top_right));

        info.addAction(moveTopRight);



        AccessibilityAction moveBottomLeft = new AccessibilityAction(R.id.action_move_bottom_left,

                getContext().getResources()

                        .getString(R.string.bubble_accessibility_action_move_bottom_left));

                res.getString(R.string.bubble_accessibility_action_move_bottom_left));

        info.addAction(moveBottomLeft);



        AccessibilityAction moveBottomRight = new AccessibilityAction(R.id.action_move_bottom_right,

                getContext().getResources()

                        .getString(R.string.bubble_accessibility_action_move_bottom_right));

                res.getString(R.string.bubble_accessibility_action_move_bottom_right));

        info.addAction(moveBottomRight);



        // Default actions.