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

Commit 5ce00a98 authored by LuK1337's avatar LuK1337 Committed by Łukasz Patron
Browse files

SystemUI: Fix up right clock handling when showing heads up 

* Oops, we somehow forgot to import this code from 16.0 ;-;

Change-Id: Ic4195a30da2870f569f07fc323e4b939320ab6c8
parent fbd4341a

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java

+12 −6
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 
    private final NotificationStackScrollLayout mStackScroller;

    private final HeadsUpStatusBarView mHeadsUpStatusBarView;

    private final View mCenteredIconView;

    private final View mClockView;

    private final ClockController mClockController;

    private final View mOperatorNameView;

    private final DarkIconDispatcher mDarkIconDispatcher;

    private final NotificationPanelView mPanelView;
@@ -87,7 +87,7 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 
                statusbarView.findViewById(R.id.heads_up_status_bar_view),

                statusbarView.findViewById(R.id.notification_stack_scroller),

                statusbarView.findViewById(R.id.notification_panel),

                statusbarView.findViewById(R.id.clock),

                new ClockController(statusbarView),

                statusbarView.findViewById(R.id.operator_name_frame),

                statusbarView.findViewById(R.id.centered_icon_area));

    }
@@ -99,7 +99,7 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 
            HeadsUpStatusBarView headsUpStatusBarView,

            NotificationStackScrollLayout stackScroller,

            NotificationPanelView panelView,

            View clockView,

            ClockController clockController,

            View operatorNameView,

            View centeredIconView) {

        mNotificationIconAreaController = notificationIconAreaController;
@@ -117,7 +117,7 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 
        mStackScroller.addOnExpandedHeightListener(mSetExpandedHeight);

        mStackScroller.addOnLayoutChangeListener(mStackScrollLayoutChangeListener);

        mStackScroller.setHeadsUpAppearanceController(this);

        mClockView = clockView;

        mClockController = clockController;

        mOperatorNameView = operatorNameView;

        mDarkIconDispatcher = Dependency.get(DarkIconDispatcher.class);

        mDarkIconDispatcher.addDarkReceiver(this);
@@ -245,12 +245,16 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 


    private void setShown(boolean isShown) {

        if (mShown != isShown) {

            View clockView = mClockController.getClock();

            boolean isRightClock = clockView.getId() == R.id.clock_right;

            mShown = isShown;

            if (isShown) {

                updateParentClipping(false /* shouldClip */);

                mHeadsUpStatusBarView.setVisibility(View.VISIBLE);

                show(mHeadsUpStatusBarView);

                hide(mClockView, View.INVISIBLE);

                if (!isRightClock) {

                    hide(clockView, View.INVISIBLE);

                }

                if (mCenteredIconView.getVisibility() != View.GONE) {

                    hide(mCenteredIconView, View.INVISIBLE);

                }
@@ -258,7 +262,9 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 
                    hide(mOperatorNameView, View.INVISIBLE);

                }

            } else {

                show(mClockView);

                if (!isRightClock) {

                    show(clockView);

                }

                if (mCenteredIconView.getVisibility() != View.GONE) {

                    show(mCenteredIconView);

                }