diff options
| author | 2014-07-22 01:31:06 +0000 | |
|---|---|---|
| committer | 2014-07-21 15:42:19 +0000 | |
| commit | 66e207ec54e2085c0eb70d5189562effafa2c9c5 (patch) | |
| tree | 35a4245755824181f679aaead3a82625d0d23044 | |
| parent | f1489c75f6ed73a2e2c7b437c1397ab8334b4386 (diff) | |
| parent | 02a7b78eab58840cf5c060e6861dfb9a539c3177 (diff) | |
Merge "Revert "Revert "Block focus with a touchscreen for ActionBars and Toolbars""" into lmp-dev
| -rw-r--r-- | core/res/res/layout/screen_action_bar.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/screen_toolbar.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/layout/screen_action_bar.xml b/core/res/res/layout/screen_action_bar.xml index 5acb588eb35e..b3a34789883b 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 56815f86e060..039e89f5cbbf 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 b9cacd7ff03c..2dccaf20090d 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"> |