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

Commit 1dd48d0b authored by Jiaquan He's avatar Jiaquan He
Browse files

Check default focus highlight for ImageView. 

This commit specially checks isDefaultFocusHighlightNeeded for
ImageView. We should also check with the content drawable of the
ImageView besides its foreground or background.

Bug: 62141891
Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases -t
android.view.cts.View_DefaultFocusHighlightTest#testIsDefaultFocusHighlightNeeded

Change-Id: Iaf12a5863d7760d9361d0196a46de07a9ccda74e
parent 0bdf1c9c

core/java/android/widget/ImageView.java

+10 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.widget; 
import android.annotation.DrawableRes;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.content.ContentResolver;

import android.content.Context;

import android.content.res.ColorStateList;
@@ -1640,4 +1641,13 @@ public class ImageView extends View { 
        super.encodeProperties(stream);

        stream.addProperty("layout:baseline", getBaseline());

    }



    /** @hide */

    @Override

    @TestApi

    public boolean isDefaultFocusHighlightNeeded(Drawable background, Drawable foreground) {

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

                || !mDrawable.hasFocusStateSpecified();

        return super.isDefaultFocusHighlightNeeded(background, foreground) && lackFocusState;

    }

}