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

Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1

Browse Source
This commit is contained in:
Wei Huang
2011-11-08 13:16:02 -08:00
committed by Android (Google) Code Review
parent 48542eb39e b75783571b
commit ea50748b54
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
policy/src/com/android/internal/policy/impl/LockScreen.java
View File

@@ -34,6 +34,7 @@ import android.view.ViewGroup;
import android.widget.*; import android.widget.*;
import android.util.Log; import android.util.Log;
import android.media.AudioManager; import android.media.AudioManager;
import android.provider.MediaStore;
import android.provider.Settings; import android.provider.Settings;
import java.io.File; import java.io.File;
@@ -225,9 +226,10 @@ class LockScreen extends LinearLayout implements KeyguardScreen {
mCallback.goToUnlockScreen(); mCallback.goToUnlockScreen();
} else if (target == 2 || target == 3) { // 2 = alt/portrait, 3 = alt/landscape } else if (target == 2 || target == 3) { // 2 = alt/portrait, 3 = alt/landscape
if (!mCameraDisabled) { if (!mCameraDisabled) {
// Broadcast an intent to start the Camera // Start the Camera
Intent intent = new Intent(Intent.ACTION_CAMERA_BUTTON, null); Intent intent = new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA);
mContext.sendOrderedBroadcast(intent, null); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mContext.startActivity(intent);
mCallback.goToUnlockScreen(); mCallback.goToUnlockScreen();
} else { } else {
toggleRingMode(); toggleRingMode();