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

Commit d965724f authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am 44104df1: Merge "Fix status bar flashing after orientation change" into gingerbread 

Merge commit '44104df1' into gingerbread-plus-aosp

* commit '44104df1':
  Fix status bar flashing after orientation change
parents 1c67b7af 44104df1

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java

+21 −21
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks 
        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);
@@ -691,6 +692,7 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks 
        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);
@@ -767,6 +769,7 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks 
        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);
@@ -1323,6 +1326,7 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks 
            mExpandedContents.getLocationInWindow(mPositionTmp);

            final int contentsBottom = mPositionTmp[1] + mExpandedContents.getHeight();



            if (expandedPosition != EXPANDED_LEAVE_ALONE) {

                mExpandedParams.y = pos + mTrackingView.getHeight()

                        - (mTrackingParams.height-closePos) - contentsBottom;

                int max = h;
@@ -1342,10 +1346,6 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks 
                }

                mExpandedDialog.getWindow().setAttributes(mExpandedParams);



            // As long as this isn't just a repositioning that's not supposed to affect

            // the user's perception of what's showing, call to say that the visibility

            // has changed. (Otherwise, someone else will call to do that).

            if (expandedPosition != EXPANDED_LEAVE_ALONE) {

                if (SPEW) Slog.d(TAG, "updateExpandedViewPos visibilityChanged(" + visible + ")");

                visibilityChanged(visible);

            }