FP2-1313: Camera Hardware button - only one picture can be taken.
ProgrammableButton was sending the wrong camera intent, causing
photos to be lost.
Change-Id: Ia083f2956b8961a8e5ec845947221b0639267c2a
diff --git a/src/com/fairphone/programmablebutton/CameraButtonReceiver.java b/src/com/fairphone/programmablebutton/CameraButtonReceiver.java
index 97a09da..5128695 100644
--- a/src/com/fairphone/programmablebutton/CameraButtonReceiver.java
+++ b/src/com/fairphone/programmablebutton/CameraButtonReceiver.java
@@ -13,7 +13,7 @@
@Override
public void onReceive(Context context, Intent intent) {
SharedPreferences preferences = context.getSharedPreferences(context.getPackageName(), Context.MODE_PRIVATE);
- String intent_action = preferences.getString(ProgrammableButton.CAMERA_BUTTON_INTENT_PREF, MediaStore.ACTION_IMAGE_CAPTURE);
+ String intent_action = preferences.getString(ProgrammableButton.CAMERA_BUTTON_INTENT_PREF, MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA);
if (!intent_action.equals(ProgrammableButton.ACTION_IGNORE)){
Intent launch = new Intent(intent_action);
launch.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/src/com/fairphone/programmablebutton/ProgrammableButton.java b/src/com/fairphone/programmablebutton/ProgrammableButton.java
index ebbf5ec..31fdb08 100644
--- a/src/com/fairphone/programmablebutton/ProgrammableButton.java
+++ b/src/com/fairphone/programmablebutton/ProgrammableButton.java
@@ -24,7 +24,7 @@
setContentView(R.layout.activity_main);
SharedPreferences preferences = getSharedPreferences(getPackageName(), Context.MODE_PRIVATE);
- String intentAction = preferences.getString(CAMERA_BUTTON_INTENT_PREF, MediaStore.ACTION_IMAGE_CAPTURE);
+ String intentAction = preferences.getString(CAMERA_BUTTON_INTENT_PREF, MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA);
TextView currentIntent = (TextView) findViewById(R.id.currentIntent);
currentIntent.setText(intentAction);
@@ -33,10 +33,9 @@
String[] items = {
ACTION_IGNORE,
- MediaStore.ACTION_IMAGE_CAPTURE,
- MediaStore.ACTION_IMAGE_CAPTURE_SECURE,
- MediaStore.ACTION_VIDEO_CAPTURE,
MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA,
+ MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE,
+ MediaStore.INTENT_ACTION_VIDEO_CAMERA,
Settings.ACTION_SETTINGS,
Settings.ACTION_WIRELESS_SETTINGS,
Settings.ACTION_AIRPLANE_MODE_SETTINGS,