diff options
4 files changed, 16 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java index 681b39e1ba43..41cce74a31dc 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java @@ -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); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 1a0acbe86c6c..8381f185cc49 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -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; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index d60ea2060e64..2e1855ca7c89 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -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); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index f310c2c2488c..fe76ae751520 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -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); |