Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f9f4d316: Merge "set correct bounds in ActionBar based on visibility of ActionBarView" into lmp-dev

Browse Source 
* commit 'f9f4d3161ed7be2365ba4f2b16d1c6571e725eb0':
  set correct bounds in ActionBar based on visibility of ActionBarView
This commit is contained in:
Chet Haase
2014-09-14 21:39:25 +00:00
committed by Android Git Automerger
parent 56c4f5c139 4605b2929e
commit ad804f5560
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/com/android/internal/widget/ActionBarContainer.java
View File

@@ -39,6 +39,7 @@ public class ActionBarContainer extends FrameLayout {
private boolean mIsTransitioning;
private View mTabContainer;
private View mActionBarView;
private View mActionContextView;
private Drawable mBackground;
private Drawable mStackedBackground;
@@ -79,6 +80,7 @@ public class ActionBarContainer extends FrameLayout {
public void onFinishInflate() {
super.onFinishInflate();
mActionBarView = findViewById(com.android.internal.R.id.action_bar);
mActionContextView = findViewById(com.android.internal.R.id.action_context_bar);
}
public void setPrimaryBackground(Drawable bg) {
@@ -312,8 +314,16 @@ public class ActionBarContainer extends FrameLayout {
}
} else {
if (mBackground != null) {
mBackground.setBounds(mActionBarView.getLeft(), mActionBarView.getTop(),
mActionBarView.getRight(), mActionBarView.getBottom());
if (mActionBarView.getVisibility() == View.VISIBLE) {
mBackground.setBounds(mActionBarView.getLeft(), mActionBarView.getTop(),
mActionBarView.getRight(), mActionBarView.getBottom());
} else if (mActionContextView != null &&
mActionContextView.getVisibility() == View.VISIBLE) {
mBackground.setBounds(mActionContextView.getLeft(), mActionContextView.getTop(),
mActionContextView.getRight(), mActionContextView.getBottom());
} else {
mBackground.setBounds(0, 0, 0, 0);
}
needsInvalidate = true;
}
mIsStacked = hasTabs;