Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '539bcca99d00166303245cd8137f49f29ff3f08e':
  Fix bug 5594320 - Overlay action bar decor layout causes two measure passes
This commit is contained in:
Adam Powell
2011-11-14 19:49:39 -08:00
committed by Android Git Automerger
parent fb52c47476 539bcca99d
commit 5d536c945d
4 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/layout/screen_action_bar.xml
View File

@@ -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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
<com.android.internal.widget.ActionBarContainer android:id="@+id/action_bar_container" <com.android.internal.widget.ActionBarContainer android:id="@+id/action_bar_container"

53
core/res/res/layout/screen_action_bar_overlay.xml
View File

@@ -19,38 +19,45 @@ This is an optimized layout for a screen with
the Action Bar enabled overlaying application content. 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"> android:fitsSystemWindows="true">
<FrameLayout android:id="@android:id/content" <FrameLayout android:id="@android:id/content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<com.android.internal.widget.ActionBarContainer android:id="@+id/action_bar_container" <LinearLayout android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_gravity="top">
style="?android:attr/actionBarStyle" <com.android.internal.widget.ActionBarContainer android:id="@+id/action_bar_container"
android:gravity="top">
<com.android.internal.widget.ActionBarView
android:id="@+id/action_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?android:attr/actionBarStyle" /> android:layout_alignParentTop="true"
<com.android.internal.widget.ActionBarContextView style="?android:attr/actionBarStyle"
android:id="@+id/action_context_bar" android:gravity="top">
android:layout_width="match_parent" <com.android.internal.widget.ActionBarView
android:layout_height="wrap_content" android:id="@+id/action_bar"
android:visibility="gone" android:layout_width="match_parent"
style="?android:attr/actionModeStyle" /> android:layout_height="wrap_content"
</com.android.internal.widget.ActionBarContainer> style="?android:attr/actionBarStyle" />
<ImageView android:src="?android:attr/windowContentOverlay" <com.android.internal.widget.ActionBarContextView
android:scaleType="fitXY" android:id="@+id/action_context_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/action_bar_container" /> android:visibility="gone"
style="?android:attr/actionModeStyle" />
</com.android.internal.widget.ActionBarContainer>
<ImageView android:src="?android:attr/windowContentOverlay"
android:scaleType="fitXY"
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" <com.android.internal.widget.ActionBarContainer android:id="@+id/split_action_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_gravity="bottom"
style="?android:attr/actionBarSplitStyle" style="?android:attr/actionBarSplitStyle"
android:visibility="gone" android:visibility="gone"
android:gravity="center"/> android:gravity="center"/>
</RelativeLayout> </FrameLayout>

2
core/res/res/layout/screen_simple.xml
View File

@@ -22,6 +22,8 @@ enabled.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout 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:orientation="vertical"> android:orientation="vertical">
<ViewStub android:id="@+id/action_mode_bar_stub" <ViewStub android:id="@+id/action_mode_bar_stub"

2
core/res/res/layout/screen_simple_overlay_action_mode.xml
View File

@@ -21,6 +21,8 @@ enabled.
--> -->
<FrameLayout 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"> android:fitsSystemWindows="true">
<FrameLayout <FrameLayout
android:id="@android:id/content" android:id="@android:id/content"