From dcec265f0d1a41ec37577eea76cccaef3b969b5b Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Fri, 24 Apr 2020 14:52:34 -0700
Subject: [PATCH] Clear swipe region cache on nav mode switch

Fixes: 154955192, 150958400
Test: Switched from gesture nav to 3 button,
was no longer able to swipe up

Change-Id: Icc7b27eb7bd1eb5ddf25d7e7c3464a77a3a88f24
---
 .../com/android/quickstep/OrientationTouchTransformer.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
index 2e99500435..2a9f32daf5 100644
--- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
+++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java
@@ -99,6 +99,10 @@ class OrientationTouchTransformer {
             return;
         }
         this.mMode = newMode;
+        // Swipe touch regions are independent of nav mode, so we have to clear them explicitly
+        // here to avoid, for ex, a nav region for 2-button rotation 0 being used for 3-button mode
+        // It tries to cache and reuse swipe regions whenever possible based only on rotation
+        mSwipeTouchRegions.clear();
         resetSwipeRegions(info);
     }