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

Commit 5f849ca7 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Revert "Set VIEW_STATE_FOCUSED only if view and window has... 

Merge "Merge "Revert "Set VIEW_STATE_FOCUSED only if view and window has focus"" into udc-dev am: af7b1229 am: 80b293f4 am: 88a4e198" into udc-qpr-dev-plus-aosp
parents 8b9623e4 37bd46a3

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -25074,7 +25074,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() && hasWindowFocus()) viewStateIndex |= StateSet.VIEW_STATE_FOCUSED;

        if (isFocused()) 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;