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

Commit 80b293f4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Set VIEW_STATE_FOCUSED only if view and window has focus"" into udc-dev am: af7b1229

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22871655



Change-Id: I1b9705d1aa745fd82251f875dbbd57990da9f29c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27738ac1 af7b1229

core/java/android/view/View.java

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

        int viewStateIndex = 0;

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

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

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

        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 ((privateFlags & PFLAG_SELECTED) != 0) viewStateIndex |= StateSet.VIEW_STATE_SELECTED;

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

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

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

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