Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ebd659d authored by Joe Onorato's avatar Joe Onorato
Browse files

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
parents c18ac6ef f9f9e248

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+4 −2
Original line number Diff line number Diff line
@@ -175,8 +175,10 @@ public class CommandQueue extends IStatusBar.Stub { 
                            break;

                        }

                        case OP_REMOVE_ICON:

                            if (mList.getIcon(index) != null) {

                                mList.removeIcon(index);

                                mCallbacks.removeIcon(mList.getSlot(index), index, viewIndex);

                            }

                            break;

                    }

                    break;

tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java

+21 −0
Original line number Diff line number Diff line
@@ -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();