Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set VIEW_STATE_FOCUSED only if view and window has focus

Browse Source 
Set VIEW_STATE_FOCUSED state when view and window gain focus or it could
draw a wrong highlight hint on non-focused window.

Bug: 244273901
Test: atest DefaultFocusHighlightTest
Test: multi-window, use dpad key to navigate focus
Change-Id: Iabf58f41fe376d5921b679d53ec82c67650d4988
This commit is contained in:
Arthur Hung
2022-09-21 03:31:04 +00:00
parent 0e76c6122f
commit 6898584b74
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/View.java
View File

@@ -24649,7 +24649,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;