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

set correct bounds in ActionBar based on visibility of ActionBarView

Browse Source 
ActionBarContainer was setting the bounds of its background assuming the
visibility of the ActionBarView. But that view becomes GONE when the
ActionBarContextView is visible, causing artifacts such as wrong shadows
when resized (as in custom configuration changes).

Issue #17280341 Quantum: drop shadow on CAB has wrong width after rotation on L, when configuration change is handled by the app

Change-Id: I07e57f00e27b41d5370cb9440b35734a8ec10f3a
This commit is contained in:
Chet Haase
2014-09-12 18:03:55 -07:00
parent ee2ec05ed7
commit ccd3da23c6
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;