commit fdb39feedd34087c9a5c7492ca31a38ec46bc2ed
author Joe Onorato <joeo@android.com> Mon Oct 11 15:44:14 2010 -0700
committer Android Code Review <code-review@android.com> Mon Oct 11 15:44:14 2010 -0700
tree 12c53a682be85280f395d213b7d7b7aa45856b99
parent 15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f
parent 43a87c5c874f1b8fbf582ff522f10051a6434906

Merge "Fix sometimes mExpandedView will appear while screen transforming."

services/java/com/android/server/status/StatusBarService.java

diff --git a/services/java/com/android/server/status/StatusBarService.java b/services/java/com/android/server/status/StatusBarService.java
index 93c8d34..b9a57d6 100644
--- a/services/java/com/android/server/status/StatusBarService.java
+++ b/services/java/com/android/server/status/StatusBarService.java
@@ -289,6 +289,7 @@
         mScrollView = (ScrollView)expanded.findViewById(R.id.scroll);
         mNotificationLinearLayout = expanded.findViewById(R.id.notificationLinearLayout);
 
+        mExpandedView.setVisibility(View.GONE);
         mOngoingTitle.setVisibility(View.GONE);
         mLatestTitle.setVisibility(View.GONE);
         
@@ -970,6 +971,7 @@
         mExpandedDialog.getWindow().setAttributes(mExpandedParams);
         mExpandedView.requestFocus(View.FOCUS_FORWARD);
         mTrackingView.setVisibility(View.VISIBLE);
+        mExpandedView.setVisibility(View.VISIBLE);
         
         if (!mTicking) {
             setDateViewVisibility(true, com.android.internal.R.anim.fade_in);
@@ -1054,6 +1056,7 @@
         mExpandedParams.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
         mExpandedDialog.getWindow().setAttributes(mExpandedParams);
         mTrackingView.setVisibility(View.GONE);
+        mExpandedView.setVisibility(View.GONE);
 
         if ((mDisabled & StatusBarManager.DISABLE_NOTIFICATION_ICONS) == 0) {
             setNotificationIconVisibility(true, com.android.internal.R.anim.fade_in);