diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-22 18:26:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-22 18:26:11 -0700 |
| commit | 7a26eefcc51e6cc794217ee398efbdcd4ad34392 (patch) | |
| tree | 0143af7328dcbd50ab8d16bad112829d37b69045 /core/java/com | |
| parent | 8f20814f86c4dabde872e8af0563202f134d5f4e (diff) | |
| parent | 89604931a85edd82c6b4a8c798fc1af610ba706e (diff) | |
| download | frameworks_base-7a26eefcc51e6cc794217ee398efbdcd4ad34392.zip frameworks_base-7a26eefcc51e6cc794217ee398efbdcd4ad34392.tar.gz frameworks_base-7a26eefcc51e6cc794217ee398efbdcd4ad34392.tar.bz2 | |
am 89604931: Merge "Fix issue #6521829: Sometimes action bar disappears in gallery" into jb-dev
* commit '89604931a85edd82c6b4a8c798fc1af610ba706e':
Fix issue #6521829: Sometimes action bar disappears in gallery
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/app/ActionBarImpl.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java index 2cbd9cc..234cb71 100644 --- a/core/java/com/android/internal/app/ActionBarImpl.java +++ b/core/java/com/android/internal/app/ActionBarImpl.java @@ -708,7 +708,15 @@ public class ActionBarImpl extends ActionBar { anim.start(); } else { mTopVisibilityView.setAlpha(1); - mContainerView.setTranslationY(0); + mTopVisibilityView.setTranslationY(0); + if (mContentView != null) { + mContentView.setTranslationY(0); + } + if (mSplitView != null && mContextDisplayMode == CONTEXT_DISPLAY_SPLIT) { + mSplitView.setAlpha(1); + mSplitView.setTranslationY(0); + mSplitView.setVisibility(View.VISIBLE); + } mShowListener.onAnimationEnd(null); } if (mOverlayLayout != null) { |