From fc6fda3950338ce737f096548a079342317cfd7f Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Fri, 24 Feb 2012 22:00:46 -0500 Subject: [PATCH] Fix fullScreenIntents. The intruder alert stuff was getting activated, but it's not really ready yet. Bug: 6070420 Change-Id: If65165e96bddf1e5e4c89ed26131e45639d5cf2d --- .../android/systemui/statusbar/phone/PhoneStatusBar.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 401553fa21cdf..24584957f1be4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -102,6 +102,8 @@ public class PhoneStatusBar extends StatusBar { public static final String ACTION_STATUSBAR_START = "com.android.internal.policy.statusbar.START"; + private static final boolean ENABLE_INTRUDERS = false; + static final int EXPANDED_LEAVE_ALONE = -10000; static final int EXPANDED_FULL_OPEN = -10001; @@ -268,7 +270,7 @@ public class PhoneStatusBar extends StatusBar { addNavigationBar(); - //addIntruderView(); + if (ENABLE_INTRUDERS) addIntruderView(); // Lastly, call to the icon policy to install/update all the icons. mIconPolicy = new PhoneStatusBarPolicy(mContext); @@ -557,8 +559,9 @@ public class PhoneStatusBar extends StatusBar { } } catch (RemoteException ex) { } - if ((notification.score >= mIntruderInImmersiveMinScore) - || (!immersive && (notification.score > mIntruderMinScore))) { + if (ENABLE_INTRUDERS && ( + (notification.score >= mIntruderInImmersiveMinScore) + || (!immersive && (notification.score > mIntruderMinScore)))) { Slog.d(TAG, "Presenting high-priority notification"); // special new transient ticker mode // 1. Populate mIntruderAlertView