am e5420255: am d367cfc1: Merge "Revert "Revert "Block focus with a touchscreen for ActionBars and Toolbars""" into lmp-dev

* commit 'e5420255d44f9f9f31b41d70f037fc880aff1203':
  Revert "Revert "Block focus with a touchscreen for ActionBars and Toolbars""

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>

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"

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">