Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7eba403e authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in... 

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

core/res/res/layout/screen_action_bar.xml

+0 −5
Original line number Diff line number Diff line
@@ -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>

core/res/res/layout/screen_action_bar_overlay.xml

+0 −6
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/ids.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>