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

Commit 68cf0f4d authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev 

am: a4b5e089

Change-Id: I125f80e800d04e7406fcd380bce2666b5b9e5a3f
parents be8e7f7e a4b5e089

core/java/android/view/accessibility/AccessibilityRecord.java

+14 −0
Original line number Diff line number Diff line
@@ -322,6 +322,20 @@ public class AccessibilityRecord { 
        return getBooleanProperty(PROPERTY_IMPORTANT_FOR_ACCESSIBILITY);

    }



    /**

     * Sets if the source is important for accessibility.

     *

     * @param importantForAccessibility True if the source is important for accessibility,

     *                                  false otherwise.

     *

     * @throws IllegalStateException If called from an AccessibilityService.

     * @hide

     */

    public void setImportantForAccessibility(boolean importantForAccessibility) {

        enforceNotSealed();

        setBooleanProperty(PROPERTY_IMPORTANT_FOR_ACCESSIBILITY, importantForAccessibility);

    }



    /**

     * Gets the number of items that can be visited.

     *

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

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.view.ViewConfiguration; 
import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.AccessibilityNodeInfo;

import android.view.accessibility.AccessibilityWindowInfo;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -387,7 +388,10 @@ public class PipTouchHandler { 
                if (!mSendingHoverAccessibilityEvents) {

                    AccessibilityEvent event = AccessibilityEvent.obtain(

                            AccessibilityEvent.TYPE_VIEW_HOVER_ENTER);

                    event.setImportantForAccessibility(true);

                    event.setSourceNodeId(AccessibilityNodeInfo.ROOT_NODE_ID);

                    event.setWindowId(

                            AccessibilityWindowInfo.PICTURE_IN_PICTURE_ACTION_REPLACER_WINDOW_ID);

                    mAccessibilityManager.sendAccessibilityEvent(event);

                    mSendingHoverAccessibilityEvents = true;

                }
@@ -397,7 +401,10 @@ public class PipTouchHandler { 
                if (mSendingHoverAccessibilityEvents) {

                    AccessibilityEvent event = AccessibilityEvent.obtain(

                            AccessibilityEvent.TYPE_VIEW_HOVER_EXIT);

                    event.setImportantForAccessibility(true);

                    event.setSourceNodeId(AccessibilityNodeInfo.ROOT_NODE_ID);

                    event.setWindowId(

                            AccessibilityWindowInfo.PICTURE_IN_PICTURE_ACTION_REPLACER_WINDOW_ID);

                    mAccessibilityManager.sendAccessibilityEvent(event);

                    mSendingHoverAccessibilityEvents = false;

                }