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

Commit 0bdf1c9c authored by Jiaquan He's avatar Jiaquan He
Browse files

Check state_focus in foreground. 

This commit checks whether the state_focus is specified in the
foreground of a view. If it is, the default focus highlight won't
show up.

Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases -t
android.view.cts.View_DefaultFocusHighlightTest#testIsDefaultFocusHighlightNeeded
Bug: 37288730
Change-Id: I5256eb656c1b8729d685edb914e867ee9a3a92a4
parent b8e5742f

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45743,6 +45743,7 @@ package android.view { 
    method public boolean isAttachedToWindow();

    method public boolean isClickable();

    method public boolean isContextClickable();

    method public boolean isDefaultFocusHighlightNeeded(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);

    method public boolean isDirty();

    method public boolean isDrawingCacheEnabled();

    method public boolean isDuplicateParentStateEnabled();

core/java/android/view/View.java

+12 −6
Original line number Diff line number Diff line
@@ -19801,18 +19801,23 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * Check whether we need to draw a default focus highlight when this view gets focused,

     * which requires:

     * <ul>

     *     <li>In the background, {@link android.R.attr#state_focused} is not defined.</li>

     *     <li>In both background and foreground, {@link android.R.attr#state_focused}

     *         is not defined.</li>

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

     * @hide

     */

    private boolean isDefaultFocusHighlightNeeded(Drawable background) {

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

                || !background.hasFocusStateSpecified();

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

    @TestApi

    public boolean isDefaultFocusHighlightNeeded(Drawable background, Drawable foreground) {

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

                || !background.hasFocusStateSpecified())

                && (foreground == null || !foreground.isStateful()

                || !foreground.hasFocusStateSpecified());

        return !isInTouchMode() && getDefaultFocusHighlightEnabled() && lackFocusState

                && isAttachedToWindow() && sUseDefaultFocusHighlight;

    }









@@ -19824,7 +19829,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     */















    private void switchDefaultFocusHighlight() {















        if (isFocused()) {













            final boolean needed = isDefaultFocusHighlightNeeded(mBackground);













            final boolean needed = isDefaultFocusHighlightNeeded(mBackground,













                    mForegroundInfo == null ? null : mForegroundInfo.mDrawable);















            final boolean active = mDefaultFocusHighlight != null;















            if (needed && !active) {















                setDefaultFocusHighlight(getDefaultFocusHighlightDrawable());