am f217145b: Merge "A few small missing things from the custom action bar layout." into jb-mr2-dev (01412780) · Commits · e / os / android_frameworks_base

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

+15 −0

Original line number	Diff line number	Diff line
		@@ -207,6 +207,16 @@ public class ActionBarOverlayLayout extends ViewGroup {
		return new LayoutParams(getContext(), attrs);
		}

		@Override
		protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
		return new LayoutParams(p);
		}

		@Override
		protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
		return p instanceof LayoutParams;
		}

		@Override
		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
		int maxHeight = 0;
		@@ -336,6 +346,11 @@ public class ActionBarOverlayLayout extends ViewGroup {
		}
		}

		@Override
		public boolean shouldDelayChildPressedState() {
		return false;
		}

		void pullChildren() {
		if (mContent == null) {
		mContent = findViewById(com.android.internal.R.id.content);