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

Commit fdb39fee authored by Joe Onorato's avatar Joe Onorato Committed by Android Code Review
Browse files

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

parents 15f7ff3c 43a87c5c

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

+3 −0
Original line number Diff line number Diff line
@@ -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);