Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e15ccee0 authored by Tony Wu's avatar Tony Wu Committed by Steve Kondik
Browse files

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
parent 420f41a0

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

+5 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ public class StatusBarService extends IStatusBar.Stub 
        mPlmnLabel = (TextView)expanded.findViewById(R.id.plmnLabel);

        mScrollView = (ScrollView)expanded.findViewById(R.id.scroll);

        mNotificationLinearLayout = expanded.findViewById(R.id.notificationLinearLayout);



        if (custExpBar) {

            mExpandedView.findViewById(R.id.exp_view_lin_layout).

                setBackgroundDrawable(expBarHeadDrawable);
@@ -369,6 +370,8 @@ public class StatusBarService extends IStatusBar.Stub 
            mOngoingTitle.setBackgroundDrawable(expBarNotifTitleDrawable);

            mLatestTitle.setBackgroundDrawable(expBarNotifTitleDrawable);

        }



        mExpandedView.setVisibility(View.GONE);

        mOngoingTitle.setVisibility(View.GONE);

        mLatestTitle.setVisibility(View.GONE);
@@ -1134,6 +1137,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);
@@ -1218,6 +1222,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);