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

Commit 1defbb19 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix broken CTS tests."

parents c8be34c6 a54e1ea2

core/java/android/view/View.java

+3 −1
Original line number 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 doesn't opt out for a default focus highlight, via

     *         {@link #setDefaultFocusHighlightEnabled(boolean)}.</li>

     *     <li>This view is attached to window.</li>

     * </ul>

     * @return {@code true} if a default focus highlight is needed.

     */

    private boolean isDefaultFocusHighlightNeeded(Drawable background) {

        final boolean hasFocusStateSpecified = background == null || !background.isStateful()

                || !background.hasFocusStateSpecified();

        return !isInTouchMode() && getDefaultFocusHighlightEnabled() && hasFocusStateSpecified;

        return !isInTouchMode() && getDefaultFocusHighlightEnabled() && hasFocusStateSpecified

                && isAttachedToWindow();

    }















    /**