drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 22b3644a: Update the datause icons.

Browse Source 
Merge commit '22b3644ac2027d055a6b187c979ef492ee6fb082' into froyo-plus-aosp

* commit '22b3644ac2027d055a6b187c979ef492ee6fb082':
  Update the datause icons.
This commit is contained in:
Robert Greenwalt
2010-04-14 12:03:33 -07:00
committed by Android Git Automerger
parent b26c8dd432 22b3644ac2
commit 57e60854f3
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/res/res/drawable-hdpi/stat_sys_throttle_warning.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
core/res/res/drawable-hdpi/stat_sys_throttled.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
core/res/res/drawable-mdpi/stat_sys_throttle_warning.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
core/res/res/drawable-mdpi/stat_sys_throttled.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 770 B

9
services/java/com/android/server/ThrottleService.java
View File

@ -425,7 +425,7 @@ public class ThrottleService extends IThrottleManager.Stub {
} }
mNotificationManager.cancel(com.android.internal.R.drawable. mNotificationManager.cancel(com.android.internal.R.drawable.
stat_sys_throttle_warning); stat_sys_throttled);
postNotification(com.android.internal.R.string.throttled_notification_title, postNotification(com.android.internal.R.string.throttled_notification_title,
com.android.internal.R.string.throttled_notification_message, com.android.internal.R.string.throttled_notification_message,
@ -460,18 +460,18 @@ public class ThrottleService extends IThrottleManager.Stub {
if (mWarningNotificationSent == false) { if (mWarningNotificationSent == false) {
mWarningNotificationSent = true; mWarningNotificationSent = true;
mNotificationManager.cancel(com.android.internal.R.drawable. mNotificationManager.cancel(com.android.internal.R.drawable.
stat_sys_throttle_warning); stat_sys_throttled);
postNotification(com.android.internal.R.string. postNotification(com.android.internal.R.string.
throttle_warning_notification_title, throttle_warning_notification_title,
com.android.internal.R.string. com.android.internal.R.string.
throttle_warning_notification_message, throttle_warning_notification_message,
com.android.internal.R.drawable.stat_sys_throttle_warning, com.android.internal.R.drawable.stat_sys_throttled,
0); 0);
} }
} else { } else {
if (mWarningNotificationSent == true) { if (mWarningNotificationSent == true) {
mNotificationManager.cancel(com.android.internal.R.drawable. mNotificationManager.cancel(com.android.internal.R.drawable.
stat_sys_throttle_warning); stat_sys_throttled);
mWarningNotificationSent =false; mWarningNotificationSent =false;
} }
} }
@ -519,7 +519,6 @@ public class ThrottleService extends IThrottleManager.Stub {
broadcast.putExtra(ThrottleManager.EXTRA_THROTTLE_LEVEL, -1); broadcast.putExtra(ThrottleManager.EXTRA_THROTTLE_LEVEL, -1);
mContext.sendStickyBroadcast(broadcast); mContext.sendStickyBroadcast(broadcast);
} }
mNotificationManager.cancel(com.android.internal.R.drawable.stat_sys_throttle_warning);
mNotificationManager.cancel(com.android.internal.R.drawable.stat_sys_throttled); mNotificationManager.cancel(com.android.internal.R.drawable.stat_sys_throttled);
mWarningNotificationSent = false; mWarningNotificationSent = false;
} }