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

Commit 027ac2b5 authored by Arthur Hung's avatar Arthur Hung Committed by Android (Google) Code Review
Browse files

Merge "Set VIEW_STATE_FOCUSED only if view and window has focus"

parents a6bc2bc4 6898584b

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -24656,7 +24656,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        int viewStateIndex = 0;

        if ((privateFlags & PFLAG_PRESSED) != 0) viewStateIndex |= StateSet.VIEW_STATE_PRESSED;

        if ((mViewFlags & ENABLED_MASK) == ENABLED) viewStateIndex |= StateSet.VIEW_STATE_ENABLED;

        if (isFocused()) viewStateIndex |= StateSet.VIEW_STATE_FOCUSED;

        if (isFocused() && hasWindowFocus()) viewStateIndex |= StateSet.VIEW_STATE_FOCUSED;

        if ((privateFlags & PFLAG_SELECTED) != 0) viewStateIndex |= StateSet.VIEW_STATE_SELECTED;

        if (hasWindowFocus()) viewStateIndex |= StateSet.VIEW_STATE_WINDOW_FOCUSED;

        if ((privateFlags & PFLAG_ACTIVATED) != 0) viewStateIndex |= StateSet.VIEW_STATE_ACTIVATED;