From 040ff76fab9c2b77b98ef790698aca0505aa2f99 Mon Sep 17 00:00:00 2001 From: "Tiwari, Divyanshu" Date: Tue, 18 Feb 2025 09:34:43 +0000 Subject: [PATCH] Changes to Enable 3A features --- camera/MultiCameraApplication/Android.bp | 2 +- .../AndroidManifest.xml | 2 +- .../intel/multicamera/AutoFitTextureView.java | 2 +- .../com/intel/multicamera/CameraBase.java | 33 +++++++++++++- .../com/intel/multicamera/DetailsDialog.java | 2 +- .../intel/multicamera/FullScreenActivity.java | 7 +-- .../com/intel/multicamera/MediaDetails.java | 2 +- .../com/intel/multicamera/MultiCamera.java | 2 +- .../intel/multicamera/MultiViewActivity.java | 2 +- .../multicamera/PermissionsActivity.java | 2 +- .../com/intel/multicamera/PhotoPreview.java | 2 +- .../com/intel/multicamera/QuickActivity.java | 2 +- .../multicamera/RoundedThumbnailView.java | 2 +- .../intel/multicamera/SettingsActivity.java | 2 +- .../intel/multicamera/SettingsPrefUtil.java | 45 ++++++++++++++++++- .../multicamera/SingleCameraActivity.java | 4 +- .../com/intel/multicamera/SurfaceUtil.java | 2 +- .../java/com/intel/multicamera/Thumbnail.java | 2 +- .../intel/multicamera/USBChangeDialog.java | 2 +- .../java/com/intel/multicamera/Utils.java | 2 +- .../com/intel/multicamera/VideoRecord.java | 4 +- .../res/layout/activity_full_screen.xml | 6 +-- .../res/layout/activity_itscameraintents.xml | 2 +- .../res/layout/activity_photo_preview.xml | 2 +- .../res/layout/activity_video_record.xml | 4 +- .../res/layout/botmleftcam.xml | 4 +- .../res/layout/botmrightcam.xml | 4 +- .../res/layout/dialog_advanced_settings.xml | 29 ++++++++++++ .../res/layout/topleftcam.xml | 4 +- .../res/layout/toprightcam.xml | 4 +- .../res/values/strings.xml | 3 +- .../res/xml/root_preferences.xml | 6 ++- .../res/xml/root_preferences_1.xml | 6 +++ .../res/xml/root_preferences_2.xml | 6 +++ .../res/xml/root_preferences_3.xml | 6 +++ 35 files changed, 169 insertions(+), 42 deletions(-) create mode 100644 camera/MultiCameraApplication/res/layout/dialog_advanced_settings.xml diff --git a/camera/MultiCameraApplication/Android.bp b/camera/MultiCameraApplication/Android.bp index e5070ed..5db7f0f 100644 --- a/camera/MultiCameraApplication/Android.bp +++ b/camera/MultiCameraApplication/Android.bp @@ -9,7 +9,7 @@ package { } android_app { - name: "MultiCameraApp", + name: "AdvancedMultiCameraApp", static_libs: [ "androidx.legacy_legacy-support-v13", diff --git a/camera/MultiCameraApplication/AndroidManifest.xml b/camera/MultiCameraApplication/AndroidManifest.xml index 3ef62a1..df60845 100644 --- a/camera/MultiCameraApplication/AndroidManifest.xml +++ b/camera/MultiCameraApplication/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.intel.AdvancedMultiCamera"> diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/AutoFitTextureView.java b/camera/MultiCameraApplication/java/com/intel/multicamera/AutoFitTextureView.java index e99dac6..e7039e5 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/AutoFitTextureView.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/AutoFitTextureView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.content.Context; import android.util.AttributeSet; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/CameraBase.java b/camera/MultiCameraApplication/java/com/intel/multicamera/CameraBase.java index 6696219..c964baf 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/CameraBase.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/CameraBase.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.app.Activity; import android.app.Dialog; @@ -149,6 +149,36 @@ private void ClickListeners(ImageButton PictureButton, ImageButton RecordButton, CameraSplit(CameraSplit); } + private void applyAdvancedSettingsToPreview() { + SharedPreferences sharedPreferences = mActivity.getPreferences(Context.MODE_PRIVATE); + boolean autoFocusEnabled = sharedPreferences.getBoolean("pref_auto_focus", true); + boolean autoExposureEnabled = sharedPreferences.getBoolean("pref_auto_exposure", true); + boolean autoWhiteBalanceEnabled = sharedPreferences.getBoolean("pref_auto_white_balance", true); + if (autoFocusEnabled) { + captureRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE); + Log.d(TAG, "Auto Focus enabled"); + } + else { + captureRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_OFF); + Log.d(TAG, "Auto Focus disabled"); + } + if (autoExposureEnabled) { + captureRequestBuilder.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON); + Log.d(TAG, "Auto Exposure enabled"); + } + else { + captureRequestBuilder.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_OFF); + Log.d(TAG, "Auto Exposure disabled"); + } + if (autoWhiteBalanceEnabled) { + captureRequestBuilder.set(CaptureRequest.CONTROL_AWB_MODE, CaptureRequest.CONTROL_AWB_MODE_AUTO); + Log.d(TAG, "Auto White Balance enabled"); + } + else { + captureRequestBuilder.set(CaptureRequest.CONTROL_AWB_MODE, CaptureRequest.CONTROL_AWB_MODE_OFF); + Log.d(TAG, "Auto White Balance disabled"); + } + } private void TakePicureOnClicked(ImageButton PictureButton) { takePictureButton = PictureButton; @@ -483,6 +513,7 @@ public void createCameraPreview() { mCameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW); captureRequestBuilder.addTarget(surface); + applyAdvancedSettingsToPreview(); mCameraDevice.createCaptureSession( outputSurfaces, new CameraCaptureSession.StateCallback() { diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/DetailsDialog.java b/camera/MultiCameraApplication/java/com/intel/multicamera/DetailsDialog.java index 6cd39fc..112a0c7 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/DetailsDialog.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/DetailsDialog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.app.AlertDialog; import android.app.Dialog; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/FullScreenActivity.java b/camera/MultiCameraApplication/java/com/intel/multicamera/FullScreenActivity.java index 948189a..8071e05 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/FullScreenActivity.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/FullScreenActivity.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; @@ -53,7 +53,7 @@ import java.util.concurrent.TimeUnit; import java.util.Objects; -import static com.intel.multicamera.MultiViewActivity.updateStorageSpace; +import static com.intel.AdvancedMultiCamera.MultiViewActivity.updateStorageSpace; public class FullScreenActivity extends AppCompatActivity { private static final String TAG = "FullScreenActivity"; @@ -93,7 +93,7 @@ protected void onCreate(Bundle savedInstanceState) { } setContentView(R.layout.activity_full_screen); - + Log.i("TAG", "fullscreen is called."); mIsRecordingVideo = false; mCameraInst = MultiCamera.getInstance(); mCameraSwitch = findViewById(R.id.camera_switch); @@ -207,6 +207,7 @@ public void onClick(View v) { bundle.putString("pref_resolution", "pref_resolution"); bundle.putString("video_list", "video_list"); bundle.putString("capture_list", "capture_list"); + bundle.putString("advanced_list", "advanced_list"); Fragment = new SettingsPrefUtil(); Fragment.setArguments(bundle); diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/MediaDetails.java b/camera/MultiCameraApplication/java/com/intel/multicamera/MediaDetails.java index a8c5ea1..e208583 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/MediaDetails.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/MediaDetails.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.content.Context; import android.provider.MediaStore; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/MultiCamera.java b/camera/MultiCameraApplication/java/com/intel/multicamera/MultiCamera.java index 9f2ce47..12b7c31 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/MultiCamera.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/MultiCamera.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.content.ContentValues; import android.graphics.Camera; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/MultiViewActivity.java b/camera/MultiCameraApplication/java/com/intel/multicamera/MultiViewActivity.java index c59dd34..786dc79 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/MultiViewActivity.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/MultiViewActivity.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.Manifest; import android.app.Dialog; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/PermissionsActivity.java b/camera/MultiCameraApplication/java/com/intel/multicamera/PermissionsActivity.java index 7835d7a..9ea60da 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/PermissionsActivity.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/PermissionsActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.Manifest; import android.app.AlertDialog; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/PhotoPreview.java b/camera/MultiCameraApplication/java/com/intel/multicamera/PhotoPreview.java index 59c508c..ceafcd5 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/PhotoPreview.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/PhotoPreview.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.app.Activity; import android.app.Dialog; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/QuickActivity.java b/camera/MultiCameraApplication/java/com/intel/multicamera/QuickActivity.java index f76647b..2c62dd5 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/QuickActivity.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/QuickActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.app.Activity; import android.content.Intent; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/RoundedThumbnailView.java b/camera/MultiCameraApplication/java/com/intel/multicamera/RoundedThumbnailView.java index f48dd1d..d292a9f 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/RoundedThumbnailView.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/RoundedThumbnailView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/SettingsActivity.java b/camera/MultiCameraApplication/java/com/intel/multicamera/SettingsActivity.java index 688e57b..82dcc1f 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/SettingsActivity.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/SettingsActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/SettingsPrefUtil.java b/camera/MultiCameraApplication/java/com/intel/multicamera/SettingsPrefUtil.java index 6b7d026..746dec5 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/SettingsPrefUtil.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/SettingsPrefUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.content.Context; import android.content.SharedPreferences; @@ -33,6 +33,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.appcompat.widget.SwitchCompat; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceFragment; @@ -42,6 +43,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import android.app.AlertDialog; public class SettingsPrefUtil extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener { @@ -177,6 +179,47 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { setPreferencesFromResource(root_preferences, rootKey); mCamcorderProfileNames = getResources().getStringArray(R.array.camcorder_profile_names); + + Preference advancedSettingsPreference = findPreference("advanced_settings"); + + if (advancedSettingsPreference != null) { + advancedSettingsPreference.setOnPreferenceClickListener(preference -> { + showAdvancedSettingsDialog(); + return true; + }); + } + } + private void showAdvancedSettingsDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); + LayoutInflater inflater = LayoutInflater.from(getContext()); + View dialogView = inflater.inflate(R.layout.dialog_advanced_settings, null); + SwitchCompat switchAutoFocus = dialogView.findViewById(R.id.switch_auto_focus); + SwitchCompat switchAutoExposure = dialogView.findViewById(R.id.switch_auto_exposure); + SwitchCompat switchAutoWhiteBalance = dialogView.findViewById(R.id.switch_auto_white_balance); + + SharedPreferences sharedPreferences = getActivity().getPreferences(Context.MODE_PRIVATE); + + switchAutoFocus.setChecked(sharedPreferences.getBoolean("pref_auto_focus", false)); + switchAutoExposure.setChecked(sharedPreferences.getBoolean("pref_auto_exposure", false)); + switchAutoWhiteBalance.setChecked(sharedPreferences.getBoolean("pref_auto_white_balance", false)); + + builder.setView(dialogView) + .setTitle("Advanced Settings") + .setPositiveButton("OK", (dialog, which) -> { + SharedPreferences.Editor editor = sharedPreferences.edit(); + + editor.putBoolean("pref_auto_focus", switchAutoFocus.isChecked()); + editor.putBoolean("pref_auto_exposure", switchAutoExposure.isChecked()); + editor.putBoolean("pref_auto_white_balance", switchAutoWhiteBalance.isChecked()); + + editor.apply(); + + Log.d(TAG, "Auto Focus: " + switchAutoFocus.isChecked()); + Log.d(TAG, "Auto Exposure: " + switchAutoExposure.isChecked()); + Log.d(TAG, "Auto White Balance: " + switchAutoWhiteBalance.isChecked()); + }) + .setNegativeButton("Cancel", null) + .show(); } @Override diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/SingleCameraActivity.java b/camera/MultiCameraApplication/java/com/intel/multicamera/SingleCameraActivity.java index 0547e2e..babd0a7 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/SingleCameraActivity.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/SingleCameraActivity.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.Manifest; import android.app.Dialog; @@ -51,7 +51,7 @@ import java.util.Objects; import static android.hardware.usb.UsbManager.ACTION_USB_DEVICE_ATTACHED; -import static com.intel.multicamera.MultiViewActivity.updateStorageSpace; +import static com.intel.AdvancedMultiCamera.MultiViewActivity.updateStorageSpace; public class SingleCameraActivity extends AppCompatActivity { private static final String TAG = "SingleCameraActivity"; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/SurfaceUtil.java b/camera/MultiCameraApplication/java/com/intel/multicamera/SurfaceUtil.java index 16ad523..d606fc1 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/SurfaceUtil.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/SurfaceUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.graphics.SurfaceTexture; import android.opengl.GLES20; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/Thumbnail.java b/camera/MultiCameraApplication/java/com/intel/multicamera/Thumbnail.java index 1df28b6..2938c30 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/Thumbnail.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/Thumbnail.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.graphics.Bitmap; import android.media.MediaMetadataRetriever; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/USBChangeDialog.java b/camera/MultiCameraApplication/java/com/intel/multicamera/USBChangeDialog.java index 9ae3551..77b082d 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/USBChangeDialog.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/USBChangeDialog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.app.Activity; import android.app.AlertDialog; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/Utils.java b/camera/MultiCameraApplication/java/com/intel/multicamera/Utils.java index eed662a..59f768b 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/Utils.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/Utils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.annotation.SuppressLint; import android.app.Activity; diff --git a/camera/MultiCameraApplication/java/com/intel/multicamera/VideoRecord.java b/camera/MultiCameraApplication/java/com/intel/multicamera/VideoRecord.java index 6c366a4..762a5b0 100644 --- a/camera/MultiCameraApplication/java/com/intel/multicamera/VideoRecord.java +++ b/camera/MultiCameraApplication/java/com/intel/multicamera/VideoRecord.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.intel.multicamera; +package com.intel.AdvancedMultiCamera; import android.app.Activity; import android.content.ContentValues; @@ -58,7 +58,7 @@ import java.util.Arrays; import java.util.List; -import static com.intel.multicamera.SettingsPrefUtil.SIZE_HD; +import static com.intel.AdvancedMultiCamera.SettingsPrefUtil.SIZE_HD; public class VideoRecord implements MediaRecorder.OnErrorListener, MediaRecorder.OnInfoListener{ diff --git a/camera/MultiCameraApplication/res/layout/activity_full_screen.xml b/camera/MultiCameraApplication/res/layout/activity_full_screen.xml index ebcc9d4..c1192cb 100644 --- a/camera/MultiCameraApplication/res/layout/activity_full_screen.xml +++ b/camera/MultiCameraApplication/res/layout/activity_full_screen.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.intel.multicamera.FullScreenActivity"> + tools:context="com.intel.AdvancedMultiCamera.FullScreenActivity"> - - - diff --git a/camera/MultiCameraApplication/res/layout/activity_photo_preview.xml b/camera/MultiCameraApplication/res/layout/activity_photo_preview.xml index 3c61107..f5f200e 100644 --- a/camera/MultiCameraApplication/res/layout/activity_photo_preview.xml +++ b/camera/MultiCameraApplication/res/layout/activity_photo_preview.xml @@ -4,6 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.intel.multicamera.PhotoPreviewActivity"> + tools:context="com.intel.AdvancedMultiCamera.PhotoPreviewActivity"> diff --git a/camera/MultiCameraApplication/res/layout/activity_video_record.xml b/camera/MultiCameraApplication/res/layout/activity_video_record.xml index c9c7612..a485187 100644 --- a/camera/MultiCameraApplication/res/layout/activity_video_record.xml +++ b/camera/MultiCameraApplication/res/layout/activity_video_record.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.intel.multicamera.FullScreenActivity"> + tools:context="com.intel.AdvancedMultiCamera.FullScreenActivity"> - diff --git a/camera/MultiCameraApplication/res/layout/botmleftcam.xml b/camera/MultiCameraApplication/res/layout/botmleftcam.xml index 9122cdf..4a10f14 100644 --- a/camera/MultiCameraApplication/res/layout/botmleftcam.xml +++ b/camera/MultiCameraApplication/res/layout/botmleftcam.xml @@ -9,12 +9,12 @@ xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"> - - - - + + + + + + + + + \ No newline at end of file diff --git a/camera/MultiCameraApplication/res/layout/topleftcam.xml b/camera/MultiCameraApplication/res/layout/topleftcam.xml index 2c9e54f..ac13991 100644 --- a/camera/MultiCameraApplication/res/layout/topleftcam.xml +++ b/camera/MultiCameraApplication/res/layout/topleftcam.xml @@ -9,13 +9,13 @@ xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"> - - - - - MultiCamera + AdvancedMultiCamera Settings Settings Record @@ -46,6 +46,7 @@ Capture Resolution Video Quality + Advanced Settings %1$dx%2$d diff --git a/camera/MultiCameraApplication/res/xml/root_preferences.xml b/camera/MultiCameraApplication/res/xml/root_preferences.xml index 83ba094..cb0c18b 100644 --- a/camera/MultiCameraApplication/res/xml/root_preferences.xml +++ b/camera/MultiCameraApplication/res/xml/root_preferences.xml @@ -38,7 +38,11 @@ app:negativeButtonText="@null" app:positiveButtonText="@null" app:title="@string/pref_header_Camera_Video_Resolution" /> - + + diff --git a/camera/MultiCameraApplication/res/xml/root_preferences_1.xml b/camera/MultiCameraApplication/res/xml/root_preferences_1.xml index 7e3aca4..aa85dc4 100644 --- a/camera/MultiCameraApplication/res/xml/root_preferences_1.xml +++ b/camera/MultiCameraApplication/res/xml/root_preferences_1.xml @@ -39,6 +39,12 @@ app:positiveButtonText="@null" app:title="@string/pref_header_Camera_Video_Resolution" /> + + + diff --git a/camera/MultiCameraApplication/res/xml/root_preferences_2.xml b/camera/MultiCameraApplication/res/xml/root_preferences_2.xml index c400f8b..f61790f 100644 --- a/camera/MultiCameraApplication/res/xml/root_preferences_2.xml +++ b/camera/MultiCameraApplication/res/xml/root_preferences_2.xml @@ -39,6 +39,12 @@ app:positiveButtonText="@null" app:title="@string/pref_header_Camera_Video_Resolution" /> + + + diff --git a/camera/MultiCameraApplication/res/xml/root_preferences_3.xml b/camera/MultiCameraApplication/res/xml/root_preferences_3.xml index 20900ac..b0e609a 100644 --- a/camera/MultiCameraApplication/res/xml/root_preferences_3.xml +++ b/camera/MultiCameraApplication/res/xml/root_preferences_3.xml @@ -39,6 +39,12 @@ app:positiveButtonText="@null" app:title="@string/pref_header_Camera_Video_Resolution" /> + + +