public/customCamera
9
0
Fork 0
mirror of https://gitee.com/shuto/customCamera.git synced 2026-05-02 00:07:24 +08:00
Code Issues Projects Releases Wiki Activity

If we don't have a background image, disable miniature and opacity options since CameraLauncher.java.

Browse Source
This commit is contained in:
Thomas BOY
2015-02-09 16:22:57 +01:00
parent 3449cea59c
commit bc0844f1ed
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/android/CameraLauncher.java
+9 -2
View File
@@ -74,14 +74,21 @@ public class CameraLauncher extends CordovaPlugin {
TransferBigData.setImgBackgroundBase64OtherOrientation(imgBackgroundBase64OtherOrientation);
}
intent.putExtra("miniature", args.getBoolean(2));
// If we don't have a background image, disable miniature and opacity options.
if (TransferBigData.getImgBackgroundBase64() == null) {
intent.putExtra("miniature", false);
intent.putExtra("opacity", false);
} else {
intent.putExtra("miniature", args.getBoolean(2));
intent.putExtra("opacity", args.getBoolean(7));
}
intent.putExtra("saveInGallery", args.getBoolean(3));
intent.putExtra("cameraBackgroundColor", args.getString(4));
intent.putExtra("cameraBackgroundColorPressed", args.getString(5));
if (args.getInt(6) >= 0 && args.getInt(6) <= 100) {
intent.putExtra("quality", args.getInt(6));
}
intent.putExtra("opacity", args.getBoolean(7));
intent.putExtra("startOrientation", this.cordova.getActivity().getResources().getConfiguration().orientation);
intent.putExtra("defaultFlash", args.getInt(8));
src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
-5
View File
@@ -460,11 +460,6 @@ public class CameraActivity extends Activity {
RelativeLayout.TRUE);
background.setLayoutParams(paramsMiniature);
} else {
Button miniature = (Button) findViewById(R.id.miniature);
miniature.setVisibility(View.INVISIBLE);
SeekBar switchOpacity = (SeekBar) findViewById(R.id.switchOpacity);
switchOpacity.setVisibility(View.INVISIBLE);
}
}