diff options
| author | Joe Onorato <joeo@android.com> | 2010-10-11 15:44:14 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-10-11 15:44:14 -0700 |
| commit | fdb39feedd34087c9a5c7492ca31a38ec46bc2ed (patch) | |
| tree | 12c53a682be85280f395d213b7d7b7aa45856b99 /services/java | |
| parent | 15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f (diff) | |
| parent | 43a87c5c874f1b8fbf582ff522f10051a6434906 (diff) | |
| download | frameworks_base-fdb39feedd34087c9a5c7492ca31a38ec46bc2ed.zip frameworks_base-fdb39feedd34087c9a5c7492ca31a38ec46bc2ed.tar.gz frameworks_base-fdb39feedd34087c9a5c7492ca31a38ec46bc2ed.tar.bz2 | |
Merge "Fix sometimes mExpandedView will appear while screen transforming."
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/status/StatusBarService.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ public class StatusBarService extends IStatusBar.Stub 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 @@ public class StatusBarService extends IStatusBar.Stub 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 @@ public class StatusBarService extends IStatusBar.Stub 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); |