diff options
| author | 2023-04-25 23:05:13 +0000 | |
|---|---|---|
| committer | 2023-04-25 23:45:28 +0000 | |
| commit | 5148384ca3417b8e49b51e42b50a76a2938c6bba (patch) | |
| tree | da542f850efc2370be5f7e34771be35f7102a31e | |
| parent | f7147b5cfdbbff0d8999d4af92bcd40b71372234 (diff) | |
Revert "Set VIEW_STATE_FOCUSED only if view and window has focus"
This reverts commit 6898584b743168a77d816f0a7938dcbd43c81291.
Reason for revert: causing b/250783866
Fixes: 250783866
Fixes: 260268425
Test: manual
Change-Id: I4cf3d5b302a5fe8a492455972f8764d293bcb471
| -rw-r--r-- | core/java/android/view/View.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 003307db832a..7c9809702dfc 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -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; |