From b75783571b2b51357f97407903b2fda9534f91f9 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Tue, 8 Nov 2011 19:12:06 +0800 Subject: [PATCH] Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA. ACTION_CAMERA_BUTTON is for camera hardware button. Change the intent to INTENT_ACTION_STILL_IMAGE_CAMERA. bug:5572158 Change-Id: I49ffbf50ecd4458065ee1c2d1fdab8d9e696a1a8 --- .../src/com/android/internal/policy/impl/LockScreen.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/policy/src/com/android/internal/policy/impl/LockScreen.java b/policy/src/com/android/internal/policy/impl/LockScreen.java index 3469483330d64..24a2420428d38 100644 --- a/policy/src/com/android/internal/policy/impl/LockScreen.java +++ b/policy/src/com/android/internal/policy/impl/LockScreen.java @@ -34,6 +34,7 @@ import android.view.ViewGroup; import android.widget.*; import android.util.Log; import android.media.AudioManager; +import android.provider.MediaStore; import android.provider.Settings; import java.io.File; @@ -225,9 +226,10 @@ class LockScreen extends LinearLayout implements KeyguardScreen { mCallback.goToUnlockScreen(); } else if (target == 2 || target == 3) { // 2 = alt/portrait, 3 = alt/landscape if (!mCameraDisabled) { - // Broadcast an intent to start the Camera - Intent intent = new Intent(Intent.ACTION_CAMERA_BUTTON, null); - mContext.sendOrderedBroadcast(intent, null); + // Start the Camera + Intent intent = new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + mContext.startActivity(intent); mCallback.goToUnlockScreen(); } else { toggleRingMode();