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

Commit 4def9116 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate KeyguardClockSwitch to dagger."

parents be5827c8 be35b76a

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+50 −26
Original line number Diff line number Diff line 
package com.android.keyguard;



import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;
@@ -24,8 +26,8 @@ import android.widget.TextClock; 
import androidx.annotation.VisibleForTesting;



import com.android.internal.colorextraction.ColorExtractor;

import com.android.internal.colorextraction.ColorExtractor.OnColorsChangedListener;

import com.android.keyguard.clock.ClockManager;

import com.android.systemui.Dependency;

import com.android.systemui.Interpolators;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.plugins.ClockPlugin;
@@ -37,37 +39,65 @@ import java.io.PrintWriter; 
import java.util.Arrays;

import java.util.TimeZone;



import javax.inject.Inject;

import javax.inject.Named;



/**

 * Switch to show plugin clock when plugin is connected, otherwise it will show default clock.

 */

public class KeyguardClockSwitch extends RelativeLayout {



    /**

     * Controller used to track StatusBar state to know when to show the big_clock_container.

     */

    private final StatusBarStateController mStatusBarStateController;



    /**

     * Color extractor used to apply colors from wallpaper to custom clock faces.

     */

    private final SysuiColorExtractor mSysuiColorExtractor;



    /**

     * Manager used to know when to show a custom clock face.

     */

    private final ClockManager mClockManager;



    /**

     * Layout transition that scales the default clock face.

     */

    private final Transition mTransition;



    /**

     * Optional/alternative clock injected via plugin.

     */

    private ClockPlugin mClockPlugin;



    /**

     * Default clock.

     */

    private TextClock mClockView;



    /**

     * Frame for default and custom clock.

     */

    private FrameLayout mSmallClockFrame;



    /**

     * Container for big custom clock.

     */

    private ViewGroup mBigClockContainer;



    /**

     * Status area (date and other stuff) shown below the clock. Plugin can decide whether or not to

     * show it below the alternate clock.

     */

    private View mKeyguardStatusArea;



    /**

     * Maintain state so that a newly connected plugin can be initialized.

     */

    private float mDarkAmount;



