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

Commit 8492b2a6 authored by arthurhung's avatar arthurhung
Browse files

Fix double tapping PIP window when first launch with talkback on 

With accessibility services on (e.g. Talkback), user could double tap
to show the pip menu if the state is close (first time launch), but
the a11y focus would set to decor view initially when menu activity
created. We should add the click action on it.

Bug: 152588263
Test: Enable talkback and enter pip mode, double click on pip window
Change-Id: I8270cc3b04c53cc20ba5428a5bfb99224d18c32c
parent 5749a307

packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java

+25 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; 
import static android.provider.Settings.ACTION_PICTURE_IN_PICTURE_SETTINGS;

import static android.view.accessibility.AccessibilityManager.FLAG_CONTENT_CONTROLS;

import static android.view.accessibility.AccessibilityManager.FLAG_CONTENT_ICONS;

import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK;



import static com.android.systemui.pip.phone.PipMenuActivityController.EXTRA_ACTIONS;

import static com.android.systemui.pip.phone.PipMenuActivityController.EXTRA_ALLOW_TIMEOUT;
@@ -68,6 +69,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.WindowManager.LayoutParams;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.FrameLayout;

import android.widget.ImageButton;

import android.widget.LinearLayout;
@@ -220,6 +222,29 @@ public class PipMenuActivity extends Activity { 


        // Hide without an animation.

        getWindow().setExitTransition(null);



        initAccessibility();

    }



    private void initAccessibility() {

        getWindow().getDecorView().setAccessibilityDelegate(new View.AccessibilityDelegate() {

            @Override

            public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {

                super.onInitializeAccessibilityNodeInfo(host, info);

                String label = getResources().getString(R.string.pip_menu_title);

                info.addAction(new AccessibilityNodeInfo.AccessibilityAction(ACTION_CLICK, label));

            }



            @Override

            public boolean performAccessibilityAction(View host, int action, Bundle args) {

                if (action == ACTION_CLICK && mMenuState == MENU_STATE_CLOSE) {

                    Message m = Message.obtain();

                    m.what = PipMenuActivityController.MESSAGE_SHOW_MENU;

                    sendMessage(m, "Could not notify controller to show PIP menu");

                }

                return super.performAccessibilityAction(host, action, args);

            }

        });

    }



    @Override