Merge "Fix setting action bar backgrounds after layout" (9d1d88ac) · Commits · e / os / android_frameworks_base

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,10 @@ public class ActionBarContainer extends FrameLayout {
		mBackground = bg;
		if (bg != null) {
		bg.setCallback(this);
		if (mActionBarView != null) {
		mBackground.setBounds(mActionBarView.getLeft(), mActionBarView.getTop(),
		mActionBarView.getRight(), mActionBarView.getBottom());
		}
		}
		setWillNotDraw(mIsSplit ? mSplitBackground == null :
		mBackground == null && mStackedBackground == null);
		@@ -98,6 +102,10 @@ public class ActionBarContainer extends FrameLayout {
		mStackedBackground = bg;
		if (bg != null) {
		bg.setCallback(this);
		if ((mIsStacked && mStackedBackground != null)) {
		mStackedBackground.setBounds(mTabContainer.getLeft(), mTabContainer.getTop(),
		mTabContainer.getRight(), mTabContainer.getBottom());
		}
		}
		setWillNotDraw(mIsSplit ? mSplitBackground == null :
		mBackground == null && mStackedBackground == null);
		@@ -112,6 +120,9 @@ public class ActionBarContainer extends FrameLayout {
		mSplitBackground = bg;
		if (bg != null) {
		bg.setCallback(this);
		if (mIsSplit && mSplitBackground != null) {
		mSplitBackground.setBounds(0, 0, getMeasuredWidth(), getMeasuredHeight());
		}
		}
		setWillNotDraw(mIsSplit ? mSplitBackground == null :
		mBackground == null && mStackedBackground == null);