commit 23051d588a5a1281b0a349729349d12863025aa4
author Danny Epstein <depstein@google.com> Fri Jul 17 14:06:16 2020 -0700
committer Danny Epstein <depstein@google.com> Fri Jul 17 14:14:19 2020 -0700
tree fcec7c58a8388484d78e0ca0980941ce9f2c5bc1
parent 2a3612f0dde8b88db25f12464cd96049bd90d0ed

Don't exit touch mode when focusing FPV.

Make FocusParkingView not call ensureTouchMode(false) when handling
ACTION_FOCUS. The RotaryService performs this action to clear focus
when the user touches the screen so we don't want to exit touch mode.

Bug: 160920511
Test: manual
Change-Id: I56e0cbaa9620287c190330ca071ab309a193ac2a

car-ui-lib/src/com/android/car/ui/FocusParkingView.java

diff --git a/car-ui-lib/src/com/android/car/ui/FocusParkingView.java b/car-ui-lib/src/com/android/car/ui/FocusParkingView.java
index 2167d23..761a764 100644
--- a/car-ui-lib/src/com/android/car/ui/FocusParkingView.java
+++ b/car-ui-lib/src/com/android/car/ui/FocusParkingView.java
@@ -17,6 +17,7 @@
 
 import static android.view.accessibility.AccessibilityNodeInfo.ACTION_COLLAPSE;
 import static android.view.accessibility.AccessibilityNodeInfo.ACTION_DISMISS;
+import static android.view.accessibility.AccessibilityNodeInfo.ACTION_FOCUS;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -130,6 +131,12 @@
                         getContext().getSystemService(InputMethodManager.class);
                 return inputMethodManager.hideSoftInputFromWindow(getWindowToken(),
                         /* flags= */ 0);
+            case ACTION_FOCUS:
+                // Don't leave this to View to handle as it will exit touch mode.
+                if (!hasFocus()) {
+                    return requestFocus();
+                }
+                break;
         }
         return super.performAccessibilityAction(action, arguments);
     }