summaryrefslogtreecommitdiffstats
path: root/tests/StatusBar/src
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-09-27 11:56:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-27 11:56:24 -0700
commitf9f9e248a034b3dd891a7bd9f476b1cad5f33779 (patch)
tree4502b7564eb6e8de12331dea641c8888371b4edd /tests/StatusBar/src
parent45a83a896701f61f72082f7116b85d1537ebf4cb (diff)
parent6fa4de3cffe1390f699051fa0c7d21e8058a5ebd (diff)
downloadframeworks_base-f9f9e248a034b3dd891a7bd9f476b1cad5f33779.zip
frameworks_base-f9f9e248a034b3dd891a7bd9f476b1cad5f33779.tar.gz
frameworks_base-f9f9e248a034b3dd891a7bd9f476b1cad5f33779.tar.bz2
am 6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some other icon." into gingerbread
Merge commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp * commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd': If an icon add remove get coalesced, don't remove some other icon.
Diffstat (limited to 'tests/StatusBar/src')
-rw-r--r--tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java21
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java b/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
index 1078701..438a060 100644
--- a/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
+++ b/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
@@ -60,6 +60,27 @@ public class StatusBarTest extends TestActivity
}
private Test[] mTests = new Test[] {
+ new Test("Double Remove") {
+ public void run() {
+ Log.d(TAG, "set 0");
+ mStatusBarManager.setIcon("speakerphone", R.drawable.stat_sys_phone, 0);
+ Log.d(TAG, "remove 1");
+ mStatusBarManager.removeIcon("tty");
+
+ SystemClock.sleep(1000);
+
+ Log.d(TAG, "set 1");
+ mStatusBarManager.setIcon("tty", R.drawable.stat_sys_phone, 0);
+ if (false) {
+ Log.d(TAG, "set 2");
+ mStatusBarManager.setIcon("tty", R.drawable.stat_sys_phone, 0);
+ }
+ Log.d(TAG, "remove 2");
+ mStatusBarManager.removeIcon("tty");
+ Log.d(TAG, "set 3");
+ mStatusBarManager.setIcon("speakerphone", R.drawable.stat_sys_phone, 0);
+ }
+ },
new Test("Hide") {
public void run() {
Window win = getWindow();