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

Commit 7a81bd82 authored by Alan Viverette's avatar Alan Viverette
Browse files

Fix invalid bounds detection in ExploreByTouchHelper 

Empty bounds are actually valid in some cases.

Change-Id: I2b9bf7c072e0370d13eff71e22498959eab07797
parent 3867e4d0

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

+6 −1
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ public abstract class ExploreByTouchHelper extends View.AccessibilityDelegate { 
    /** Default class name used for virtual views. */

    private static final String DEFAULT_CLASS_NAME = View.class.getName();



    /** Default bounds used to determine if the client didn't set any. */

    private static final Rect INVALID_PARENT_BOUNDS = new Rect(

            Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE);



    // Temporary, reusable data structures.

    private final Rect mTempScreenRect = new Rect();

    private final Rect mTempParentRect = new Rect();
@@ -372,6 +376,7 @@ public abstract class ExploreByTouchHelper extends View.AccessibilityDelegate { 
        // Ensure the client has good defaults.

        node.setEnabled(true);

        node.setClassName(DEFAULT_CLASS_NAME);

        node.setBoundsInParent(INVALID_PARENT_BOUNDS);



        // Allow the client to populate the node.

        onPopulateNodeForVirtualView(virtualViewId, node);
@@ -383,7 +388,7 @@ public abstract class ExploreByTouchHelper extends View.AccessibilityDelegate { 
        }



        node.getBoundsInParent(mTempParentRect);

        if (mTempParentRect.isEmpty()) {

        if (mTempParentRect.equals(INVALID_PARENT_BOUNDS)) {

            throw new RuntimeException("Callbacks must set parent bounds in "

                    + "populateNodeForVirtualViewId()");

        }