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

Commit 5148384c authored by Yabin Huang's avatar Yabin Huang
Browse files

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

This reverts commit 6898584b.

Reason for revert: causing b/250783866

Fixes: 250783866
Fixes: 260268425
Test: manual

Change-Id: I4cf3d5b302a5fe8a492455972f8764d293bcb471
parent f7147b5c

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -25079,7 +25079,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;