Merge "DO NOT MERGE Dismiss system dialog" into qt-qpr1-dev (e59b568a) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarFacetButton.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -125,13 +125,19 @@ public class CarFacetButton extends LinearLayout {

		/** Defines the behavior of a button click. */
		protected OnClickListener getButtonClickListener(Intent toSend) {
		return v -> mContext.startActivityAsUser(toSend, UserHandle.CURRENT);
		return v -> {
		mContext.startActivityAsUser(toSend, UserHandle.CURRENT);
		mContext.sendBroadcastAsUser(
		new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), UserHandle.CURRENT);
		};
		}

		/** Defines the behavior of a long click. */
		protected OnLongClickListener getButtonLongClickListener(Intent toSend) {
		return v -> {
		mContext.startActivityAsUser(toSend, UserHandle.CURRENT);
		mContext.sendBroadcastAsUser(
		new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), UserHandle.CURRENT);
		return true;
		};
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,9 @@ public class CarNavigationButton extends com.android.keyguard.AlphaOptimizedImag
		try {
		if (mBroadcastIntent) {
		mContext.sendBroadcastAsUser(toSend, UserHandle.CURRENT);
		mContext.sendBroadcastAsUser(
		new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS),
		UserHandle.CURRENT);
		return;
		}
		mContext.startActivityAsUser(toSend, UserHandle.CURRENT);