diff options
| author | 2011-05-26 14:14:50 -0700 | |
|---|---|---|
| committer | 2011-05-26 14:14:50 -0700 | |
| commit | d31320d58fa3597962ed47d131aef6340beee4fa (patch) | |
| tree | 37cf70204ab72f28a12d9b0e7251448d3c866a72 | |
| parent | 2b26dee8b2b229e0b7f1785fdef2cb4e977c8310 (diff) | |
| parent | 47dae694d7476e8a3de1e9b487b89e003b8440b1 (diff) | |
am 47dae694: am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
* commit '47dae694d7476e8a3de1e9b487b89e003b8440b1':
DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
| -rw-r--r-- | core/res/res/layout/screen_action_bar.xml | 5 | ||||
| -rw-r--r-- | core/res/res/layout/screen_action_bar_overlay.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/ids.xml | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/core/res/res/layout/screen_action_bar.xml b/core/res/res/layout/screen_action_bar.xml index 70af26519ea6..56843354272e 100644 --- a/core/res/res/layout/screen_action_bar.xml +++ b/core/res/res/layout/screen_action_bar.xml @@ -43,9 +43,4 @@ This is an optimized layout for a screen with the Action Bar enabled. android:layout_weight="1" android:foregroundGravity="fill_horizontal|top" 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> diff --git a/core/res/res/layout/screen_action_bar_overlay.xml b/core/res/res/layout/screen_action_bar_overlay.xml index b486ee75fc37..89f0d89d01aa 100644 --- a/core/res/res/layout/screen_action_bar_overlay.xml +++ b/core/res/res/layout/screen_action_bar_overlay.xml @@ -46,10 +46,4 @@ 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 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> diff --git a/core/res/res/values/ids.xml b/core/res/res/values/ids.xml index d05685c6cecd..e8d9fde4b822 100644 --- a/core/res/res/values/ids.xml +++ b/core/res/res/values/ids.xml @@ -74,4 +74,5 @@ <item type="id" name="rowTypeId" /> <item type="id" name="up" /> <item type="id" name="action_menu_divider" /> + <item type="id" name="lower_action_context_bar" /> </resources> |