summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/keyguard
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-05-26 18:14:37 +0200
committerJorim Jaggi <jjaggi@google.com>2014-05-26 22:41:16 +0200
commitecc798e6668046c2f67cf30c6ab1db2eba80cab1 (patch)
tree31f787e57adaa984bbf3a7382f0ba22e8d88a2da /packages/SystemUI/src/com/android/systemui/keyguard
parenta0be6d53a823f8115d3863773398d640ec2a8c44 (diff)
downloadframeworks_base-ecc798e6668046c2f67cf30c6ab1db2eba80cab1.zip
frameworks_base-ecc798e6668046c2f67cf30c6ab1db2eba80cab1.tar.gz
frameworks_base-ecc798e6668046c2f67cf30c6ab1db2eba80cab1.tar.bz2
Improve scrim handling
Bug: 15163546 Change-Id: I0d2c05b035f832f4b4e6a2fc34113fe9d5677525
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index e73e904..b2872fa 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -62,6 +62,7 @@ import com.android.keyguard.analytics.KeyguardAnalytics;
import com.android.keyguard.analytics.Session;
import com.android.systemui.SystemUI;
import com.android.systemui.statusbar.phone.PhoneStatusBar;
+import com.android.systemui.statusbar.phone.ScrimController;
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
import com.android.systemui.statusbar.phone.StatusBarWindowManager;
@@ -1316,9 +1317,10 @@ public class KeyguardViewMediator extends SystemUI {
}
public StatusBarKeyguardViewManager registerStatusBar(PhoneStatusBar phoneStatusBar,
- ViewGroup container, StatusBarWindowManager statusBarWindowManager) {
+ ViewGroup container, StatusBarWindowManager statusBarWindowManager,
+ ScrimController scrimController) {
mStatusBarKeyguardViewManager.registerStatusBar(phoneStatusBar, container,
- statusBarWindowManager);
+ statusBarWindowManager, scrimController);
return mStatusBarKeyguardViewManager;
}