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

Commit 9c01f219 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 7ed3d005: Merge "Fix bug 3380292 - long title in actionbar context mode... 

am 7ed3d005: Merge "Fix bug 3380292 - long title in actionbar context mode pushes buttons over edge" into honeycomb

* commit '7ed3d005':
  Fix bug 3380292 - long title in actionbar context mode pushes buttons over edge
parents 802fb15d 7ed3d005

core/java/com/android/internal/widget/ActionBarContextView.java

+5 −10
Original line number Diff line number Diff line
@@ -278,18 +278,13 @@ public class ActionBarContextView extends ViewGroup implements AnimatorListener 
            availableWidth = measureChildView(mClose, availableWidth, childSpecHeight, 0);

        }



        if (mTitleLayout != null && mCustomView == null) {

            availableWidth = measureChildView(mTitleLayout, availableWidth, childSpecHeight, 0);

        }



        final int childCount = getChildCount();

        for (int i = 0; i < childCount; i++) {

            final View child = getChildAt(i);

            if (child == mClose || child == mTitleLayout || child == mCustomView) {

                continue;

        if (mMenuView != null) {

            availableWidth = measureChildView(mMenuView, availableWidth,

                    childSpecHeight, 0);

        }



            availableWidth = measureChildView(child, availableWidth, childSpecHeight, 0);

        if (mTitleLayout != null && mCustomView == null) {

            availableWidth = measureChildView(mTitleLayout, availableWidth, childSpecHeight, 0);

        }



        if (mCustomView != null) {

core/res/res/menu/webview_copy.xml

+5 −5
Original line number Diff line number Diff line
@@ -18,26 +18,26 @@ 
    <item android:id="@+id/copy"

        android:icon="?android:attr/actionModeCopyDrawable"

        android:title="@string/copy"

        android:showAsAction="always|withText"

        android:showAsAction="ifRoom|withText"

        />

    <item android:id="@+id/share"

        android:icon="@drawable/ic_menu_share"

        android:title="@string/share"

        android:showAsAction="always|withText"

        android:showAsAction="ifRoom|withText"

        />

    <item android:id="@+id/select_all"

        android:title="@string/selectAll"

        android:showAsAction="always|withText"

        android:showAsAction="ifRoom|withText"

        />

    <item android:id="@+id/find"

        android:icon="@drawable/ic_menu_find"

        android:title="@string/find"

        android:showAsAction="always|withText"

        android:showAsAction="ifRoom|withText"

        />

    <item android:id="@+id/websearch"

        android:icon="@drawable/ic_menu_search"

        android:title="@string/websearch"

        android:showAsAction="always|withText"

        android:showAsAction="ifRoom|withText"

        />

</menu>