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

Commit de1eaab7 authored by Xiaohui Chen's avatar Xiaohui Chen Committed by Android (Google) Code Review
Browse files

Merge "sysui: refactor for extensibility" into nyc-dev

parents 045e5a78 5da71359

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+8 −0
Original line number Diff line number Diff line
@@ -18,11 +18,14 @@ package com.android.systemui; 


import android.content.Context;

import android.util.Log;

import android.view.View;

import android.view.ViewGroup;



import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.ViewMediatorCallback;

import com.android.systemui.statusbar.ScrimView;

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

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

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

import com.android.systemui.statusbar.phone.StatusBarWindowManager;
@@ -66,4 +69,9 @@ public class SystemUIFactory { 
            ViewGroup container) {

        return new KeyguardBouncer(context, callback, lockPatternUtils, windowManager, container);

    }



    public ScrimController createScrimController(ScrimView scrimBehind, ScrimView scrimInFront,

            View headsUpScrim, boolean scrimSrcEnabled) {

        return new ScrimController(scrimBehind, scrimInFront, headsUpScrim, scrimSrcEnabled);

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class NotificationPanelView extends PanelView implements 
    private TextView mClockView;

    private View mReserveNotificationSpace;

    private View mQsNavbarScrim;

    private NotificationsQuickSettingsContainer mNotificationContainerParent;

    protected NotificationsQuickSettingsContainer mNotificationContainerParent;

    protected NotificationStackScrollLayout mNotificationStackScroller;

    private boolean mAnimateNextTopPaddingChange;

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

+3 −2
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ import com.android.systemui.EventLogTags; 
import com.android.systemui.Interpolators;

import com.android.systemui.Prefs;

import com.android.systemui.R;

import com.android.systemui.SystemUIFactory;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.classifier.FalsingManager;

import com.android.systemui.doze.DozeHost;
@@ -771,8 +772,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        ScrimView scrimBehind = (ScrimView) mStatusBarWindow.findViewById(R.id.scrim_behind);

        ScrimView scrimInFront = (ScrimView) mStatusBarWindow.findViewById(R.id.scrim_in_front);

        View headsUpScrim = mStatusBarWindow.findViewById(R.id.heads_up_scrim);

        mScrimController = new ScrimController(scrimBehind, scrimInFront, headsUpScrim,

                mScrimSrcModeEnabled);

        mScrimController = SystemUIFactory.getInstance().createScrimController(

                scrimBehind, scrimInFront, headsUpScrim, mScrimSrcModeEnabled);

        mHeadsUpManager.addListener(mScrimController);

        mStackScroller.setScrimController(mScrimController);

        mScrimController.setBackDropView(mBackdrop);

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

+4 −4
Original line number Diff line number Diff line
@@ -56,16 +56,16 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
    private static final int TAG_START_ALPHA = R.id.scrim_alpha_start;

    private static final int TAG_END_ALPHA = R.id.scrim_alpha_end;



    private final ScrimView mScrimBehind;

    protected final ScrimView mScrimBehind;

    private final ScrimView mScrimInFront;

    private final UnlockMethodCache mUnlockMethodCache;

    private final View mHeadsUpScrim;



    private boolean mKeyguardShowing;

    protected boolean mKeyguardShowing;

    private float mFraction;



    private boolean mDarkenWhileDragging;

    private boolean mBouncerShowing;

    protected boolean mBouncerShowing;

    private boolean mWakeAndUnlocking;

    private boolean mAnimateChange;

    private boolean mUpdatePending;
@@ -203,7 +203,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, 
        mUpdatePending = true;

    }



    private void updateScrims() {

    protected void updateScrims() {

        if (mAnimateKeyguardFadingOut || mForceHideScrims) {

            setScrimInFrontColor(0f);

            setScrimBehindColor(0f);