summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-05-22 18:03:20 -0700
committerDianne Hackborn <hackbod@google.com>2012-05-22 18:03:20 -0700
commit80d55065b1577db732c259e0e4d745617b6f1bff (patch)
treeb2e95d2cb6346ac943031b26524f4855708e71ab /core/java/com
parent2bccea2461556a525c5c65be0364b5b9404c8651 (diff)
downloadframeworks_base-80d55065b1577db732c259e0e4d745617b6f1bff.zip
frameworks_base-80d55065b1577db732c259e0e4d745617b6f1bff.tar.gz
frameworks_base-80d55065b1577db732c259e0e4d745617b6f1bff.tar.bz2
Fix issue #6521829: Sometimes action bar disappears in gallery
Change-Id: Ieb1f1fd0ebb87037cda94e1e1d6e2ca9a9c0754e
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/app/ActionBarImpl.java10
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) {