Skip to content

Commit

Permalink
Track AOSP Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
Browse files Browse the repository at this point in the history
Prevent simultaneous interaction with action bar and content
Bug 8034744
  • Loading branch information
JakeWharton committed Apr 28, 2013
1 parent b2a61c4 commit c1fcd72
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ 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:splitMotionEvents="false"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<com.actionbarsherlock.internal.widget.ActionBarContainer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ the Action Bar enabled overlaying application content.
-->

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
android:splitMotionEvents="false">
<com.actionbarsherlock.internal.nineoldandroids.widget.NineFrameLayout android:id="@+id/abs__content"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
Expand Down
3 changes: 2 additions & 1 deletion actionbarsherlock/res/layout/abs__screen_action_bar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.actionbarsherlock.internal.widget.ActionBarContainer
android:id="@+id/abs__action_bar_container"
android:layout_width="fill_parent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ the Action Bar enabled overlaying application content.
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
android:splitMotionEvents="false">
<com.actionbarsherlock.internal.nineoldandroids.widget.NineFrameLayout android:id="@+id/abs__content"
android:layout_width="match_parent"
android:layout_height="match_parent" />
Expand Down

0 comments on commit c1fcd72

Please sign in to comment.