diff options
author | Wu-cheng Li <wuchengli@google.com> | 2011-11-08 19:12:06 +0800 |
---|---|---|
committer | Wu-cheng Li <wuchengli@google.com> | 2011-11-08 21:19:34 +0800 |
commit | b75783571b2b51357f97407903b2fda9534f91f9 (patch) | |
tree | cd49ebf453bd45a0839c1fae5c6f2d60f618203a /policy | |
parent | 6581043a44ab46a47f09080eeb7c9fc9d0a2d0c0 (diff) | |
download | frameworks_base-b75783571b2b51357f97407903b2fda9534f91f9.zip frameworks_base-b75783571b2b51357f97407903b2fda9534f91f9.tar.gz frameworks_base-b75783571b2b51357f97407903b2fda9534f91f9.tar.bz2 |
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
Diffstat (limited to 'policy')
-rw-r--r-- | policy/src/com/android/internal/policy/impl/LockScreen.java | 8 |
1 files 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 3469483..24a2420 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(); |