From e2a2d16bd5fea2023f8c77b70514fc8b94c252dc Mon Sep 17 00:00:00 2001
From: DvTonder <david.vantonder@gmail.com>
Date: Tue, 11 Dec 2012 21:59:59 -0500
Subject: [PATCH] SystemUI: Tweak number of notifications detection method

Change-Id: Ibd46fa5039e1d3062dcdb8f3c4dbd9ec1bdc73b0
---
 .../systemui/statusbar/phone/PhoneStatusBar.java    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 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 c6800fb4bdce5..4ca3bf84c64d9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -2617,8 +2617,7 @@ public boolean skipToSettingsPanel() {
         }
 
         int N = mNotificationData.size();
-        int thisUsersNotifications = 0;
-        for (int i=0; i<N; i++) {
+        for (int i = 0; i < N; i++) {
             Entry ent = mNotificationData.get(N-i-1);
             if(ent != null
                     && ent.notification != null
@@ -2628,14 +2627,12 @@ && notificationIsForCurrentUser(ent.notification)) {
                     case com.android.internal.R.drawable.stat_sys_adb:
                         continue;
                 }
-                thisUsersNotifications++;
+                // We have at least one notification, we cannot skip
+                return false;
             }
         }
-        if(thisUsersNotifications == 0) {
-            return true;
-        }
-
-        return false;
+        // No notifications for current user, lets skip to Settings panel
+        return true;
     }
 
     private static class FastColorDrawable extends Drawable {