Merge "Revert "Set VIEW_STATE_FOCUSED only if view and window has focus"" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
af7b1229c2
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user