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

Commit e01df808 authored by Nan Wu's avatar Nan Wu Committed by Android (Google) Code Review
Browse files

Merge "Fix Camera app shortcut issue" into main

parents 80de5ddc 2a1242ee

packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ constructor( 
                activityOptions.setDisallowEnterPictureInPictureWhileLaunching(true)

                activityOptions.rotationAnimationHint =

                    WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS

                intent.collectExtraIntentKeys()

                try {

                    activityTaskManager.startActivityAsUser(

                        null,

packages/SystemUI/src/com/android/systemui/statusbar/phone/ActivityStarterInternalImpl.kt

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ constructor( 
                    // if it is volume panel.

                    options.setDisallowEnterPictureInPictureWhileLaunching(true)

                }

                intent.collectExtraIntentKeys()

                try {

                    result[0] =

                        ActivityTaskManager.getService()

packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ constructor( 
                    // if it is volume panel.

                    options.setDisallowEnterPictureInPictureWhileLaunching(true)

                }

                intent.collectExtraIntentKeys()

                try {

                    result[0] =

                        ActivityTaskManager.getService()