Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I83beeb45320de2c3fc3a00c2f5cd86a17ac1dc9f
This commit is contained in:
Jean-Baptiste Queru
2012-06-23 07:08:59 -07:00
parent 0e61a72684 f8f76d52a7
commit c34188a954
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -3689,6 +3689,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();
@@ -24096,6 +24098,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);

4
core/java/android/view/FocusFinder.java
View File

@@ -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)) {

12
core/java/android/view/View.java
View File

@@ -8737,6 +8737,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.
* We cache the matrix to avoid recalculating it when transform properties
* have not changed.