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

Commit f8f76d52 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "Add the possibility to modify the View focus rect"

parents 8c71784e defdb1e4

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -23034,6 +23034,7 @@ package android.view { 
    method public void getDrawingRect(android.graphics.Rect);

    method public void getDrawingRect(android.graphics.Rect);

    method public long getDrawingTime();

    method public long getDrawingTime();

    method public boolean getFilterTouchesWhenObscured();

    method public boolean getFilterTouchesWhenObscured();

    method public void getFocusRect(android.graphics.Rect);

    method public java.util.ArrayList<android.view.View> getFocusables(int);

    method public java.util.ArrayList<android.view.View> getFocusables(int);

    method public void getFocusedRect(android.graphics.Rect);

    method public void getFocusedRect(android.graphics.Rect);

    method public boolean getGlobalVisibleRect(android.graphics.Rect, android.graphics.Point);

    method public boolean getGlobalVisibleRect(android.graphics.Rect, android.graphics.Point);

core/java/android/view/FocusFinder.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -181,8 +181,8 @@ public class FocusFinder { 
            // only interested in other non-root views

            // only interested in other non-root views

            if (focusable == focused || focusable == root) continue;

            if (focusable == focused || focusable == root) continue;





            // get visible bounds of other view in same coordinate system

            // get focus bounds of other view in same coordinate system

            focusable.getDrawingRect(mOtherRect);

            focusable.getFocusRect(mOtherRect);

            root.offsetDescendantRectToMyCoords(focusable, mOtherRect);

            root.offsetDescendantRectToMyCoords(focusable, mOtherRect);





            if (isBetterCandidate(direction, focusedRect, mOtherRect, mBestCandidateRect)) {

            if (isBetterCandidate(direction, focusedRect, mOtherRect, mBestCandidateRect)) {

core/java/android/view/View.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -7128,6 +7128,18 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal 
        }

        }

    }

    }




















    /**














     * When searching for a view to focus this rectangle is used when considering if this view is














     * a good candidate for receiving focus.














     *














     * By default, the rectangle is the {@link #getDrawingRect}) of the view.














     *














     * @param r The rectangle to fill in, in this view's coordinates.














     */














    public void getFocusRect(Rect r) {














        getDrawingRect(r);














    }
























   /**







   /**











     * Utility method to retrieve the inverse of the current mMatrix property.







     * Utility method to retrieve the inverse of the current mMatrix property.











     * We cache the matrix to avoid recalculating it when transform properties







     * We cache the matrix to avoid recalculating it when transform properties