Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Dismiss system dialog am: 07af69531c

Browse Source 
Change-Id: I49650bdefe90510fde2f6de95f32a7229b1a17e4
This commit is contained in:
Automerger Merge Worker
2020-02-19 00:59:43 +00:00
parent b585c1cc78 07af69531c
commit fcbb0e0faa
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,13 +125,19 @@ public class CarFacetButton extends LinearLayout {
/** Defines the behavior of a button click. */ /** Defines the behavior of a button click. */
protected OnClickListener getButtonClickListener(Intent toSend) { 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. */ /** Defines the behavior of a long click. */
protected OnLongClickListener getButtonLongClickListener(Intent toSend) { protected OnLongClickListener getButtonLongClickListener(Intent toSend) {
return v -> { return v -> {
mContext.startActivityAsUser(toSend, UserHandle.CURRENT); mContext.startActivityAsUser(toSend, UserHandle.CURRENT);
mContext.sendBroadcastAsUser(
new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), UserHandle.CURRENT);
return true; return true;
}; };
} }

3
packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarNavigationButton.java
View File

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