diff options
| author | Adam Powell <adamp@google.com> | 2011-05-26 13:34:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-26 13:34:45 -0700 |
| commit | 47dae694d7476e8a3de1e9b487b89e003b8440b1 (patch) | |
| tree | f4151e6f69ea3398693cd5c2419536f5c41e9ca2 /core | |
| parent | 5e34a1945a6b26dff5551a37627c5216b076d896 (diff) | |
| parent | 7eba403e9a64f7153b7e5788902d4f799739158e (diff) | |
| download | frameworks_base-47dae694d7476e8a3de1e9b487b89e003b8440b1.zip frameworks_base-47dae694d7476e8a3de1e9b487b89e003b8440b1.tar.gz frameworks_base-47dae694d7476e8a3de1e9b487b89e003b8440b1.tar.bz2 | |
am 7eba403e: Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2
* commit '7eba403e9a64f7153b7e5788902d4f799739158e':
DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
Diffstat (limited to 'core')
| -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 70af265..5684335 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 b486ee7..89f0d89 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 d05685c..e8d9fde 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> |