From 5d6b93e9342209920938df782671c46f84745cd2 Mon Sep 17 00:00:00 2001
From: Jason Chang <jasonsfchang@google.com>
Date: Wed, 26 Aug 2020 08:05:22 +0000
Subject: [PATCH] Revert "Fix Talkback should talk the strings in tutorial on
 the top screen"

This reverts commit 8da28ef6deb3679560113e8243a5e65e08e7f7d0.

Reason for revert: It will cause another exit one-handed gesture conflict side-effect, so revert it.

Change-Id: Ice0325198db596ac144aae83555f6c268431d0b1
---
 .../android/systemui/onehanded/OneHandedTutorialHandler.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/onehanded/OneHandedTutorialHandler.java b/packages/SystemUI/src/com/android/systemui/onehanded/OneHandedTutorialHandler.java
index 88329725174e9..de34b2ec831d5 100644
--- a/packages/SystemUI/src/com/android/systemui/onehanded/OneHandedTutorialHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/onehanded/OneHandedTutorialHandler.java
@@ -163,7 +163,9 @@ public class OneHandedTutorialHandler implements OneHandedTransitionCallback, Du
         final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
                 mDisplaySize.x, mTutorialAreaHeight, 0, 0,
                 WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
-                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+                        | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
+                        | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
                 PixelFormat.TRANSLUCENT);
         lp.gravity = Gravity.TOP | Gravity.LEFT;
         lp.privateFlags |= WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;