Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
improve the camera preview speed
n8fr8d7ff89add4b5
diff --git a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.javaindex 57f8a97..c4853c2 100644--- a/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java+++ b/src/main/java/info/guardianproject/phoneypot/MonitorActivity.java@@ -120,6 +120,13 @@ public class MonitorActivity extends FragmentActivity {}});+ findViewById(R.id.btnSettings).setOnClickListener(new View.OnClickListener() {+ @Override+ public void onClick(View v) {+ showSettings();+ }+ });+}diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/media/MotionAsyncTask.java b/src/main/java/info/guardianproject/phoneypot/sensors/media/MotionAsyncTask.javaindex 6b82781..dc9bd23 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/media/MotionAsyncTask.java+++ b/src/main/java/info/guardianproject/phoneypot/sensors/media/MotionAsyncTask.java@@ -101,7 +101,7 @@ public class MotionAsyncTask extends Thread {if (changedPixels != null) {hasChanged = true;for (int changedPixel : changedPixels) {- newPic[changedPixel] = Color.RED;+ newPic[changedPixel] = Color.YELLOW;}}diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java b/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.javaindex 33b308a..5de52b7 100644--- a/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java+++ b/src/main/java/info/guardianproject/phoneypot/sensors/motion/Preview.java@@ -201,6 +201,8 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {}parameters.setPictureSize(w, h);+ parameters.setPreviewSize(w,h);+ parameters.setPreviewFpsRange(30000,30000);/** If the flash is needed@@ -321,9 +323,18 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {// Now that the size is known, set up the camera parameters and begin// the preview.Camera.Parameters parameters = camera.getParameters();- parameters.setPreviewSize(w, h);- parameters.setPreviewFpsRange(PREVIEW_INTERVAL,PREVIEW_INTERVAL*2);- int degree = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation();+ //parameters.setPreviewSize(w, h)+ //List<int[]> fpsRange = parameters.getSupportedPreviewFpsRange();+ //parameters.setPreviewFpsRange(fpsRange.get(fpsRange.size()-1)[1],fpsRange.get(fpsRange.size()-1)[1]);++ // for 30fps+ // parameters.set("fast-fps-mode", 0); // 0 for 30fps+ //parameters.setPreviewFpsRange(30000, 30000);++ // for auto focus+ //parameters.set("focus-mode", "continuous-video");++ int degree = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation();int displayOrientation = 0;if (prefs.getCamera().equals(PreferenceManager.FRONT)) {diff --git a/src/main/res/drawable/round_drawable_accent.xml b/src/main/res/drawable/round_drawable_accent.xmlindex 5ca6896..093cd40 100644--- a/src/main/res/drawable/round_drawable_accent.xml+++ b/src/main/res/drawable/round_drawable_accent.xml@@ -5,8 +5,8 @@android:color="@color/colorAccent" /><padding- android:left="5dp"- android:right="5dp"/>+ android:left="7dp"+ android:right="7dp"/><cornersandroid:bottomLeftRadius="7dp"diff --git a/src/main/res/layout/activity_monitor.xml b/src/main/res/layout/activity_monitor.xmlindex 57e4f57..f075c19 100644--- a/src/main/res/layout/activity_monitor.xml+++ b/src/main/res/layout/activity_monitor.xml@@ -12,7 +12,6 @@android:layout_width="match_parent"android:layout_height="match_parent">-<fragment class="info.guardianproject.phoneypot.ui.CameraFragment"android:id="@+id/fragment_camera"android:layout_width="match_parent"@@ -24,7 +23,7 @@android:layout_height="match_parent"android:id="@+id/timer_container"android:orientation="vertical"- android:background="#aaffffff"+ android:background="#55ffffff"android:gravity="center_vertical|center_horizontal">@@ -53,14 +52,16 @@/><Button- android:layout_width="120dp"- android:layout_height="40dp"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"android:text="@string/start_now"android:textStyle="bold"android:textColor="@color/colorAccent"android:background="@drawable/round_drawable_accent"android:id="@+id/btnStartNow"android:layout_margin="10dp"+ android:textSize="25dp"+ android:padding="6dp"/><Buttonandroid:layout_width="wrap_content"@@ -97,6 +98,13 @@android:src="@drawable/ic_mic_white_36dp"android:layout_margin="20dp"/>+ <ImageView+ android:id="@+id/btnSettings"+ android:layout_width="36dp"+ android:layout_height="36dp"+ android:src="@drawable/ic_settings_white_24dp"+ android:layout_margin="20dp"+ /></LinearLayout></FrameLayout>diff --git a/src/main/res/layout/camera_fragment.xml b/src/main/res/layout/camera_fragment.xmlindex fef94cf..1c28035 100644--- a/src/main/res/layout/camera_fragment.xml+++ b/src/main/res/layout/camera_fragment.xml@@ -10,10 +10,8 @@android:layout_height="1dp"></FrameLayout>-<ImageViewandroid:id="@+id/new_image"- android:layout_alignParentRight="true"android:layout_width="match_parent"android:layout_height="match_parent"android:layout_below="@id/preview"