diff options
| author | Adam Powell <adamp@google.com> | 2011-05-26 13:21:32 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-05-26 13:24:08 -0700 |
| commit | dc61f26701e7ad95d91d7e8888ed27f852d38032 (patch) | |
| tree | 054f6836ca6738c8395e8f2b03633fa9294ee303 /core | |
| parent | 42f8094c066209a65b09d53611ef5c93daba4c51 (diff) | |
| download | frameworks_base-dc61f26701e7ad95d91d7e8888ed27f852d38032.zip frameworks_base-dc61f26701e7ad95d91d7e8888ed27f852d38032.tar.gz frameworks_base-dc61f26701e7ad95d91d7e8888ed27f852d38032.tar.bz2 | |
DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones
in smaller-screen decor layouts.
Keep the internal id declared to keep code in sync with downstream
branches.
Change-Id: I25d2ff7c40c220ecc93b195dfd4e953fe0b4d944
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> |