Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38652301 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I36d12f2532582d8e9570ff46f328a9e4fdfd5a9e
parents 5b3ee027 dbd8e89b

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+6 −0
Original line number Diff line number Diff line
@@ -860,6 +860,8 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
            mMetricsLogger.action(MetricsEvent.ACTION_EMERGENCY_DIALER_FROM_POWER_MENU);

            mUiEventLogger.log(GlobalActionsEvent.GA_EMERGENCY_DIALER_PRESS);

            if (mTelecomManager != null) {

                // Close shade so user sees the activity

                mStatusBar.collapseShade();

                Intent intent = mTelecomManager.createLaunchEmergencyDialerIntent(

                        null /* number */);

                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");

                            mIActivityManager.requestInteractiveBugReport();

                        }

                        // Close shade so user sees the activity

                        mStatusBar.collapseShade();

                    } catch (RemoteException e) {

                    }

                }
@@ -1008,6 +1012,8 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
                mMetricsLogger.action(MetricsEvent.ACTION_BUGREPORT_FROM_POWER_MENU_FULL);

                mUiEventLogger.log(GlobalActionsEvent.GA_BUGREPORT_LONG_PRESS);

                mIActivityManager.requestFullBugReport();

                // Close shade so user sees the activity

                mStatusBar.collapseShade();

            } catch (RemoteException e) {

            }

            return false;