resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp (c34188a9) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -8736,6 +8736,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