    /**

     * If the Keyguard Slice has a header (big center-aligned text.)

     */
@@ -96,22 +126,20 @@ public class KeyguardClockSwitch extends RelativeLayout { 
     *

     * The color palette changes when the wallpaper is changed.

     */

    private SysuiColorExtractor.OnColorsChangedListener mColorsListener = (extractor, which) -> {

    private final OnColorsChangedListener mColorsListener = (extractor, which) -> {

        if ((which & WallpaperManager.FLAG_LOCK) != 0) {

            if (extractor instanceof SysuiColorExtractor) {

                updateColors((SysuiColorExtractor) extractor);

            } else {

                updateColors(Dependency.get(SysuiColorExtractor.class));

            }

            updateColors();

        }

    };



    public KeyguardClockSwitch(Context context) {

        this(context, null);

    }



    public KeyguardClockSwitch(Context context, AttributeSet attrs) {

    @Inject

    public KeyguardClockSwitch(@Named(VIEW_CONTEXT) Context context, AttributeSet attrs,

            StatusBarStateController statusBarStateController, SysuiColorExtractor colorExtractor,

            ClockManager clockManager) {

        super(context, attrs);

        mStatusBarStateController = statusBarStateController;

        mSysuiColorExtractor = colorExtractor;

        mClockManager = clockManager;

        mTransition = new ClockBoundsTransition();

    }
@@ -133,22 +161,18 @@ public class KeyguardClockSwitch extends RelativeLayout { 
    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        Dependency.get(ClockManager.class).addOnClockChangedListener(mClockChangedListener);

        StatusBarStateController stateController = Dependency.get(StatusBarStateController.class);

        stateController.addCallback(mStateListener);

        mStateListener.onStateChanged(stateController.getState());

        SysuiColorExtractor colorExtractor = Dependency.get(SysuiColorExtractor.class);

        colorExtractor.addOnColorsChangedListener(mColorsListener);

        updateColors(colorExtractor);

        mClockManager.addOnClockChangedListener(mClockChangedListener);

        mStatusBarStateController.addCallback(mStateListener);

        mSysuiColorExtractor.addOnColorsChangedListener(mColorsListener);

        updateColors();

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        Dependency.get(ClockManager.class).removeOnClockChangedListener(mClockChangedListener);

        Dependency.get(StatusBarStateController.class).removeCallback(mStateListener);

        Dependency.get(SysuiColorExtractor.class)

                .removeOnColorsChangedListener(mColorsListener);

        mClockManager.removeOnClockChangedListener(mClockChangedListener);

        mStatusBarStateController.removeCallback(mStateListener);

        mSysuiColorExtractor.removeOnColorsChangedListener(mColorsListener);

        setClockPlugin(null);

    }
@@ -290,9 +314,9 @@ public class KeyguardClockSwitch extends RelativeLayout { 
        }

    }



    private void updateColors(SysuiColorExtractor colorExtractor) {

        ColorExtractor.GradientColors colors = colorExtractor.getColors(WallpaperManager.FLAG_LOCK,

                true);

    private void updateColors() {

        ColorExtractor.GradientColors colors = mSysuiColorExtractor.getColors(

                WallpaperManager.FLAG_LOCK, true);

        mSupportsDarkText = colors.supportsDarkText();

        mColorPalette = colors.getColorPalette();

        if (mClockPlugin != null) {

packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java

+15 −4
Original line number Diff line number Diff line
@@ -28,9 +28,12 @@ import android.util.Log; 
import android.util.SparseArray;

import android.view.Display;

import android.view.DisplayInfo;

import android.view.LayoutInflater;

import android.view.View;

import android.view.WindowManager;



import com.android.systemui.util.InjectionInflationController;



// TODO(multi-display): Support multiple external displays

public class KeyguardDisplayManager {

    protected static final String TAG = "KeyguardDisplayManager";
@@ -38,6 +41,7 @@ public class KeyguardDisplayManager { 


    private final MediaRouter mMediaRouter;

    private final DisplayManager mDisplayService;

    private final InjectionInflationController mInjectableInflater;

    private final Context mContext;



    private boolean mShowing;
@@ -75,8 +79,10 @@ public class KeyguardDisplayManager { 
        }

    };



    public KeyguardDisplayManager(Context context) {

    public KeyguardDisplayManager(Context context,

            InjectionInflationController injectableInflater) {

        mContext = context;

        mInjectableInflater = injectableInflater;

        mMediaRouter = mContext.getSystemService(MediaRouter.class);

        mDisplayService = mContext.getSystemService(DisplayManager.class);

        mDisplayService.registerDisplayListener(mDisplayListener, null /* handler */);
@@ -110,7 +116,7 @@ public class KeyguardDisplayManager { 
        final int displayId = display.getDisplayId();

        Presentation presentation = mPresentations.get(displayId);

        if (presentation == null) {

            presentation = new KeyguardPresentation(mContext, display);

            presentation = new KeyguardPresentation(mContext, display, mInjectableInflater);

            presentation.setOnDismissListener(dialog -> {

                if (null != mPresentations.get(displayId)) {

                    mPresentations.remove(displayId);
@@ -201,6 +207,7 @@ public class KeyguardDisplayManager { 
    private final static class KeyguardPresentation extends Presentation {

        private static final int VIDEO_SAFE_REGION = 80; // Percentage of display width & height

        private static final int MOVE_CLOCK_TIMEOUT = 10000; // 10s

        private final InjectionInflationController mInjectableInflater;

        private View mClock;

        private int mUsableWidth;

        private int mUsableHeight;
@@ -217,8 +224,10 @@ public class KeyguardDisplayManager { 
            }

        };



        KeyguardPresentation(Context context, Display display) {

        KeyguardPresentation(Context context, Display display,

                InjectionInflationController injectionInflater) {

            super(context, display, R.style.keyguard_presentation_theme);

            mInjectableInflater = injectionInflater;

            getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG);

            setCancelable(false);

        }
@@ -239,7 +248,9 @@ public class KeyguardDisplayManager { 
            mMarginLeft = (100 - VIDEO_SAFE_REGION) * p.x / 200;

            mMarginTop = (100 - VIDEO_SAFE_REGION) * p.y / 200;



            setContentView(R.layout.keyguard_presentation);

            LayoutInflater inflater = mInjectableInflater.injectable(

                    LayoutInflater.from(getContext()));

            setContentView(inflater.inflate(R.layout.keyguard_presentation, null));

            mClock = findViewById(R.id.clock);



            // Avoid screen burn in

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+5 −1
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ import com.android.systemui.statusbar.phone.BiometricUnlockController; 
import com.android.systemui.statusbar.phone.NotificationPanelView;

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

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

import com.android.systemui.util.InjectionInflationController;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -710,7 +711,10 @@ public class KeyguardViewMediator extends SystemUI { 
        mContext.registerReceiver(mDelayedLockBroadcastReceiver, delayedActionFilter,

                SYSTEMUI_PERMISSION, null /* scheduler */);



        mKeyguardDisplayManager = new KeyguardDisplayManager(mContext);

        InjectionInflationController injectionInflationController =

                new InjectionInflationController(SystemUIFactory.getInstance().getRootComponent());

        mKeyguardDisplayManager = new KeyguardDisplayManager(mContext,

                injectionInflationController);



        mAlarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);

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

+14 −8
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ import com.android.systemui.statusbar.policy.ConfigurationController; 
import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;

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

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

import com.android.systemui.util.InjectionInflationController;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -141,6 +142,7 @@ public class NotificationPanelView extends PanelView implements 
    private static final AnimationProperties CLOCK_ANIMATION_PROPERTIES = new AnimationProperties()

            .setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD);



    private final InjectionInflationController mInjectionInflationController;

    private final PowerManager mPowerManager;

    private final AccessibilityManager mAccessibilityManager;

    private final NotificationWakeUpCoordinator mWakeUpCoordinator;
@@ -336,10 +338,12 @@ public class NotificationPanelView extends PanelView implements 


    @Inject

    public NotificationPanelView(@Named(VIEW_CONTEXT) Context context, AttributeSet attrs,

            InjectionInflationController injectionInflationController,

            NotificationWakeUpCoordinator coordinator,

            PulseExpansionHandler pulseExpansionHandler) {

        super(context, attrs);

        setWillNotDraw(!DEBUG);

        mInjectionInflationController = injectionInflationController;

        mFalsingManager = FalsingManager.getInstance(context);

        mPowerManager = context.getSystemService(PowerManager.class);

        mWakeUpCoordinator = coordinator;
@@ -475,7 +479,8 @@ public class NotificationPanelView extends PanelView implements 
        // Re-inflate the status view group.

        int index = indexOfChild(mKeyguardStatusView);

        removeView(mKeyguardStatusView);

        mKeyguardStatusView = (KeyguardStatusView) LayoutInflater.from(mContext).inflate(

        mKeyguardStatusView = (KeyguardStatusView) mInjectionInflationController

                .injectable(LayoutInflater.from(mContext)).inflate(

                    R.layout.keyguard_status_view,

                    this,

                    false);
@@ -490,7 +495,8 @@ public class NotificationPanelView extends PanelView implements 
        index = indexOfChild(mKeyguardBottomArea);

        removeView(mKeyguardBottomArea);

        KeyguardBottomAreaView oldBottomArea = mKeyguardBottomArea;

        mKeyguardBottomArea = (KeyguardBottomAreaView) LayoutInflater.from(mContext).inflate(

        mKeyguardBottomArea = (KeyguardBottomAreaView) mInjectionInflationController

                .injectable(LayoutInflater.from(mContext)).inflate(

                    R.layout.keyguard_bottom_area,

                    this,

                    false);

packages/SystemUI/src/com/android/systemui/util/InjectionInflationController.java

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.view.InflateException; 
import android.view.LayoutInflater;

import android.view.View;



import com.android.keyguard.KeyguardClockSwitch;

import com.android.systemui.SystemUIFactory;

import com.android.systemui.qs.QSCarrierGroup;

import com.android.systemui.qs.QSFooterImpl;
@@ -130,6 +131,11 @@ public class InjectionInflationController { 
         * Creates the QSCarrierGroup

         */

        QSCarrierGroup createQSCarrierGroup();



        /**

         * Creates the KeyguardClockSwitch.

         */

        KeyguardClockSwitch createKeyguardClockSwitch();

    }



    /**