summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--res/layout/main.xml4
-rw-r--r--src/com/example/rotorm/CameraActivity.java5
2 files changed, 7 insertions, 2 deletions
diff --git a/res/layout/main.xml b/res/layout/main.xml
index a075341..2041418 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -23,4 +23,4 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="Capture" />
-</LinearLayout> \ No newline at end of file
+</RelativeLayout> \ No newline at end of file
diff --git a/src/com/example/rotorm/CameraActivity.java b/src/com/example/rotorm/CameraActivity.java
index e228e52..220f2bf 100644
--- a/src/com/example/rotorm/CameraActivity.java
+++ b/src/com/example/rotorm/CameraActivity.java
@@ -8,6 +8,7 @@ import java.util.List;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.PutObjectRequest;
import android.app.Activity;
import android.content.Context;
@@ -113,6 +114,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent data){
//we are now ready to upload the file
//http://aws.amazon.com/articles/SDKs/Android/3002109349624271
AmazonS3Client s3Client = new AmazonS3Client( new BasicAWSCredentials( AWS_ACCESS_KEY_ID, AWS_SECRET_KEY ) );
+ //our bucket already exists
+
+ //PutObjectRequest por = new PutObjectRequest( Constants.getPictureBucket(), Constants.PICTURE_NAME, new java.io.File( filePath) );
+ //s3Client.putObject( por );
} else {
// initialize video camera