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

Commit 41e6e0c4 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am c34188a9: resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp 

* commit 'c34188a9':
  Add the possibility to modify the View focus rect
parents 4786626b c34188a9

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -3697,6 +3697,8 @@ package android.app { 
    ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet);

    ctor public MediaRouteButton(android.content.Context, android.util.AttributeSet, int);

    method public int getRouteTypes();

    method public void onAttachedToWindow();

    method public void onDetachedFromWindow();

    method public void setExtendedSettingsClickListener(android.view.View.OnClickListener);

    method public void setRouteTypes(int);

    method public void showDialog();
@@ -24122,6 +24124,7 @@ package android.view { 
    method public long getDrawingTime();

    method public boolean getFilterTouchesWhenObscured();

    method public boolean getFitsSystemWindows();

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

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

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

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

core/java/android/view/FocusFinder.java

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

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



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

            focusable.getDrawingRect(mOtherRect);

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

            focusable.getFocusRect(mOtherRect);

            root.offsetDescendantRectToMyCoords(focusable, mOtherRect);



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

core/java/android/view/View.java

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

    }













    /**













     * 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.















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