Updated version number.
This commit is contained in:
@@ -17,8 +17,8 @@
|
||||
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="ve.ucv.ciens.ccg.nxtcam"
|
||||
android:versionCode="140404"
|
||||
android:versionName="14.04.04" >
|
||||
android:versionCode="140618"
|
||||
android:versionName="14.06.18" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="11"
|
||||
|
@@ -87,7 +87,7 @@ public class MainActivity extends Activity implements WifiOnDialogListener, Conn
|
||||
|
||||
// Set up gui components.
|
||||
startButton = (Button)findViewById(R.id.startButton);
|
||||
//startButton.setEnabled(false);
|
||||
startButton.setEnabled(false);
|
||||
connectButton = (Button)findViewById(R.id.connectButton);
|
||||
|
||||
// Set up services.
|
||||
|
@@ -116,8 +116,10 @@ public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback
|
||||
|
||||
try{ camera.stopPreview(); }catch (Exception e){ }
|
||||
|
||||
Logger.log_d(TAG, CLASS_NAME + ".surfaceChanged(): Request layout.");
|
||||
requestLayout();
|
||||
|
||||
Logger.log_d(TAG, CLASS_NAME + ".surfaceChanged(): Get parameters.");
|
||||
camParams = camera.getParameters();
|
||||
sizes = camParams.getSupportedPreviewSizes();
|
||||
|
||||
@@ -194,7 +196,7 @@ public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback
|
||||
* @param target The ideal preview size.
|
||||
* @return The size from the list of sizes that better matches the target. Null if sizes is null or empty.
|
||||
*/
|
||||
private final Size getOptimalPreviewSize(List<Size> sizes, final Size target) {
|
||||
private Size getOptimalPreviewSize(List<Size> sizes, final Size target) {
|
||||
final int TARGET_HEIGHT = target.height;
|
||||
Size optimalSize = null;
|
||||
double minDiff = Double.MAX_VALUE;
|
||||
|
Reference in New Issue
Block a user