summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2010-04-14 12:03:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-14 12:03:33 -0700
commit57e60854f3c7a64aad3c4178df210c6f3e98ee8b (patch)
tree500352e7e0f63fd41b7b55d584bf2272cb4aabfb /services
parentb26c8dd432bf0ea8042e04e63c57913c7bd4e3d4 (diff)
parent22b3644ac2027d055a6b187c979ef492ee6fb082 (diff)
downloadframeworks_base-57e60854f3c7a64aad3c4178df210c6f3e98ee8b.zip
frameworks_base-57e60854f3c7a64aad3c4178df210c6f3e98ee8b.tar.gz
frameworks_base-57e60854f3c7a64aad3c4178df210c6f3e98ee8b.tar.bz2
am 22b3644a: Update the datause icons.
Merge commit '22b3644ac2027d055a6b187c979ef492ee6fb082' into froyo-plus-aosp * commit '22b3644ac2027d055a6b187c979ef492ee6fb082': 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;
}