Add expand and collapse. (4762c2d7) · Commits · e / os / android_frameworks_base

core/java/android/app/StatusBarManager.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -106,18 +106,6 @@ public class StatusBarManager {
		}
		}

		/**
		* Toggle the status bar.
		*/
		public void toggle() {
		try {
		mService.toggle();
		} catch (RemoteException ex) {
		// system process is dead anyway.
		throw new RuntimeException(ex);
		}
		}

		public void setIcon(String slot, int iconId, int iconLevel) {
		try {
		mService.setIcon(slot, mContext.getPackageName(), iconId, iconLevel);

core/java/com/android/internal/statusbar/IStatusBar.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -24,5 +24,7 @@ oneway interface IStatusBar
		void setIcon(int index, in StatusBarIcon icon);
		void removeIcon(int index);
		void disable(int state);
		void animateExpand();
		void animateCollapse();
		}

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ interface IStatusBarService
		{
		void expand();
		void collapse();
		void toggle();
		void disable(int what, IBinder token, String pkg);
		void setIcon(String slot, String iconPackage, int iconId, int iconLevel);
		void setIconVisibility(String slot, boolean visible);
		@@ -33,4 +32,5 @@ interface IStatusBarService

		// ---- Methods below are for use by the status bar policy services ----
		void registerStatusBar(IStatusBar callbacks, out StatusBarIconList state);
		void visibilityChanged(boolean visible);
		}

packages/StatusBarPhone/src/com/android/policy/statusbar/phone/CommandQueue.java

+29 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,8 @@ import com.android.internal.statusbar.StatusBarIconList;
		* This class takes the functions from IStatusBar that come in on
		* binder pool threads and posts messages to get them onto the main
		* thread, and calls onto Callbacks. It also takes care of
		* coalescing these calls so they don't stack up.
		* coalescing these calls so they don't stack up. For the calls
		* are coalesced, note that they are all idempotent.
		*/
		class CommandQueue extends IStatusBar.Stub {
		private static final String TAG = "StatusBar.CommandQueue";
		@@ -42,6 +43,10 @@ class CommandQueue extends IStatusBar.Stub {

		private static final int MSG_DISABLE = 0x00020000;

		private static final int MSG_SET_VISIBILITY = 0x00030000;
		private static final int OP_EXPAND = 1;
		private static final int OP_COLLAPSE = 2;

		private StatusBarIconList mList;
		private Callbacks mCallbacks;
		private Handler mHandler = new H();
		@@ -55,6 +60,8 @@ class CommandQueue extends IStatusBar.Stub {
		StatusBarIcon old, StatusBarIcon icon);
		public void removeIcon(String slot, int index, int viewIndex);
		public void disable(int state);
		public void animateExpand();
		public void animateCollapse();
		}

		public CommandQueue(Callbacks callbacks, StatusBarIconList list) {
		@@ -85,9 +92,24 @@ class CommandQueue extends IStatusBar.Stub {
		}
		}

		public void animateExpand() {
		synchronized (mList) {
		mHandler.removeMessages(MSG_SET_VISIBILITY);
		mHandler.obtainMessage(MSG_SET_VISIBILITY, OP_EXPAND, 0, null).sendToTarget();
		}
		}

		public void animateCollapse() {
		synchronized (mList) {
		mHandler.removeMessages(MSG_SET_VISIBILITY);
		mHandler.obtainMessage(MSG_SET_VISIBILITY, OP_COLLAPSE, 0, null).sendToTarget();
		}
		}

		private final class H extends Handler {
		public void handleMessage(Message msg) {
		final int what = msg.what & MSG_MASK;
		Slog.d(TAG, "handleMessage what=0x" + Integer.toHexString(what) + " arg1=" + msg.arg1);
		switch (what) {
		case MSG_ICON: {
		final int index = msg.what & INDEX_MASK;
		@@ -116,6 +138,12 @@ class CommandQueue extends IStatusBar.Stub {
		case MSG_DISABLE:
		mCallbacks.disable(msg.arg1);
		break;
		case MSG_SET_VISIBILITY:
		if (msg.arg1 == OP_EXPAND) {
		mCallbacks.animateExpand();
		} else {
		mCallbacks.animateCollapse();
		}
		}
		}
		}

packages/StatusBarPhone/src/com/android/policy/statusbar/phone/PhoneStatusBarService.java

+14 −21

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ import java.util.Set;


		public class PhoneStatusBarService extends StatusBarService {
		static final String TAG = "StatusBar";
		static final String TAG = "PhoneStatusBarService";
		static final boolean SPEW = false;

		public static final String ACTION_STATUSBAR_START
		@@ -203,10 +203,6 @@ public class PhoneStatusBarService extends StatusBarService {
		super.onCreate();
		}

		public void setNotificationCallbacks(NotificationCallbacks listener) {
		mNotificationCallbacks = listener;
		}

		// ================================================================================
		// Constructing the view
		// ================================================================================
		@@ -531,7 +527,7 @@ public class PhoneStatusBarService extends StatusBarService {
		return;
		}
		mExpandedVisible = true;
		panelSlightlyVisible(true);
		visibilityChanged(true);

		updateExpandedViewPos(EXPANDED_LEAVE_ALONE);
		mExpandedParams.flags &= ~WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
		@@ -545,7 +541,7 @@ public class PhoneStatusBarService extends StatusBarService {
		}
		}

		void animateExpand() {
		public void animateExpand() {
		if (SPEW) Slog.d(TAG, "Animate expand: expanded=" + mExpanded);
		if ((mDisabled & StatusBarManager.DISABLE_EXPAND) != 0) {
		return ;
		@@ -558,7 +554,7 @@ public class PhoneStatusBarService extends StatusBarService {
		performFling(0, 2000.0f, true);
		}

		void animateCollapse() {
		public void animateCollapse() {
		if (SPEW) {
		Slog.d(TAG, "animateCollapse(): mExpanded=" + mExpanded
		+ " mExpandedVisible=" + mExpandedVisible
		@@ -618,7 +614,7 @@ public class PhoneStatusBarService extends StatusBarService {
		return;
		}
		mExpandedVisible = false;
		panelSlightlyVisible(false);
		visibilityChanged(false);
		mExpandedParams.flags \|= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
		mExpandedParams.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
		mExpandedDialog.getWindow().setAttributes(mExpandedParams);
		@@ -1205,7 +1201,7 @@ public class PhoneStatusBarService extends StatusBarService {
		// because the window itself extends below the content view.
		mExpandedParams.y = -disph;
		}
		panelSlightlyVisible(visible);
		visibilityChanged(visible);
		mExpandedDialog.getWindow().setAttributes(mExpandedParams);
		}

		@@ -1237,16 +1233,13 @@ public class PhoneStatusBarService extends StatusBarService {
		* this is what he wants. (see bug 1131461)
		*/
		private boolean mPanelSlightlyVisible;
		void panelSlightlyVisible(boolean visible) {
		if (true) {
		// XXX
		return;
		}
		void visibilityChanged(boolean visible) {
		if (mPanelSlightlyVisible != visible) {
		mPanelSlightlyVisible = visible;
		if (visible) {
		// tell the notification manager to turn off the lights.
		mNotificationCallbacks.onPanelRevealed();
		try {
		mBarService.visibilityChanged(visible);
		} catch (RemoteException ex) {
		// Won't fail unless the world has ended.
		}
		}
		}
		@@ -1260,7 +1253,7 @@ public class PhoneStatusBarService extends StatusBarService {
		if ((diff & StatusBarManager.DISABLE_EXPAND) != 0) {
		if ((net & StatusBarManager.DISABLE_EXPAND) != 0) {
		Slog.d(TAG, "DISABLE_EXPAND: yes");
		//animateCollapse();
		animateCollapse();
		}
		}
		if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
		@@ -1288,7 +1281,7 @@ public class PhoneStatusBarService extends StatusBarService {
		private View.OnClickListener mClearButtonListener = new View.OnClickListener() {
		public void onClick(View v) {
		mNotificationCallbacks.onClearAll();
		//addPendingOp(OP_EXPAND, null, false);
		animateCollapse();
		}
		};