summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2010-04-14 12:11:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-14 12:11:07 -0700
commiteaa8b1a7dade2b0f57ec200b0e22b6f0ddf7b860 (patch)
tree3d3ad9a235d642aeb0671f16e57bd5d848e7d333 /services
parentc059f34230b29312e384a12da57c31b2c38c3ca9 (diff)
parent57e60854f3c7a64aad3c4178df210c6f3e98ee8b (diff)
downloadframeworks_base-eaa8b1a7dade2b0f57ec200b0e22b6f0ddf7b860.zip
frameworks_base-eaa8b1a7dade2b0f57ec200b0e22b6f0ddf7b860.tar.gz
frameworks_base-eaa8b1a7dade2b0f57ec200b0e22b6f0ddf7b860.tar.bz2
am 57e60854: am 22b3644a: Update the datause icons.
Merge commit '57e60854f3c7a64aad3c4178df210c6f3e98ee8b' into kraken * commit '57e60854f3c7a64aad3c4178df210c6f3e98ee8b': Update the datause icons.
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/ThrottleService.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/services/java/com/android/server/ThrottleService.java b/services/java/com/android/server/ThrottleService.java
index 16fd104..9333dd8 100644
--- a/services/java/com/android/server/ThrottleService.java
+++ b/services/java/com/android/server/ThrottleService.java
@@ -425,7 +425,7 @@ public class ThrottleService extends IThrottleManager.Stub {
}
mNotificationManager.cancel(com.android.internal.R.drawable.
- stat_sys_throttle_warning);
+ stat_sys_throttled);
postNotification(com.android.internal.R.string.throttled_notification_title,
com.android.internal.R.string.throttled_notification_message,
@@ -460,18 +460,18 @@ public class ThrottleService extends IThrottleManager.Stub {
if (mWarningNotificationSent == false) {
mWarningNotificationSent = true;
mNotificationManager.cancel(com.android.internal.R.drawable.
- stat_sys_throttle_warning);
+ stat_sys_throttled);
postNotification(com.android.internal.R.string.
throttle_warning_notification_title,
com.android.internal.R.string.
throttle_warning_notification_message,
- com.android.internal.R.drawable.stat_sys_throttle_warning,
+ com.android.internal.R.drawable.stat_sys_throttled,
0);
}
} else {
if (mWarningNotificationSent == true) {
mNotificationManager.cancel(com.android.internal.R.drawable.
- stat_sys_throttle_warning);
+ stat_sys_throttled);
mWarningNotificationSent =false;
}
}
@@ -519,7 +519,6 @@ public class ThrottleService extends IThrottleManager.Stub {
broadcast.putExtra(ThrottleManager.EXTRA_THROTTLE_LEVEL, -1);
mContext.sendStickyBroadcast(broadcast);
}
- mNotificationManager.cancel(com.android.internal.R.drawable.stat_sys_throttle_warning);
mNotificationManager.cancel(com.android.internal.R.drawable.stat_sys_throttled);
mWarningNotificationSent = false;
}