Merge "Fix broken CTS tests." (1defbb19) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19694,13 +19694,15 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	* <li>This view is not in touch mode.</li>		* <li>This view is not in touch mode.</li>
	* <li>This view doesn't opt out for a default focus highlight, via		* <li>This view doesn't opt out for a default focus highlight, via
	* {@link #setDefaultFocusHighlightEnabled(boolean)}.</li>		* {@link #setDefaultFocusHighlightEnabled(boolean)}.</li>
			* <li>This view is attached to window.</li>
	* </ul>		* </ul>
	* @return {@code true} if a default focus highlight is needed.		* @return {@code true} if a default focus highlight is needed.
	*/		*/
	private boolean isDefaultFocusHighlightNeeded(Drawable background) {		private boolean isDefaultFocusHighlightNeeded(Drawable background) {
	final boolean hasFocusStateSpecified = background == null \|\| !background.isStateful()		final boolean hasFocusStateSpecified = background == null \|\| !background.isStateful()
	\|\| !background.hasFocusStateSpecified();		\|\| !background.hasFocusStateSpecified();
	return !isInTouchMode() && getDefaultFocusHighlightEnabled() && hasFocusStateSpecified;		return !isInTouchMode() && getDefaultFocusHighlightEnabled() && hasFocusStateSpecified
			&& isAttachedToWindow();
	}		}

	/**		/**