Merge "A few small missing things from the custom action bar layout." into jb-mr2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f217145b56
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user