commit ace9c5af6aeebba4d7ffbf69bd8c2552e14fbb3e
author Danny Epstein <depstein@google.com> Thu Sep 24 17:38:03 2020 -0700
committer Danny Epstein <depstein@google.com> Fri Sep 25 12:05:15 2020 -0700
tree 0611108665e13a98a73c2421b4d185daba38ffe7
parent 9ab1db063580a57629d361e624eb2f72ca3f9217

Fix flicker issue.

Don't call initFocus() when handling ACTION_UP nudge events as this
event will typically arrive before the TYPE_VIEW_FOCUSED event when we
delegate focusing to a FocusArea and will cause us to focus a nearby
view when we discover that mFocusedNode is no longer focused.

Test: manual
Bug: 169272887
Change-Id: Ic1d6d1b34f676eac9f2fe9d5cfa3c16d8f0a5cab

src/com/android/car/rotary/RotaryService.java

diff --git a/src/com/android/car/rotary/RotaryService.java b/src/com/android/car/rotary/RotaryService.java
index 9f120a5..01b3060 100644
--- a/src/com/android/car/rotary/RotaryService.java
+++ b/src/com/android/car/rotary/RotaryService.java
@@ -1129,9 +1129,6 @@
         if (!isValidAction(action)) {
             return;
         }
-        if (initFocus()) {
-            return;
-        }
 
         // If the focused node is in direct manipulation mode, manipulate it directly.
         if (mInDirectManipulationMode) {
@@ -1149,6 +1146,14 @@
             return;
         }
 
+        // Don't call initFocus() when handling ACTION_UP nudge events as this event will typically
+        // arrive before the TYPE_VIEW_FOCUSED event when we delegate focusing to a FocusArea, and
+        // will cause us to focus a nearby view when we discover that mFocusedNode is no longer
+        // focused.
+        if (initFocus()) {
+            return;
+        }
+
         // If the focused node is not in direct manipulation mode, try to move the focus to another
         // node.
         List<AccessibilityWindowInfo> windows = getWindows();