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

Merge "Collapse shade for buttons that launch activities" into sc-dev am: dbd8e89bff

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15000577

Change-Id: Ic797e138b5c730692d8b2403b3a43c629aac3aa5
This commit is contained in:
Beth Thibodeau
2021-06-19 00:17:04 +00:00
committed by Automerger Merge Worker
parent ba131a9c68 dbd8e89bff
commit 6d0b9ae456
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
View File

@@ -860,6 +860,8 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
mMetricsLogger.action(MetricsEvent.ACTION_EMERGENCY_DIALER_FROM_POWER_MENU); mMetricsLogger.action(MetricsEvent.ACTION_EMERGENCY_DIALER_FROM_POWER_MENU);
mUiEventLogger.log(GlobalActionsEvent.GA_EMERGENCY_DIALER_PRESS); mUiEventLogger.log(GlobalActionsEvent.GA_EMERGENCY_DIALER_PRESS);
if (mTelecomManager != null) { if (mTelecomManager != null) {
// Close shade so user sees the activity
mStatusBar.collapseShade();
Intent intent = mTelecomManager.createLaunchEmergencyDialerIntent( Intent intent = mTelecomManager.createLaunchEmergencyDialerIntent(
null /* number */); null /* number */);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
@@ -990,6 +992,8 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
Log.w(TAG, "Bugreport handler could not be launched"); Log.w(TAG, "Bugreport handler could not be launched");
mIActivityManager.requestInteractiveBugReport(); mIActivityManager.requestInteractiveBugReport();
} }
// Close shade so user sees the activity
mStatusBar.collapseShade();
} catch (RemoteException e) { } catch (RemoteException e) {
} }
} }
@@ -1008,6 +1012,8 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
mMetricsLogger.action(MetricsEvent.ACTION_BUGREPORT_FROM_POWER_MENU_FULL); mMetricsLogger.action(MetricsEvent.ACTION_BUGREPORT_FROM_POWER_MENU_FULL);
mUiEventLogger.log(GlobalActionsEvent.GA_BUGREPORT_LONG_PRESS); mUiEventLogger.log(GlobalActionsEvent.GA_BUGREPORT_LONG_PRESS);
mIActivityManager.requestFullBugReport(); mIActivityManager.requestFullBugReport();
// Close shade so user sees the activity
mStatusBar.collapseShade();
} catch (RemoteException e) { } catch (RemoteException e) {
} }
return false; return false;