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

Commit 539bcca9 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1

parents a26cf301 136a10a2

core/res/res/layout/screen_action_bar.xml

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,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:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:fitsSystemWindows="true">

    <com.android.internal.widget.ActionBarContainer android:id="@+id/action_bar_container"

core/res/res/layout/screen_action_bar_overlay.xml

+30 −23
Original line number Diff line number Diff line
@@ -19,14 +19,20 @@ This is an optimized layout for a screen with 
the Action Bar enabled overlaying application content.

-->



<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">

    <FrameLayout android:id="@android:id/content"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

    <LinearLayout android:layout_width="match_parent"

                  android:layout_height="wrap_content"

                  android:layout_gravity="top">

        <com.android.internal.widget.ActionBarContainer android:id="@+id/action_bar_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

            style="?android:attr/actionBarStyle"

            android:gravity="top">

            <com.android.internal.widget.ActionBarView
@@ -46,11 +52,12 @@ the Action Bar enabled overlaying application content. 
                   android:layout_width="match_parent"

                   android:layout_height="wrap_content"

                   android:layout_below="@id/action_bar_container" />

    </LinearLayout>

    <com.android.internal.widget.ActionBarContainer android:id="@+id/split_action_bar"

                  android:layout_width="match_parent"

                  android:layout_height="wrap_content"

                  android:layout_alignParentBottom="true"

                  android:layout_gravity="bottom"

                  style="?android:attr/actionBarSplitStyle"

                  android:visibility="gone"

                  android:gravity="center"/>

</RelativeLayout>
 
</FrameLayout>

core/res/res/layout/screen_simple.xml

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ enabled. 
-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    android:orientation="vertical">

    <ViewStub android:id="@+id/action_mode_bar_stub"

core/res/res/layout/screen_simple_overlay_action_mode.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ enabled. 
-->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">

    <FrameLayout

         android:id="@android:id/content"