diff options
| author | Adam Powell <adamp@google.com> | 2013-01-23 23:20:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-23 23:20:57 +0000 |
| commit | 5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba (patch) | |
| tree | 61269d0117a6ac1e33dbaa2134e12882a3c06662 | |
| parent | 596532d9dbea3460dbc989b0316c721ca69f4915 (diff) | |
| parent | d28f30a9e0f30cb48e88958ae4b95f3243e8a0f9 (diff) | |
| download | frameworks_base-5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba.zip frameworks_base-5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba.tar.gz frameworks_base-5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba.tar.bz2 | |
Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
4 files changed, 8 insertions, 4 deletions
diff --git a/core/res/res/layout-xlarge/screen_action_bar.xml b/core/res/res/layout-xlarge/screen_action_bar.xml index 751d322..0b6122d 100644 --- a/core/res/res/layout-xlarge/screen_action_bar.xml +++ b/core/res/res/layout-xlarge/screen_action_bar.xml @@ -20,7 +20,8 @@ This is an optimized layout for a screen with the Action Bar enabled. <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + android:splitMotionEvents="false"> <com.android.internal.widget.ActionBarContainer android:id="@+id/action_bar_container" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/core/res/res/layout-xlarge/screen_action_bar_overlay.xml b/core/res/res/layout-xlarge/screen_action_bar_overlay.xml index f2a1ea1..a95635e 100644 --- a/core/res/res/layout-xlarge/screen_action_bar_overlay.xml +++ b/core/res/res/layout-xlarge/screen_action_bar_overlay.xml @@ -23,7 +23,8 @@ the Action Bar enabled overlaying application content. xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/action_bar_overlay_layout" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:splitMotionEvents="false"> <FrameLayout android:id="@android:id/content" android:layout_width="match_parent" android:layout_height="match_parent" /> diff --git a/core/res/res/layout/screen_action_bar.xml b/core/res/res/layout/screen_action_bar.xml index b0f1bc5..f0b2313 100644 --- a/core/res/res/layout/screen_action_bar.xml +++ b/core/res/res/layout/screen_action_bar.xml @@ -22,7 +22,8 @@ This is an optimized layout for a screen with the Action Bar enabled. android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:fitsSystemWindows="true"> + android:fitsSystemWindows="true" + android:splitMotionEvents="false"> <com.android.internal.widget.ActionBarContainer android:id="@+id/action_bar_container" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/core/res/res/layout/screen_action_bar_overlay.xml b/core/res/res/layout/screen_action_bar_overlay.xml index 20a7db1..c8181d1 100644 --- a/core/res/res/layout/screen_action_bar_overlay.xml +++ b/core/res/res/layout/screen_action_bar_overlay.xml @@ -23,7 +23,8 @@ the Action Bar enabled overlaying application content. xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/action_bar_overlay_layout" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:splitMotionEvents="false"> <FrameLayout android:id="@android:id/content" android:layout_width="match_parent" android:layout_height="match_parent" /> |