diff options
author | Joe Onorato <joeo@google.com> | 2010-09-27 14:13:46 -0700 |
---|---|---|
committer | Joe Onorato <joeo@google.com> | 2010-09-27 14:13:46 -0700 |
commit | 7ebd659dbf3aa672cd1a686938f3df22d429be1f (patch) | |
tree | 8b20433831b23de28592f8022e65e89195e02b2c /tests/StatusBar | |
parent | c18ac6ef8475bf0b4a200054f898498bc21e1534 (diff) | |
parent | f9f9e248a034b3dd891a7bd9f476b1cad5f33779 (diff) | |
download | frameworks_base-7ebd659dbf3aa672cd1a686938f3df22d429be1f.zip frameworks_base-7ebd659dbf3aa672cd1a686938f3df22d429be1f.tar.gz frameworks_base-7ebd659dbf3aa672cd1a686938f3df22d429be1f.tar.bz2 |
Merge commit 'f9f9e248' into manualmerge
Conflicts:
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
Change-Id: Ibbb2fec2d8c6f5d41398272753d271dfae698100
Diffstat (limited to 'tests/StatusBar')
-rw-r--r-- | tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java | 21 |
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 ca438ec..7e69ee4 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 (FLAG_FULLSCREEN)") { public void run() { Window win = getWindow(); |