Merge "QS: Back button closes detail (if showing)" into lmp-dev (487315f8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ public class QSPanel extends ViewGroup {
		mDetailDoneButton.setOnClickListener(new OnClickListener() {
		@Override
		public void onClick(View v) {
		showDetail(false, mDetailRecord);
		closeDetail();
		}
		});
		}
		@@ -134,7 +134,7 @@ public class QSPanel extends ViewGroup {
		if (mExpanded == expanded) return;
		mExpanded = expanded;
		if (!mExpanded) {
		showDetail(false /show/, mDetailRecord);
		closeDetail();
		}
		}

		@@ -226,6 +226,14 @@ public class QSPanel extends ViewGroup {
		addView(r.tileView);
		}

		public boolean isShowingDetail() {
		return mDetailRecord != null;
		}

		public void closeDetail() {
		showDetail(false, mDetailRecord);
		}

		private void handleShowDetail(Record r, boolean show) {
		if (r instanceof TileRecord) {
		handleShowDetailTile((TileRecord) r, show);

+8 −0

Original line number	Diff line number	Diff line
		@@ -1424,6 +1424,14 @@ public class NotificationPanelView extends PanelView implements
		return mQsExpanded;
		}

		public boolean isQsDetailShowing() {
		return mQsPanel.isShowingDetail();
		}

		public void closeQsDetail() {
		mQsPanel.closeDetail();
		}

		@Override
		public boolean shouldDelayChildPressedState() {
		return true;

+5 −1

Original line number	Diff line number	Diff line
		@@ -3458,7 +3458,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		return true;
		}
		if (mNotificationPanel.isQsExpanded()) {
		if (mNotificationPanel.isQsDetailShowing()) {
		mNotificationPanel.closeQsDetail();
		} else {
		mNotificationPanel.animateCloseQs();
		}
		return true;
		}
		if (mState != StatusBarState.KEYGUARD && mState != StatusBarState.SHADE_LOCKED) {