Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65083049 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 

# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '5a32ec32':
  Prevent simultaneous interaction with action bar and content
parents 2c64b539 5a32ec32

core/res/res/layout-xlarge/screen_action_bar.xml

+2 −1
Original line number Diff line number Diff line
@@ -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"

core/res/res/layout-xlarge/screen_action_bar_overlay.xml

+2 −1
Original line number Diff line number Diff line
@@ -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" />

core/res/res/layout/screen_action_bar.xml

+2 −1
Original line number Diff line number Diff line
@@ -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"

core/res/res/layout/screen_action_bar_overlay.xml

+2 −1
Original line number Diff line number Diff line
@@ -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" />