diff options
| author | Adam Powell <adamp@google.com> | 2014-05-30 20:08:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 20:08:35 +0000 |
| commit | 2157b9dcef00eac182b557b4d78cb66c31eba1bd (patch) | |
| tree | 381d784f704a2fb91db4180f1d82d2d9920584cc /core/java/com | |
| parent | 910219d8590711652983b6d90368bb9868fb8c25 (diff) | |
| parent | a24114e7b1418ec911b6328656f36f9598482d87 (diff) | |
| download | frameworks_base-2157b9dcef00eac182b557b4d78cb66c31eba1bd.zip frameworks_base-2157b9dcef00eac182b557b4d78cb66c31eba1bd.tar.gz frameworks_base-2157b9dcef00eac182b557b4d78cb66c31eba1bd.tar.bz2 | |
am a082f3a0: Merge "Fix bad casts in action bars" into lmp-preview-dev
* commit 'a082f3a05ede6ae5fa4ab64b30a77de18579264c':
Fix bad casts in action bars
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/app/WindowDecorActionBar.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/com/android/internal/app/WindowDecorActionBar.java b/core/java/com/android/internal/app/WindowDecorActionBar.java index 5c7a4e6..c0b5b97 100644 --- a/core/java/com/android/internal/app/WindowDecorActionBar.java +++ b/core/java/com/android/internal/app/WindowDecorActionBar.java @@ -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); |