SystemUi: Respect shouldCollapsePanel when handling onClick. (daafc613) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tiles/CustomQSTile.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ public class CustomQSTile extends QSTile<QSTile.State> {
		private int mCurrentUserId;
		private StatusBarPanelCustomTile mTile;
		private CustomQSDetailAdapter mDetailAdapter;
		private boolean mCollapsePanel;

		public CustomQSTile(Host host, StatusBarPanelCustomTile tile) {
		super(host);
		@@ -96,11 +97,12 @@ public class CustomQSTile extends QSTile<QSTile.State> {
		if (mExpandedStyle != null &&
		mExpandedStyle.getStyle() != CustomTile.ExpandedStyle.NO_STYLE) {
		showDetail(true);
		return;
		}
		if (mOnClick != null) {
		if (mOnClick.isActivity()) {
		if (mCollapsePanel) {
		mHost.collapsePanels();
		}
		if (mOnClick != null) {
		mOnClick.send();
		} else if (mOnClickUri != null) {
		final Intent intent = new Intent().setData(mOnClickUri);
		@@ -130,6 +132,7 @@ public class CustomQSTile extends QSTile<QSTile.State> {
		mOnClick = customTile.onClick;
		mOnClickUri = customTile.onClickUri;
		mExpandedStyle = customTile.expandedStyle;
		mCollapsePanel = customTile.collapsePanel;
		mDetailAdapter = new CustomQSDetailAdapter();
		}