Merge "Fix MediaRouteActionProvider button sizing" (5d1f11d9) · Commits · e / os / android_frameworks_base

core/java/android/app/MediaRouteActionProvider.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.util.Log;
		import android.view.ActionProvider;
		import android.view.MenuItem;
		import android.view.View;
		import android.view.ViewGroup;

		import java.lang.ref.WeakReference;

		@@ -82,6 +83,8 @@ public class MediaRouteActionProvider extends ActionProvider {
		mView = new MediaRouteButton(mContext);
		mView.setRouteTypes(mRouteTypes);
		mView.setExtendedSettingsClickListener(mExtendedSettingsListener);
		mView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
		ViewGroup.LayoutParams.MATCH_PARENT));
		return mView;
		}

+8 −2

Original line number	Diff line number	Diff line
		@@ -489,8 +489,10 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo

		@Override
		protected LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
		if (p instanceof LayoutParams) {
		LayoutParams result = new LayoutParams((LayoutParams) p);
		if (p != null) {
		final LayoutParams result = p instanceof LayoutParams
		? new LayoutParams((LayoutParams) p)
		: new LayoutParams(p);
		if (result.gravity <= Gravity.NO_GRAVITY) {
		result.gravity = Gravity.CENTER_VERTICAL;
		}
		@@ -563,6 +565,10 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
		super(c, attrs);
		}

		public LayoutParams(ViewGroup.LayoutParams other) {
		super(other);
		}

		public LayoutParams(LayoutParams other) {
		super((LinearLayout.LayoutParams) other);
		isOverflowButton = other.isOverflowButton;