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

Merge "Attaches source for camera launch when unlocked." into tm-qpr-dev am: 4b452106b0

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

Change-Id: Iea6a24ad934df429f752fc2f257c385a7255e8a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ale Nijamkin
2022-12-14 17:39:51 +00:00
committed by Automerger Merge Worker
parent f5ac31a93f 4b452106b0
commit 924cd25b13
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt
View File

@@ -28,7 +28,6 @@ import android.os.RemoteException
import android.os.UserHandle import android.os.UserHandle
import android.util.Log import android.util.Log
import android.view.WindowManager import android.view.WindowManager
import androidx.annotation.VisibleForTesting
import com.android.keyguard.KeyguardUpdateMonitor import com.android.keyguard.KeyguardUpdateMonitor
import com.android.systemui.ActivityIntentHelper import com.android.systemui.ActivityIntentHelper
import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dagger.qualifiers.Main
@@ -83,7 +82,7 @@ class CameraGestureHelper @Inject constructor(
*/ */
fun launchCamera(source: Int) { fun launchCamera(source: Int) {
val intent: Intent = getStartCameraIntent() val intent: Intent = getStartCameraIntent()
intent.putExtra(EXTRA_CAMERA_LAUNCH_SOURCE, source) intent.putExtra(CameraIntents.EXTRA_LAUNCH_SOURCE, source)
val wouldLaunchResolverActivity = activityIntentHelper.wouldLaunchResolverActivity( val wouldLaunchResolverActivity = activityIntentHelper.wouldLaunchResolverActivity(
intent, KeyguardUpdateMonitor.getCurrentUser() intent, KeyguardUpdateMonitor.getCurrentUser()
) )
@@ -149,9 +148,4 @@ class CameraGestureHelper @Inject constructor(
cameraIntents.getInsecureCameraIntent() cameraIntents.getInsecureCameraIntent()
} }
} }
companion object {
@VisibleForTesting
const val EXTRA_CAMERA_LAUNCH_SOURCE = "com.android.systemui.camera_launch_source"
}
} }

1
packages/SystemUI/src/com/android/systemui/camera/CameraIntents.kt
View File

@@ -29,6 +29,7 @@ class CameraIntents {
MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE
val DEFAULT_INSECURE_CAMERA_INTENT_ACTION = val DEFAULT_INSECURE_CAMERA_INTENT_ACTION =
MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA
const val EXTRA_LAUNCH_SOURCE = "com.android.systemui.camera_launch_source"
@JvmStatic @JvmStatic
fun getOverrideCameraPackage(context: Context): String? { fun getOverrideCameraPackage(context: Context): String? {

1
packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesCommandQueueCallbacks.java
View File

@@ -371,6 +371,7 @@ public class CentralSurfacesCommandQueueCallbacks implements CommandQueue.Callba
if (!mKeyguardStateController.isShowing()) { if (!mKeyguardStateController.isShowing()) {
final Intent cameraIntent = CameraIntents.getInsecureCameraIntent(mContext); final Intent cameraIntent = CameraIntents.getInsecureCameraIntent(mContext);
cameraIntent.putExtra(CameraIntents.EXTRA_LAUNCH_SOURCE, source);
mCentralSurfaces.startActivityDismissingKeyguard(cameraIntent, mCentralSurfaces.startActivityDismissingKeyguard(cameraIntent,
false /* onlyProvisioned */, true /* dismissShade */, false /* onlyProvisioned */, true /* dismissShade */,
true /* disallowEnterPictureInPictureWhileLaunching */, null /* callback */, 0, true /* disallowEnterPictureInPictureWhileLaunching */, null /* callback */, 0,

2
packages/SystemUI/tests/src/com/android/systemui/camera/CameraGestureHelperTest.kt
View File

@@ -301,7 +301,7 @@ class CameraGestureHelperTest : SysuiTestCase() {
val intent = intentCaptor.value val intent = intentCaptor.value
assertThat(CameraIntents.isSecureCameraIntent(intent)).isEqualTo(isSecure) assertThat(CameraIntents.isSecureCameraIntent(intent)).isEqualTo(isSecure)
assertThat(intent.getIntExtra(CameraGestureHelper.EXTRA_CAMERA_LAUNCH_SOURCE, -1)) assertThat(intent.getIntExtra(CameraIntents.EXTRA_LAUNCH_SOURCE, -1))
.isEqualTo(source) .isEqualTo(source)
} }