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

Commit 36403e79 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Inject a time-tick handler. 

Bug: 141882822
Test: atest SystemUITests
Change-Id: I5b01cab803bc58362c22270069200bf7722b4c17
parent a0da22d0

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.car;

package com.android.systemui.statusbar.car;





import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;

import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;

import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME;





import android.animation.Animator;

import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorListenerAdapter;
@@ -30,6 +31,7 @@ import android.content.Context; 
import android.content.res.Configuration;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.os.Handler;

import android.os.PowerManager;

import android.os.PowerManager;

import android.util.DisplayMetrics;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.Log;
@@ -323,6 +325,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            ViewMediatorCallback viewMediatorCallback,

            ViewMediatorCallback viewMediatorCallback,

            InitController initController,

            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            DarkIconDispatcher darkIconDispatcher,

            @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,

            DismissCallbackRegistry dismissCallbackRegistry,

            DismissCallbackRegistry dismissCallbackRegistry,

            /* Car Settings injected components. */

            /* Car Settings injected components. */

            CarServiceProvider carServiceProvider,

            CarServiceProvider carServiceProvider,
@@ -405,6 +408,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                viewMediatorCallback,

                viewMediatorCallback,

                initController,

                initController,

                darkIconDispatcher,

                darkIconDispatcher,

                timeTickHandler,

                dismissCallbackRegistry);

                dismissCallbackRegistry);

        mScrimController = scrimController;

        mScrimController = scrimController;

        mLockscreenLockIconController = lockscreenLockIconController;

        mLockscreenLockIconController = lockscreenLockIconController;

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarModule.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -17,8 +17,10 @@ 
package com.android.systemui.statusbar.car;

package com.android.systemui.statusbar.car;





import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;

import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;

import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME;





import android.content.Context;

import android.content.Context;

import android.os.Handler;

import android.os.PowerManager;

import android.os.PowerManager;

import android.util.DisplayMetrics;

import android.util.DisplayMetrics;
@@ -193,6 +195,7 @@ public class CarStatusBarModule { 
            ViewMediatorCallback viewMediatorCallback,

            ViewMediatorCallback viewMediatorCallback,

            InitController initController,

            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            DarkIconDispatcher darkIconDispatcher,

            @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,

            DismissCallbackRegistry dismissCallbackRegistry,

            DismissCallbackRegistry dismissCallbackRegistry,

            CarServiceProvider carServiceProvider,

            CarServiceProvider carServiceProvider,

            Lazy<PowerManagerHelper> powerManagerHelperLazy,

            Lazy<PowerManagerHelper> powerManagerHelperLazy,
@@ -273,6 +276,7 @@ public class CarStatusBarModule { 
                viewMediatorCallback,

                viewMediatorCallback,

                initController,

                initController,

                darkIconDispatcher,

                darkIconDispatcher,

                timeTickHandler,

                dismissCallbackRegistry,

                dismissCallbackRegistry,

                carServiceProvider,

                carServiceProvider,

                powerManagerHelperLazy,

                powerManagerHelperLazy,

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ import static android.view.WindowInsetsController.APPEARANCE_LOW_PROFILE_BARS; 
import static android.view.WindowInsetsController.APPEARANCE_OPAQUE_STATUS_BARS;

import static android.view.WindowInsetsController.APPEARANCE_OPAQUE_STATUS_BARS;





import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;

import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;

import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME;

import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_ASLEEP;

import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_ASLEEP;

import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_AWAKE;

import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_AWAKE;

import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_WAKING;

import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_WAKING;
@@ -685,6 +686,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            ViewMediatorCallback viewMediatorCallback,

            ViewMediatorCallback viewMediatorCallback,

            InitController initController,

            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            DarkIconDispatcher darkIconDispatcher,

            @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,

            DismissCallbackRegistry dismissCallbackRegistry) {

            DismissCallbackRegistry dismissCallbackRegistry) {

        super(context);

        super(context);

        mFeatureFlags = featureFlags;

        mFeatureFlags = featureFlags;
@@ -767,6 +769,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
                    mEntryManager.updateNotifications("onBubbleExpandChanged");

                    mEntryManager.updateNotifications("onBubbleExpandChanged");

                    updateScrimController();

                    updateScrimController();

                };

                };





        DateTimeView.setReceiverHandler(timeTickHandler);

    }

    }





    @Override

    @Override
@@ -801,8 +806,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mVibrateOnOpening = mContext.getResources().getBoolean(

        mVibrateOnOpening = mContext.getResources().getBoolean(

                R.bool.config_vibrateOnIconAnimation);

                R.bool.config_vibrateOnIconAnimation);





        DateTimeView.setReceiverHandler(Dependency.get(Dependency.TIME_TICK_HANDLER));



        // start old BaseStatusBar.start().

        // start old BaseStatusBar.start().

        mWindowManagerService = WindowManagerGlobal.getWindowManagerService();

        mWindowManagerService = WindowManagerGlobal.getWindowManagerService();

        mDevicePolicyManager = (DevicePolicyManager) mContext.getSystemService(

        mDevicePolicyManager = (DevicePolicyManager) mContext.getSystemService(

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -17,8 +17,10 @@ 
package com.android.systemui.statusbar.phone;

package com.android.systemui.statusbar.phone;





import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;

import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;

import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME;





import android.content.Context;

import android.content.Context;

import android.os.Handler;

import android.os.PowerManager;

import android.os.PowerManager;

import android.util.DisplayMetrics;

import android.util.DisplayMetrics;
@@ -173,6 +175,7 @@ public class StatusBarModule { 
            ViewMediatorCallback viewMediatorCallback,

            ViewMediatorCallback viewMediatorCallback,

            InitController initController,

            InitController initController,

            DarkIconDispatcher darkIconDispatcher,

            DarkIconDispatcher darkIconDispatcher,

            @Named(TIME_TICK_HANDLER_NAME) Handler timeTickHandler,

            DismissCallbackRegistry dismissCallbackRegistry) {

            DismissCallbackRegistry dismissCallbackRegistry) {

        return new StatusBar(

        return new StatusBar(

                context,

                context,
@@ -249,6 +252,7 @@ public class StatusBarModule { 
                viewMediatorCallback,

                viewMediatorCallback,

                initController,

                initController,

                darkIconDispatcher,

                darkIconDispatcher,

                timeTickHandler,

                dismissCallbackRegistry);

                dismissCallbackRegistry);

    }

    }

}
 
}

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -399,6 +399,7 @@ public class StatusBarTest extends SysuiTestCase { 
                mViewMediatorCallback,

                mViewMediatorCallback,

                mInitController,

                mInitController,

                mDarkIconDispatcher,

                mDarkIconDispatcher,

                new Handler(TestableLooper.get(this).getLooper()),

                mDismissCallbackRegistry);

                mDismissCallbackRegistry);





        when(mStatusBarWindowView.findViewById(R.id.lock_icon_container)).thenReturn(

        when(mStatusBarWindowView.findViewById(R.id.lock_icon_container)).thenReturn(