am f217145b: Merge "A few small missing things from the custom action bar layout." into jb-mr2-dev

* commit 'f217145b56d8826aa47f33f6ff5afe484ba8db69':
  A few small missing things from the custom action bar layout.
This commit is contained in:
Dianne Hackborn
2013-03-06 16:47:45 +00:00
committed by Android Git Automerger

View File

@@ -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);