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

am a082f3a0: Merge "Fix bad casts in action bars" into lmp-preview-dev

Browse Source 
* commit 'a082f3a05ede6ae5fa4ab64b30a77de18579264c':
  Fix bad casts in action bars
This commit is contained in:
Adam Powell
2014-05-30 20:08:35 +00:00
committed by Android Git Automerger
parent 910219d859 a24114e7b1
commit 2157b9dcef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/app/WindowDecorActionBar.java
View File

@@ -588,7 +588,7 @@ public class WindowDecorActionBar extends ActionBar implements
return;
}
final FragmentTransaction trans = ((View) mDecorToolbar).isInEditMode() ? null :
final FragmentTransaction trans = mDecorToolbar.getViewGroup().isInEditMode() ? null :
mActivity.getFragmentManager().beginTransaction().disallowAddToBackStack();
if (mSelectedTab == tab) {
@@ -847,7 +847,7 @@ public class WindowDecorActionBar extends ActionBar implements
mDecorToolbar.animateToVisibility(toActionMode ? View.GONE : View.VISIBLE);
mContextView.animateToVisibility(toActionMode ? View.VISIBLE : View.GONE);
if (mTabScrollView != null && !mDecorToolbar.hasEmbeddedTabs() &&
isCollapsed((View) mDecorToolbar)) {
isCollapsed(mDecorToolbar.getViewGroup())) {
mTabScrollView.animateToVisibility(toActionMode ? View.GONE : View.VISIBLE);
}
}
@@ -959,7 +959,7 @@ public class WindowDecorActionBar extends ActionBar implements
// Clear out the context mode views after the animation finishes
mContextView.closeMode();
((View) mDecorToolbar).sendAccessibilityEvent(
mDecorToolbar.getViewGroup().sendAccessibilityEvent(
AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
mOverlayLayout.setHideOnContentScrollEnabled(mHideOnContentScroll);