From 200689da6703949c12f9439e7f9619b84410c941 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Mon, 14 Jul 2014 22:42:23 +0000
Subject: [PATCH] Revert "Block focus with a touchscreen for ActionBars and
 Toolbars"

This reverts commit a2933761d17bc5106357a1edd9bd3ff978160133.

Change-Id: Idedd430574925a0e86311a3d9fee51a74731c2f8
(cherry picked from commit d886cf139532a78b2d34d13403f10295a9bbd14e)
---
 core/res/res/layout/screen_action_bar.xml | 2 --
 core/res/res/layout/screen_toolbar.xml    | 1 -
 core/res/res/values/styles.xml            | 1 -
 3 files changed, 4 deletions(-)

diff --git a/core/res/res/layout/screen_action_bar.xml b/core/res/res/layout/screen_action_bar.xml
index b3a34789883b8..5acb588eb35e6 100644
--- a/core/res/res/layout/screen_action_bar.xml
+++ b/core/res/res/layout/screen_action_bar.xml
@@ -35,7 +35,6 @@ This is an optimized layout for a screen with the Action Bar enabled.
         android:layout_alignParentTop="true"
         style="?attr/actionBarStyle"
         android:transitionName="android:action_bar"
-        android:touchscreenBlocksFocus="true"
         android:gravity="top">
         <com.android.internal.widget.ActionBarView
             android:id="@+id/action_bar"
@@ -54,6 +53,5 @@ This is an optimized layout for a screen with the Action Bar enabled.
                   android:layout_height="wrap_content"
                   style="?attr/actionBarSplitStyle"
                   android:visibility="gone"
-                  android:touchscreenBlocksFocus="true"
                   android:gravity="center"/>
 </com.android.internal.widget.ActionBarOverlayLayout>
diff --git a/core/res/res/layout/screen_toolbar.xml b/core/res/res/layout/screen_toolbar.xml
index 039e89f5cbbf3..56815f86e0608 100644
--- a/core/res/res/layout/screen_toolbar.xml
+++ b/core/res/res/layout/screen_toolbar.xml
@@ -35,7 +35,6 @@ This is an optimized layout for a screen with a toolbar enabled.
         android:layout_alignParentTop="true"
         style="?attr/actionBarStyle"
         android:transitionName="android:action_bar"
-        android:touchscreenBlocksFocus="true"
         android:gravity="top">
         <Toolbar
             android:id="@+id/action_bar"
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index f8b3bb22e113c..94ac19c983450 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1202,7 +1202,6 @@ please see styles_device_defaults.xml.
         <item name="navigationButtonStyle">@style/Widget.Toolbar.Button.Navigation</item>
         <item name="collapseIcon">?attr/homeAsUpIndicator</item>
         <item name="contentInsetStart">16dp</item>
-        <item name="touchscreenBlocksFocus">true</item>
     </style>
 
     <style name="Widget.Toolbar.Button.Navigation" parent="Widget">