From 02a7b78eab58840cf5c060e6861dfb9a539c3177 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Mon, 21 Jul 2014 17:29:43 -0700
Subject: [PATCH] Revert "Revert "Block focus with a touchscreen for ActionBars
 and Toolbars""

This reverts commit 9d629b6daba8c433fe014728e1ad07e034906c79.

Once more, with feeling!

Bug 16284253
---
 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 insertions(+)

diff --git a/core/res/res/layout/screen_action_bar.xml b/core/res/res/layout/screen_action_bar.xml
index 5acb588eb35e6..b3a34789883b8 100644
--- a/core/res/res/layout/screen_action_bar.xml
+++ b/core/res/res/layout/screen_action_bar.xml
@@ -35,6 +35,7 @@ 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"
@@ -53,5 +54,6 @@ 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 56815f86e0608..039e89f5cbbf3 100644
--- a/core/res/res/layout/screen_toolbar.xml
+++ b/core/res/res/layout/screen_toolbar.xml
@@ -35,6 +35,7 @@ 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 b9cacd7ff03c9..2dccaf20090db 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1203,6 +1203,7 @@ 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">