Skip to content

Commit 43a87c5

Browse files
Tony WuTony Wu
authored andcommitted
Fix sometimes mExpandedView will appear while screen transforming.
While watching YouTube and receiving a call, after hang up the call, mExpandedView may flash when screen transform from Phone to YouTube. Change-Id: Ib25a0cd1086c278b91a2b34e21744a3c432a8f35
1 parent 7888486 commit 43a87c5

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ private void makeStatusBarView(Context context) {
289289
mScrollView = (ScrollView)expanded.findViewById(R.id.scroll);
290290
mNotificationLinearLayout = expanded.findViewById(R.id.notificationLinearLayout);
291291

292+
mExpandedView.setVisibility(View.GONE);
292293
mOngoingTitle.setVisibility(View.GONE);
293294
mLatestTitle.setVisibility(View.GONE);
294295

@@ -970,6 +971,7 @@ private void makeExpandedVisible() {
970971
mExpandedDialog.getWindow().setAttributes(mExpandedParams);
971972
mExpandedView.requestFocus(View.FOCUS_FORWARD);
972973
mTrackingView.setVisibility(View.VISIBLE);
974+
mExpandedView.setVisibility(View.VISIBLE);
973975

974976
if (!mTicking) {
975977
setDateViewVisibility(true, com.android.internal.R.anim.fade_in);
@@ -1054,6 +1056,7 @@ void performCollapse() {
10541056
mExpandedParams.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
10551057
mExpandedDialog.getWindow().setAttributes(mExpandedParams);
10561058
mTrackingView.setVisibility(View.GONE);
1059+
mExpandedView.setVisibility(View.GONE);
10571060

10581061
if ((mDisabled & StatusBarManager.DISABLE_NOTIFICATION_ICONS) == 0) {
10591062
setNotificationIconVisibility(true, com.android.internal.R.anim.fade_in);

0 commit comments

Comments
 (0)