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

Merge commit 'f9f9e248' into manualmerge

Browse Source 
Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
	tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java

Change-Id: Ibbb2fec2d8c6f5d41398272753d271dfae698100
This commit is contained in:
Joe Onorato
2010-09-27 14:13:46 -07:00
parent c18ac6ef84 f9f9e248a0
commit 7ebd659dbf
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
View File

@ -175,8 +175,10 @@ public class CommandQueue extends IStatusBar.Stub {
break;
}
case OP_REMOVE_ICON:
mList.removeIcon(index);
mCallbacks.removeIcon(mList.getSlot(index), index, viewIndex);
if (mList.getIcon(index) != null) {
mList.removeIcon(index);
mCallbacks.removeIcon(mList.getSlot(index), index, viewIndex);
}
break;
}
break;

21
tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
View File

@ -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();