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

Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2

Browse Source
This commit is contained in:
Adam Powell
2011-05-26 13:26:33 -07:00
committed by Android (Google) Code Review
parent 1d8f8819f1 dc61f26701
commit 7eba403e9a
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,9 +43,4 @@ This is an optimized layout for a screen with the Action Bar enabled.
android:layout_weight="1" android:layout_weight="1"
android:foregroundGravity="fill_horizontal|top" android:foregroundGravity="fill_horizontal|top"
android:foreground="?android:attr/windowContentOverlay" /> android:foreground="?android:attr/windowContentOverlay" />
<LinearLayout android:id="@+id/lower_action_context_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/actionBarStyle"
android:visibility="gone" />
</LinearLayout> </LinearLayout>

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

@@ -46,10 +46,4 @@ the Action Bar enabled overlaying application content.
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:layout_below="@id/action_bar_container" />
<LinearLayout android:id="@+id/lower_action_context_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
style="?android:attr/actionBarStyle"
android:visibility="gone" />
</RelativeLayout> </RelativeLayout>

1
core/res/res/values/ids.xml
View File

@@ -74,4 +74,5 @@
<item type="id" name="rowTypeId" /> <item type="id" name="rowTypeId" />
<item type="id" name="up" /> <item type="id" name="up" />
<item type="id" name="action_menu_divider" /> <item type="id" name="action_menu_divider" />
<item type="id" name="lower_action_context_bar" />
</resources> </resources>