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

Commit cfdbe732 authored by Bruno Martins's avatar Bruno Martins
Browse files

fixup! SystemUI: Fix up right clock handling when showing heads up 

This fixes SystemUI-tests compilation.

Change-Id: I1086ea43ecce87d34c2fd918f8a6b791a38a1cd7
parent 33feffc8

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

+1 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.systemui.statusbar.phone;



import android.content.Context;

import android.graphics.Point;

import android.graphics.Rect;

import android.view.DisplayCutout;
@@ -92,7 +91,6 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 




    public HeadsUpAppearanceController(

            Context context,

            NotificationIconAreaController notificationIconAreaController,

            HeadsUpManagerPhone headsUpManager,

            View notificationShadeView,
@@ -108,7 +106,7 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 
                notificationShadeView.findViewById(R.id.notification_stack_scroller),

                notificationPanelViewController,

                statusBarView.findViewById(R.id.clock),

                new ClockController(context, statusBarView),

                new ClockController(statusBarView.getContext(), statusBarView),

                statusBarView.findViewById(R.id.operator_name_frame),

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

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -1124,7 +1124,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
                    // TODO: this should probably be scoped to the StatusBarComponent

                    // TODO (b/136993073) Separate notification shade and status bar

                    mHeadsUpAppearanceController = new HeadsUpAppearanceController(

                            mContext,

                            mNotificationIconAreaController, mHeadsUpManager,

                            mNotificationShadeWindowView,

                            mStatusBarStateController, mKeyguardBypassController,

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java

+3 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator 
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.NotificationTestHelper;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;

import com.android.systemui.statusbar.phone.ClockController;

import com.android.systemui.statusbar.policy.KeyguardStateController;



import org.junit.Assert;
@@ -86,7 +87,6 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase { 
        mKeyguardStateController = mock(KeyguardStateController.class);

        mCommandQueue = mock(CommandQueue.class);

        mHeadsUpAppearanceController = new HeadsUpAppearanceController(

                mContext,

                mock(NotificationIconAreaController.class),

                mHeadsUpManager,

                mStatusbarStateController,
@@ -98,6 +98,7 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase { 
                mStackScroller,

                mPanelView,

                new View(mContext),

                mock(ClockController.class),

                mOperatorNameView,

                new View(mContext));

        mHeadsUpAppearanceController.setAppearFraction(0.0f, 0.0f);
@@ -166,7 +167,6 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase { 
        mHeadsUpAppearanceController.setAppearFraction(1.0f, 1.0f);



        HeadsUpAppearanceController newController = new HeadsUpAppearanceController(

                mContext,

                mock(NotificationIconAreaController.class),

                mHeadsUpManager,

                mStatusbarStateController,
@@ -178,6 +178,7 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase { 
                mStackScroller,

                mPanelView,

                new View(mContext),

                mock(ClockController.class),

                new View(mContext),

                new View(mContext));

        newController.readFrom(mHeadsUpAppearanceController);