diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 429289dafbf63c4c558a6dfef038ec85153aa44f..6b7e91f65c6fe5848eda8fdcf49f58204d4647fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,10 @@
-image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:legacy"
+image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"
 
 stages:
 - build
 
 before_script:
+- apt update && apt-get install libncurses5 -y
 - export GRADLE_USER_HOME=$(pwd)/.gradle
 - chmod +x ./gradlew
 
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 4c67987dd01db57e7cbed94096dbb130df782ea0..739592789291956836722e2c3d9f1b674e27fd81 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,11 +1,10 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="AndroidLintLockedOrientationActivity" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="AndroidLintSourceLockedOrientationActivity" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="AndroidLintUnusedResources" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="CharsetObjectCanBeUsed" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CommentedOutCode" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="ConstantConditions" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
       <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
diff --git a/_docs/baseline_delete_white_48.png b/_docs/baseline_delete_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..318f8e78d1211e7931a498b6d49eb7dda4049166
Binary files /dev/null and b/_docs/baseline_delete_white_48.png differ
diff --git a/_docs/baseline_switch_camera_white_48.png b/_docs/baseline_switch_camera_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..79ec87f58952adf477638b95643e8d87883614f3
Binary files /dev/null and b/_docs/baseline_switch_camera_white_48.png differ
diff --git a/_docs/credits.html b/_docs/credits.html
index 82f8745e83f97f85340c1e1de188fb0c59ea1d34..261f47924b65b05dfdb14634efc29a8892797584 100644
--- a/_docs/credits.html
+++ b/_docs/credits.html
@@ -24,16 +24,15 @@
 <!-- End Cookie Consent plugin -->
 
 <!-- Google Analytics -->
-<!-- anonymizeIp is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- anonymize_ip is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-38364448-5"></script>
 <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
 
-  ga('create', 'UA-38364448-5', 'auto');
-  ga('set', 'anonymizeIp', true);
-  ga('send', 'pageview');
+  gtag('config', 'UA-38364448-5', { 'anonymize_ip': true });
 </script>
 
 </head>
@@ -60,21 +59,21 @@
 <li>Changing icons for pause/resume video by Johan Ejdemark ( johanejdemark AT hotmail DOT com).</li>
 <li>Azerbaijani translation by Eldost ( l-dost AT mail DOT ru ).</li>
 <li>Brazilian tranlation by Kaio Duarte.</li>
-<li>Chinese Simplified translation by Michael Lu ( yeskky AT gmail DOT com ) and tumuyan ( tumuyan AT gmail DOT com ).</li>
+<li>Chinese Simplified translation by Michael Lu ( yeskky AT gmail DOT com ), tumuyan ( tumuyan AT gmail DOT com ) and Tommy He.</li>
 <li>Chinese Traditional translation by You-Cheng Hsieh ( yochenhsieh AT gmail DOT com ) and Hsiu-Ming Chang.</li>
 <li>Belarusian translation by Zmicer Turok.</li>
 <li>Czech translation by Jaroslav Svoboda ( multi DOT flexi AT gmail DOT com , http://jaroslavsvoboda.eu ).</li>
 <li>French translation by Olivier Seiler ( oseiler AT nebuka DOT net ) and Eric Lassauge ( lassauge AT users DOT sf DOT net ).</li>
-<li>German translation by Ronny Steiner, Sebastian Ahlborn, Carsten Schlote, Wilhelm Stein.</li>
+<li>German translation by Ronny Steiner, Sebastian Ahlborn, Carsten Schlote, Wilhelm Stein, Jochen Wiesel.</li>
 <li>Greek translation by Wasilis Mandratzis-Walz.</li>
 <li>Hungarian translation by Báthory Péter.</li>
-<li>Italian tranlation by Valerio Bozzolan, Stefano Gualmo ( s DOT gualmo AT gmail DOT com ).</li>
+<li>Italian tranlation by Valerio Bozzolan, Stefano Gualmo ( s DOT gualmo AT gmail DOT com ), Renato Giliberti.</li>
 <li>Japanese translation by Mitsuse and Yanagimoto Yoshiaki.</li>
 <li>Korean translation by Halcyonest.</li>
 <li>Norwegian Bokmål translation by Imre Kristoffer Eilertsen ( imreeil42 AT gmail DOT com ).</li>
-<li>Polish translation by Jacek Buczyński.</li>
+<li>Polish translation by Jacek Buczyński and Grzegorz Koryga.</li>
 <!-- Portugese translation by johnny, says no need to credit -->
-<li>Russian translation by maksnogin ( maksnogin AT gmail DOT com ), Grigorii Chirkov, Dmitry Vahnin aka JSBmanD, Aleksey Khlybov<!--and Vitamin - Vitamin said no need to credit -->.</li>
+<li>Russian translation by maksnogin ( maksnogin AT gmail DOT com ), Grigorii Chirkov, Dmitry Vahnin aka JSBmanD, Aleksey Khlybov, Ilya Pogrebenko<!--and Vitamin - Vitamin said no need to credit -->.</li>
 <li>Slovenian translation by Peter Klofutar.</li>
 <li>Spanish translation by Mario Sanoguera ( sanogueralorenzo AT gmail DOT com , https://play.google.com/store/apps/developer?id=Mario+Sanoguera ; Sebastian05067, https://forum.xda-developers.com/member.php?u=6302705 ) and Gonzalo Prieto Vega.</li>
 <li>Turkish translation by Serdar Erkoc ( serdarerkoc2004 AT yahoo DOT com ).</li>
diff --git a/_docs/devices.html b/_docs/devices.html
index 1e8f6e38aff38a4ec19a169c912c55fed105decf..bc99d5cfd737471b0843c0f06b776ce74db924a7 100644
--- a/_docs/devices.html
+++ b/_docs/devices.html
@@ -24,16 +24,15 @@
 <!-- End Cookie Consent plugin -->
 
 <!-- Google Analytics -->
-<!-- anonymizeIp is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- anonymize_ip is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-38364448-5"></script>
 <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-38364448-5', 'auto');
-  ga('set', 'anonymizeIp', true);
-  ga('send', 'pageview');
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-38364448-5', { 'anonymize_ip': true });
 </script>
 
 </head>
@@ -90,15 +89,15 @@
 
 <h3>Google Nexuses/Pixels</h3>
 
-<p>In general, Google Nexuses have worked well for Open Camera. Firstly because Google provide good support for their own
-        Android camera API, both old and Camera2 (as you'd hope!) - and they use it for their own Google camera. Secondly because
-        I've owned several Nexuses (Galaxy Nexus, Nexus 7, Nexus 6), and so have been able to test Open Camera against them.</p>
+<p>In general, Google Nexuses and Pixels have worked well for Open Camera.</p>
 
-<p>Camera2 on the Nexus 6 works well (there are some minor issues, e.g., manual exposure doesn't work well when recording
+<p>Camera2 API on the Nexus 6 works well (there are some minor issues, e.g., manual exposure doesn't work well when recording
         video). It's hard to be sure about other Nexuses though.</p>
 
-<p>In theory all this should apply to the Pixels, but I haven't been able to test - though from what people tell me, things
-seem to work including Camera2 features. Open Camera also supports Google's HDR+ mode on the Pixels with Pixel Visual Core.</p>
+<p>Similarly Camera2 API works well on the Pixel 6 Pro, although some minor issues (manual white balance doesn't work, some
+        of the Video picture profiles don't work). Open Camera also supports Google's HDR+ mode on the Pixels with Pixel Visual Core
+        (including the Pixel 6 Pro). As of Open Camera 1.50, Night Sight on the Pixel 6 Pro is available via the photo mode X-Night.
+        As of Open Camera 1.50, all of the Pixel 6 Pro's cameras are available to use by zooming in or out.</p>
 
 <p>Color effects don't work on the Nexus 7.</p>
 
@@ -168,16 +167,21 @@ manual controls, RAW and 120fps video.</p>
         API. Known issues are:</p>
 <ul>
         <li>Slow motion and high speed frame rate video doesn't work (see below for more details).</li>
-        <li>The maximum manual shutter speed allowed for third party camera applications is 0.1s (most devices
-                seem to allow at least 0.5s).</li>
         <li>The "Image quality" setting has no effect for JPEGs (unless post-processing options such as auto-level or
         photo stamp are applied). This has also been reported for other Samsung devices; I also have the same
         issue with other third party camera applications on my S10e. See
         <a href="https://sourceforge.net/p/opencamera/discussion/general/thread/1abb56eb/">this thread</a>
         for details.</li>
+        <li>HDR and Expo bracketing does not work properly on Android 11+ (the image that is meant to be a darker
+        exposure does not come out dark). This can be resolved in Open Camera by enabling the option
+        Settings/Photo settings/"Enable dummy capture HDR/expo fix" (and making sure
+        "Enable fast HDR/expo burst" is also enabled).</li>
 </ul>
-<p>Both rear physical cameras are available to Open Camera; also the two modes for the front camera ("cropped" and
-        "wide") are available to Open Camera.<p>
+<p>Both rear physical cameras (standard and ultra wide) are available to Open Camera (as separate cameras); also the two modes for the front camera
+        ("cropped" and "wide") are available to Open Camera.<p>
+
+<p>At least some Samsung Galaxy devices support the camera extension modes (X-Auto, X-Night, X-Bokeh, X-Bty) (including the Galaxy S10e;
+in general this is likely available for the flagship S devices running Android 12+).</p>
 
 <p>More generally I have occasionally tested on various Samsung devices using their remote test labs - although useful, this is limited
         compared to owning a real device (especially when the test labs are dark!)</p>
@@ -205,7 +209,7 @@ manual controls, RAW and 120fps video.</p>
         <a href="https://filmicpro.helpscoutdocs.com/article/42-samsung-note-9-filmic-pro-v6-compatibility-guide">Note 9</a> (these articles
         are for Filmic Pro, but the issues faced likely affect all third party camera applications, including Open Camera).</p>
 
-<p>On a positive note, the Galaxy Note 4 and 5 were used with Open Camera to film
+<p>On a related note, the Galaxy Note 4 and 5 were used with Open Camera to film
         <a href="https://sourceforge.net/p/opencamera/blog/2015/10/cai-lan-gong---worlds-first-feature-film-shot-with-a-smartphone-at-4k-resolution/">the
                 world's first 4K feature film shot on a phone</a>.</p>
 
diff --git a/_docs/focus_mode_auto.png b/_docs/focus_mode_auto.png
index 56b64ba353ee10c7756b2f35c367e0839ccd652e..7e48c33a32bccdcd0e3eefd092a610803a017922 100644
Binary files a/_docs/focus_mode_auto.png and b/_docs/focus_mode_auto.png differ
diff --git a/_docs/focus_mode_continuous_picture.png b/_docs/focus_mode_continuous_picture.png
index 1c8f98e5a6250313e83a6e3a74aaedcb44093cea..51d42c162e90551f8a98d8d915d950a3fc22e8d4 100644
Binary files a/_docs/focus_mode_continuous_picture.png and b/_docs/focus_mode_continuous_picture.png differ
diff --git a/_docs/focus_mode_edof.png b/_docs/focus_mode_edof.png
index e54169327373a7777fa9b1565c0e2eddb1271594..4e01fb608f27c7904e65c480ec9c7f7c4715d841 100644
Binary files a/_docs/focus_mode_edof.png and b/_docs/focus_mode_edof.png differ
diff --git a/_docs/focus_mode_fixed.png b/_docs/focus_mode_fixed.png
index 7ae033fe616d83bd6148d17c3afbe63eeedc2f7d..420daef09df19498698759d0561c1834f4e407c9 100644
Binary files a/_docs/focus_mode_fixed.png and b/_docs/focus_mode_fixed.png differ
diff --git a/_docs/focus_mode_infinity.png b/_docs/focus_mode_infinity.png
index 745587bd2659f2ffdc870fb42bb3301504a9240f..649110367e5b3c8d27ad805aa513314d3c657033 100644
Binary files a/_docs/focus_mode_infinity.png and b/_docs/focus_mode_infinity.png differ
diff --git a/_docs/focus_mode_manual.png b/_docs/focus_mode_manual.png
index 09171291ab76e80f3c019bc675aeae0b308be68b..c4341672b3ad641f5c9d11526af2583016a44a64 100644
Binary files a/_docs/focus_mode_manual.png and b/_docs/focus_mode_manual.png differ
diff --git a/_docs/help.html b/_docs/help.html
index 0ebedc42bfd0a85fede2cb6f334e482532fc31a2..534d9d3370173764e9ba748b8d260a0049932cb5 100644
--- a/_docs/help.html
+++ b/_docs/help.html
@@ -31,16 +31,15 @@
 <!-- End Cookie Consent plugin -->
 
 <!-- Google Analytics -->
-<!-- anonymizeIp is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- anonymize_ip is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-38364448-5"></script>
 <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-38364448-5', 'auto');
-  ga('set', 'anonymizeIp', true);
-  ga('send', 'pageview');
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-38364448-5', { 'anonymize_ip': true });
 </script>
 
 <!-- Google adsense auto ads -->
@@ -124,7 +123,7 @@ a photo. In some cases, you can also hold (long press) for a continuous burst:</
     smaller video icon will switch to video mode. The photo and video icons will then swap: click the larger video icon to
     start/stop video recording, and click the smaller photo icon to switch back to photo mode.</p>
 
-<p><img src="switch_camera.png" alt="Switch Camera icon" width="32" height="32"><b>Switch camera</b> - Switches between front and back camera (if your
+<p><img src="baseline_switch_camera_white_48.png" alt="Switch Camera icon" width="32" height="32"><b>Switch camera</b> - Switches between front and back camera (if your
 device has both front and back cameras). If your device has more than one front and/or back camera, then this will switch
 between the first front and back camera.</p>
 
@@ -134,7 +133,9 @@ between the first front and back camera.</p>
     the standard and ultra-wide camera.
     If Settings/On screen GUI/"Multiple cameras icon" is disabled, then this icon will not show; instead the "Switch camera"
     icon can by used to cycle through all the cameras.
-    Note that some devices do not allow third party applications to access their multiple cameras, in which case Open Camera isn't
+    Note that some devices do not expose the multiple cameras explicitly, but instead will automatically switch cameras as required
+    when zooming in or out (requires Camera2 API).
+    Note that some other devices do not allow third party applications to access their multiple cameras at all, in which case Open Camera isn't
     able to use them.</p>
 
 <p><img src="exposure_unlocked.png" alt="Lock Exposure icon" width="32" height="32"><b>Exposure lock</b> - Click to lock or unlock the exposure.
@@ -195,7 +196,8 @@ will be available which instead work by making the screen light up (note, front
     </li>
     <li><img src="focus_mode_manual.png" alt="Manual focus icon" width="32" height="32"><b>Manual</b> -
         A slider appears allowing you to manually control the focus distance (only available if Camera2
-        API is used).
+        API is used). Also see the options "Focus assist" and "Focus peaking" under Settings/Camera preview/
+        which may be useful when using manual focus.
     </li>
     <li><img src="focus_mode_fixed.png" alt="Fixed focus icon" width="32" height="32"><b>Fixed</b> -
         The focus remains fixed.
@@ -226,7 +228,20 @@ will be available which instead work by making the screen light up (note, front
     taken, at infinite focus distance. Focus bracketing is typically used with
     <a href="https://en.wikipedia.org/wiki/Focus_stacking">Focus stacking</a> software to merge the images into a single
     photo. Note that whilst taking a set of focus bracketed photos, you can cancel the set by pressing the "take photo"
-    button again.</li>
+    button again. Also see the options "Focus assist" and "Focus peaking" under Settings/Camera preview/
+    which may be useful when adjusting the focus distances.</li>
+    <li><b>X- modes</b> - These extension modes enable device specific algorithms or effects that manufacturers have exposed to
+    third party applications (via Android's camera extensions API) (requires Android 12; only available on some devices,
+        and if Camera2 API is used).
+        <ul>
+            <li><b>X-Auto:</b> Allows the device to choose which algorithm to use based on the current scene. Note this differs to
+            "STD" mode in that it allows the use of the other camera extensions e.g. Night mode for low light scenes.</li>
+            <li><b>X-Night:</b> Improves image quality under low light conditions.</li>
+            <li><b>X-Bokeh:</b> Blurs the background of photos. This is typically intended when taking portraits of people.</li>
+            <li><b>X-Bty:</b> Face retouch or "beauty", applies cosmetic effects to people's faces.</li>
+        </ul>
+        Note many features are unavailable when using an extension mode, including flash, zoom and manual controls.
+    </li>
 </ul></li>
 <li><b>Auto-level</b> - Enable the auto-level feature for photos (see
 <a href="#auto_stabilise">below</a>). (Only available if the device has enough memory.)</li>
@@ -265,7 +280,7 @@ has a hardware menu button, pressing that should also open the settings.)</p>
 photo/video (by default saved in the OpenCamera folder). If you get the message "No Gallery app available", then you should install
 a Gallery app.
 You can also "long press" on the Gallery icon - this will let you switch between the recent save locations, or take you straight to a
-file dialog to choose a save location if additional locations have yet been defined. See
+dialog to choose a save location if additional locations have yet been defined. See
 <a href="#save_location">Save location</a> under Settings/More camera controls for more details.</p>
 
 <p><b><img src="ic_pause_circle_outline_white_48dp.png" alt="Pause video icon" width="32" height="32">Pause video</b> - When recording
@@ -296,8 +311,8 @@ cached location). If the location isn't available, a dash will be shown through
 photos look right whether you hold the device in "portrait" or "landscape" mode. But Open Camera has the option to rotate the
 photos so they are perfectly level, so your shots come out looking perfectly level every time!</p>
 
-<p><a href="auto_level_v_1_48_web.jpg">
-<img src="auto_level_v_1_48_web.jpg" style="max-width:100%" alt="Screenshots demonstrating auto-level" title="Screenshots demonstrating auto-level">
+<p><a href="auto_level_v_1_49_web.jpg">
+<img src="auto_level_v_1_49_web.jpg" style="max-width:100%" alt="Screenshots demonstrating auto-level" title="Screenshots demonstrating auto-level">
 </a></p>
 
 <p>The above shows a rather exaggerated example - in practice, you can probably take better photos, but this feature ensures they
@@ -338,6 +353,7 @@ algorithm is in reducing noise and enhancing detail.</li>
 <li>If you have a Google Pixel with Pixel Visual Core, you should get Google's HDR+ photos when using Open Camera's Standard photo mode, so there
 is generally little benefit to using Open Camera's NR mode on these devices. See "Does Open Camera support HDR+" in the
 <a href="#faq">FAQ</a> for more details.</li>
+<li>If the photo mode "X-Night" is available, this may get better results for low light scenes.</li>
 </ul>
 
 <p>In Noise Reduction photo mode, an additional "NR mode" option will appear on the popup mode. This defaults to Normal, but
@@ -345,8 +361,6 @@ you can change to "Low Light" mode, which further improves results in dark scene
 mode, it will take a burst of images for a duration of around 5 seconds. For best results, use a tripod, or try to hold the
 camera as steady as possible.</p>
 
-<p>See my <a href="https://sourceforge.net/p/opencamera/blog/2018/09/noise-reduction-photo-mode/">blog post</a> for more details.</p>
-
 <p><a name="dro"><b>DRO</b></a></p>
 
 <p>Dynamic Range Optimisation (DRO) is a technique that optimises the dynamic range available in the image. In particular, dark
@@ -360,13 +374,13 @@ see <a href="#dro_vs_hdr">DRO vs HDR</a>.</p>
 
 <p>High Dynamic Range Imaging (HDR) is a technique where the camera takes multiple shots at different exposures, and combines them
 into a single image. A typical problem in photography is that a scene may contain a brightness range that is wider than what can be
-captured in a single shot. Varying the exposure (whether by touching on the screen, or exposure compentation or manual exposure) might
-make darker regions brighter, but leave other areas over-exposured. Or reducing the exposure to prevent over-exposure may result in
+captured in a single shot. Varying the exposure (whether by touching on the screen, or exposure compensation or manual exposure) might
+make darker regions brighter, but leave other areas over-exposed. Or reducing the exposure to prevent over-exposure may result in
 the rest of the scene being too dark. HDR uses an algorithm to combine the best parts of each image, and adjusts the colors so that
 the full range of brightness values are captured in the scene:</p>
 
-<p><a href="hdr_20160901_194227.jpg">
-<img src="hdr_20160901_194227_thumb.jpg" style="max-width:100%" alt="Images demonstrating HDR" title="Images demonstrating HDR">
+<p><a href="testHDR11_cropped_result_web.jpg">
+<img src="testHDR11_cropped_result_thumb.jpg" style="max-width:100%" alt="Images demonstrating HDR" title="Images demonstrating HDR">
 </a></p>
 
 <p>The left set of three images show the individual exposures, the right the final HDR image.</p>
@@ -403,13 +417,6 @@ three separate images, rather than reprocessing a single image.</li>
 than Standard photo mode). Though NR still has the advantage that it is less prone to ghosting and misalignment. NR is also better
 suited to working in a wide range of scenes.</p>
 
-<p>The set of images below shows: Standard photo on the left, Noise Reduction in the middle, HDR on the right. There is less overexposure
-in the sky in the Noise Reduction result, but the HDR mode does even better.</p>
-
-<p><a href="avg_image_test45.jpg">
-<img src="avg_image_test45_thumb.jpg" style="max-width:100%" alt="Screenshots demonstrating Noise Reduction vs HDR" title="Screenshots demonstrating Noise Reduction vs HDR">
-</a></p>
-
 <p>In summary: NR is better if you just want a "works best in most cases" option. HDR may be a better choice specifically in
 scenes with high dynamic range, that also don't have movement in the scene.</p>
 
@@ -494,7 +501,7 @@ affects taking photos.</p>
 
 <p><b>Pause after taking photo</b> - If ticked, after taking a photo the display will pause, with options to share
 <img src="share.png" alt="Share icon" width="32" height="32"> or delete
-<img src="trash.png" alt="Trash icon" width="32" height="32"> the
+<img src="baseline_delete_white_48.png" alt="Trash icon" width="32" height="32"> the
 photo. To keep the photo and continue, touch the screen, press back, or take another photo. Note that this isn't supported
 when holding the shutter button to take a continuous burst of photos.</p>
 
@@ -522,17 +529,18 @@ key to focus, then both to take a photo.</li>
 <p><b>Audio control options</b> - If enabled, this allows taking a photo (or starting video recording, depending on the mode)
 by making a noise. An on-screen microphone button <img src="ic_mic_white_48dp.png" alt="Microphone icon" width="32" height="32"> will appear, to
 start/stop listening. The "loud noise" option will listen for any noise (so you can remotely take a photo by saying "cheese",
-whistling, or whatever you prefer). Note that leaving the listening turned on may use additional battery. The "voice command" option
-listens specifically for saying "cheese" - so this has the advantage that it's less likely to be triggered unintentionally.
+whistling, or whatever you prefer). Note that leaving the listening turned on may use additional battery. <!--The "voice command" option
+listens specifically for saying "cheese" - so this has the advantage that it's less likely to be triggered unintentionally.-->
 Note that this can't be used to stop video recording - if you want to have some remote control on video recording,
 see the "Max duration of video" option.</p>
 
 <p><b>Audio control sensitivity</b> - This controls how sensitive Open Camera is to noises, if "Audio control" is set to "Loud noise".
 If you find it's taking photos too often unintentionally, or isn't responding to your sounds, try adjusting this option.</p>
 
-<p><b>Bluetooth LE remote control</b> - Open Camera supports connecting to the Kraken Smart Housing via the options in
-these settings. Once connected via Bluetooth, it should be possible to control Open Camera from the device. The on-screen
-display of Open Camera will also display information from the Kraken (temperature and depth).</p>
+<p><b>Bluetooth LE remote control</b> - Open Camera supports connecting to some specific "smart housing" cases via the
+    options in these settings. See "Remote device type" for supported types. At the time of writing, only one make/model
+    is supported. Once connected via Bluetooth, it should be possible to control Open Camera from the device.
+    The on-screen display of Open Camera will also display information from the housing (temperature and depth).</p>
 
 <p><b>Lock photo/video orientation</b> - Normally the orientation of the photo/video will be rotated by some multiple of
 90 degree such that the orientation looks right - e.g. if your device is held in portrait, the resultant image/video will
@@ -540,19 +548,28 @@ be in portrait. This option allows fixing the camera to either be in portrait or
 <a href="#auto_stabilise">auto-level</a> is also enabled, it will have the effect of aligning photos to the nearest
 90 degrees.</p>
 
-<p><a name="save_location"><b>Save location</b></a> - Select the folder to store the photos in. Click on a folder
-(or "Parent Folder") to navigate through the filesystem. Select "New Folder" to create a new folder in the currently
-displayed folder. Select "Use Folder" to choose the currently displayed folder. Note that on Android, there are some
-folders that cannot be written to - Open Camera will display a message if you try to use one of these folders. Once
-you have specified a new save location, you can long press on the Gallery icon to quickly switch between recent save
-locations. Note that if "Use Storage Access Framework" is selected, this option will instead show up the Android standard
-file chooser - navigate to the desired folder, and click "SELECT". If you want to save to an SD card, see "How can I
-save to my external SD card?" under the <a href="#faq">FAQ</a>.</p>
+<p><a name="save_location"><b>Save location</b></a> - Select the folder to store the resultant photos or videos in.</p>
+<ul>
+    <li><b>On Android 9 or earlier:</b> This opens a file dialog. Click on a folder (or "Parent Folder") to navigate through
+        the filesystem. Select "New Folder" to create a new folder in the currently displayed folder. Select "Use Folder"
+        to choose the currently displayed folder. Note that on Android, there are some folders that cannot be written
+        to - Open Camera will display a message if you try to use one of these folders.</li>
+    <li><b>On Android 10 or later:</b> This opens a dialog to type the name of the folder. This
+        will be a subfolder of DCIM on your internal storage. You can specify subfolders with the "/"
+        character. For example, specifying Camera/holiday will save inside DCIM/Camera/holiday/
+        on your internal storage.</li>
+    <li><b>If "Storage Access Framework" is enabled</b>: Then on any Android version, this option
+        will show up the Android standard file chooser - navigate to the desired folder, and click "SELECT" or
+        "ALLOW ACCESS" (wording varies depending on Android version).</li>
+</ul>
+<p>Once you have specified a new save location, you can long press on the Gallery icon to quickly switch between recent save
+    locations. If you want to save to an SD card, see "How can I save to my external SD card?" under the <a href="#faq">FAQ</a>.</p>
 
-<p><b>Use Storage Access Framework</b> - If selected, Open Camera will instead use the Android
+<p><b>Storage Access Framework</b> - If selected, Open Camera will instead use the Android
 <a href="https://developer.android.com/guide/topics/providers/document-provider.html">Storage Access Framework</a>. This
-has some advantages, such as using the standard Android file picker, and being the only way to save to SD cards on Android 5
-- though it may be slightly slower to take photos. (Requires Android 5.0 or higher.)</p>
+has some advantages, such as using the standard Android file picker, and being the only way to save to SD cards on Android 5+.
+In some cases it may allow you to save to cloud or local storage providers provided by other apps or services.
+Furthermore on Android 10+, it is the only way to save outside of the DCIM/ folder. (Requires Android 5.0 or higher.)</p>
 
 <!--Enter the folder to store the photos in. This can be either a relative path (e.g.,
 OpenCamera or even something like MyPics/Camera) in which case the folder will be located inside the "DCIM"
@@ -573,10 +590,10 @@ can also select UTC <a href="https://en.wikipedia.org/wiki/Coordinated_Universal
 For the latter option, a "Z" will be appended to the filename (e.g., "IMG_20160524_155116Z.jpg"). The Z (Zulu) suffix
 is a standard convention for identifying UTC timestamps.</p>
 
-<p><b>Show camera when locked</b> - If you have a lock screen on your device (e.g., PIN to unlock), Open Camera by
-default will show above the lock screen - i.e., if locked, you won't have to enter the PIN to use Open Camera. The
-device still needs to be unlocked in order to go to the Settings or Gallery. If you would prefer Open Camera to always
-be unavailable when your device is locked, you can disable this option.</p>
+<p><b>Show camera when locked</b> - If you have a lock screen on your device (e.g., PIN to unlock), if this option
+    is enabled Open Camera will show above the lock screen - i.e., if locked, you won't have to enter the PIN to
+    use Open Camera. The device still needs to be unlocked in order to go to the Settings or Gallery. If you would
+    prefer Open Camera to always be unavailable when your device is locked, this option should be disabled.</p>
 
 <p><b>Perform auto-focus on startup</b> - Whether Open Camera should auto-focus when starting the camera. Some devices
 have a bug where the flash turns on when this happens, so a workaround is to disable this option.</p>
@@ -652,9 +669,7 @@ image should be drawn with.</p>
 <p><b>Show free memory</b> - Whether to display the remaining storage space of the device.</p>
 
 <p><b>Show ISO</b> - If selected, the current ISO, exposure time and frame rate (FPS) will be displayed (only available if Camera2
-    API is used). The text will be shown in red when the auto-exposure routine is scanning. In flash auto mode, a flash symbol will
-    also indicate when flash will fire. Note that this is not an absolute guarantee - when you take a photo, the camera will make an
-    updated decision on whether to fire the flash, which in some cases may disagree with whether the flash symbol was displayed.</p>
+    API is used). The text will be shown in red when the auto-exposure routine is scanning.</p>
 
 <p><b>Show a histogram</b> - Allows displaying an on-screen histogram (only available if Camera2 API is used). Note that the
     histogram reflects the currently display on-screen preview, and will not necessarily be accurate for the final resultant photograph,
@@ -775,7 +790,8 @@ rather take photos by other methods (e.g., if your device has a hardware shutter
 <p><b>Show What's New dialog</b> - When updating to a major new version, Open Camera displays a dialog explaining the new
 features and other options. You can disable this dialog from being displayed if you prefer.</p>
 
-<p><b>Multiple cameras icon</b> - This option only shows on devices with more than one front and/or back cameras. When
+<p><b>Multiple cameras icon</b> - This option only shows on devices that allow explicitly switching between more than
+one front and/or back cameras. When
 enabled (the default), such devices will have two on-screen icons: one to switch between front/back cameras, and another
 to switch between the multiple front or back cameras. If this option is disabled, only a single icon will show, which
 will cycle between all cameras.</p>
@@ -891,18 +907,19 @@ Disabling this option will show the full extent of the panorama, but will leave
 <p><b>Panorama original images</b> - Whether to save the original shots in <a href="#pano">Panorama</a> mode. This can be useful
 if you want to use a third party application to stitch the images together to create a panorama. Note that these original
 images are always saved in PNG format. This option can also be useful for debugging purposes, to send me example images when
-reporting problems with panorama - for this, it's best to select to include the debug XML file (note that you'll typically need
-a third party File Explorer application to see and delete XML files on Android).</p>
+reporting problems with panorama - for this, it's best to select to include the debug XML file. Note the XML files will be
+saved inside <small>Android/data/net.sourceforge.opencamera/files/</small>, and you'll typically need
+a third party File Explorer application to see and delete XML files.</p>
 
 <p><b>Front camera mirror</b> - Normally for front cameras, the preview will behave like a mirror, but resultant
 photos will still be as the camera (or other people) view the scene. This option can be used to mirror the
 resultant photo, so the resultant photo matches the mirrored image you see on the screen.</p>
 
 <p><b>Artist</b> - If text is entered in this setting, then the text will be stored in the image's Exif metadata as the
-    "Artist" tag. Only supported for JPEG format. Not supported for RAW photos (DNG format). (Requires Android 7.)</p>
+    "Artist" tag. Only supported for JPEG format. Not supported for RAW photos (DNG format).</p>
 
 <p><b>Copyright</b> - If text is entered in this setting, then the text will be stored in the image's Exif metadata as the
-    "Copyright" tag. Only supported for JPEG format. Not supported for RAW photos (DNG format). (Requires Android 7.)</p>
+    "Copyright" tag. Only supported for JPEG format. Not supported for RAW photos (DNG format).</p>
 
 <p><a name="stamp_photos"><b>Stamp photos</b></a> - Option to add a date and timestamp to the resultant photos. If "Store
 location data" is enabled (see "Location settings" below), then the current location latitude
@@ -916,10 +933,16 @@ extra control over the date and time formatting. Also used for Video settings/"V
 <p><b>GPS stamp format</b> - If "Stamp photos" is enabled, this allows extra control over the GPS
 formatting. Also used for Video settings/"Video subtitles".</p>
 
-<p><b>Use addresses</b> - If "Stamp photos" and "Store location data" is enabled, this allows the location
+<!--<p><b>Use addresses</b> - If "Stamp photos" and "Store location data" is enabled, this allows the location
     to be displayed on the resultant photo in the form of an address, either as well as or instead of GPS
-    coordinates. Note that an Internet connection is required for this to succeed. Also used for
-    Video settings/"Video subtitles".</p>
+    coordinates. Similarly also used for Video settings/"Video subtitles".
+    An Internet connection is required for this to succeed.
+    Note that if enabled, this requires that your device transmits location data across the Internet to a third party
+    in order to convert GPS coordinates to an address (this uses the
+    <a href="https://developer.android.com/reference/android/location/Geocoder">Geocoder API</a>).
+    This feature provides no guarantees on availability or accuracy. Results are a best guess, and not
+    guaranteed to be meaningful or correct.
+</p>-->
 
 <p><b>Distance unit</b> - If "Stamp photos" is enabled, this controls whether to use metres (m) or
 feet (ft) when recording the GPS altitude. Also used for Video settings/"Video subtitles".</p>
@@ -942,6 +965,11 @@ Camera2 API. A common issue is poor flash behaviour (either flash doesn't fire,
 If so, enabling this option may help - this uses an alternative algorithm for flash (using the torch to simulate flash
 as a workaround). Note that this is enabled by default for Samsung devices.</p>
 
+<p><b>Enable dummy capture HDR/expo fix</b> - (Camera2 API only.) Enable this option if your device has problems taking photos
+in HDR or Exposure Bracketing photo modes, specifically if some expo images come out with the same exposures. This option
+takes an additional "dummy" image which may resolve such problems. Note that "Enable fast HDR/expo burst" (below) must
+be enabled for this option to have an effect.</p>
+
 <p><b>Enable fast HDR/expo burst</b> - (Camera2 API only.) Disable this option if your device has problems taking photos
 in HDR or Exposure Bracketing photo modes (disabling this option will result in a longer delay between the photos being
 taken, but may give more stable behaviour if your device is having problems with this).</p>
@@ -963,7 +991,7 @@ your device supports optical image stabilization (OIS).</p>
 
 <p><b>Video format</b> - Allows choice of various video file formats and codecs. Please test before using, as some may
 not work properly on all devices! Also note:</p><ul>
-    <li>WebM does not support recording video (at the time of writing, it seems encoding in Vorbis audio format is
+    <li>WebM does not support recording audio (at the time of writing, it seems encoding in Vorbis audio format is
     <a href="https://developer.android.com/guide/topics/media/media-formats#audio-formats">not supported</a> on
     Android).</li>
     <li>WebM does not support storing location data ("Store location data" option).</li>
@@ -1026,11 +1054,17 @@ behaviour of these buttons).</p>
 
 <p><b>Video subtitles</b> - This option is analogous to the "Stamp photos" option, but rather than embedding text into
 the video itself, it stores the text in a separate subtitles
-(<a href="https://matroska.org/technical/specs/subtitles/srt.html">".SRT"</a>) file. Most decent video players should support
+(<a href="https://www.matroska.org/technical/subtitles.html#srt-subtitles">".SRT"</a>) file. Most decent video players should support
 SRT files, and use them to display the information as subtitles. The subtitles will record the date and time. If "Store location data" is enabled (see
 "Location settings" below), then the current location latitude and longitude coordinates will also be recorded (if the location is
 known). Similarly for "Store compass direction". Note that you can control the formatting style for date, time and location using
-the options under the "Photo settings" menu (Datestamp format, Timestamp format, GPS stamp format, Distance unit).</p>
+    the options under the "Photo settings" menu (Datestamp format, Timestamp format, GPS stamp format, Distance unit).</p>
+<ul>
+    <li>Note that on Android 10, using this option means the ".SRT" files will show in most gallery apps as separate unplayable video
+        files. A workaround is to enable Settings/More camera controls/"Storage Access Framework".</li>
+    <li>On Android 11+, this option is only available if Settings/More camera controls/"Storage Access Framework" is
+        enabled. This is due to changes in Android 11 which affect how applications are able to save files.</li>
+</ul>
 
 <p><b>Video bitrate (approx)</b> - If set to a value other than "default", the default video bitrate is overridden. Higher values mean better
     quality video, but the files take up more disk space. Note that some values may be unsupported by your device, and may
@@ -1083,7 +1117,7 @@ location. Location data will also be stored in videos (though only for devices t
 <p><b>Store compass direction</b> - If selected, then photos will be tagged with the compass direction.
 Only supported for JPEG format. Not supported for RAW photos (DNG format) or videos.</p>
 
-<p><b>Store compass direction</b> - If selected, then photos will be tagged with the device's yaw, pitch and roll.
+<p><b>Store yaw, pitch and roll</b> - If selected, then photos will be tagged with the device's yaw, pitch and roll.
     Note that Exif data does not have direct support for this, instead it will be written as a string in the Exif data's
     User Comment for the image. Only supported for JPEG format. Not supported for RAW photos (DNG format) or videos.</p>
 
@@ -1115,9 +1149,6 @@ specified by using this option.</p>
 
 <p><b>Online help</b> - Load this web page.</p>
 
-<p><b>Donate to support development</b> - Loads the page for
-<a href="https://play.google.com/store/apps/details?id=harman.mark.donation">my donation app</a>.</p>
-
 <p><b>Camera API</b> - If set to "Camera2 API", this enables support for the Camera2 API that was introduced
 in Android 5. Changing this setting will cause Open Camera to restart. Camera2 API enables more advanced features
 (including manual ISO/exposure, manual focus, HDR, exposure bracketing).
@@ -1151,7 +1182,8 @@ this information to the clipboard.</p>
     is the risk that settings on some devices may be incompatible with other devices. Also if the
     saved settings file specified a save location, this may not be valid on the new device (or if
     using "Storage Access Framework", you may have to reselect the folder in Open Camera, to grant
-    write permission for the folder).</p>
+    write permission for the folder). Note that on Android 10+, the file dialog will only let you
+    select a file inside <small>Android/data/net.sourceforge.opencamera/files/</small>.</p>
 
 <p><b>Reset settings</b> - Resets all Open Camera settings to their default. Selecting this option will cause
 Open Camera to restart. Note that this will not delete any saved settings (see above options).</p>
@@ -1211,21 +1243,16 @@ e.g., "extSdCard".</li>
 <li><b>Android 4.4</b> - Unfortunately it is not possible for 3rd party apps to write to external SD cards.
 <b>This is not a bug or missing feature in Open Camera</b>, rather that
 <a href="http://www.androidpolice.com/2014/02/17/external-blues-google-has-brought-big-changes-to-sd-cards-in-kitkat-and-even-samsung-may-be-implementing-them/">Google
-have blocked write access to external SD cards in Android 4.4</a>. There is one exception: if you use a
-folder in <small>Android/data/net.sourceforge.opencamera/</small> on your SD card (use the "New folder" option to create
-the folders/sub-folders if necessary), that should allow saving to the SD card. <b>Note that all files in this
-folder will be deleted if you uninstall Open Camera</b>, so be careful that you don't lose your photo/videos
-if you use this method, and then uninstall!</li>
+have blocked write access to external SD cards in Android 4.4</a>.</li>
 <li><b>Android 5.0 onwards</b> - The restrictions on SD cards introduced in Android 4.4 still apply, however
-instead you can enable Settings/More camera controls/"Use Storage Access Framework", and this should allow you
+instead you can enable Settings/More camera controls/"Storage Access Framework", and this should allow you
 to save to external SD cards. If when choosing a folder, you only see "Recent", you may need to click on the
-three dots at the top right to open the menu, to enable showing the drives (e.g., "Show internal storage".</li>
+three dots at the top right to open the menu, to enable showing the drives (e.g., "Show internal storage").</li>
 <li><b>Android 6.0 onwards</b> - From Android 6, some devices support "Adoptable Storage" allowing you to
 select to use
 an SD card as internal storage. Note that not all devices support this, even if running Android 6 or later. If your device
 doesn't support this, or you want to instead use an SD card as "portable storage", you'll have to use
-the Storage Access Framework method as with Android 5 (or the <small>Android/data/net.sourceforge.opencamera/</small> method as
-with Android 4.4).</li>
+the Storage Access Framework method as with Android 5.</li>
 </ul>
 
 <p><b>Can you implement disabling shutter sound for my phone?</b> -
@@ -1244,7 +1271,7 @@ with Android 4.4).</li>
 <p><b>Photos or videos fail to save!</b> - Firstly, if you're trying to save to an
 external SD card, see "How can I save to my external SD card?" above. Otherwise:</p>
 <ul>
-    <li>If Settings/More camera controls/"Use Storage Access Framework" is enabled,
+    <li>If Settings/More camera controls/"Storage Access Framework" is enabled,
     in some cases the permission may be lost, try rechoosing the save location (from
     Settings/More camera controls/"Save location").</li>
     <li>If not using Storage Access Framework, but you have changed the save location,
@@ -1256,7 +1283,7 @@ external SD card, see "How can I save to my external SD card?" above. Otherwise:
 <p><b>I switched to a new phone, and now something doesn't work!</b> - Google's auto-backup will
 typically transfer settings to a new phone, but this may mean a camera-specific setting is no
 longer relevant. In particular, if you set a non-default save location, it may be that the path is
-not valid on the new device, or if using Settings/More camera controls/"Use Storage Access Framework",
+not valid on the new device, or if using Settings/More camera controls/"Storage Access Framework",
 you may need to rechoose the save location (from Settings/More camera controls/"Save location") to
 grant permission to the new device. You can use Settings/Settings manager/"Reset settings" to reset
 Open Camera to its original state, to rule out any issues from an Android backup from another
@@ -1271,9 +1298,9 @@ and untick Auto-level.</p>
 that are made available to third party applications. Usually this means front and back cameras, but some devices have
 multiple front and/or back-facing cameras. Use the
 <img src="baseline_add_a_photo_white_48.png" alt="Switch multi-camera icon" width="16" height="16">switch multi-camera icon
-to switch between multiple front or back cameras. In some cases the extra cameras aren't made available to third party
-applications, so it isn't possible for Open Camera to support them. Even where they are, since there is no current standard
-on what the extra cameras are used for, it can't do anything with them other than allowing you to switch between them.</p>
+to switch between multiple front or back cameras. Note that some devices do not expose the multiple cameras explicitly,
+but instead will automatically switch cameras as required when zooming in or out. In some cases the extra cameras aren't
+made available to third party applications, so it isn't possible for Open Camera to support them.</p>
 
 <p><b>Why doesn't Open Camera support the maximum video resolution on my device?</b> - If you
 are using Camera2 API, make sure that you're not in slow motion mode (see "Speed" under
@@ -1467,6 +1494,8 @@ can paste the information into your web browser, email or whatever.</p>
 <a href="http://sourceforge.net/p/opencamera/discussion/">forums</a>.
 For some enquiries you may prefer to use email.
 Please contact me at <a href="mailto:mark.harman.apps@gmail.com?subject=Open%20Camera">mark.harman.apps@gmail.com</a>.
+    <!-- if I change my email, remember also to update the contact for privacy policy
+        in privacy_oc.html , as well as email address contact for in-app privacy policy -->
 Please note that I get a <i>lot</i> of emails
 for Open Camera these days - I try to reply as many as I can, but this is not always feasible. I do however
 read every email and forum post.</p>
diff --git a/_docs/history.html b/_docs/history.html
index 2ff449e9d6f6903943b03f7855390cc4627bed0f..1e08a256c5c225de62ce3fd41262f4ee6bff6022 100644
--- a/_docs/history.html
+++ b/_docs/history.html
@@ -24,16 +24,15 @@
 <!-- End Cookie Consent plugin -->
 
 <!-- Google Analytics -->
-<!-- anonymizeIp is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- anonymize_ip is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-38364448-5"></script>
 <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-38364448-5', 'auto');
-  ga('set', 'anonymizeIp', true);
-  ga('send', 'pageview');
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-38364448-5', { 'anonymize_ip': true });
 </script>
 
 </head>
@@ -48,6 +47,132 @@
 <p>&lt; <small><a href="index.html">Main Page.</a></small></p>
 
 <pre>
+Version 1.50.1 (2022/06/08)
+
+FIXED   Crash on OPPO devices for old camera API introduced in 1.50.
+
+Version 1.50 (2022/06/04)
+
+FIXED   HDR photos came out black on some Samsung Galaxy devices with Android 12.
+FIXED   Problems with flash on Camera2 API (Samsung Galaxy, OnePlus, Pixel 6 Pro). Galaxy and
+        OnePlus devices therefore no longer default to using the "alternative flash method".
+FIXED   Problems with expo, HDR and long manual exposures on some devices (e.g., Pixel 6 Pro).
+FIXED   Granting only approximate location permission on Android 12 would turn geotagging option
+        back off.
+FIXED   On-screen text looked strange on Android 12.
+FIXED   Gallery icon overlapped with navigation bar if using widescreen resolution with UI in left
+        or right handed mode.
+ADDED   Support for Android 12's camera extensions API. When using Camera2 API, on selected devices
+        advanced photo modes are now available (e.g., Night on Pixel 6 Pro; Night, Bokeh and Beauty
+        on some Galaxy devices).
+ADDED   Improved support for devices with multiple camera devices, where extra cameras are exposed
+        via zooming in and out (e.g., Pixel 5/6).
+ADDED   New debug option Settings/Photo settings/"Enable dummy capture HDR/expo fix". Please enable
+        this if you are having problems with HDR or expo bracketing mode on Samsung Galaxy devices
+        with Android 11+ (specifically if some expo images come out with the same exposures).
+UPDATED Removed "use addresses" and "say cheese" options. Sorry about that, but
+        this is due to new data privacy requirements on Google Play: although
+        these used standard Android APIs, information was not available for these APIs to satisfy
+        data privacy requirements.
+UPDATED Now targetting Android 12. For remote control device options, new bluetooth permissions are
+        used instead of requiring location permission.
+UPDATED Move gallery icon slightly to avoid overlapping with Android 12 camera privacy icon.
+UPDATED Made pinch zoom smoother, to allow finer control.
+
+Version 1.49.2 (2022/01/13)
+
+FIXED   Dialog for "Save settings" shouldn't allow multiple lines.
+FIXED   Crash for NR photo mode on some devices since version 1.49.
+UPDATED Switched to using AppCompat AppCompatActivity.
+UPDATED Photo stamp custom text now uses AppCompat libraries to support latest emoji.
+UPDATED Made appearance of info "toasts" more consistent.
+
+Version 1.49.1 (2021/09/20)
+
+FIXED   Crop guides weren't drawn correctly in portrait orientation in 1.49.
+FIXED   Diagonals grid wasn't drawn correctly in portrait orientation in 1.49.
+
+Version 1.49 (2021/09/07)
+
+FIXED   Crash when failing to save photos/videos with mediastore (Android 10+ if not using Storage
+        Access Framework).
+FIXED   Crash related to original camera API.
+FIXED   Crash when using photo stamp with auto-level when angle is zero.
+FIXED   Couldn't exit immersive mode on Android 11.
+FIXED   Behaviour where widescreen preview aspect ratios show under on-screen navigation bar wasn't
+        working properly on Android 11.
+FIXED   Manual white balance had inverted effect.
+FIXED   Video subtitles file didn't work properly when video file restarted due to max filesize.
+FIXED   Taking a photo in RAW only, then clicking on the gallery thumbnail would sometimes
+        incorrectly open an earlier non-RAW photo or video.
+FIXED   Corrected pitch and compass line lengths for portrait vs landscape orientations.
+FIXED   Single and double tap options to take photo weren't working correctly in panorama mode.
+FIXED   When using manual ISO seekbar, sometimes incorrect ISO button would be highlighted.
+UPDATED Now supports portrait and landscape system orientations, rather than being locked to
+        landscape system orientation.
+UPDATED Double tap to take photo option no longer performs a touch to focus, this now only happens
+        from a single tap.
+UPDATED Improved performance when opening camera and clicking on gallery icon (mainly relevant for
+        using Storage Access Framework with Android 10+ when save folder has large number of files).
+UPDATED Set max preview exposure time to be 1/5s instead of 1/12s, for when using manual exposure.
+UPDATED Support longer exposure time (1/5s) on some Samsung Galaxy S devices.
+UPDATED Improvements to brightness levels for Noise Reduction, DRO and HDR photo modes (images
+        coming out too dark in some cases).
+UPDATED Improvement to Noise Reduction photo mode quality (improved ability to distinguish noise
+        from ghosting effects).
+UPDATED Improvement to Noise Reduction photo mode to avoid overexposing in lower light scenes.
+UPDATED Improved choosing when to use 8 images for Noise Reduction photo mode.
+UPDATED Optimisations for DRO and NR photo modes on Samsung devices.
+UPDATED Accessibility improvement, set hints for EditTexts.
+UPDATED Now targetting Android 11. Due to changes in Android 11 this means "video subtitles" option
+        is now only available when saving with
+        Settings/More camera controls/"Storage Access Framework" enabled.
+UPDATED Updated some user interface icons.
+
+Version 1.48.3 (2020/11/20)
+
+FIXED   Possible crash for panorama if failing to crop due to poor transformations; now fails
+        gracefully.
+FIXED   Crash on EXTERNAL devices with Camera2 API that didn't support querying the view angles.
+FIXED   Photos would sometimes fail to save on some devices with Storage Access Framework, when some
+        options were enabled (options like DRO, HDR, auto-level, photostamp that require
+        post-processing; custom Exif tags like artist or copyright; or when using geotagging with
+        Camera2 API).
+FIXED   Fix for HDR scenes with both very bright and very dark regions, result would be over
+        exposed.
+FIXED   Fixed possible misalignment for HDR scenes with very bright or very dark images.
+FIXED   Corrupt videos could be left over if video failed to start.
+FIXED   Possible problem taking photos on some devices with LIMITED Camera2 API support.
+FIXED   Possible problem with default edge mode and noise reduction mode behaviours on some devices
+        with LIMITED Camera2 API support.
+FIXED   UI would become sluggish if camera or storage permission denied with "Don't ask again".
+UPDATED Now supporting "scoped storage" on Android 10+. This means storage permission is no longer
+        required on Android 10+. However this means the following changes:
+          * Saving outside of DCIM/ is no longer possible unless using the Storage Access Framework
+            option. If you had set up a custom save folder outside of DCIM/ and are on Android 10+,
+            it will be reset to the default DCIM/OpenCamera/ folder. If you want to continue saving
+            outside of DCIM/, you can enable
+            Settings/More camera controls/"Use Storage Access Framework" and choose a new folder.
+          * If using Video subtitles option, then the .SRT files will show up in gallery
+            applications, unless Settings/More camera controls/"Use Storage Access Framework" is
+            enabled.
+        Note that these changes are required due to changes being made in Android that applications
+        are required to support.
+UPDATED Use seekbar for more settings (audio control sensitivity, image quality, photo stamp font
+        size).
+UPDATED Debug XML files for panorama now saved in Android/data/net.sourceforge.opencamera/files/.
+UPDATED Camera now closed when in settings or preview otherwise in background.
+
+Version 1.48.2 (2020/07/12)
+
+FIXED   Manual focus and focus bracketing seekbars weren't being hidden when in immersive mode.
+FIXED   Video subtitles would stop before end of video on some devices when using Storage Access
+        Framework.
+UPDATED Switched to AndroidX support library.
+UPDATED Artist, Copyright exif tags option now supported for devices running Android 6 or earlier.
+UPDATED Selecting remote device type for Bluetooth remote control now calls Open Camera's
+        DeviceScanner directly; DeviceScanner activity no longer exported.
+
 Version 1.48.1 (2020/05/02)
 
 FIXED   Crash on devices with Camera2 API where camera reports no picture, video or preview
diff --git a/_docs/index.html b/_docs/index.html
index 6f5829bd1d450466e8d7478ceaa20a45eee76fe3..d3bd47db00de4b1371990a0485ceddf6fb4ad970 100644
--- a/_docs/index.html
+++ b/_docs/index.html
@@ -16,6 +16,13 @@
     }
 </script>-->
 
+<script>
+    var old_domain = "//opencamera.sourceforge.io";
+    if( window.location.href.indexOf(old_domain) >= 0 ) {
+        window.location.href = window.location.href.replace(old_domain, "//opencamera.org.uk");
+    }
+</script>
+
 <!-- EU cookie law, needed for analytics and adsense -->
 <!-- Begin Cookie Consent plugin by Silktide - http://silktide.com/cookieconsent -->
 <script type="text/javascript">
@@ -31,16 +38,15 @@
 <!-- End Cookie Consent plugin -->
 
 <!-- Google Analytics -->
-<!-- anonymizeIp is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- anonymize_ip is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-38364448-5"></script>
 <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-38364448-5', 'auto');
-  ga('set', 'anonymizeIp', true);
-  ga('send', 'pageview');
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-38364448-5', { 'anonymize_ip': true });
 </script>
 
 <!-- Google adsense auto ads -->
@@ -106,7 +112,7 @@ browsers -->
 <li>Option to <a href="help.html#auto_stabilise">auto-level</a> so your pictures are perfectly level no matter what.</li>
 <li>Expose your camera's functionality: support for scene modes, color effects, white balance, ISO, exposure compensation/lock, selfie with "screen flash", HD video and more.</li>
 <li>Handy remote controls: timer (with optional voice countdown), auto-repeat mode (with configurable delay).</li>
-<li>Option to take photo remotely by making a noise, or by voice command "cheese".</li>
+<li>Option to take photo remotely by making a noise<!--, or by voice command "cheese"-->.</li>
 <li>Configurable volume keys and user interface.</li>
 <li>Upside-down preview option for use with attachable lenses.</li>
 <li>Overlay a choice of grids and crop guides.</li>
@@ -114,8 +120,8 @@ browsers -->
 <li>Apply date and timestamp, location coordinates, and custom text to photos; store date/time and location as video subtitles (.SRT).</li>
 <li>Panorama, including for front camera.</li>
 <li>Support for <a href="help.html#hdr">HDR</a> (with auto-alignment and ghost removal) and Exposure Bracketing.</li>
-<li>Support for Camera2 API: manual controls (with optional focus assist); burst mode; RAW (DNG) files; slow motion video.</li>
-<li>Noise reduction (including low light night mode) and Dynamic range optimisation modes for better quality photos.</li>
+<li>Support for Camera2 API: manual controls (with optional focus assist); burst mode; RAW (DNG) files; camera vendor extensions; slow motion video; log profile video.</li>
+<li>Noise reduction (including low light night mode) and Dynamic range optimisation modes.</li>
 <li>Options for on-screen histogram, zebra stripes, focus peaking.</li>
 <li>Focus bracketing mode.</li>
 <li>Completely free, and no ads in the app (I only run ads on the website). Open Source.</li>
@@ -124,13 +130,8 @@ browsers -->
 <p>(Some features may not be available on all devices, as they may depend on hardware features, or the Android version.)</p>
 
 <!-- we don't use the Google Play badge because it looks awful - comes out way too big?! -->
-<p><a href="https://play.google.com/store/apps/details?id=net.sourceforge.opencamera">Download on Google Play.</a></p>
-
-<p>Also see <a href="info.html#altdownload">alternative download sites</a>.</p>
+<p><a href="https://play.google.com/store/apps/details?id=net.sourceforge.opencamera">Get it on Google Play.</a></p>
 
-<hr>
-<p>Open Camera is completely free, however if you wish you can show your appreciation by <a href="info.html#supportme">supporting me</a>.</p>
- 
 <hr>
 <p>
 <a href="http://sourceforge.net/p/opencamera/blog/">Open Camera Blog</a> ~
@@ -142,7 +143,6 @@ browsers -->
 <ul>
 <li><a href="#requirements">Requirements</a></li>
 <li><a href="help.html">Instructions</a></li>
-<li><a href="info.html#supportme">Support me!</a></li>
 <li><a href="#credits">Credits</a></li>
 <li><a href="privacy_oc.html">Privacy policy</a></li>
 <li><a href="#licence">Licence and Terms of Service</a></li>
@@ -201,6 +201,8 @@ available from
 Also see <i>"Can I use the Open Camera source code in my app?"</i> under the <a href="help.html#usesource">FAQ</a>.
 </p>
 
+<p>Open Camera uses the AndroidX/Jetpack libraries, under <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache license version 2.0</a>.</p>
+
 <p>The following files are used in Open Camera:</p>
 <ul style="font-size:small">
 <!-- use &#8203; to limit widths on continuous text to 30 characters, to avoid messing up view on mobile devices -->
@@ -213,19 +215,27 @@ Also see <i>"Can I use the Open Camera source code in my app?"</i> under the <a
     by Google, under <a href="https://www.apache.org/licenses/LICENSE-2.0.html">Apache license version 2.0</a> (some cases include modifications, no need to credit me).
     In particular:
     baseline_add_a_photo_white_48.png,
-    baseline_bluetooth_white_48.png, baseline_check_white_48.png, baseline_close_white_48.png, baseline_filter_vintage_white_48.png,
+    baseline_bedtime_white_48.png
+    baseline_bluetooth_white_48.png, baseline_check_white_48.png, baseline_close_white_48.png,
+    baseline_delete_white_48.png,
+    baseline_face_retouching_natural_white_48.png,
+    baseline_filter_vintage_white_48.png,
     baseline_folder_open_white_48.png,
     baseline_highlight_white_48.png,
     baseline_panorama_horizontal_white_48.png,
     baseline_photo_library_white_48.png,
+    baseline_portrait_white_48.png,
     baseline_remove_red_eye_white_48.png,
     baseline_rotate_left_white_48.png, baseline_rotate_right_white_48.png,
     baseline_shutter_speed_white_48.png,
+    baseline_switch_camera_white_48.png,
     baseline_text_fields_red_48.png (modified from baseline_text_fields_white_48), baseline_text_fields_white_48.png,
     exposure_locked.png (modified from baseline_lock_white_48 and ic_exposure_white_48dp),
     exposure_unlocked.png (modified from baseline_lock_open_white_48 and ic_exposure_white_48dp),
-    flash_auto.png (from ic_action_flash_automatic), flash_off.png (from ic_action_flash_off),
+    flash_auto.png (from baseline_flash_auto_white_48), flash_off.png (from baseline_flash_off_white_48),
     flash_on.png (from ic_action_flash_on),
+    focus_mode_continuous_picture.png and focus_mode_continuous_video.png (from baseline_loop_white_48),
+    focus_mode_infinity (from baseline_loop_white_48),
     focus_mode_locked.png (modified from baseline_lock_white_48),
     ic_burst_mode_white_48dp.png, ic_colorize_white_48dp.png,
     ic_exposure_red_48dp.png, ic_exposure_white_48dp.png, ic_face_red_48dp.png (modified from ic_face_white_48dp), ic_face_white_48dp.png,
@@ -243,15 +253,13 @@ Also see <i>"Can I use the Open Camera source code in my app?"</i> under the <a
     ic_timelapse_white_48dp.png, ic_timer_white_48dp.png,
     ic_touch_app_white_48dp.png, ic_videocam_white_48dp.png,
     ic_stat_notify_take_photo.png (modified from ic_photo_camera_white_48dp),
-    popup*.png (modified from ic_more_vert_white, baseline_highlight_white, baseline_remove_red_eye_white, ic_action_flash_automatic,
-        ic_action_flash_off, ic_action_flash_on),
+    popup*.png (modified from ic_more_vert_white, baseline_highlight_white, baseline_remove_red_eye_white, baseline_flash_auto_white,
+    baseline_flash_off_white, ic_action_flash_on),
     settings.png (from ic_action_settings), share.png (from ic_action_share),
-    switch_camera.png (from ic_action_switch_camera),
     take_photo.png (modified from ic_photo_camera_white_48dp), take_photo_pref.png (modified from ic_photo_camera_white_48dp),
     take_photo_pressed.png (modified from ic_photo_camera_white_48dp), take_photo_when_video_recording.png (modified from ic_photo_camera_white_48dp),
     take_video.png (modified from baseline_videocam_white_48), take_video_pref.png (modified from baseline_videocam_white_48),
     take_video_pressed.png (modified from baseline_videocam_white_48), take_video_recording.png (modified from baseline_videocam_white_48),
-    trash.png (from ic_action_discard),
     white_balance_locked.png (modified from baseline_lock_white_48),
     white_balance_unlocked.png (modified from baseline_lock_open_white_48).
     <br>Modified versions of some of these icons are also used on this website.
diff --git a/_docs/info.html b/_docs/info.html
index 11f210a69d7f48360757d0ee8e0d611787e7eaee..91c2124f99d4e4ab60c7d8a3bb5202cbda9dbb39 100644
--- a/_docs/info.html
+++ b/_docs/info.html
@@ -24,16 +24,15 @@
 <!-- End Cookie Consent plugin -->
 
 <!-- Google Analytics -->
-<!-- anonymizeIp is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- anonymize_ip is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-38364448-5"></script>
 <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-38364448-5', 'auto');
-  ga('set', 'anonymizeIp', true);
-  ga('send', 'pageview');
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-38364448-5', { 'anonymize_ip': true });
 </script>
 
 </head>
@@ -60,50 +59,13 @@
 
 <!-- note this is also linked to from Sourceforge "external link" -->
 
-<p>Open Camera is completely free, however if you wish you can show your appreciation to me by making an optional payment.
-    Please note that this is not required, and that doing so will not provide any additional features (or remove the ads I have on the
-    website). However for those who wish to make a contribution to me, this is greatly appreciated!</p>
-
-<p>You can contribute through PayPal, simply click the "Buy Now" button, and enter the amount you wish to give me:</p>
-
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="hidden" name="hosted_button_id" value="S2TF5UGTV7F9A">
-<input type="image" src="https://www.paypalobjects.com/en_US/GB/i/btn/btn_buynowCC_LG.gif" border="0" name="submit" alt="PayPal – The safer, easier way to pay online!">
-<img alt="" border="0" src="https://www.paypalobjects.com/en_GB/i/scr/pixel.gif" width="1" height="1">
-</form>
-
-<p>...or you can also set up a regular contribution:</p>
-
-<!-- n.b., the A, B, C for the option names is needed as the "values" have to be unique otherwise they'll all map to
-the same amount! Unfortunately PayPal doesn't seem to allow offering the same description with different values. -->
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-<input type="hidden" name="cmd" value="_s-xclick">
-<input type="hidden" name="hosted_button_id" value="ZYBUX88DNQXV2">
-<table>
-<tr><td><input type="hidden" name="on0" value=""></td></tr><tr><td><select name="os0">
-    <option value="Contribution A">Contribution A : $1.00 USD - monthly</option>
-    <option value="Contribution B">Contribution B : $2.00 USD - monthly</option>
-    <option value="Contribution C">Contribution C : $5.00 USD - monthly</option>
-</select> </td></tr>
-</table>
-<input type="hidden" name="currency_code" value="USD">
-<input type="image" src="https://www.paypalobjects.com/en_US/GB/i/btn/btn_subscribeCC_LG.gif" border="0" name="submit" alt="PayPal – The safer, easier way to pay online!">
-<img alt="" border="0" src="https://www.paypalobjects.com/en_GB/i/scr/pixel.gif" width="1" height="1">
-</form>
-
-<p>(PayPal account not required, supports debit or credit card)<!--, or Bitcoin <b>1KZm8bKwTY8kSpqEmHZ2pBWeC6aFCs7zxG</b>-->.
-Thanks!</p>
-
-<p>Please note that these contributions do not constitute a charitable donation, and hence not eligible for tax-deduction. (If you have found my webpage because you are using a camera app with ads inside it, then you may have downloaded a third party clone that is not distributed by me. For my Open Camera app, please make sure you've downloaded from the links given on my <a href="index.html">Main Page</a>.)</p>
-
-<p><b>Privacy policy:</b> Please note that some information such as name, email, amount will be shared to me by PayPal. All PayPal transactions are subject to the <a href="https://www.paypal.com/uk/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> (alternatively known as PayPal's Privacy Statement).</p>
+<p>I am not currently accepting donations. Thanks to those who have supported me in the past!</p>
 
 <h2><a name="altdownload"><b>Alternative download sites</b></a></h2>
 
 <ul>
 
-<li>Open Camera can also be installed from <a href="https://f-droid.org/">F-Droid</a>.</li>
+<li>Open Camera can also be installed from <a href="https://f-droid.org/en/packages/net.sourceforge.opencamera/">F-Droid</a>.</li>
 
 <li>The APK files are also available from
 <!-- use &#8203; to limit widths on continuous text to 30 characters, to avoid messing up view on mobile devices -->
diff --git a/_docs/privacy_oc.html b/_docs/privacy_oc.html
index 38972821d7f243aa56c221b1deab5488cb2991dd..48728d312ceeef5ab4edf66267619d0ebd875a1c 100644
--- a/_docs/privacy_oc.html
+++ b/_docs/privacy_oc.html
@@ -24,16 +24,15 @@
 <!-- End Cookie Consent plugin -->
 
 <!-- Google Analytics -->
-<!-- anonymizeIp is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- anonymize_ip is set: unclear if this is needed for EU GDPR, but just in case -->
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-38364448-5"></script>
 <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-38364448-5', 'auto');
-  ga('set', 'anonymizeIp', true);
-  ga('send', 'pageview');
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-38364448-5', { 'anonymize_ip': true });
 </script>
 
 </head>
@@ -51,44 +50,65 @@
 <!-- also linked from the cookie popup, other pages on this site, and Google Play store listing -->
 <!-- if changing this, remember to consider if the in-application privacy policy needs updating -->
 
+<p>Open Camera is developed by Mark Harman.</p>
+
 <p>Open Camera accesses and records camera sensor and microphone data, which is used for the purpose
 of taking photos and recording videos, to fulfil its purpose as a camera. Microphone permission is also used for the optional "Audio control" options.</p>
 
-<p>Open Camera requires permission to "access photos, media and files on your devices", as this permission is required for Android to
-save resultant files such as photos and videos to your device.</p>
+<p>Open Camera requires permission (at least for Android 9 and earlier, or using versions of Open Camera older than 1.48.3) to
+    "access photos, media and files on your devices" (storage permission), as this permission is required for Android to save resultant files such as photos and videos to your device.</p>
+
+<p>Location permission is requested in order to deliver the optional geotagging features (for photos and videos, including stamp and subtitles options).
+    When relevant option(s) are enabled, your device location will be stored in photo/video/subtitle files.</p>
 
-<p>Location permission is required for the optional geotagging features (for photos and videos, including stamp and subtitles options).
-    When relevant option(s) are enabled, your device location will be stored in photo/video/subtitle files.
-    Location permission is also required to connect to Bluetooth remote control devices.</p>
+<p>Bluetooth permissions are used to allow the optional feature to discover and connect to Bluetooth LE remote control devices;
+    the Bluetooth remote control feature also requires location permission (on Android 11 or earlier) or
+    Nearby Devices permission (on Android 12 or later).</p>
 
-<p>Bluetooth permission is required for communicating with some supported Bluetooth remote control devices.</p>
+<p>Resultant data such as photos or videos can be shared with
+    other apps if you use the share option in Open Camera, or when Open Camera is called by
+    another app on your device, or when you use the Storage Access Framework option to save
+    to another app or service.</p>
+
+<p>Data handling procedures, data retention and deletion policies: Open Camera
+    does not transmit personal or sensitive information to me.</p>
 
 <p>Since Open Camera also uses operating system APIs, you should review relevant privacy policies
     such as for your device, manufacturer, operating system and/or Google accounts. For example:</p>
 <ul>
-    <li>The optional voice control option uses the Android
+    <li>For versions 1.49.2 or earlier: the optional voice control option used the Android
         <a href="https://developer.android.com/reference/android/speech/SpeechRecognizer">speech recognition service</a>.
         When enabled, audio data is likely to be sent to remote servers by Android to perform speech recognition.
+        This is subject to the Data Processing Addendum for Products where Google is a Data Processor,
+        located at
+        <a href="https://privacy.google.com/businesses/gdprprocessorterms/">https://privacy.google.com/businesses/gdprprocessorterms/</a> , as updated from time to time.
+        This option is no longer available in version 1.50 onwards.
     </li>
-    <li>The "addresses" option for photo stamp or video subtitles uses the Android
+    <li>For versions 1.49.2 or earlier: The "addresses" option for photo stamp or video subtitles used the Android
         <a href="https://developer.android.com/reference/android/location/Geocoder">Geocoder API</a>.
-        When enabled, this requires that your device transmits location data across the Internet to a
+        When this option is enabled, in order to deliver this functionality the API transmits your device location data across the Internet to a
         third party (which may depend on what "backend services" are installed on your device).
+        This option is no longer available in version 1.50 onwards.
     </li>
     <li>Apps/services such as cloud services on your device may auto-upload photos and videos that are saved on your device.
     </li>
 </ul>
 
+<p>If you have inquiries about my privacy policy, please contact me by email at
+    <a href="mailto:mark.harman.apps@gmail.com?subject=Open%20Camera%20privacy%20policy">mark.harman.apps@gmail.com</a>.</p>
+
 <!-- from https://support.google.com/adsense/answer/1348695?hl=en-GB , for adsense -->
 <p>Although Open Camera is ad-free, the Open Camera website has ads via Google Adsense: Third party vendors, including Google, use cookies to
 serve ads based on a user's previous visits to this website or other websites. Google's use of advertising cookies enables it and
 its partners to serve ads based on people's visit to this sites and/or other sites on the Internet. You may opt out of personalised
-advertising by visiting <a href="https://www.google.co.uk/settings/ads">Google's Ads Settings.</a> Alternatively, you can
-opt out of some third-party vendors' uses of cookies for personalised advertising by visiting
+advertising by visiting <a href="https://www.google.co.uk/settings/ads">Google's Ads Settings.</a> The cookies of other third-party
+vendors or ad networks may also be used to serve ads. You can opt out of some third-party vendors' uses of cookies for personalised advertising by visiting
 <a href="http://www.aboutads.info/choices/">www.aboutads.info</a>.</p>
 
 <p><b>Update:</b> I have instructed Google to not display personalised ads to users in the EEA.</p>
 
+<p>Note that cookies are still used for serving even non-personalised ads.</p>
+
 <p>The Open Camera website also uses <a href="https://analytics.google.com">Google Analytics</a> which uses cookies, please see their
 <a href="https://support.google.com/analytics/answer/6004245">Privacy Policy</a> for more details.</p>
 
diff --git a/_docs/stylesheet.css b/_docs/stylesheet.css
index fbf030952275aef112e0a70c5707a45e4723c551..804a107ded9d435860fab932acf0d1ea9142600d 100644
--- a/_docs/stylesheet.css
+++ b/_docs/stylesheet.css
@@ -1,4 +1,5 @@
 body {
 	color: #000000;
 	background-color: rgb(245,236,220);
+	font-family: Tahoma, Geneva, sans-serif;
 }
diff --git a/_docs/switch_camera.png b/_docs/switch_camera.png
deleted file mode 100644
index c5f8a1860822bb8f3a039406330616def0f5df0f..0000000000000000000000000000000000000000
Binary files a/_docs/switch_camera.png and /dev/null differ
diff --git a/_docs/trash.png b/_docs/trash.png
deleted file mode 100644
index 81493dd2d8de1217576d6dffc5efe19352c2294b..0000000000000000000000000000000000000000
Binary files a/_docs/trash.png and /dev/null differ
diff --git a/androidx_LICENSE-2.0.txt b/androidx_LICENSE-2.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d645695673349e3947e8e5ae42332d0ac3164cd7
--- /dev/null
+++ b/androidx_LICENSE-2.0.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/app/build.gradle b/app/build.gradle
index a74a36609789c4a26c2b7c04cc8bb14504f0408f..890003d1b52a3e20765587aaba075c457998537c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     compileOptions.encoding = 'UTF-8'
 
     compileOptions {
@@ -12,7 +12,7 @@ android {
     defaultConfig {
         applicationId "foundation.e.camera"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
 
         renderscriptTargetApi 21
         //renderscriptSupportModeEnabled true // don't use support library as it bloats the APK, and we don't need pre-4.4 support
@@ -34,16 +34,15 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-        checkReleaseBuilds false
-        abortOnError false
-    }
 
     // needed to use android.test package (ActivityInstrumentationTestCase2 etc) when targetting sdk 28 (Android 9) -
     // see https://developer.android.com/training/testing/set-up-project
     useLibrary 'android.test.runner'
     useLibrary 'android.test.base'
+    lint {
+        abortOnError false
+        checkReleaseBuilds false
+    }
     //useLibrary 'android.test.mock'
 
     aaptOptions {
@@ -58,5 +57,12 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation "androidx.constraintlayout:constraintlayout:2.1.3"
     implementation "org.greenrobot:eventbus:3.3.1"
-    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+
+    // appcompat version must be 1.4.0 or later to satisfy emoji policy!
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+
+    implementation 'androidx.exifinterface:exifinterface:1.3.3'
+
+    testImplementation 'junit:junit:4.13.1'
 }
diff --git a/app/src/androidTest/java/net/sourceforge/opencamera/test/AvgTests.java b/app/src/androidTest/java/net/sourceforge/opencamera/test/AvgTests.java
index a502dd85c51af99c130d9270310c29efd19014cb..6e5334ce5364f4b3c7716084adf5af1155cd97c8 100644
--- a/app/src/androidTest/java/net/sourceforge/opencamera/test/AvgTests.java
+++ b/app/src/androidTest/java/net/sourceforge/opencamera/test/AvgTests.java
@@ -9,6 +9,7 @@ public class AvgTests {
      *  To use these tests, the testdata/ subfolder should be manually copied to the test device in the DCIM/testOpenCamera/
      *  folder (so you have DCIM/testOpenCamera/testdata/). We don't use assets/ as we'd end up with huge APK sizes which takes
      *  time to transfer to the device every time we run the tests.
+     *  On Android 10+, scoped storage permission needs to be given to Open Camera for the DCIM/testOpenCamera/ folder.
      */
     public static Test suite() {
         TestSuite suite = new TestSuite(MainTests.class.getName());
diff --git a/app/src/androidTest/java/net/sourceforge/opencamera/test/HDRNTests.java b/app/src/androidTest/java/net/sourceforge/opencamera/test/HDRNTests.java
index 7283de7a3f76b401af194b7716ed4d7e74a83a10..4c82cfd8a2d3dfcd2e48639e456c5b5a66161130 100644
--- a/app/src/androidTest/java/net/sourceforge/opencamera/test/HDRNTests.java
+++ b/app/src/androidTest/java/net/sourceforge/opencamera/test/HDRNTests.java
@@ -9,6 +9,7 @@ public class HDRNTests {
      *  To use these tests, the testdata/ subfolder should be manually copied to the test device in the DCIM/testOpenCamera/
      *  folder (so you have DCIM/testOpenCamera/testdata/). We don't use assets/ as we'd end up with huge APK sizes which takes
      *  time to transfer to the device every time we run the tests.
+     *  On Android 10+, scoped storage permission needs to be given to Open Camera for the DCIM/testOpenCamera/ folder.
      */
     public static Test suite() {
         TestSuite suite = new TestSuite(MainTests.class.getName());
diff --git a/app/src/androidTest/java/net/sourceforge/opencamera/test/HDRTests.java b/app/src/androidTest/java/net/sourceforge/opencamera/test/HDRTests.java
index 9efcae467926839fd51b69362dd5037a541d1c25..5c6b5622412ada30e95696045ee975052da70aa8 100644
--- a/app/src/androidTest/java/net/sourceforge/opencamera/test/HDRTests.java
+++ b/app/src/androidTest/java/net/sourceforge/opencamera/test/HDRTests.java
@@ -9,6 +9,7 @@ public class HDRTests {
      *  To use these tests, the testdata/ subfolder should be manually copied to the test device in the DCIM/testOpenCamera/
      *  folder (so you have DCIM/testOpenCamera/testdata/). We don't use assets/ as we'd end up with huge APK sizes which takes
      *  time to transfer to the device every time we run the tests.
+     *  On Android 10+, scoped storage permission needs to be given to Open Camera for the DCIM/testOpenCamera/ folder.
      */
     public static Test suite() {
         TestSuite suite = new TestSuite(MainTests.class.getName());
@@ -74,6 +75,10 @@ public class HDRTests {
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testHDR55"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testHDR56"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testHDR57"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testHDR58"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testHDR59"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testHDR60"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testHDR61"));
         return suite;
     }
 }
diff --git a/app/src/androidTest/java/net/sourceforge/opencamera/test/MainActivityTest.java b/app/src/androidTest/java/net/sourceforge/opencamera/test/MainActivityTest.java
index 95a0289533fe8d3d1fd550a317eea9b6ec40afb9..d59715747073e88d9abd282f733e48f42a1ad344 100644
--- a/app/src/androidTest/java/net/sourceforge/opencamera/test/MainActivityTest.java
+++ b/app/src/androidTest/java/net/sourceforge/opencamera/test/MainActivityTest.java
@@ -1,6 +1,8 @@
 package net.sourceforge.opencamera.test;
 
 import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
@@ -30,16 +32,19 @@ import net.sourceforge.opencamera.SaveLocationHistory;
 import net.sourceforge.opencamera.cameracontroller.CameraController;
 import net.sourceforge.opencamera.preview.Preview;
 import net.sourceforge.opencamera.ui.FolderChooserDialog;
+import net.sourceforge.opencamera.ui.MainUI;
 import net.sourceforge.opencamera.ui.PopupView;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
+import android.content.ContentUris;
+import android.content.ContentValues;
 import android.content.Intent;
 import android.content.SharedPreferences;
 //import android.content.res.AssetManager;
+import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-//import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Point;
@@ -49,12 +54,14 @@ import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.params.TonemapCurve;
 import android.location.Location;
 import android.media.CamcorderProfile;
-import android.media.ExifInterface;
+import androidx.exifinterface.media.ExifInterface;
 import android.media.MediaScannerConnection;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-//import android.os.Environment;
+import android.os.ParcelFileDescriptor;
 import android.preference.PreferenceManager;
+import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.renderscript.Allocation;
 import androidx.annotation.RequiresApi;
@@ -69,6 +76,8 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.ZoomControls;
 
+// ignore warning about "Call to Thread.sleep in a loop", this is only test code
+@SuppressWarnings("BusyWait")
 public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActivity> {
     private static final String TAG = "MainActivityTest";
     private MainActivity mActivity = null;
@@ -81,6 +90,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         super("net.sourceforge.opencamera", MainActivity.class);
     }
 
+    static boolean isEmulator() {
+        return Build.MODEL.contains("Android SDK built for x86");
+    }
+
     private Intent createDefaultIntent() {
         Intent intent = new Intent();
         intent.putExtra("test_project", true);
@@ -196,7 +209,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
     private void pauseAndResume() {
         Log.d(TAG, "pauseAndResume");
-        pauseAndResume(true);
+        boolean camera_is_open = mPreview.getCameraController() != null;
+        pauseAndResume(camera_is_open);
     }
 
     private void pauseAndResume(boolean wait_until_camera_opened) {
@@ -231,7 +245,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             public void run() {
                 mActivity.initLocation(); // initLocation now called via MainActivity.setWindowFlagsForCamera() rather than updateForSettings()
                 mActivity.getApplicationInterface().getDrawPreview().updateSettings();
-                mActivity.updateForSettings();
+                mActivity.updateForSettings(true);
             }
         });
         // need to wait for UI code to finish before leaving
@@ -560,12 +574,13 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
      */
     private void subTestSaveFocusMode() {
         Log.d(TAG, "subTestSaveFocusMode");
+        setToDefault();
+
         if( !mPreview.supportsFocus() ) {
+            Log.d(TAG, "test requires focus");
             return;
         }
 
-        setToDefault();
-
         String non_default_focus = getNonDefaultFocus();
 
         String focus_value = mPreview.getCameraController().getFocusValue();
@@ -875,11 +890,15 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "frame size: " + mPreview.getView().getWidth() + ", " + mPreview.getView().getHeight());
         double frame_aspect_ratio = ((double)mPreview.getView().getWidth()) / (double)mPreview.getView().getHeight();
         double preview_aspect_ratio = ((double)mPreview.getCameraController().getPreviewSize().width) / (double)mPreview.getCameraController().getPreviewSize().height;
+        if( mActivity.getSystemOrientation() == MainActivity.SystemOrientation.PORTRAIT ) {
+            frame_aspect_ratio = 1.0f / frame_aspect_ratio;
+        }
         Log.d(TAG, "frame_aspect_ratio: " + frame_aspect_ratio);
         Log.d(TAG, "preview_aspect_ratio: " + preview_aspect_ratio);
         // we calculate etol like this, due to errors from rounding
         //double etol = 1.0f / Math.min((double)mPreview.getWidth(), (double)mPreview.getHeight()) + 1.0e-5;
         double etol = (double)mPreview.getView().getWidth() / (double)(mPreview.getView().getHeight() * (mPreview.getView().getHeight()-1) ) + 1.0e-5;
+        Log.d(TAG, "etol: " + etol);
         assertTrue( Math.abs(frame_aspect_ratio - preview_aspect_ratio) <= etol );
     }
 
@@ -904,6 +923,9 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         //double targetRatio = mPreview.getTargetRatioForPreview(display_size);
         double targetRatio = mPreview.getTargetRatio();
         double expTargetRatio = ((double)display_size.x) / (double)display_size.y;
+        if( mActivity.getSystemOrientation() == MainActivity.SystemOrientation.PORTRAIT ) {
+            expTargetRatio = 1.0f / expTargetRatio;
+        }
         Log.d(TAG, "targetRatio: " + targetRatio);
         Log.d(TAG, "expTargetRatio: " + expTargetRatio);
         assertTrue( Math.abs(targetRatio - expTargetRatio) <= 1.0e-5 );
@@ -1476,10 +1498,19 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     }
 
     /* Test doing touch to auto-focus region by swiping to all four corners works okay.
+     * Update: now only do one corner, due to complications with different orientations and devices.
      */
     public void testAutoFocusCorners() {
         Log.d(TAG, "testAutoFocusCorners");
         setToDefault();
+        {
+            // icons along top mode interferes with doing the touch at corners (e.g., on Galaxy Nexus)
+            SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
+            SharedPreferences.Editor editor = settings.edit();
+            editor.putString(PreferenceKeys.UIPlacementPreferenceKey, "ui_right");
+            editor.apply();
+            updateForSettings();
+        }
 
         if( !mPreview.supportsFocus() ) {
             return;
@@ -1487,6 +1518,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         int [] gui_location = new int[2];
         mPreview.getView().getLocationOnScreen(gui_location);
+        Log.d(TAG, "gui_location: " + Arrays.toString(gui_location));
         final int step_dist_c = 2;
         final float scale = mActivity.getResources().getDisplayMetrics().density;
         final int large_step_dist_c = (int) (80 * scale + 0.5f); // convert dps to pixels
@@ -1512,28 +1544,41 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertNull(mPreview.getCameraController().getFocusAreas());
         assertNull(mPreview.getCameraController().getMeteringAreas());
 
-        // do larger step at top-right, due to conflicting with Settings button
-        // but we now ignore swipes - so we now test for that instead
-        Log.d(TAG, "top-right");
+        // skip top-right, as in portrait orientation we'd conflict with settings button
+        /*Log.d(TAG, "top-right");
         TouchUtils.drag(MainActivityTest.this, gui_location[0]+width-1-large_step_dist_c, gui_location[0]+width-1, gui_location[1]+large_step_dist_c, gui_location[1], step_count_c);
         assertFalse(mPreview.hasFocusArea());
         assertNull(mPreview.getCameraController().getFocusAreas());
-        assertNull(mPreview.getCameraController().getMeteringAreas());
+        assertNull(mPreview.getCameraController().getMeteringAreas());*/
 
-        Log.d(TAG, "bottom-left");
-        TouchUtils.drag(MainActivityTest.this, gui_location[0]+step_dist_c, gui_location[0], gui_location[1]+height-1-step_dist_c, gui_location[1]+height-1, step_count_c);
-        assertTrue(mPreview.hasFocusArea());
-        assertNotNull(mPreview.getCameraController().getFocusAreas());
-        assertEquals(1, mPreview.getCameraController().getFocusAreas().size());
-        assertNotNull(mPreview.getCameraController().getMeteringAreas());
-        assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+        // skip bottom right, conflicts with zoom on various devices
+        // but note in portrait mode, this is bottom-left that we need to skip
+        // update: and in portrait mode, that now conflicts with settings, so we just skip this too
+
+        /*if( mActivity.getSystemOrientation() == MainActivity.SystemOrientation.PORTRAIT ) {
+            Log.d(TAG, "bottom-right");
+            TouchUtils.drag(MainActivityTest.this, gui_location[0]+width-1-step_dist_c, gui_location[0]+width-1, gui_location[1]+height-1-step_dist_c, gui_location[1]+height-1, step_count_c);
+            assertTrue(mPreview.hasFocusArea());
+            assertNotNull(mPreview.getCameraController().getFocusAreas());
+            assertEquals(1, mPreview.getCameraController().getFocusAreas().size());
+            assertNotNull(mPreview.getCameraController().getMeteringAreas());
+            assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+        }
+        else {
+            Log.d(TAG, "bottom-left");
+            TouchUtils.drag(MainActivityTest.this, gui_location[0]+step_dist_c, gui_location[0], gui_location[1]+height-1-step_dist_c, gui_location[1]+height-1, step_count_c);
+            assertTrue(mPreview.hasFocusArea());
+            assertNotNull(mPreview.getCameraController().getFocusAreas());
+            assertEquals(1, mPreview.getCameraController().getFocusAreas().size());
+            assertNotNull(mPreview.getCameraController().getMeteringAreas());
+            assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+        }*/
 
         mPreview.clearFocusAreas();
         assertFalse(mPreview.hasFocusArea());
         assertNull(mPreview.getCameraController().getFocusAreas());
         assertNull(mPreview.getCameraController().getMeteringAreas());
 
-        // skip bottom right, conflicts with zoom on various devices
     }
 
     /* Test face detection, and that we don't get the focus/metering areas set.
@@ -1621,6 +1666,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         // check face detection not already started
         assertTrue( mPreview.getCameraController().startFaceDetection() );
+
+        assertTrue( mPreview.getCameraController() == null || mPreview.getCameraController().count_camera_parameters_exception == 0 );
     }
 
     private void subTestPopupButtonAvailability(String test_key, String option, boolean expected) {
@@ -1803,6 +1850,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
         assertFalse(mPreview.isVideo());
         String photo_focus_value = mPreview.getCameraController().getFocusValue();
+        Log.d(TAG, "picture photo_focus_value: "+ photo_focus_value);
 
         View popupButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.popup);
         clickView(popupButton);
@@ -1872,11 +1920,9 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             waitUntilCameraOpened();
             int new_cameraId = mPreview.getCameraId();
             assertTrue(cameraId != new_cameraId);
-            focus_value = mPreview.getCameraController().getFocusValue();
-            Log.d(TAG, "front picture focus_value: "+ focus_value);
-            if( mPreview.supportsFocus() ) {
-                assertEquals(focus_value, photo_focus_value);
-            }
+            // n.b., front camera default photo focus value not necessarily same as back camera, if they have different focus modes
+            photo_focus_value = mPreview.getCameraController().getFocusValue();
+            Log.d(TAG, "front picture photo_focus_value: "+ photo_focus_value);
 
             // test popup buttons for photo mode:
             clickView(popupButton);
@@ -2050,12 +2096,14 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         waitUntilCameraOpened();
     }
 
-    /** Return the number of files in the supplied folder. 0 will be returned if the folder doesn't
+    /** Return the number of files in the save folder. 0 will be returned if the folder doesn't
      *  exist.
      */
-    private int getNFiles(File folder) {
-        File [] files = folder.listFiles();
-        Log.d(TAG, "getNFiles: " + folder + " has: " + Arrays.toString(files));
+    private int getNFiles() {
+        //File folder = mActivity.getImageFolder();
+        //File [] files = folder.listFiles();
+        String [] files = filesInSaveFolder();
+        Log.d(TAG, "getNFiles: " + Arrays.toString(files));
         return files == null ? 0 : files.length;
     }
 
@@ -2075,8 +2123,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         switchToFocusValue("focus_mode_continuous_picture");
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         assertEquals(0, mPreview.count_cameraTakePicture);
@@ -2097,7 +2144,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertTrue(mPreview.isPreviewStarted()); // check preview restarted
         Log.d(TAG, "count_cameraTakePicture: " + mPreview.count_cameraTakePicture);
         assertEquals(3, mPreview.count_cameraTakePicture);
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(3, n_new_files);
     }
@@ -2141,8 +2188,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         String focus_value_ui = "focus_mode_continuous_picture";
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         Thread.sleep(1000);
@@ -2184,8 +2230,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertEquals(1, mPreview.count_cameraTakePicture);
         mActivity.waitUntilImageQueueEmpty();
 
-        assertTrue( folder.exists() );
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(1, n_new_files);
     }
@@ -2208,8 +2253,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         String focus_value_ui = "focus_mode_continuous_picture";
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         Thread.sleep(1000);
@@ -2263,8 +2307,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertEquals(mPreview.count_cameraAutoFocus, saved_count + 1);
         mActivity.waitUntilImageQueueEmpty();
 
-        assertTrue( folder.exists() );
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(1, n_new_files);
     }
@@ -2383,6 +2426,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     }
 
     /* Test for taking HDR photo then going to background, also tests notifications.
+     * Note test is unstable on Android emulator when testing for the notification, unclear why.
      */
     public void testPhotoBackgroundHDR() throws InterruptedException {
         Log.d(TAG, "testPhotoBackgroundHDR");
@@ -2403,8 +2447,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertSame(mActivity.getApplicationInterface().getPhotoMode(), MyApplicationInterface.PhotoMode.HDR);
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         Thread.sleep(1000);
@@ -2441,8 +2484,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         this.getInstrumentation().waitForIdleSync();
         assertFalse(mActivity.testHasNotification());
 
-        assertTrue( folder.exists() );
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(1, n_new_files);
     }
@@ -2702,6 +2744,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         long [] delays = {20, 50, 100, 1000};
         int [] n_iters = {50, 30, 30, 3};
+        if( isEmulator() ) {
+            // this takes much longer to run on emulator, due to taking ~15s for the first waitForIdleSync() in the loop
+            n_iters = new int[]{1, 1, 1, 1};
+        }
         assertEquals(delays.length, n_iters.length);
 
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
@@ -2722,8 +2768,11 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                         mActivity.getApplicationInterface().getDrawPreview().updateSettings();
                     }
                 });
+                Log.d(TAG, "    wait for idle sync");
                 this.getInstrumentation().waitForIdleSync();
+                Log.d(TAG, "    about to sleep for: " + delays[i]);
                 Thread.sleep(delays[i]);
+                Log.d(TAG, "    done sleep");
                 if (delays[i] >= 1000) {
                     assertTrue(mPreview.isPreviewBitmapEnabled());
                 }
@@ -2735,8 +2784,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                         mActivity.getApplicationInterface().getDrawPreview().updateSettings();
                     }
                 });
+                Log.d(TAG, "    wait for idle sync again");
                 this.getInstrumentation().waitForIdleSync();
                 Thread.sleep(delays[i]);
+                Log.d(TAG, "    done wait for idle sync");
                 if (delays[i] >= 1000) {
                     assertFalse(mPreview.isPreviewBitmapEnabled());
                     assertFalse(mPreview.refreshPreviewBitmapTaskIsRunning());
@@ -2797,9 +2848,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         // test touch to focus clears the exposure controls
         int [] gui_location = new int[2];
         mPreview.getView().getLocationOnScreen(gui_location);
-        final int step_dist_c = 2;
+        final float scale = mActivity.getResources().getDisplayMetrics().density;
+        final int large_step_dist_c = (int) (80 * scale + 0.5f); // convert dps to pixels
         final int step_count_c = 10;
-        TouchUtils.drag(MainActivityTest.this, gui_location[0]+step_dist_c, gui_location[0], gui_location[1]+step_dist_c, gui_location[1], step_count_c);
+        TouchUtils.drag(MainActivityTest.this, gui_location[0]+large_step_dist_c, gui_location[0], gui_location[1]+large_step_dist_c, gui_location[1], step_count_c);
         assertEquals(exposureButton.getVisibility(), View.VISIBLE);
         assertEquals(exposureContainer.getVisibility(), View.GONE);
         clickView(exposureButton);
@@ -2815,7 +2867,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertEquals(mPreview.getCurrentExposure() - mPreview.getMinimumExposure(), seekBar.getProgress());
 
         // clear again so as to not interfere with take photo routine
-        TouchUtils.drag(MainActivityTest.this, gui_location[0]+step_dist_c, gui_location[0], gui_location[1]+step_dist_c, gui_location[1], step_count_c);
+        TouchUtils.drag(MainActivityTest.this, gui_location[0]+large_step_dist_c, gui_location[0], gui_location[1]+large_step_dist_c, gui_location[1], step_count_c);
         assertEquals(exposureButton.getVisibility(), View.VISIBLE);
         assertEquals(exposureContainer.getVisibility(), View.GONE);
 
@@ -2873,16 +2925,19 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             clickView(switchCameraButton);
             waitUntilCameraOpened();
 
-            assertEquals(exposureButton.getVisibility(), View.VISIBLE);
+            assertEquals(exposureButton.getVisibility(), (mPreview.supportsExposures() ? View.VISIBLE : View.GONE));
             assertEquals(exposureContainer.getVisibility(), View.GONE);
-            assertEquals(mPreview.getCurrentExposure(), -1);
-            assertEquals(mPreview.getCurrentExposure() - mPreview.getMinimumExposure(), seekBar.getProgress());
 
-            clickView(exposureButton);
-            assertEquals(exposureButton.getVisibility(), View.VISIBLE);
-            assertEquals(exposureContainer.getVisibility(), View.VISIBLE);
-            assertEquals(mPreview.getCurrentExposure(), -1);
-            assertEquals(mPreview.getCurrentExposure() - mPreview.getMinimumExposure(), seekBar.getProgress());
+            if( mPreview.supportsExposures() ) {
+                assertEquals(mPreview.getCurrentExposure(), -1);
+                assertEquals(mPreview.getCurrentExposure() - mPreview.getMinimumExposure(), seekBar.getProgress());
+
+                clickView(exposureButton);
+                assertEquals(exposureButton.getVisibility(), View.VISIBLE);
+                assertEquals(exposureContainer.getVisibility(), View.VISIBLE);
+                assertEquals(mPreview.getCurrentExposure(), -1);
+                assertEquals(mPreview.getCurrentExposure() - mPreview.getMinimumExposure(), seekBar.getProgress());
+            }
         }
     }
 
@@ -3174,10 +3229,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "visibility is now: " + audioControlButton.getVisibility());
         assertEquals(audioControlButton.getVisibility(), View.GONE);
 
-        editor.putString(PreferenceKeys.AudioControlPreferenceKey, "voice");
+        /*editor.putString(PreferenceKeys.AudioControlPreferenceKey, "voice");
         editor.apply();
         updateForSettings();
-        assertEquals(audioControlButton.getVisibility(), View.VISIBLE);
+        assertEquals(audioControlButton.getVisibility(), View.VISIBLE);*/
 
         editor.putString(PreferenceKeys.AudioControlPreferenceKey, "none");
         editor.apply();
@@ -3255,7 +3310,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             // make sure the test fails rather than hanging, if for some reason we get stuck (note that testTakePhotoManualISOExposure takes over 10s on Nexus 6)
             // also see note at end of setToDefault for Nokia 8, need to sleep briefly to avoid hanging here
             if( !is_focus_bracketing ) {
-                assertTrue(System.currentTimeMillis() - time_s < (is_panorama ? 40000 : 20000)); // need longer for panorama on Nexus 7 for testTakePhotoPanoramaMax
+                assertTrue(System.currentTimeMillis() - time_s < (is_panorama ? 50000 : 20000)); // need longer for panorama on Nexus 7 for testTakePhotoPanoramaMax
             }
             assertTrue(!mPreview.isTakingPhoto() || switchCameraButton.getVisibility() == View.GONE);
             assertTrue(!mPreview.isTakingPhoto() || switchMultiCameraButton.getVisibility() == View.GONE);
@@ -3279,6 +3334,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Thread.sleep(2000);
         int saved_count = mPreview.count_cameraAutoFocus;
         Log.d(TAG, "saved count_cameraAutoFocus: " + saved_count);
+        Log.d(TAG, "has focus area?: " + mPreview.hasFocusArea());
         Log.d(TAG, "about to click preview for autofocus");
         if( double_tap_photo ) {
             TouchUtils.tapView(MainActivityTest.this, mPreview.getView());
@@ -3289,24 +3345,36 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         this.getInstrumentation().waitForIdleSync();
         Log.d(TAG, "1 count_cameraAutoFocus: " + mPreview.count_cameraAutoFocus);
         assertEquals((manual_can_auto_focus ? saved_count + 1 : saved_count), mPreview.count_cameraAutoFocus);
-        assertEquals(mPreview.hasFocusArea(), can_focus_area);
-        if( can_focus_area ) {
+        Log.d(TAG, "has focus area?: " + mPreview.hasFocusArea());
+        if( single_tap_photo || double_tap_photo ) {
+            assertFalse(mPreview.hasFocusArea());
+            assertNull(mPreview.getCameraController().getFocusAreas());
+            assertNull(mPreview.getCameraController().getMeteringAreas());
+        }
+        else if( can_focus_area ) {
+            assertTrue(mPreview.hasFocusArea());
             assertNotNull(mPreview.getCameraController().getFocusAreas());
             assertEquals(1, mPreview.getCameraController().getFocusAreas().size());
             assertNotNull(mPreview.getCameraController().getMeteringAreas());
             assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
         }
         else {
+            assertFalse(mPreview.hasFocusArea());
             assertNull(mPreview.getCameraController().getFocusAreas());
-            // we still set metering areas
-            assertNotNull(mPreview.getCameraController().getMeteringAreas());
-            assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+            if( mPreview.getCameraController().supportsMetering() ) {
+                // we still set metering areas
+                assertNotNull(mPreview.getCameraController().getMeteringAreas());
+                assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+            }
+            else {
+                assertNull(mPreview.getCameraController().getMeteringAreas());
+            }
         }
         String new_focus_value_ui = mPreview.getCurrentFocusValue();
         //noinspection StringEquality
         assertTrue(new_focus_value_ui == focus_value_ui || new_focus_value_ui.equals(focus_value_ui)); // also need to do == check, as strings may be null if focus not supported
-        if( focus_value.equals("focus_mode_continuous_picture") && !single_tap_photo )
-            assertEquals("focus_mode_auto", mPreview.getCameraController().getFocusValue()); // continuous focus mode switches to auto focus on touch (unless single_tap_photo)
+        if( focus_value.equals("focus_mode_continuous_picture") && !single_tap_photo && !double_tap_photo && mPreview.supportsFocus() && mPreview.getSupportedFocusValues().contains("focus_mode_auto") )
+            assertEquals("focus_mode_auto", mPreview.getCameraController().getFocusValue()); // continuous focus mode switches to auto focus on touch (unless single_tap_photo, or auto focus not supported)
         else
             assertEquals(mPreview.getCameraController().getFocusValue(), focus_value);
         if( double_tap_photo ) {
@@ -3348,7 +3416,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         }
     }
 
-    private void checkFocusAfterTakePhoto2(final boolean touch_to_focus, final boolean test_wait_capture_result, final boolean locked_focus, final boolean can_auto_focus, final boolean can_focus_area, final int saved_count) {
+    private void checkFocusAfterTakePhoto2(final boolean touch_to_focus, final boolean single_tap_photo, final boolean double_tap_photo, final boolean test_wait_capture_result, final boolean locked_focus, final boolean can_auto_focus, final boolean can_focus_area, final int saved_count) {
         // in locked focus mode, taking photo should never redo an auto-focus
         // if photo mode, we may do a refocus if the previous auto-focus failed, but not if it succeeded
         Log.d(TAG, "2 count_cameraAutoFocus: " + mPreview.count_cameraAutoFocus);
@@ -3361,18 +3429,30 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         else if( touch_to_focus ) {
             Log.d(TAG, "can_focus_area?: " + can_focus_area);
             Log.d(TAG, "hasFocusArea?: " + mPreview.hasFocusArea());
-            assertEquals(mPreview.hasFocusArea(), can_focus_area);
-            if( can_focus_area ) {
+            if( single_tap_photo || double_tap_photo ) {
+                assertFalse(mPreview.hasFocusArea());
+                assertNull(mPreview.getCameraController().getFocusAreas());
+                assertNull(mPreview.getCameraController().getMeteringAreas());
+            }
+            else if( can_focus_area ) {
+                assertTrue(mPreview.hasFocusArea());
                 assertNotNull(mPreview.getCameraController().getFocusAreas());
                 assertEquals(1, mPreview.getCameraController().getFocusAreas().size());
                 assertNotNull(mPreview.getCameraController().getMeteringAreas());
                 assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
             }
             else {
+                assertFalse(mPreview.hasFocusArea());
                 assertNull(mPreview.getCameraController().getFocusAreas());
-                // we still set metering areas
-                assertNotNull(mPreview.getCameraController().getMeteringAreas());
-                assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+
+                if( mPreview.getCameraController().supportsMetering() ) {
+                    // we still set metering areas
+                    assertNotNull(mPreview.getCameraController().getMeteringAreas());
+                    assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+                }
+                else {
+                    assertNull(mPreview.getCameraController().getMeteringAreas());
+                }
             }
         }
         else {
@@ -3427,7 +3507,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         return exp_n_new_files;
     }
 
-    private void checkFilenames(final boolean is_raw, final File [] files, final File [] files2) {
+    private void checkFilenames(final boolean is_raw, final String [] files, final String [] files2) {
         Log.d(TAG, "checkFilenames");
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity);
         boolean hdr_save_expo =  sharedPreferences.getBoolean(PreferenceKeys.HDRSaveExpoPreferenceKey, false);
@@ -3440,7 +3520,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         String filename_jpeg = null;
         String filename_dng = null;
         int n_files = files == null ? 0 : files.length;
-        for(File file : files2) {
+        for(String file : files2) {
             Log.d(TAG, "check file: " + file);
             boolean is_new = true;
             for(int j=0;j<n_files && is_new;j++) {
@@ -3451,7 +3531,9 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             }
             if( is_new ) {
                 Log.d(TAG, "file is new");
-                String filename = file.getName();
+                //String filename = file.getName();
+                //noinspection UnnecessaryLocalVariable
+                String filename = file;
                 assertTrue(filename.startsWith("IMG_"));
                 if( filename.endsWith(".jpg") ) {
                     assertTrue(hdr_save_expo || is_expo || is_focus_bracketing || is_fast_burst || filename_jpeg == null);
@@ -3516,11 +3598,111 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         }
     }
 
-    private void checkFilesAfterTakePhoto(final boolean is_raw, final boolean test_wait_capture_result, final File [] files, final String suffix, final int max_time_s, final Date date) throws InterruptedException {
-        File folder = mActivity.getImageFolder();
+    private enum UriType {
+        MEDIASTORE_IMAGES,
+        MEDIASTORE_VIDEOS,
+        STORAGE_ACCESS_FRAMEWORK
+    }
+
+    /** Returns an array of filenames (not including full path)  of images or videos in the current
+     *  save folder, by querying the media store; or by using storage access framework on the
+     *  supplied uri.
+     */
+    private List<String> mediaFilesinSaveFolder(Uri baseUri, String bucket_id, UriType uri_type) {
+        List<String> files = new ArrayList<>();
+        final int column_name_c = 0; // filename (without path), including extension
+
+        String [] projection;
+        switch( uri_type ) {
+            case MEDIASTORE_IMAGES:
+                projection = new String[] {MediaStore.Images.ImageColumns.DISPLAY_NAME};
+                break;
+            case MEDIASTORE_VIDEOS:
+                projection = new String[] {MediaStore.Video.VideoColumns.DISPLAY_NAME};
+                break;
+            case STORAGE_ACCESS_FRAMEWORK:
+                projection = new String[] {DocumentsContract.Document.COLUMN_DISPLAY_NAME};
+                break;
+            default:
+                throw new RuntimeException("unknown uri_type: " + uri_type);
+        }
+
+        String selection = "";
+        switch( uri_type ) {
+            case MEDIASTORE_IMAGES:
+                selection = MediaStore.Images.ImageColumns.BUCKET_ID + " = " + bucket_id;
+                break;
+            case MEDIASTORE_VIDEOS:
+                selection = MediaStore.Video.VideoColumns.BUCKET_ID + " = " + bucket_id;
+                break;
+            case STORAGE_ACCESS_FRAMEWORK:
+                break;
+            default:
+                throw new RuntimeException("unknown uri_type: " + uri_type);
+        }
+        Log.d(TAG, "selection: " + selection);
+
+        Cursor cursor = mActivity.getContentResolver().query(baseUri, projection, selection, null, null);
+        if( cursor != null && cursor.moveToFirst() ) {
+            Log.d(TAG, "found: " + cursor.getCount());
+
+            do {
+                String name = cursor.getString(column_name_c);
+                files.add(name);
+            }
+            while( cursor.moveToNext() );
+        }
+
+        if( cursor != null ) {
+            cursor.close();
+        }
+
+        return files;
+    }
+
+    /** Returns an array of filenames (not including full path) in the current save folder.
+     */
+    private String [] filesInSaveFolder() {
+        Log.d(TAG, "filesInSaveFolder");
+        if( MainActivity.useScopedStorage() ) {
+            List<String> files = new ArrayList<>();
+            if( mActivity.getStorageUtils().isUsingSAF() ) {
+                // See documentation for StorageUtils.getLatestMediaSAF() - for some reason with scoped storage when not having READ_EXTERNAL_STORAGE,
+                // we can't query the mediastore for files saved via SAF!
+                Uri treeUri = mActivity.getStorageUtils().getTreeUriSAF();
+                Uri baseUri = DocumentsContract.buildChildDocumentsUriUsingTree(treeUri, DocumentsContract.getTreeDocumentId(treeUri));
+                files.addAll( mediaFilesinSaveFolder(baseUri, null, UriType.STORAGE_ACCESS_FRAMEWORK) );
+            }
+            else {
+                String save_folder = mActivity.getStorageUtils().getImageFolderPath();
+                String bucket_id = String.valueOf(save_folder.toLowerCase().hashCode());
+                files.addAll( mediaFilesinSaveFolder(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, bucket_id, UriType.MEDIASTORE_IMAGES) );
+                files.addAll( mediaFilesinSaveFolder(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, bucket_id, UriType.MEDIASTORE_VIDEOS) );
+            }
+
+            if( files.size() == 0 ) {
+                return null;
+            }
+            else {
+                return files.toArray(new String[0]);
+            }
+        }
+        else {
+            File folder = mActivity.getImageFolder();
+            File [] files = folder.listFiles();
+            if( files == null )
+                return null;
+            String [] filenames = new String[files.length];
+            for(int i=0;i<files.length;i++) {
+                filenames[i] = files[i].getName();
+            }
+            return filenames;
+        }
+    }
+
+    private void checkFilesAfterTakePhoto(final boolean is_raw, final boolean test_wait_capture_result, final String [] files, final String suffix, final int max_time_s, final Date date) throws InterruptedException {
         int n_files = files == null ? 0 : files.length;
-        assertTrue( folder.exists() );
-        File [] files2 = folder.listFiles();
+        String [] files2 = filesInSaveFolder();
         int n_new_files = (files2 == null ? 0 : files2.length) - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         int exp_n_new_files = getExpNNewFiles(is_raw);
@@ -3536,20 +3718,30 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         }
 
         if( !mActivity.getApplicationInterface().isRawOnly() ) {
-            assertNotNull(mActivity.test_last_saved_image);
-            File saved_image_file = new File(mActivity.test_last_saved_image);
-            Log.d(TAG, "saved name: " + saved_image_file.getName());
+            String saved_image_filename;
+            if( MainActivity.useScopedStorage() || mActivity.getStorageUtils().isUsingSAF() ) {
+                /*assertNotNull(mActivity.test_last_saved_imagename);
+                saved_image_filename = mActivity.test_last_saved_imagename;*/
+                assertNotNull(mActivity.test_last_saved_imageuri);
+                saved_image_filename = mActivity.getStorageUtils().getFileName(mActivity.test_last_saved_imageuri);
+            }
+            else {
+                assertNotNull(mActivity.test_last_saved_image);
+                File saved_image_file = new File(mActivity.test_last_saved_image);
+                saved_image_filename = saved_image_file.getName();
+            }
+            Log.d(TAG, "saved name: " + saved_image_filename);
             /*Log.d(TAG, "expected name: " + expected_filename);
             Log.d(TAG, "expected name1: " + expected_filename1);
             assertTrue(expected_filename.equals(saved_image_file.getName()) || expected_filename1.equals(saved_image_file.getName()));*/
             // allow for possibility that the time has passed since taking the photo
             boolean matched = false;
             for(int i=0;i<=max_time_s && !matched;i++) {
-                Date test_date = new Date(date.getTime() - 1000*i);
+                Date test_date = new Date(date.getTime() - 1000L *i);
                 String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(test_date);
                 String expected_filename = "IMG_" + timeStamp + suffix + ".jpg";
                 Log.d(TAG, "expected name: " + expected_filename);
-                if( expected_filename.equals(saved_image_file.getName() ) )
+                if( expected_filename.equals(saved_image_filename) )
                     matched = true;
             }
             assertTrue(matched);
@@ -3626,9 +3818,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         int saved_count_cameraTakePicture = mPreview.count_cameraTakePicture;
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        Log.d(TAG, "folder: " + folder);
-        File [] files = folder.listFiles();
+        String [] files = filesInSaveFolder();
         int n_files = files == null ? 0 : files.length;
         Log.d(TAG, "n_files at start: " + n_files);
 
@@ -3665,8 +3855,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         if( focus_value.equals("focus_mode_auto") || focus_value.equals("focus_mode_macro") ) {
             manual_can_auto_focus = true;
         }
-        else if( focus_value.equals("focus_mode_continuous_picture") && !single_tap_photo ) {
-            // if single_tap_photo and continuous mode, we go straight to taking a photo rather than doing a touch to focus
+        else if( focus_value.equals("focus_mode_continuous_picture") && !single_tap_photo && !double_tap_photo ) {
+            // if single_tap_photo or double_tap_photo, and continuous mode, we go straight to taking a photo rather than doing a touch to focus
             manual_can_auto_focus = true;
         }
 
@@ -3681,6 +3871,9 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         checkFocusInitial(focus_value, focus_value_ui);
 
+        int saved_thumbnail_count = mActivity.getApplicationInterface().getDrawPreview().test_thumbnail_anim_count;
+        Log.d(TAG, "saved_thumbnail_count: " + saved_thumbnail_count);
+
         if( touch_to_focus ) {
             subTestTouchToFocus(wait_after_focus, single_tap_photo, double_tap_photo, manual_can_auto_focus, can_focus_area, focus_value, focus_value_ui);
         }
@@ -3698,7 +3891,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         Date date = new Date();
         String suffix = "";
-        int max_time_s = 1;
+        int max_time_s = 2;
         if( is_dro ) {
             suffix = "_DRO";
         }
@@ -3708,7 +3901,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         else if( is_nr ) {
             suffix = "_NR";
             if( mActivity.getApplicationInterface().getNRModePref() == MyApplicationInterface.NRModePref.NRMODE_LOW_LIGHT )
-                max_time_s += 4; // takes longer to save low light photo
+                max_time_s += 6; // takes longer to save low light photo
         }
         else if( is_expo ) {
             suffix = "_" + (n_expo_images-1);
@@ -3721,7 +3914,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         else if( is_fast_burst ) {
             suffix = "_" + (n_fast_burst_images-1); // when burst numbering starts from _0
             //suffix = "_" + (n_fast_burst_images); // when burst numbering starts from _1
-            max_time_s = 3; // takes longer to save 20 images!
+            max_time_s = 4; // takes longer to save 20 images!
         }
 
         if( is_raw ) {
@@ -3737,16 +3930,17 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "after idle sync");
         Log.d(TAG, "take picture count: " + mPreview.count_cameraTakePicture);
         assertEquals(mPreview.count_cameraTakePicture, saved_count_cameraTakePicture + 1);
-        if( test_wait_capture_result ) {
+        /*if( test_wait_capture_result ) {
             // if test_wait_capture_result, then we'll have waited too long for thumbnail animation
         }
         else if( is_focus_bracketing ) {
             // thumbnail animation may have already occurred (e.g., see testTakePhotoFocusBracketingHeavy()
         }
-        else if( has_thumbnail_anim ) {
+        else*/ if( has_thumbnail_anim ) {
             long time_s = System.currentTimeMillis();
-            while( !mActivity.hasThumbnailAnimation() ) {
-                Log.d(TAG, "waiting for thumbnail animation");
+            //while( !mActivity.hasThumbnailAnimation() ) {
+            while( mActivity.getApplicationInterface().getDrawPreview().test_thumbnail_anim_count <= saved_thumbnail_count ) {
+                Log.d(TAG, "waiting for thumbnail animation: " + mActivity.getApplicationInterface().getDrawPreview().test_thumbnail_anim_count + " vs " + saved_thumbnail_count);
                 Thread.sleep(10);
                 int allowed_time_ms = 10000;
                 if( is_hdr || is_nr || is_expo ) {
@@ -3758,6 +3952,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         }
         else {
             assertFalse( mActivity.hasThumbnailAnimation() );
+            assertEquals(saved_thumbnail_count, mActivity.getApplicationInterface().getDrawPreview().test_thumbnail_anim_count);
         }
         mActivity.waitUntilImageQueueEmpty();
         Log.d(TAG, "mActivity.hasThumbnailAnimation()?: " + mActivity.hasThumbnailAnimation());
@@ -3766,11 +3961,12 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         checkFilesAfterTakePhoto(is_raw, test_wait_capture_result, files, suffix, max_time_s, date);
 
-        checkFocusAfterTakePhoto2(touch_to_focus, test_wait_capture_result, locked_focus, can_auto_focus, can_focus_area, saved_count);
+        checkFocusAfterTakePhoto2(touch_to_focus, single_tap_photo, double_tap_photo, test_wait_capture_result, locked_focus, can_auto_focus, can_focus_area, saved_count);
 
         postTakePhotoChecks(immersive_mode, exposureVisibility, exposureLockVisibility);
 
         assertFalse(mActivity.getApplicationInterface().getImageSaver().test_queue_blocked);
+        assertTrue( mPreview.getCameraController() == null || mPreview.getCameraController().count_camera_parameters_exception == 0 );
     }
 
     public void testTakePhoto() throws InterruptedException {
@@ -3786,6 +3982,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mPreview.supportsRaw() ) {
+            Log.d(TAG, "test requires RAW");
             return;
         }
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
@@ -3804,6 +4001,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mPreview.supportsRaw() ) {
+            Log.d(TAG, "test requires RAW");
             return;
         }
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
@@ -3830,6 +4028,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mPreview.supportsRaw() ) {
+            Log.d(TAG, "test requires RAW");
             return;
         }
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
@@ -3839,8 +4038,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         updateForSettings();
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         int start_count = mPreview.count_cameraTakePicture;
@@ -3861,7 +4059,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         }
 
         mActivity.waitUntilImageQueueEmpty();
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(n_new_files, 2 * n_photos); // if we fail here, be careful we haven't lost images (i.e., waitUntilImageQueueEmpty() returns before all images are saved)
     }
@@ -3873,6 +4071,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mPreview.supportsRaw() ) {
+            Log.d(TAG, "test requires RAW");
             return;
         }
 
@@ -3885,8 +4084,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         updateForSettings();
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         View takePhotoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.take_photo);
@@ -3915,7 +4113,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "count_cameraTakePicture: " + mPreview.count_cameraTakePicture);
         assertEquals(mPreview.count_cameraTakePicture, n_repeat);
 
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(n_new_files, 2 * n_repeat); // if we fail here, be careful we haven't lost images (i.e., waitUntilImageQueueEmpty() returns before all images are saved)
     }
@@ -3927,6 +4125,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mPreview.supportsRaw() ) {
+            Log.d(TAG, "test requires RAW");
             return;
         }
 
@@ -3971,6 +4170,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mPreview.supportsRaw() ) {
+            Log.d(TAG, "test requires RAW");
             return;
         }
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
@@ -3994,6 +4194,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mPreview.supportsRaw() ) {
+            Log.d(TAG, "test requires RAW");
             return;
         }
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
@@ -4018,6 +4219,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mPreview.supportsRaw() ) {
+            Log.d(TAG, "test requires RAW");
             return;
         }
 
@@ -4035,6 +4237,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         subTestTakePhoto(false, false, true, true, false, false, true, false);
     }
 
+    /** We no longer run this - superseded by testTakePhotoAutoLevel etc.
+     */
     public void testTakePhotoAutoStabilise() throws InterruptedException {
         Log.d(TAG, "testTakePhotoAutoStabilise");
         setToDefault();
@@ -4513,6 +4717,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
      * For multi-camera devices, this tests the behaviour with
      * PreferenceKeys.MultiCamButtonPreferenceKey devices, so the switch camera icon still cycles
      * through all cameras.
+     * Can be unstable on Android emulator if the time taken to focus means we've already switched
+     * back from auto to continuous focus (after touch to focus).
      */
     public void testTakePhotoFrontCameraAll() throws InterruptedException {
         Log.d(TAG, "testTakePhotoFrontCameraAll");
@@ -4555,7 +4761,12 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         subTestTakePhotoMultiCameras(false, true);
     }
 
-    /* Tests taking a photo with front camera and screen flash.
+    /** Tests taking a photo with front camera and screen flash.
+     *  Note this test fails on Android emulator with old camera API, because on front camera when
+     *  we switch from continuous to auto focus from touch to focus, we're still in continuous focus
+     *  mode, despite both focus modes being supported for front camera - I confirmed that we do
+     *  switch to auto focus, and haven't reset to continuous! Could be a threading/synchronization
+     *  issue from trying to read the camera parameters from the test thread?
      */
     public void testTakePhotoFrontCameraScreenFlash() throws InterruptedException {
         Log.d(TAG, "testTakePhotoFrontCameraScreenFlash");
@@ -4607,6 +4818,13 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         }
 
         setToDefault();
+
+        if( !mPreview.supportsFocus() ) {
+            // if no focus, then the photo will be taken on the UI thread
+            Log.d(TAG, "test requires focus");
+            return;
+        }
+
         switchToFocusValue("focus_mode_auto");
 
         mPreview.getCameraController().test_release_during_photo = true;
@@ -4631,7 +4849,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "testTakePhotoManualFocus");
         setToDefault();
 
-        if( !mPreview.getSupportedFocusValues().contains("focus_mode_manual2") ) {
+        if( !mPreview.supportsFocus() || !mPreview.getSupportedFocusValues().contains("focus_mode_manual2") ) {
             return;
         }
         SeekBar seekBar = mActivity.findViewById(net.sourceforge.opencamera.R.id.focus_seekbar);
@@ -4689,7 +4907,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
         SharedPreferences.Editor editor = settings.edit();
-        editor.putString(PreferenceKeys.AudioControlPreferenceKey, "voice");
+        editor.putString(PreferenceKeys.AudioControlPreferenceKey, "noise");
         editor.apply();
         updateForSettings();
 
@@ -4697,6 +4915,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     }
 
     /** Tests the use of the FLAG_LAYOUT_NO_LIMITS flag introduced in 1.48.
+     *  In 1.49 this was replaced with View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION.
      */
     public void testLayoutNoLimits() throws InterruptedException {
         Log.d(TAG, "testLayoutNoLimits");
@@ -4715,21 +4934,27 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         Thread.sleep(1000);
         assertEquals(0, mActivity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+        assertEquals(0, mActivity.getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
         assertEquals(0, mActivity.getMainUI().test_navigation_gap);
 
         // test changing resolution
         MainActivity.test_preview_want_no_limits_value = true;
         updateForSettings();
         Thread.sleep(1000);
-        boolean supports_no_limits = mActivity.getNavigationGap() != 0;
+        //final boolean supports_no_limits = mActivity.getNavigationGap() != 0;
+        final boolean supports_no_limits = false;
+        final boolean supports_hide_navigation = mActivity.getNavigationGap() != 0;
         Log.d(TAG, "supports_no_limits: " + supports_no_limits);
+        Log.d(TAG, "supports_hide_navigation: " + supports_hide_navigation);
 
         assertEquals(supports_no_limits ? WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS : 0, mActivity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+        assertEquals(supports_hide_navigation ? View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION : 0, mActivity.getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
         assertEquals(mActivity.getNavigationGap(), mActivity.getMainUI().test_navigation_gap);
         MainActivity.test_preview_want_no_limits_value = false;
         updateForSettings();
         Thread.sleep(1000);
         assertEquals(0, mActivity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+        assertEquals(0, mActivity.getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
         assertEquals(0, mActivity.getMainUI().test_navigation_gap);
 
         if( mPreview.getCameraControllerManager().getNumberOfCameras() > 1 ) {
@@ -4738,11 +4963,13 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             switchToCamera(1);
             Thread.sleep(1000);
             assertEquals(supports_no_limits ? WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS : 0, mActivity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+            assertEquals(supports_hide_navigation ? View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION : 0, mActivity.getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
             assertEquals(mActivity.getNavigationGap(), mActivity.getMainUI().test_navigation_gap);
             MainActivity.test_preview_want_no_limits_value = false;
             switchToCamera(0);
             Thread.sleep(1000);
             assertEquals(0, mActivity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+            assertEquals(0, mActivity.getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
             assertEquals(0, mActivity.getMainUI().test_navigation_gap);
         }
 
@@ -4754,6 +4981,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertTrue(mPreview.isVideo());
         Thread.sleep(1000);
         assertEquals(supports_no_limits ? WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS : 0, mActivity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+        assertEquals(supports_hide_navigation ? View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION : 0, mActivity.getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
         assertEquals(mActivity.getNavigationGap(), mActivity.getMainUI().test_navigation_gap);
         MainActivity.test_preview_want_no_limits_value = false;
         clickView(switchVideoButton);
@@ -4761,6 +4989,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertFalse(mPreview.isVideo());
         Thread.sleep(1000);
         assertEquals(0, mActivity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+        assertEquals(0, mActivity.getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
         assertEquals(0, mActivity.getMainUI().test_navigation_gap);
 
         // test after restart
@@ -4768,10 +4997,12 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         restart();
         Thread.sleep(1000);
         assertEquals(supports_no_limits ? WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS : 0, mActivity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+        assertEquals(supports_hide_navigation ? View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION : 0, mActivity.getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
         assertEquals(mActivity.getNavigationGap(), mActivity.getMainUI().test_navigation_gap);
     }
 
     /** Tests the use of the FLAG_LAYOUT_NO_LIMITS flag introduced in 1.48, with the mode set from startup.
+     *  In 1.49 this was replaced with View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION.
      */
     public void testLayoutNoLimitsStartup() throws InterruptedException {
         Log.d(TAG, "testLayoutNoLimitsStartup");
@@ -4789,12 +5020,16 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         Thread.sleep(1000);
-        boolean supports_no_limits = mActivity.getNavigationGap() != 0;
+        //boolean supports_no_limits = mActivity.getNavigationGap() != 0;
+        final boolean supports_no_limits = false;
+        final boolean supports_hide_navigation = mActivity.getNavigationGap() != 0;
         Log.d(TAG, "supports_no_limits: " + supports_no_limits);
+        Log.d(TAG, "supports_hide_navigation: " + supports_hide_navigation);
 
         Log.d(TAG, "check FLAG_LAYOUT_NO_LIMITS");
         Log.d(TAG, "test_navigation_gap: " + mActivity.getMainUI().test_navigation_gap);
         assertEquals(supports_no_limits ? WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS : 0, mActivity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+        assertEquals(supports_hide_navigation ? View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION : 0, mActivity.getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
         assertEquals(mActivity.getNavigationGap(), mActivity.getMainUI().test_navigation_gap);
     }
 
@@ -4802,8 +5037,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         mPreview.count_cameraTakePicture = 0;
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
@@ -4854,7 +5088,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Bitmap thumbnail = mActivity.gallery_bitmap;
         assertNotNull(thumbnail);
 
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         int exp_n_new_files = is_raw ? 2 : 1;
         Log.d(TAG, "exp_n_new_files: " + exp_n_new_files);
@@ -4880,7 +5114,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "after idle sync 3");
 
         // check photo not deleted
-        n_new_files = getNFiles(folder) - n_files;
+        n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         Log.d(TAG, "exp_n_new_files: " + exp_n_new_files);
         assertEquals(n_new_files, exp_n_new_files);
@@ -4923,7 +5157,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
         SharedPreferences.Editor editor = settings.edit();
-        editor.putString(PreferenceKeys.AudioControlPreferenceKey, "voice");
+        editor.putString(PreferenceKeys.AudioControlPreferenceKey, "noise");
         editor.apply();
         updateForSettings();
 
@@ -4957,8 +5191,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
      */
     private void subTestTakePhotoPreviewPausedShareTrash(boolean is_raw, boolean share) throws InterruptedException {
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
@@ -5012,7 +5245,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Bitmap thumbnail = mActivity.gallery_bitmap;
         assertNotNull(thumbnail);
 
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         int exp_n_new_files = is_raw ? 2 : 1;
         Log.d(TAG, "exp_n_new_files: " + exp_n_new_files);
@@ -5038,7 +5271,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             Log.d(TAG, "done click share");
 
             // check photo(s) not deleted
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(n_new_files, exp_n_new_files);
         }
@@ -5048,7 +5281,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             Log.d(TAG, "done click trash");
 
             // check photo(s) deleted
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(0, n_new_files);
 
@@ -5187,12 +5420,18 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         int saved_count = mPreview.count_cameraAutoFocus;
         TouchUtils.clickView(MainActivityTest.this, mPreview.getView());
         Log.d(TAG, "1 count_cameraAutoFocus: " + mPreview.count_cameraAutoFocus);
-        assertEquals(mPreview.count_cameraAutoFocus, saved_count + 1);
-        assertTrue(mPreview.hasFocusArea());
-        assertNotNull(mPreview.getCameraController().getFocusAreas());
-        assertEquals(1, mPreview.getCameraController().getFocusAreas().size());
-        assertNotNull(mPreview.getCameraController().getMeteringAreas());
-        assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+
+        if( mPreview.supportsFocus() ) {
+            assertEquals(mPreview.count_cameraAutoFocus, saved_count + 1);
+            assertTrue(mPreview.hasFocusArea());
+            assertNotNull(mPreview.getCameraController().getFocusAreas());
+            assertEquals(1, mPreview.getCameraController().getFocusAreas().size());
+            assertNotNull(mPreview.getCameraController().getMeteringAreas());
+            assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+        }
+        else {
+            assertEquals(mPreview.count_cameraAutoFocus, saved_count);
+        }
 
         // wait 3s for auto-focus to complete
         Thread.sleep(3000);
@@ -5211,12 +5450,17 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         // taking photo shouldn't have done an auto-focus, and still have focus areas
         Log.d(TAG, "2 count_cameraAutoFocus: " + mPreview.count_cameraAutoFocus);
-        assertEquals(mPreview.count_cameraAutoFocus, saved_count + 1);
-        assertTrue(mPreview.hasFocusArea());
-        assertNotNull(mPreview.getCameraController().getFocusAreas());
-        assertEquals(1, mPreview.getCameraController().getFocusAreas().size());
-        assertNotNull(mPreview.getCameraController().getMeteringAreas());
-        assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+        if( mPreview.supportsFocus() ) {
+            assertEquals(mPreview.count_cameraAutoFocus, saved_count + 1);
+            assertTrue(mPreview.hasFocusArea());
+            assertNotNull(mPreview.getCameraController().getFocusAreas());
+            assertEquals(1, mPreview.getCameraController().getFocusAreas().size());
+            assertNotNull(mPreview.getCameraController().getMeteringAreas());
+            assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+        }
+        else {
+            assertEquals(mPreview.count_cameraAutoFocus, saved_count);
+        }
 
         mActivity.waitUntilImageQueueEmpty();
     }
@@ -5224,6 +5468,12 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     private void takePhotoRepeatFocus(boolean locked) throws InterruptedException {
         Log.d(TAG, "takePhotoRepeatFocus");
         setToDefault();
+
+        if( !mPreview.supportsFocus() ) {
+            Log.d(TAG, "test requires focus");
+            return;
+        }
+
         if( locked ) {
             switchToFocusValue("focus_mode_locked");
         }
@@ -5307,8 +5557,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertTrue(mPreview.isPreviewStarted());
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         View switchCameraButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.switch_camera);
@@ -5352,7 +5601,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         mActivity.waitUntilImageQueueEmpty();
 
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(1, n_new_files);
 
@@ -5386,8 +5635,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
     private void takePhotoLoop(int count) {
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         int start_count = mPreview.count_cameraTakePicture;
@@ -5407,7 +5655,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         }
 
         mActivity.waitUntilImageQueueEmpty();
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(n_new_files, count);
     }
@@ -5469,8 +5717,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     private void takePhotoLoopAngles(int [] angles) {
         // count initial files in folder
         mActivity.test_have_angle = true;
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         int start_count = mPreview.count_cameraTakePicture;
@@ -5491,7 +5738,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         }
 
         mActivity.waitUntilImageQueueEmpty();
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(n_new_files, angles.length); // if we fail here, be careful we haven't lost images (i.e., waitUntilImageQueueEmpty() returns before all images are saved); note that in some cases, this test fails here because the activity onPause() after clicking take photo?!
 
@@ -5613,9 +5860,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         mActivity.getApplicationInterface().test_n_videos_scanned = 0;
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        Log.d(TAG, "folder: " + folder);
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity);
@@ -5665,6 +5910,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         }
 
         int exp_n_new_files = 0;
+        boolean failed_to_start = false;
         if( mPreview.isVideoRecording() ) {
             assertEquals((int) (Integer) takePhotoButton.getTag(), net.sourceforge.opencamera.R.drawable.take_video_recording);
             assertEquals((int) (Integer) switchVideoButton.getTag(), net.sourceforge.opencamera.R.drawable.take_photo);
@@ -5714,11 +5960,13 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                     Log.d(TAG, "touch to focus");
                     TouchUtils.clickView(MainActivityTest.this, mPreview.getView());
                     Thread.sleep(1000); // wait for autofocus
-                    assertTrue(mPreview.hasFocusArea());
-                    assertNotNull(mPreview.getCameraController().getFocusAreas());
-                    assertEquals(1, mPreview.getCameraController().getFocusAreas().size());
-                    assertNotNull(mPreview.getCameraController().getMeteringAreas());
-                    assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+                    if( mPreview.supportsFocus() ) {
+                        assertTrue(mPreview.hasFocusArea());
+                        assertNotNull(mPreview.getCameraController().getFocusAreas());
+                        assertEquals(1, mPreview.getCameraController().getFocusAreas().size());
+                        assertNotNull(mPreview.getCameraController().getMeteringAreas());
+                        assertEquals(1, mPreview.getCameraController().getMeteringAreas().size());
+                    }
                     Log.d(TAG, "done touch to focus");
 
                     // this time, don't wait
@@ -5761,6 +6009,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         else {
             Log.d(TAG, "didn't start video");
             assertTrue(allow_failure);
+            failed_to_start = true;
         }
 
         if( mPreview.usingCamera2API() ) {
@@ -5768,14 +6017,17 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             assertEquals(mPreview.getCurrentPreviewSize().height, mPreview.getCameraController().test_texture_view_buffer_h);
         }
 
-        assertTrue( folder.exists() );
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         if( test_cb == null ) {
             if( time_ms <= 500 ) {
                 // if quick, should have deleted corrupt video - but may be device dependent, sometimes we manage to record a video anyway!
                 assertTrue(n_new_files == 0 || n_new_files == 1);
             }
+            else if( failed_to_start ) {
+                // if video recording failed to start, we should have deleted any file created!
+                assertEquals(0, n_new_files);
+            }
             else {
                 assertEquals(n_non_video_files+1, n_new_files);
             }
@@ -5818,6 +6070,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             assertEquals(n_new_files-n_non_video_files, mActivity.getApplicationInterface().test_n_videos_scanned);
         }
 
+        assertTrue( mPreview.getCameraController() == null || mPreview.getCameraController().count_camera_parameters_exception == 0 );
         return n_new_files;
     }
 
@@ -5837,7 +6090,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
         SharedPreferences.Editor editor = settings.edit();
-        editor.putString(PreferenceKeys.AudioControlPreferenceKey, "voice");
+        editor.putString(PreferenceKeys.AudioControlPreferenceKey, "noise");
         editor.apply();
         updateForSettings();
 
@@ -5866,6 +6119,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertEquals(1, n_new_files);
     }
 
+    /** Tests video subtitles option.
+     */
     public void testTakeVideoSubtitles() throws InterruptedException {
         Log.d(TAG, "testTakeVideoSubtitles");
 
@@ -5878,13 +6133,35 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             updateForSettings();
         }
 
+        subTestTakeVideo(false, false, false, false, null, 5000, false,
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.R ? 0 : 1 // boo, Android 11 doesn't allow video subtitles to be saved with mediastore API!
+        );
+    }
+
+    /** Tests video subtitles option, when using Storage Access Framework.
+     */
+    public void testTakeVideoSubtitlesSAF() throws InterruptedException {
+        Log.d(TAG, "testTakeVideoSubtitlesSAF");
+
+        setToDefault();
+        {
+            SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
+            SharedPreferences.Editor editor = settings.edit();
+            editor.putString(PreferenceKeys.VideoSubtitlePref, "preference_video_subtitle_yes");
+            editor.putBoolean(PreferenceKeys.UsingSAFPreferenceKey, true);
+            editor.putString(PreferenceKeys.SaveLocationSAFPreferenceKey, "content://com.android.externalstorage.documents/tree/primary%3ADCIM%2FOpenCamera");
+            editor.apply();
+            updateForSettings();
+        }
+
         subTestTakeVideo(false, false, false, false, null, 5000, false, 1);
     }
 
     /** Tests video subtitles option, including GPS - also tests losing the connection.
+     *  Also test with Storage Access Framework, so this can run on Android 11+.
      */
-    public void testTakeVideoSubtitlesGPS() throws InterruptedException {
-        Log.d(TAG, "testTakeVideoSubtitlesGPS");
+    public void testTakeVideoSubtitlesGPSSAF() throws InterruptedException {
+        Log.d(TAG, "testTakeVideoSubtitlesGPSSAF");
 
         setToDefault();
         {
@@ -5892,6 +6169,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             SharedPreferences.Editor editor = settings.edit();
             editor.putString(PreferenceKeys.VideoSubtitlePref, "preference_video_subtitle_yes");
             editor.putBoolean(PreferenceKeys.LocationPreferenceKey, true);
+            editor.putBoolean(PreferenceKeys.UsingSAFPreferenceKey, true);
+            editor.putString(PreferenceKeys.SaveLocationSAFPreferenceKey, "content://com.android.externalstorage.documents/tree/primary%3ADCIM%2FOpenCamera");
             editor.apply();
             updateForSettings();
         }
@@ -5971,7 +6250,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                 assertEquals(pauseVideoButton.getVisibility(), View.VISIBLE);
                 assertTrue( mPreview.isVideoRecording() );
                 assertFalse(mPreview.isVideoRecordingPaused());
-                long video_time = mPreview.getVideoTime();
+                long video_time = mPreview.getVideoTime(false);
                 Log.d(TAG, "video time: " + video_time);
                 assertTrue( video_time >= 3000 - time_tol_ms );
                 assertTrue( video_time <= 3000 + time_tol_ms );
@@ -5999,7 +6278,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                 assertEquals(pauseVideoButton.getVisibility(), View.VISIBLE);
                 assertTrue( mPreview.isVideoRecording() );
                 assertTrue( mPreview.isVideoRecordingPaused() );
-                video_time = mPreview.getVideoTime();
+                video_time = mPreview.getVideoTime(false);
                 Log.d(TAG, "video time: " + video_time);
                 assertTrue( video_time >= 3000 - time_tol_ms );
                 assertTrue( video_time <= 3000 + time_tol_ms );
@@ -6029,7 +6308,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                 assertEquals(pauseVideoButton.getVisibility(), View.VISIBLE);
                 assertTrue( mPreview.isVideoRecording() );
                 assertFalse(mPreview.isVideoRecordingPaused());
-                video_time = mPreview.getVideoTime();
+                video_time = mPreview.getVideoTime(false);
                 Log.d(TAG, "video time: " + video_time);
                 assertTrue( video_time >= 6000 - time_tol_ms );
                 assertTrue( video_time <= 6000 + time_tol_ms );
@@ -6079,7 +6358,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                 assertEquals(pauseVideoButton.getVisibility(), View.VISIBLE);
                 assertTrue( mPreview.isVideoRecording() );
                 assertFalse(mPreview.isVideoRecordingPaused());
-                long video_time = mPreview.getVideoTime();
+                long video_time = mPreview.getVideoTime(false);
                 Log.d(TAG, "video time: " + video_time);
                 assertTrue( video_time >= 3000 - time_tol_ms );
                 assertTrue( video_time <= 3000 + time_tol_ms );
@@ -6109,7 +6388,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                 assertEquals(pauseVideoButton.getVisibility(), View.VISIBLE);
                 assertTrue( mPreview.isVideoRecording() );
                 assertTrue( mPreview.isVideoRecordingPaused() );
-                video_time = mPreview.getVideoTime();
+                video_time = mPreview.getVideoTime(false);
                 Log.d(TAG, "video time: " + video_time);
                 assertTrue( video_time >= 3000 - time_tol_ms );
                 assertTrue( video_time <= 3000 + time_tol_ms );
@@ -6297,12 +6576,12 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                 // wait until automatically stops
                 Log.d(TAG, "wait until video recording stops");
                 long time_s = System.currentTimeMillis();
-                long video_time_s = mPreview.getVideoTime();
+                long video_time_s = mPreview.getVideoTime(false);
                 // simulate remaining memory now being reduced, so we don't keep trying to restart
                 mActivity.getApplicationInterface().test_available_memory = 10000000;
                 while( mPreview.isVideoRecording() ) {
                     assertTrue( System.currentTimeMillis() - time_s <= 35000 );
-                    long video_time = mPreview.getVideoTime();
+                    long video_time = mPreview.getVideoTime(false);
                     assertTrue( video_time >= video_time_s );
                 }
                 Log.d(TAG, "video recording now stopped");
@@ -6382,6 +6661,11 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             public int doTest() {
                 if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) {
                     assertTrue(mPreview.isVideoRecording());
+
+                    long video_time = mPreview.getVideoTime(false);
+                    long video_time_this_file = mPreview.getVideoTime(true);
+                    assertEquals(video_time, video_time_this_file);
+
                     Log.d(TAG, "wait");
                     try {
                         Thread.sleep(10000);
@@ -6400,10 +6684,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                 // wait until automatically stops
                 Log.d(TAG, "wait until video recording stops");
                 long time_s = System.currentTimeMillis();
-                long video_time_s = mPreview.getVideoTime();
+                long video_time_s = mPreview.getVideoTime(false);
                 while( mPreview.isVideoRecording() ) {
                     assertTrue( System.currentTimeMillis() - time_s <= 8000 );
-                    long video_time = mPreview.getVideoTime();
+                    long video_time = mPreview.getVideoTime(false);
                     assertTrue( video_time >= video_time_s );
                 }
                 Log.d(TAG, "video recording now stopped - wait for restart");
@@ -6426,7 +6710,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                         Log.e(TAG, "time: " + (c_time - time_s));
                     }
                     assertTrue( c_time - time_s <= 10000 );
-                    long video_time = mPreview.getVideoTime();
+                    long video_time = mPreview.getVideoTime(false);
                     if( video_time < video_time_s )
                         Log.d(TAG, "compare: " + video_time_s + " to " + video_time);
                     assertTrue( video_time + 1 >= video_time_s );
@@ -6480,6 +6764,13 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) {
             assertTrue( n_new_files >= 2 );
         }
+
+        // if we've restarted, the total video time should be longer than the video time for the most recent file
+        long video_time = mPreview.getVideoTime(false);
+        long video_time_this_file = mPreview.getVideoTime(true);
+        Log.d(TAG, "video_time: " + video_time);
+        Log.d(TAG, "video_time_this_file: " + video_time_this_file);
+        assertTrue(video_time > video_time_this_file + 1000);
     }
 
     /** Max filesize is for ~4.5s, and max duration is 5s, check we only get 1 video.
@@ -6508,10 +6799,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                 // wait until automatically stops
                 Log.d(TAG, "wait until video recording stops");
                 long time_s = System.currentTimeMillis();
-                long video_time_s = mPreview.getVideoTime();
+                long video_time_s = mPreview.getVideoTime(false);
                 while( mPreview.isVideoRecording() ) {
                     assertTrue( System.currentTimeMillis() - time_s <= 8000 );
-                    long video_time = mPreview.getVideoTime();
+                    long video_time = mPreview.getVideoTime(false);
                     assertTrue( video_time >= video_time_s );
                 }
                 Log.d(TAG, "video recording now stopped - check we don't restart");
@@ -6577,6 +6868,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             // as this tests Android 8+'s seamless restart
             return;
         }
+        if( isEmulator() ) {
+            // as test takes about 6.5 minutes on emulator (possibly due to unusual video file sizes), even though it does eventually pass
+            return;
+        }
 
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
         SharedPreferences.Editor editor = settings.edit();
@@ -6642,6 +6937,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     }
 
     /** As testTakeVideoMaxFileSize4(), but using Storage Access Framework.
+     *  N.B., failing on Galaxy S10e Android 12 due to receiving MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED
+     *  shortly after MEDIA_RECORDER_INFO_MAX_FILESIZE_APPROACHING.
      */
     public void testTakeVideoMaxFileSize4SAF() throws InterruptedException {
         Log.d(TAG, "testTakeVideoMaxFileSize4SAF");
@@ -6779,6 +7076,44 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         subTestTakeVideo(false, false, true, false, null, 5000, false, 0);
     }
 
+    public void testTakeVideoForceFailureSAF() throws InterruptedException {
+        Log.d(TAG, "testTakeVideoForceFailureSAF");
+
+        if( Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP ) {
+            Log.d(TAG, "SAF requires Android Lollipop or better");
+            return;
+        }
+
+        setToDefault();
+        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
+        SharedPreferences.Editor editor = settings.edit();
+        editor.putBoolean(PreferenceKeys.UsingSAFPreferenceKey, true);
+        editor.putString(PreferenceKeys.SaveLocationSAFPreferenceKey, "content://com.android.externalstorage.documents/tree/primary%3ADCIM%2FOpenCamera");
+        editor.apply();
+        updateForSettings();
+
+        mActivity.getPreview().test_video_failure = true;
+        subTestTakeVideo(false, false, true, false, null, 5000, false, 0);
+    }
+
+    public void testTakeVideoForceIOException() throws InterruptedException {
+        Log.d(TAG, "testTakeVideoForceIOException");
+
+        setToDefault();
+
+        mActivity.getPreview().test_video_ioexception = true;
+        subTestTakeVideo(false, false, true, false, null, 5000, false, 0);
+    }
+
+    public void testTakeVideoForceCameraControllerException() throws InterruptedException {
+        Log.d(TAG, "testTakeVideoForceCameraControllerException");
+
+        setToDefault();
+
+        mActivity.getPreview().test_video_cameracontrollerexception = true;
+        subTestTakeVideo(false, false, true, false, null, 5000, false, 0);
+    }
+
     /* Test can be reliable on some devices, test no longer run as part of test suites.
      */
     public void testTakeVideo4K() throws InterruptedException {
@@ -7076,6 +7411,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     }
 
     /** Take video with timelapse mode.
+     *  Fails on Android emulator (at least for Android 7.1 on VirtualScene camera).
      */
     public void testTakeVideoTimeLapse() throws InterruptedException {
         Log.d(TAG, "testTakeVideoTimeLapse");
@@ -7294,8 +7630,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertTrue(mPreview.isPreviewStarted());
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity);
@@ -7354,9 +7689,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "check still taking video");
         assertTrue( mPreview.isVideoRecording() );
 
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
-        assertEquals(1, n_new_files);
+        // note, if using scoped storage without SAF (i.e., mediastore API), then the video file won't show up until after we've finished recording (IS_PENDING is set to 0)
+        assertEquals(MainActivity.useScopedStorage() && !mActivity.getStorageUtils().isUsingSAF() ? 0 : 1, n_new_files);
 
         if( restart ) {
             if( interrupt ) {
@@ -7371,10 +7707,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                 Thread.sleep(10000);
                 Log.d(TAG, "check restarted video");
                 assertTrue( mPreview.isVideoRecording() );
-                assertTrue( folder.exists() );
-                n_new_files = getNFiles(folder) - n_files;
+                n_new_files = getNFiles() - n_files;
                 Log.d(TAG, "n_new_files: " + n_new_files);
-                assertEquals(2, n_new_files);
+                // as noted above, with mediastore API then the latest file won't be visible yet
+                assertEquals(MainActivity.useScopedStorage() && !mActivity.getStorageUtils().isUsingSAF() ? 1 : 2, n_new_files);
 
                 Thread.sleep(15000);
             }
@@ -7385,8 +7721,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "check stopped taking video");
         assertFalse(mPreview.isVideoRecording());
 
-        assertTrue( folder.exists() );
-        n_new_files = getNFiles(folder) - n_files;
+        n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(n_new_files, (restart ? 2 : 1));
 
@@ -7406,6 +7741,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertEquals(shareButton.getVisibility(), View.GONE);
     }
 
+    /**
+     * Fails on Android emulator, for some reason EXTRA_DURATION_LIMIT makes the video stop due to
+     * hitting max duration immediately.
+     */
     public void testTakeVideoMaxDuration() throws InterruptedException {
         Log.d(TAG, "testTakeVideoMaxDuration");
 
@@ -7414,6 +7753,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         subTestTakeVideoMaxDuration(false, false);
     }
 
+    /**
+     * Fails on Android emulator, for some reason EXTRA_DURATION_LIMIT makes the video stop due to
+     * hitting max duration immediately.
+     */
     public void testTakeVideoMaxDurationRestart() throws InterruptedException {
         Log.d(TAG, "testTakeVideoMaxDurationRestart");
 
@@ -7422,6 +7765,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         subTestTakeVideoMaxDuration(true, false);
     }
 
+    /**
+     * Fails on Android emulator, for some reason EXTRA_DURATION_LIMIT makes the video stop due to
+     * hitting max duration immediately.
+     */
     public void testTakeVideoMaxDurationRestartInterrupt() throws InterruptedException {
         Log.d(TAG, "testTakeVideoMaxDurationRestartInterrupt");
 
@@ -7446,8 +7793,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertTrue(mPreview.isPreviewStarted());
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         assertEquals(switchVideoButton.getVisibility(), View.VISIBLE);
@@ -7465,9 +7811,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "check still taking video");
         assertTrue( mPreview.isVideoRecording() );
 
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
-        assertEquals(1, n_new_files);
+        // note, if using scoped storage without SAF (i.e., mediastore API), then the video file won't show up until after we've finished recording (IS_PENDING is set to 0)
+        assertEquals(MainActivity.useScopedStorage() && !mActivity.getStorageUtils().isUsingSAF() ? 0 : 1, n_new_files);
 
         // now go to settings
         View settingsButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.settings);
@@ -7478,8 +7825,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "after idle sync");
         assertFalse(mPreview.isVideoRecording());
 
-        assertTrue( folder.exists() );
-        n_new_files = getNFiles(folder) - n_files;
+        n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(1, n_new_files);
 
@@ -7503,10 +7849,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         assertTrue( mPreview.isVideoRecording() );
 
-        assertTrue( folder.exists() );
-        n_new_files = getNFiles(folder) - n_files;
+        n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
-        assertEquals(2, n_new_files);
+        // see note above about mediastore API
+        assertEquals(MainActivity.useScopedStorage() && !mActivity.getStorageUtils().isUsingSAF() ? 1 : 2, n_new_files);
 
     }
 
@@ -7545,7 +7891,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         Thread.sleep(500);
 
-        assertEquals(mPreview.getCurrentFocusValue(), non_default_focus_mode);
+        // camera should be closed in settings
+        assertNull(mPreview.getCameraController());
 
         mActivity.runOnUiThread(new Runnable() {
             public void run() {
@@ -7557,9 +7904,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         this.getInstrumentation().waitForIdleSync();
         Thread.sleep(500);
 
+        assertEquals(mPreview.getCurrentFocusValue(), non_default_focus_mode);
+
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         assertEquals(switchVideoButton.getVisibility(), View.VISIBLE);
@@ -7577,10 +7925,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "check still taking video");
         assertTrue( mPreview.isVideoRecording() );
 
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
-        assertEquals(1, n_new_files);
-
+        // note, if using scoped storage without SAF (i.e., mediastore API), then the video file won't show up until after we've finished recording (IS_PENDING is set to 0)
+        assertEquals(MainActivity.useScopedStorage() && !mActivity.getStorageUtils().isUsingSAF() ? 0 : 1, n_new_files);
     }
 
     public void testTakeVideoFlashVideo() throws InterruptedException {
@@ -7666,8 +8014,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertFalse(mPreview.isOnTimer());
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         View takePhotoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.take_photo);
@@ -7701,7 +8048,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                 });
                 // need to wait for UI code to finish before leaving
                 this.getInstrumentation().waitForIdleSync();
-                Thread.sleep(500);
+                Thread.sleep(1000); // need at least 1000ms for Nexus 7
             }
             else {
                 View popupButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.popup);
@@ -7713,7 +8060,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             // check timer cancelled, and not yet taken a photo
             assertFalse(mPreview.isOnTimer());
             assertEquals(0, mPreview.count_cameraTakePicture);
-            int n_new_files = getNFiles(folder) - n_files;
+            int n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(0, n_new_files);
 
@@ -7725,7 +8072,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             Log.d(TAG, "done clicking take photo");
             assertTrue(mPreview.isOnTimer());
             assertEquals(0, mPreview.count_cameraTakePicture);
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(0, n_new_files);
 
@@ -7734,7 +8081,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             Log.d(TAG, "waited, count now " + mPreview.count_cameraTakePicture);
             assertFalse(mPreview.isOnTimer());
             assertEquals(1, mPreview.count_cameraTakePicture);
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(1, n_new_files);
 
@@ -7750,7 +8097,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             Log.d(TAG, "done clicking take photo");
             assertTrue(mPreview.isOnTimer());
             assertEquals(1, mPreview.count_cameraTakePicture);
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(1, n_new_files);
 
@@ -7759,7 +8106,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             Log.d(TAG, "waited, count now " + mPreview.count_cameraTakePicture);
             assertFalse(mPreview.isOnTimer());
             assertEquals(2, mPreview.count_cameraTakePicture);
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(2, n_new_files);
 
@@ -7771,7 +8118,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             Log.d(TAG, "done clicking take photo");
             assertTrue(mPreview.isOnTimer());
             assertEquals(2, mPreview.count_cameraTakePicture);
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(2, n_new_files);
 
@@ -7784,7 +8131,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             Log.d(TAG, "done clicking take photo to cancel");
             assertFalse(mPreview.isOnTimer());
             assertEquals(2, mPreview.count_cameraTakePicture);
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(2, n_new_files);
 
@@ -7793,7 +8140,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             Log.d(TAG, "waited, count now " + mPreview.count_cameraTakePicture);
             assertFalse(mPreview.isOnTimer());
             assertEquals(2, mPreview.count_cameraTakePicture);
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(2, n_new_files);
         }
@@ -7845,8 +8192,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertFalse(mPreview.isOnTimer());
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         View switchVideoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.switch_video);
@@ -7882,20 +8228,22 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
      */
     public void testPopup() {
         Log.d(TAG, "testPopup");
-        setToDefault();
-
-        switchToFlashValue("flash_off");
-        switchToFlashValue("flash_on");
-
-        if( mPreview.getSupportedFocusValues().contains("focus_mode_macro") ) {
-            switchToFocusValue("focus_mode_macro");
-        }
-        else if( mPreview.getSupportedFocusValues().contains("focus_mode_infinity") ) {
-            switchToFocusValue("focus_mode_infinity");
-        }
+        setToDefault();
 
-        if( mPreview.getSupportedFocusValues().contains("focus_mode_auto") ) {
-            switchToFocusValue("focus_mode_auto");
+        switchToFlashValue("flash_off");
+        switchToFlashValue("flash_on");
+
+        if( mPreview.supportsFocus() ) {
+            if( mPreview.getSupportedFocusValues().contains("focus_mode_macro") ) {
+                switchToFocusValue("focus_mode_macro");
+            }
+            else if( mPreview.getSupportedFocusValues().contains("focus_mode_infinity") ) {
+                switchToFocusValue("focus_mode_infinity");
+            }
+
+            if( mPreview.getSupportedFocusValues().contains("focus_mode_auto") ) {
+                switchToFocusValue("focus_mode_auto");
+            }
         }
 
         // now open popup, pause and resume, then reopen popup
@@ -8353,8 +8701,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         }
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         assertEquals(0, mPreview.count_cameraTakePicture);
@@ -8380,7 +8727,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             assertTrue(mPreview.isPreviewStarted()); // check preview restarted
             Log.d(TAG, "count_cameraTakePicture: " + mPreview.count_cameraTakePicture);
             assertEquals(3, mPreview.count_cameraTakePicture);
-            int n_new_files = getNFiles(folder) - n_files;
+            int n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(3, n_new_files);
 
@@ -8391,7 +8738,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             assertTrue(mPreview.isPreviewStarted()); // check preview restarted
             Log.d(TAG, "mPreview.count_cameraTakePicture: " + mPreview.count_cameraTakePicture);
             assertEquals(3, mPreview.count_cameraTakePicture);
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(3, n_new_files);
 
@@ -8405,14 +8752,14 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             clickView(takePhotoButton);
             Thread.sleep(7000);
             assertEquals(6, mPreview.count_cameraTakePicture);
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(6, n_new_files);
             assertFalse(mPreview.isPreviewStarted()); // check preview paused
 
             TouchUtils.clickView(MainActivityTest.this, mPreview.getView());
             this.getInstrumentation().waitForIdleSync();
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(6, n_new_files);
             assertTrue(mPreview.isPreviewStarted()); // check preview restarted
@@ -8447,14 +8794,14 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             this.getInstrumentation().waitForIdleSync();
             assertEquals(7, mPreview.count_cameraTakePicture);
             mActivity.waitUntilImageQueueEmpty();
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(7, n_new_files);
 
             // wait 2s, should still not have taken another photo
             Thread.sleep(2000);
             assertEquals(7, mPreview.count_cameraTakePicture);
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(7, n_new_files);
             // check GUI has returned to correct state
@@ -8470,13 +8817,13 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             // wait another 5s, should have taken another photo (need to allow time for the extra auto-focus)
             Thread.sleep(5000);
             assertEquals(8, mPreview.count_cameraTakePicture);
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(8, n_new_files);
             // wait 4s, should not have taken any more photos
             Thread.sleep(4000);
             assertEquals(8, mPreview.count_cameraTakePicture);
-            n_new_files = getNFiles(folder) - n_files;
+            n_new_files = getNFiles() - n_files;
             Log.d(TAG, "n_new_files: " + n_new_files);
             assertEquals(8, n_new_files);
         }
@@ -8575,30 +8922,52 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertEquals(size, new_size);
     }
 
-    private void testExif(String file, boolean expect_gps) throws IOException {
+    /** Tests the Exif tags in the resultant file. If the file is null, the uri will be
+     *  used instead to read the Exif tags.
+     */
+    private void testExif(String file, Uri uri, boolean expect_gps) throws IOException {
         //final String TAG_GPS_IMG_DIRECTION = "GPSImgDirection";
         //final String TAG_GPS_IMG_DIRECTION_REF = "GPSImgDirectionRef";
-        ExifInterface exif = new ExifInterface(file);
-        assertNotNull(exif.getAttribute(ExifInterface.TAG_ORIENTATION));
-        assertNotNull(exif.getAttribute(ExifInterface.TAG_MAKE));
-        assertNotNull(exif.getAttribute(ExifInterface.TAG_MODEL));
-        if( expect_gps ) {
-            assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE));
-            assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF));
-            assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE));
-            assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF));
-            // can't read custom tags, even though we can write them?!
-            //assertTrue(exif.getAttribute(TAG_GPS_IMG_DIRECTION) != null);
-            //assertTrue(exif.getAttribute(TAG_GPS_IMG_DIRECTION_REF) != null);
+        InputStream inputStream = null;
+        ExifInterface exif;
+        if( file != null ) {
+            assertNull(uri); // should only supply one of file or uri
+            exif = new ExifInterface(file);
         }
         else {
-            assertNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE));
-            assertNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF));
-            assertNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE));
-            assertNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF));
-            // can't read custom tags, even though we can write them?!
-            //assertTrue(exif.getAttribute(TAG_GPS_IMG_DIRECTION) == null);
-            //assertTrue(exif.getAttribute(TAG_GPS_IMG_DIRECTION_REF) == null);
+            assertNotNull(uri);
+            inputStream = getActivity().getContentResolver().openInputStream(uri);
+            exif = new ExifInterface(inputStream);
+        }
+
+        assertNotNull(exif.getAttribute(ExifInterface.TAG_ORIENTATION));
+        if( !( isEmulator() && Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1 ) ) {
+            // older Android emulator versions don't store exif info in photos
+            assertNotNull(exif.getAttribute(ExifInterface.TAG_MAKE));
+            assertNotNull(exif.getAttribute(ExifInterface.TAG_MODEL));
+
+            if( expect_gps ) {
+                assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE));
+                assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF));
+                assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE));
+                assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF));
+                // can't read custom tags, even though we can write them?!
+                //assertTrue(exif.getAttribute(TAG_GPS_IMG_DIRECTION) != null);
+                //assertTrue(exif.getAttribute(TAG_GPS_IMG_DIRECTION_REF) != null);
+            }
+            else {
+                assertNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE));
+                assertNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF));
+                assertNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE));
+                assertNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF));
+                // can't read custom tags, even though we can write them?!
+                //assertTrue(exif.getAttribute(TAG_GPS_IMG_DIRECTION) == null);
+                //assertTrue(exif.getAttribute(TAG_GPS_IMG_DIRECTION_REF) == null);
+            }
+        }
+
+        if( inputStream != null ) {
+            inputStream.close();
         }
     }
 
@@ -8640,6 +9009,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         View takePhotoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.take_photo);
         mActivity.test_last_saved_image = null;
+        mActivity.test_last_saved_imageuri = null;
         clickView(takePhotoButton);
 
         Log.d(TAG, "wait until finished taking photo");
@@ -8647,8 +9017,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         this.getInstrumentation().waitForIdleSync();
         assertEquals(1, mPreview.count_cameraTakePicture);
         mActivity.waitUntilImageQueueEmpty();
-        assertNotNull(mActivity.test_last_saved_image);
-        testExif(mActivity.test_last_saved_image, true);
+        testExif(mActivity.test_last_saved_image, mActivity.test_last_saved_imageuri, true);
 
         // now test with auto-stabilise
         {
@@ -8659,6 +9028,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             updateForSettings();
         }
         mActivity.test_last_saved_image = null;
+        mActivity.test_last_saved_imageuri = null;
         clickView(takePhotoButton);
 
         Log.d(TAG, "wait until finished taking photo");
@@ -8666,8 +9036,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         this.getInstrumentation().waitForIdleSync();
         assertEquals(2, mPreview.count_cameraTakePicture);
         mActivity.waitUntilImageQueueEmpty();
-        assertNotNull(mActivity.test_last_saved_image);
-        testExif(mActivity.test_last_saved_image, true);
+        testExif(mActivity.test_last_saved_image, mActivity.test_last_saved_imageuri, true);
 
         // switch to front camera
         if( mPreview.getCameraControllerManager().getNumberOfCameras() > 1 ) {
@@ -8744,6 +9113,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         View takePhotoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.take_photo);
         mActivity.test_last_saved_image = null;
+        mActivity.test_last_saved_imageuri = null;
         clickView(takePhotoButton);
 
         assertTrue(mActivity.getLocationSupplier().noLocationListeners());
@@ -8760,8 +9130,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertNull(mActivity.getLocationSupplier().getLocation());
 
         mActivity.waitUntilImageQueueEmpty();
-        assertNotNull(mActivity.test_last_saved_image);
-        testExif(mActivity.test_last_saved_image, false);
+        testExif(mActivity.test_last_saved_image, mActivity.test_last_saved_imageuri, false);
 
         assertTrue(mActivity.getLocationSupplier().noLocationListeners());
         assertFalse(mActivity.getLocationSupplier().testHasReceivedLocation());
@@ -8776,6 +9145,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             updateForSettings();
         }
         mActivity.test_last_saved_image = null;
+        mActivity.test_last_saved_imageuri = null;
         clickView(takePhotoButton);
 
         assertTrue(mActivity.getLocationSupplier().noLocationListeners());
@@ -8792,8 +9162,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertNull(mActivity.getLocationSupplier().getLocation());
 
         mActivity.waitUntilImageQueueEmpty();
-        assertNotNull(mActivity.test_last_saved_image);
-        testExif(mActivity.test_last_saved_image, false);
+        testExif(mActivity.test_last_saved_image, mActivity.test_last_saved_imageuri, false);
 
         assertTrue(mActivity.getLocationSupplier().noLocationListeners());
         assertFalse(mActivity.getLocationSupplier().testHasReceivedLocation());
@@ -8851,6 +9220,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
     /* Tests we don't save location data; also tests that we save other exif data.
      * May fail on devices without mobile network, especially if we don't even have wifi.
+     * Fails on Android emulator with Camera2 API, due to photos having Exif TAG_GPS_LATITUDE tag
+     * set to "0/1000,0/1000,0/1000" instead of null.
      */
     public void testLocationOff() throws IOException {
         Log.d(TAG, "testLocationOff");
@@ -8890,11 +9261,15 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     }
 
     /* Tests we disable location when going to settings, but re-enable it when returning to camera.
+     * Also tests camera is turned off when going to settings.
+     * Fails on Android emulator because we immediately get location again after returning from settings.
      */
     public void testLocationSettings() throws InterruptedException {
         Log.d(TAG, "testLocationSettings");
         setToDefault();
 
+        assertTrue(mPreview.openCameraAttempted());
+        assertNotNull(mPreview.getCameraController());
         assertTrue(mActivity.getLocationSupplier().noLocationListeners());
         assertFalse(mActivity.getLocationSupplier().testHasReceivedLocation());
         assertNull(mActivity.getLocationSupplier().getLocation());
@@ -8928,6 +9303,9 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         mActivity.getLocationSupplier().getLocation(locationInfo);
         assertFalse(locationInfo.LocationWasCached());
 
+        assertTrue(mPreview.openCameraAttempted());
+        assertNotNull(mPreview.getCameraController());
+
         // now go to settings
         assertFalse(mActivity.isCameraInBackground());
         View settingsButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.settings);
@@ -8938,10 +9316,14 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "after idle sync");
         assertTrue(mActivity.isCameraInBackground());
 
-        // now check we're not listening for location
+        // now check we're not listening for location, or opening camera
         start_t = System.currentTimeMillis();
         int count = 0;
         while( System.currentTimeMillis() - start_t <= 15000 ) {
+            assertFalse(mPreview.isOpeningCamera());
+            assertFalse(mPreview.openCameraAttempted());
+            assertNull(mPreview.getCameraController());
+
             assertTrue(mActivity.getLocationSupplier().noLocationListeners());
             assertFalse(mActivity.getLocationSupplier().testHasReceivedLocation());
             assertNull(mActivity.getLocationSupplier().getLocation());
@@ -8963,6 +9345,9 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "after idle sync");
         assertFalse(mActivity.isCameraInBackground());
 
+        // check camera is reopening
+        assertTrue(mPreview.isOpeningCamera() || mPreview.openCameraAttempted());
+
         // check we start listening again
         // first should have a cached location
         assertTrue(mActivity.getLocationSupplier().hasLocationListeners());
@@ -8972,6 +9357,11 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         mActivity.getLocationSupplier().getLocation(locationInfo);
         assertTrue(locationInfo.LocationWasCached());
 
+        // check camera is opened after a pause
+        Thread.sleep(1000);
+        assertTrue(mPreview.openCameraAttempted());
+        assertNotNull(mPreview.getCameraController());
+
         // check we get a non-cached location
         while( !mActivity.getLocationSupplier().testHasReceivedLocation() ) {
             this.getInstrumentation().waitForIdleSync();
@@ -9025,6 +9415,11 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             Log.d(TAG, "after idle sync");
             assertFalse(mActivity.isCameraInBackground());
         }
+
+        // check camera is opened after a pause
+        Thread.sleep(1000);
+        assertTrue(mPreview.openCameraAttempted());
+        assertNotNull(mPreview.getCameraController());
     }
 
     private void subTestPhotoStamp() throws IOException {
@@ -9040,6 +9435,9 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         assertEquals(0, mPreview.count_cameraTakePicture);
 
+        int n_old_files = getNFiles();
+        Log.d(TAG, "n_old_files: " + n_old_files);
+
         View takePhotoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.take_photo);
         clickView(takePhotoButton);
 
@@ -9049,8 +9447,10 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "photo count: " + mPreview.count_cameraTakePicture);
         assertEquals(1, mPreview.count_cameraTakePicture);
         mActivity.waitUntilImageQueueEmpty();
-        assertNotNull(mActivity.test_last_saved_image);
-        testExif(mActivity.test_last_saved_image, false);
+        int n_files = getNFiles() - n_old_files;
+        Log.d(TAG, "n_files: " + n_files);
+        assertEquals(1, n_files);
+        testExif(mActivity.test_last_saved_image, mActivity.test_last_saved_imageuri, false);
 
         // now again with location
         {
@@ -9081,13 +9481,16 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "photo count: " + mPreview.count_cameraTakePicture);
         assertEquals(2, mPreview.count_cameraTakePicture);
         mActivity.waitUntilImageQueueEmpty();
-        assertNotNull(mActivity.test_last_saved_image);
-        testExif(mActivity.test_last_saved_image, true);
+        n_files = getNFiles() - n_old_files;
+        Log.d(TAG, "n_files: " + n_files);
+        assertEquals(2, n_files);
+        testExif(mActivity.test_last_saved_image, mActivity.test_last_saved_imageuri, true);
 
-        // now again with custom text
+        // now again with location and custom text
         {
             SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
             SharedPreferences.Editor editor = settings.edit();
+            editor.putBoolean(PreferenceKeys.LocationPreferenceKey, true);
             editor.putString(PreferenceKeys.TextStampPreferenceKey, "Test stamp!£$");
             editor.apply();
             updateForSettings();
@@ -9107,14 +9510,17 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "photo count: " + mPreview.count_cameraTakePicture);
         assertEquals(3, mPreview.count_cameraTakePicture);
         mActivity.waitUntilImageQueueEmpty();
-        assertNotNull(mActivity.test_last_saved_image);
-        testExif(mActivity.test_last_saved_image, true);
+        n_files = getNFiles() - n_old_files;
+        Log.d(TAG, "n_files: " + n_files);
+        assertEquals(3, n_files);
+        testExif(mActivity.test_last_saved_image, mActivity.test_last_saved_imageuri, true);
 
         // now test with auto-stabilise
         {
             assertFalse(mActivity.getApplicationInterface().getDrawPreview().getStoredAutoStabilisePref());
             SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
             SharedPreferences.Editor editor = settings.edit();
+            editor.putString(PreferenceKeys.TextStampPreferenceKey, "");
             editor.putBoolean(PreferenceKeys.AutoStabilisePreferenceKey, true);
             editor.apply();
             updateForSettings();
@@ -9129,14 +9535,36 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "photo count: " + mPreview.count_cameraTakePicture);
         assertEquals(4, mPreview.count_cameraTakePicture);
         mActivity.waitUntilImageQueueEmpty();
-        assertNotNull(mActivity.test_last_saved_image);
-        testExif(mActivity.test_last_saved_image, true);
+        n_files = getNFiles() - n_old_files;
+        Log.d(TAG, "n_files: " + n_files);
+        assertEquals(4, n_files);
+        testExif(mActivity.test_last_saved_image, mActivity.test_last_saved_imageuri, true);
+
+        // now again with auto-stabilise angle 0
+
+        mActivity.test_have_angle = true;
+        mActivity.test_angle = 0.0f;
 
+        clickView(takePhotoButton);
+
+        Log.d(TAG, "wait until finished taking photo");
+        waitForTakePhoto();
+        this.getInstrumentation().waitForIdleSync();
+        Log.d(TAG, "photo count: " + mPreview.count_cameraTakePicture);
+        assertEquals(5, mPreview.count_cameraTakePicture);
         mActivity.waitUntilImageQueueEmpty();
+        n_files = getNFiles() - n_old_files;
+        Log.d(TAG, "n_files: " + n_files);
+        assertEquals(5, n_files);
+        testExif(mActivity.test_last_saved_image, mActivity.test_last_saved_imageuri, true);
+
+        mActivity.test_have_angle = false;
     }
 
     /* Tests we can stamp date/time and location to photo.
      * May fail on devices without mobile network, especially if we don't even have wifi.
+     * Fails on Android emulator with Camera2 API, due to photos having Exif TAG_GPS_LATITUDE tag
+     * set to "0/1000,0/1000,0/1000" instead of null.
      */
     public void testPhotoStamp() throws IOException {
         Log.d(TAG, "testPhotoStamp");
@@ -9240,6 +9668,27 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "actual zoom = " + mPreview.getCameraController().getZoom());
         assertEquals(max_zoom - zoomSeekBar.getProgress(), mPreview.getCameraController().getZoom());
 
+        // test we can find 1x zoom (which won't be the first entry for devices that exposure ultra-wide
+        // cameras via the zoom)
+        boolean found_1xzoom = false;
+        for(int i=0;i<max_zoom && !found_1xzoom;i++) {
+            if( mPreview.getZoomRatio(i) == 1.0f ) {
+                found_1xzoom = true;
+            }
+        }
+        assertTrue(found_1xzoom);
+
+        assertTrue(mPreview.getMinZoomRatio() <= 1.0f);
+        assertTrue(mPreview.getMaxZoomRatio() > 1.0f);
+
+        // check zoom values are non-decreasing
+        for(int i=0;i<max_zoom-1;i++) {
+            float zoom0 = mPreview.getZoomRatio(i);
+            float zoom1 = mPreview.getZoomRatio(i+1);
+            Log.d(TAG, "check zoom: " + zoom0 + " -> " + zoom1);
+            assertTrue(zoom1 >= zoom0);
+        }
+
         if( mPreview.supportsFocus() ) {
             assertFalse(mPreview.hasFocusArea());
             assertNull(mPreview.getCameraController().getFocusAreas());
@@ -9267,7 +9716,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         mPreview.scaleZoom(0.5f);
         this.getInstrumentation().waitForIdleSync();
         Log.d(TAG, "compare actual zoom " + mPreview.getCameraController().getZoom() + " to zoom " + zoom);
-        assertEquals(mPreview.getCameraController().getZoom(), zoom);
+        // here test the zoom ratio values themselves rather than the indices, as we may have repeated zoom_ratios entries for 1x zoom
+        assertEquals( mPreview.getZoomRatio(mPreview.getCameraController().getZoom()), mPreview.getZoomRatio(zoom) );
         assertEquals(max_zoom - zoomSeekBar.getProgress(), mPreview.getCameraController().getZoom());
 
         // test to max/min
@@ -9303,7 +9753,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         zoomSeekBar.setProgress(zoomSeekBar.getMax());
         this.getInstrumentation().waitForIdleSync();
         Log.d(TAG, "compare actual zoom " + mPreview.getCameraController().getZoom() + " to zoom " + zoom);
-        assertEquals(mPreview.getCameraController().getZoom(), zoom);
+        assertEquals(mPreview.getCameraController().getZoom(), 0);
         assertEquals(max_zoom - zoomSeekBar.getProgress(), mPreview.getCameraController().getZoom());
 
         // use volume keys to zoom in/out
@@ -9314,14 +9764,14 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         this.getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_VOLUME_UP);
         this.getInstrumentation().waitForIdleSync();
         Log.d(TAG, "compare actual zoom " + mPreview.getCameraController().getZoom() + " to zoom " + zoom);
-        assertEquals(mPreview.getCameraController().getZoom(), zoom + 1);
+        assertEquals(mPreview.getCameraController().getZoom(), 1);
         assertEquals(max_zoom - zoomSeekBar.getProgress(), mPreview.getCameraController().getZoom());
 
         Log.d(TAG, "zoom out with volume keys");
         this.getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_VOLUME_DOWN);
         this.getInstrumentation().waitForIdleSync();
         Log.d(TAG, "compare actual zoom " + mPreview.getCameraController().getZoom() + " to zoom " + zoom);
-        assertEquals(mPreview.getCameraController().getZoom(), zoom);
+        assertEquals(mPreview.getCameraController().getZoom(), 0);
         assertEquals(max_zoom - zoomSeekBar.getProgress(), mPreview.getCameraController().getZoom());
 
         // now test with -/+ controls
@@ -9335,7 +9785,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         mActivity.zoomIn();
         this.getInstrumentation().waitForIdleSync();
         Log.d(TAG, "compare actual zoom " + mPreview.getCameraController().getZoom() + " to zoom " + zoom);
-        assertEquals(mPreview.getCameraController().getZoom(), zoom + 1);
+        assertEquals(mPreview.getCameraController().getZoom(), 1);
         assertEquals(max_zoom - zoomSeekBar.getProgress(), mPreview.getCameraController().getZoom());
         if( mPreview.supportsFocus() ) {
             // check that focus areas cleared
@@ -9356,7 +9806,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         mActivity.zoomOut();
         this.getInstrumentation().waitForIdleSync();
         Log.d(TAG, "compare actual zoom " + mPreview.getCameraController().getZoom() + " to zoom " + zoom);
-        assertEquals(mPreview.getCameraController().getZoom(), zoom);
+        assertEquals(mPreview.getCameraController().getZoom(), 0);
         assertEquals(max_zoom - zoomSeekBar.getProgress(), mPreview.getCameraController().getZoom());
         if( mPreview.supportsFocus() ) {
             // check that focus areas cleared
@@ -9384,14 +9834,14 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         mActivity.zoomIn();
         this.getInstrumentation().waitForIdleSync();
         Log.d(TAG, "compare actual zoom " + mPreview.getCameraController().getZoom() + " to zoom " + zoom);
-        assertEquals(mPreview.getCameraController().getZoom(), zoom + 1);
+        assertEquals(mPreview.getCameraController().getZoom(), 1);
         assertEquals(max_zoom - zoomSeekBar.getProgress(), mPreview.getCameraController().getZoom());
 
         Log.d(TAG, "zoom out");
         mActivity.zoomOut();
         this.getInstrumentation().waitForIdleSync();
         Log.d(TAG, "compare actual zoom " + mPreview.getCameraController().getZoom() + " to zoom " + zoom);
-        assertEquals(mPreview.getCameraController().getZoom(), zoom);
+        assertEquals(mPreview.getCameraController().getZoom(), 0);
         assertEquals(max_zoom - zoomSeekBar.getProgress(), mPreview.getCameraController().getZoom());
     }
 
@@ -9437,6 +9887,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         final SeekBar zoomSeekBar = mActivity.findViewById(net.sourceforge.opencamera.R.id.zoom_seekbar);
         assertEquals(zoomSeekBar.getVisibility(), View.VISIBLE);
         int init_zoom = mPreview.getCameraController().getZoom();
+        float init_zoom_ratio = mPreview.getZoomRatio(init_zoom);
         int max_zoom = mPreview.getMaxZoom();
         zoomSeekBar.setProgress(0);
         this.getInstrumentation().waitForIdleSync();
@@ -9449,13 +9900,15 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         clickView(switchCameraButton);
         waitUntilCameraOpened();
         int new_cameraId = mPreview.getCameraId();
+        Log.d(TAG, "cameraId: " + cameraId);
+        Log.d(TAG, "new_cameraId: " + new_cameraId);
         assertTrue(cameraId != new_cameraId);
 
         max_zoom = mPreview.getMaxZoom();
         Log.d(TAG, "after pause and resume: compare actual zoom " + mPreview.getCameraController().getZoom() + " to zoom " + max_zoom);
         // as of Open Camera v1.43, zoom is reset when pause/resuming
         //assertTrue(mPreview.getCameraController().getZoom() == max_zoom);
-        assertEquals(mPreview.getCameraController().getZoom(), init_zoom);
+        assertEquals(mPreview.getZoomRatio(mPreview.getCameraController().getZoom()), init_zoom_ratio);
         assertEquals(max_zoom - zoomSeekBar.getProgress(), mPreview.getCameraController().getZoom());
     }
 
@@ -9677,6 +10130,9 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         File folder = mActivity.getImageFolder();
         if( folder.exists() && delete_folder ) {
+            // Note when using scoped storage, this won't actually work (although the test code won't fail)
+            // It's not possible to delete folders with scoped storage unless via SAF which would need permission to have been
+            // given to such folders.
             assertTrue(folder.isDirectory());
             // delete folder - need to delete contents first
             if( folder.isDirectory() ) {
@@ -9693,10 +10149,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             //noinspection ResultOfMethodCallIgnored
             folder.delete();
         }
-        int n_old_files = 0;
-        if( folder.exists() ) {
-            n_old_files = getNFiles(folder);
-        }
+        int n_old_files = getNFiles();
         Log.d(TAG, "n_old_files: " + n_old_files);
 
         View takePhotoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.take_photo);
@@ -9713,8 +10166,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         mActivity.waitUntilImageQueueEmpty();
 
-        assertTrue( folder.exists() );
-        int n_new_files = getNFiles(folder);
+        int n_new_files = getNFiles();
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(n_new_files, n_old_files + 1);
 
@@ -9758,6 +10210,12 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     @SuppressLint("SdCardPath")
     public void testCreateSaveFolder4() {
         Log.d(TAG, "testCreateSaveFolder4");
+
+        if( MainActivity.useScopedStorage() ) {
+            // can't save outside DCIM when using scoped storage
+            return;
+        }
+
         subTestCreateSaveFolder(false, "/sdcard/Pictures/OpenCameraTest", true);
     }
 
@@ -9789,10 +10247,150 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         subTestCreateSaveFolder(true, "content://com.android.externalstorage.documents/tree/primary%3ADCIM", true);
     }
 
+    /** Tests code for checking existing non-SAF save locations, when updating to scoped storage.
+     *  Case where save location is invalid for scoped storage.
+     */
+    public void testScopedStorageChecks1() {
+        Log.d(TAG, "testScopedStorageChecks1");
+        setToDefault();
+
+        {
+            SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
+            SharedPreferences.Editor editor = settings.edit();
+            editor.putString(PreferenceKeys.SaveLocationPreferenceKey, "/storage/emulated/0/Pictures/Camera");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_0", "OpenCamera");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_1", "/storage/emulated/0/DCIM");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_2", "/storage/emulated/0/DCIM/OpenCameraéúíóá!£$%^&()/test");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_3", "Camera");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_4", "/storage/sdcard/DCIM/OpenCamera");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_5", "/storage/emulated/0/Pictures/Camera");
+            editor.putInt(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_size", 6);
+            editor.apply();
+        }
+
+        restart();
+
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity);
+        if( MainActivity.useScopedStorage() ) {
+            assertEquals("OpenCamera", sharedPreferences.getString(PreferenceKeys.SaveLocationPreferenceKey, "OpenCamera"));
+            // because the save folder is reset to "OpenCamera", we've also removed it from the original position in the history
+            assertEquals("", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_0", null));
+            assertEquals("OpenCameraéúíóá!£$%^&()/test", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_1", null));
+            assertEquals("Camera", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_2", null));
+            // invalid entry removed here
+            assertEquals("OpenCamera", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_3", null));
+            assertEquals(4, sharedPreferences.getInt(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_size", 0));
+        }
+        else {
+            // should be unchanged
+            assertEquals("/storage/emulated/0/Pictures/Camera", sharedPreferences.getString(PreferenceKeys.SaveLocationPreferenceKey, "OpenCamera"));
+            assertEquals("OpenCamera", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_0", null));
+            assertEquals("/storage/emulated/0/DCIM", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_1", null));
+            assertEquals("/storage/emulated/0/DCIM/OpenCameraéúíóá!£$%^&()/test", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_2", null));
+            assertEquals("Camera", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_3", null));
+            assertEquals("/storage/sdcard/DCIM/OpenCamera", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_4", null));
+            assertEquals("/storage/emulated/0/Pictures/Camera", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_5", null));
+            assertEquals(6, sharedPreferences.getInt(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_size", 0));
+        }
+    }
+
+    /** Tests code for checking existing non-SAF save locations, when updating to scoped storage.
+     *  This test a version where everything is valid and shouldn't change.
+     */
+    public void testScopedStorageChecks2() {
+        Log.d(TAG, "testScopedStorageChecks2");
+        setToDefault();
+
+        {
+            SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
+            SharedPreferences.Editor editor = settings.edit();
+            editor.putString(PreferenceKeys.SaveLocationPreferenceKey, "Camera");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_0", "OpenCamera");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_1", "test");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_2", "Camera");
+            editor.putInt(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_size", 3);
+            editor.apply();
+        }
+
+        restart();
+
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity);
+        assertEquals("Camera", sharedPreferences.getString(PreferenceKeys.SaveLocationPreferenceKey, "OpenCamera"));
+        assertEquals("OpenCamera", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_0", null));
+        assertEquals("test", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_1", null));
+        assertEquals("Camera", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_2", null));
+        assertEquals(3, sharedPreferences.getInt(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_size", 0));
+    }
+
+    /** Tests code for checking existing non-SAF save locations, when updating to scoped storage.
+     *  This tests a version with default settings, where nothing should change.
+     */
+    public void testScopedStorageChecks3() {
+        Log.d(TAG, "testScopedStorageChecks3");
+        setToDefault();
+
+        restart();
+
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity);
+        assertEquals("OpenCamera", sharedPreferences.getString(PreferenceKeys.SaveLocationPreferenceKey, "OpenCamera"));
+        assertEquals("OpenCamera", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_0", null));
+        assertEquals(1, sharedPreferences.getInt(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_size", 0));
+    }
+
+    /** Tests code for checking existing non-SAF save locations, when updating to scoped storage.
+     *  Case where save location contains sub-folder, so is valid but needs updating for scoped storage.
+     */
+    public void testScopedStorageChecks4() {
+        Log.d(TAG, "testScopedStorageChecks4");
+        setToDefault();
+
+        {
+            SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
+            SharedPreferences.Editor editor = settings.edit();
+            editor.putString(PreferenceKeys.SaveLocationPreferenceKey, "/storage/emulated/0/DCIM/OpenCamera/subfolder");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_0", "/storage/emulated/0/DCIM/OpenCamera/subfolder/subfolder");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_1", "/storage/emulated/0/Pictures");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_2", "/storage/emulated/0");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_3", "OpenCamera");
+            editor.putString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_4", "/storage/emulated/0/DCIM/OpenCamera/subfolder");
+            editor.putInt(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_size", 5);
+            editor.apply();
+        }
+
+        restart();
+
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(mActivity);
+        if( MainActivity.useScopedStorage() ) {
+            assertEquals("OpenCamera/subfolder", sharedPreferences.getString(PreferenceKeys.SaveLocationPreferenceKey, "OpenCamera"));
+            assertEquals("OpenCamera/subfolder/subfolder", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_0", null));
+            // invalid entry removed here
+            // invalid entry removed here
+            assertEquals("OpenCamera", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_1", null));
+            assertEquals("OpenCamera/subfolder", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_2", null));
+            assertEquals(3, sharedPreferences.getInt(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_size", 0));
+        }
+        else {
+            // should be unchanged
+            assertEquals("/storage/emulated/0/DCIM/OpenCamera/subfolder", sharedPreferences.getString(PreferenceKeys.SaveLocationPreferenceKey, "OpenCamera"));
+            assertEquals("/storage/emulated/0/DCIM/OpenCamera/subfolder/subfolder", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_0", null));
+            assertEquals("/storage/emulated/0/Pictures", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_1", null));
+            assertEquals("/storage/emulated/0", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_2", null));
+            assertEquals("OpenCamera", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_3", null));
+            assertEquals("/storage/emulated/0/DCIM/OpenCamera/subfolder", sharedPreferences.getString(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_4", null));
+            assertEquals(5, sharedPreferences.getInt(PreferenceKeys.SaveLocationHistoryBasePreferenceKey + "_size", 0));
+        }
+    }
+
     /** Tests launching the folder chooser on a new folder.
      */
     public void testFolderChooserNew() throws InterruptedException {
         Log.d(TAG, "testFolderChooserNew");
+
+        if( MainActivity.useScopedStorage() ) {
+            Log.d(TAG, "folder chooser not relevant for scoped storage");
+            return;
+        }
+
         setToDefault();
 
         {
@@ -9837,6 +10435,12 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
      */
     public void testFolderChooserInvalid() throws InterruptedException {
         Log.d(TAG, "testFolderChooserInvalid");
+
+        if( MainActivity.useScopedStorage() ) {
+            Log.d(TAG, "folder chooser not relevant for scoped storage");
+            return;
+        }
+
         setToDefault();
 
         {
@@ -9993,7 +10597,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         setToDefault();
 
-        int display_orientation = mPreview.getDisplayRotation();
+        int display_orientation = mActivity.getApplicationInterface().getDisplayRotation();
         Log.d(TAG, "display_orientation = " + display_orientation);
 
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
@@ -10002,7 +10606,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         editor.apply();
         updateForSettings();
 
-        int new_display_orientation = mPreview.getDisplayRotation();
+        int new_display_orientation =  mActivity.getApplicationInterface().getDisplayRotation();
         Log.d(TAG, "new_display_orientation = " + new_display_orientation);
         assertEquals(new_display_orientation, ((display_orientation + 2) % 4));
     }
@@ -10147,6 +10751,11 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertEquals(100, quality);
     }
 
+    /** Note this test fails on Android emulator with old camera API, because we get a
+     *  RuntimeException from setParameters when trying to set white balance (we catch the
+     *  exception, but the test fails because the white balance hasn't been changed to the expected
+     *  value).
+     */
     public void testCameraModes() {
         Log.d(TAG, "testCameraModes");
         subTestSceneMode();
@@ -10674,6 +11283,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mActivity.supportsFocusBracketing() ) {
+            Log.d(TAG, "test requires focus bracketing");
             return;
         }
 
@@ -10712,7 +11322,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertEquals(initial_focus_distance, new_actual_focus_distance, 1.0e-5f);
     }
 
-    /** Tests taking a photo in focus bracketing mode, with auto-level and 50 images.
+    /** Tests taking a photo in focus bracketing mode, with auto-level and 20 images.
      */
     public void testTakePhotoFocusBracketingHeavy() throws InterruptedException {
         Log.d(TAG, "testTakePhotoFocusBracketingHeavy");
@@ -10720,6 +11330,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mActivity.supportsFocusBracketing() ) {
+            Log.d(TAG, "test requires focus bracketing");
             return;
         }
 
@@ -10772,6 +11383,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mActivity.supportsFocusBracketing() ) {
+            Log.d(TAG, "test requires focus bracketing");
             return;
         }
 
@@ -10844,9 +11456,11 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mActivity.supportsFocusBracketing() ) {
+            Log.d(TAG, "test requires focus bracketing");
             return;
         }
         if( !mPreview.supportsRaw() ) {
+            Log.d(TAG, "test requires RAW");
             return;
         }
 
@@ -10894,9 +11508,11 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         setToDefault();
 
         if( !mActivity.supportsFocusBracketing() ) {
+            Log.d(TAG, "test requires focus bracketing");
             return;
         }
         if( !mPreview.supportsRaw() ) {
+            Log.d(TAG, "test requires RAW");
             return;
         }
 
@@ -10976,7 +11592,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         subTestTakePhoto(false, false, true, true, false, false, false, false);
         Log.d(TAG, "test_capture_results: " + mPreview.getCameraController().test_capture_results);
         assertEquals(mPreview.getCameraController().test_capture_results, n_back_photos + 1);
-        if( mActivity.getPreview().getCameraController().captureResultHasIso() && mActivity.getPreview().getCameraController().captureResultIso() >= CameraController.ISO_FOR_DARK )
+        if( mActivity.getPreview().getCameraController().captureResultHasIso() && HDRProcessor.sceneIsLowLight( mActivity.getPreview().getCameraController().captureResultIso(), mActivity.getPreview().getCameraController().captureResultExposureTime() ) )
             assertEquals(CameraController.N_IMAGES_NR_DARK_LOW_LIGHT, mActivity.getPreview().getCameraController().getBurstTotal());
         // reset
         mActivity.getApplicationInterface().setNRMode("preference_nr_mode_normal");
@@ -11037,10 +11653,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "subTestTakePhotoContinuousBurst");
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        Log.d(TAG, "folder: " + folder);
-        File [] files = folder.listFiles();
-        int n_files = files == null ? 0 : files.length;
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         final View takePhotoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.take_photo);
@@ -11070,8 +11683,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         assertFalse(mActivity.getApplicationInterface().getImageSaver().test_queue_blocked);
 
-        File [] files2 = folder.listFiles();
-        int n_new_files = (files2 == null ? 0 : files2.length) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         if( is_slow ) {
             // with limited queue, won't be able to save as many files
@@ -11086,6 +11698,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     }
 
     /** Tests continuous burst.
+     *  Fails on Android emulator with Camera2 API, due to a serious camera error occurring for
+     *  fast burst with more than 5 images!
      */
     public void testTakePhotoContinuousBurst() throws InterruptedException {
         Log.d(TAG, "testTakePhotoContinuousBurst");
@@ -11105,6 +11719,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     }
 
     /** Tests continuous burst, but with flags set for slow saving and shorter queue.
+     *  Fails on Android emulator with Camera2 API, due to a serious camera error occurring for
+     *  fast burst with more than 5 images!
      */
     public void testTakePhotoContinuousBurstSlow() throws InterruptedException {
         Log.d(TAG, "testTakePhotoContinuousBurstSlow");
@@ -11134,14 +11750,14 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mActivity);
         SharedPreferences.Editor editor = settings.edit();
         editor.putString(PreferenceKeys.PhotoModePreferenceKey, "preference_photo_mode_panorama");
+        //editor.putString(PreferenceKeys.PanoramaSaveExpoPreferenceKey, "preference_panorama_save_all"); // test/debug
         editor.apply();
         updateForSettings();
 
         assertSame(mActivity.getApplicationInterface().getPhotoMode(), MyApplicationInterface.PhotoMode.Panorama);
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         Thread.sleep(1000);
@@ -11167,7 +11783,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertEquals(switchMultiCameraButton.getVisibility(), (mActivity.showSwitchMultiCamIcon() ? View.VISIBLE : View.GONE));
         assertEquals(switchVideoButton.getVisibility(), View.VISIBLE);
         assertEquals(exposureButton.getVisibility(), View.VISIBLE);
-        assertEquals(exposureLockButton.getVisibility(), View.VISIBLE);
+        assertEquals(exposureLockButton.getVisibility(), (mPreview.supportsExposureLock() ? View.VISIBLE : View.GONE));
         assertEquals(audioControlButton.getVisibility(), View.GONE);
         assertEquals(popupButton.getVisibility(), View.VISIBLE);
         assertEquals(trashButton.getVisibility(), View.GONE);
@@ -11251,7 +11867,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertEquals(switchMultiCameraButton.getVisibility(), (mActivity.showSwitchMultiCamIcon() ? View.VISIBLE : View.GONE));
         assertEquals(switchVideoButton.getVisibility(), View.VISIBLE);
         assertEquals(exposureButton.getVisibility(), View.VISIBLE);
-        assertEquals(exposureLockButton.getVisibility(), View.VISIBLE);
+        assertEquals(exposureLockButton.getVisibility(), (mPreview.supportsExposureLock() ? View.VISIBLE : View.GONE));
         assertEquals(audioControlButton.getVisibility(), View.GONE);
         assertEquals(popupButton.getVisibility(), View.VISIBLE);
         assertEquals(trashButton.getVisibility(), View.GONE);
@@ -11283,13 +11899,14 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         mActivity.waitUntilImageQueueEmpty();
 
-        assertTrue( folder.exists() );
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(n_new_files, (cancel ? 0 : 1));
     }
 
     /* Test for panorama photo mode.
+     * Can fail on Android emulator due to failing to create panorama image from identical set of
+     * images (since we don't actually move the camera).
      */
     public void testTakePhotoPanorama() throws InterruptedException {
         Log.d(TAG, "testTakePhotoPanorama");
@@ -11298,6 +11915,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     }
 
     /* Test for panorama photo mode, taking max number of panorama shots.
+     * Can fail on Android emulator due to failing to create panorama image from identical set of
+     * images (since we don't actually move the camera).
      */
     public void testTakePhotoPanoramaMax() throws InterruptedException {
         Log.d(TAG, "testTakePhotoPanoramaMax");
@@ -11333,10 +11952,41 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         return bitmap;
     }*/
 
+    /** Converts a path to a Uri for com.android.providers.media.documents.
+     */
+    private Uri getDocumentUri(String filename) throws FileNotFoundException {
+        Log.d(TAG, "getDocumentUri: " + filename);
+
+        // convert from File path format to Storage Access Framework form
+        Uri treeUri = Uri.parse("content://com.android.externalstorage.documents/tree/primary%3ADCIM%2FtestOpenCamera");
+        Log.d(TAG, "treeUri: " + treeUri);
+        if( !filename.startsWith(images_base_path) ) {
+            Log.e(TAG, "unknown base for: " + filename);
+            throw new FileNotFoundException();
+        }
+        String stem = filename.substring(images_base_path.length());
+        Uri stemUri = Uri.parse("content://com.android.externalstorage.documents/tree/primary%3ADCIM" + stem.replace("/", "%2F"));
+        Log.d(TAG, "stem: " + stem);
+        Log.d(TAG, "stemUri: " + stemUri);
+        //String docID = "primary:DCIM" + stem;
+        String docID = DocumentsContract.getTreeDocumentId(stemUri);
+        Log.d(TAG, "docID: " + docID);
+        Uri uri = DocumentsContract.buildDocumentUriUsingTree(treeUri, docID);
+
+        if( uri == null ) {
+            throw new FileNotFoundException();
+        }
+        return uri;
+    }
+
     private Bitmap getBitmapFromFile(String filename) throws FileNotFoundException {
         return getBitmapFromFile(filename, 1);
     }
 
+    /** Loads bitmap from supplied filename.
+     *  Note that on Android 10+ (with scoped storage), this uses Storage Access Framework, which
+     *  means Open Camera must have SAF permission to the folder DCIM/testOpenCamera.
+     */
     private Bitmap getBitmapFromFile(String filename, int inSampleSize) throws FileNotFoundException {
         Log.d(TAG, "getBitmapFromFile: " + filename);
         BitmapFactory.Options options = new BitmapFactory.Options();
@@ -11348,15 +11998,45 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             options.inDensity = inSampleSize;
             options.inTargetDensity = 1;
         }
-        Bitmap bitmap = BitmapFactory.decodeFile(filename, options);
+
+        Uri uri = null;
+        Bitmap bitmap;
+
+        if( MainActivity.useScopedStorage() ) {
+            uri = getDocumentUri(filename);
+            Log.d(TAG, "uri: " + uri);
+            InputStream is = mActivity.getContentResolver().openInputStream(uri);
+            bitmap = BitmapFactory.decodeStream(is, null, options);
+            try {
+                is.close();
+            }
+            catch(IOException e) {
+                e.printStackTrace();
+            }
+        }
+        else {
+            bitmap = BitmapFactory.decodeFile(filename, options);
+        }
         if( bitmap == null )
             throw new FileNotFoundException();
         Log.d(TAG, "    done: " + bitmap);
 
         // now need to take exif orientation into account, as some devices or camera apps store the orientation in the exif tag,
         // which getBitmap() doesn't account for
+        ParcelFileDescriptor parcelFileDescriptor = null;
+        FileDescriptor fileDescriptor;
         try {
-            ExifInterface exif = new ExifInterface(filename);
+            ExifInterface exif = null;
+            if( uri != null ) {
+                parcelFileDescriptor = mActivity.getContentResolver().openFileDescriptor(uri, "r");
+                if( parcelFileDescriptor != null ) {
+                    fileDescriptor = parcelFileDescriptor.getFileDescriptor();
+                    exif = new ExifInterface(fileDescriptor);
+                }
+            }
+            else {
+                exif = new ExifInterface(filename);
+            }
             if( exif != null ) {
                 int exif_orientation_s = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED);
                 boolean needs_tf = false;
@@ -11399,6 +12079,16 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         catch(IOException e) {
             e.printStackTrace();
         }
+        finally {
+            if( parcelFileDescriptor != null ) {
+                try {
+                    parcelFileDescriptor.close();
+                }
+                catch(IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
         /*{
             for(int y=0;y<bitmap.getHeight();y++) {
                 for(int x=0;x<bitmap.getWidth();x++) {
@@ -11505,6 +12195,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
     /* Tests launching with ACTION_VIDEO_CAPTURE intent, along with EXTRA_DURATION_LIMIT. The test
      * then tests we actually record video with the duration limit set.
+     * Fails on Android emulator, for some reason EXTRA_DURATION_LIMIT makes the video stop due to
+     * hitting max duration immediately.
      */
     public void testIntentVideoDurationLimit() throws InterruptedException, ApplicationInterface.NoFreeStorageException {
         Log.d(TAG, "testIntentVideoDurationLimit");
@@ -11532,8 +12224,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertEquals( max_filesize, mActivity.getApplicationInterface().getVideoMaxFileSizePref().max_filesize, 5*1048576 );
 
         // count initial files in folder
-        File folder = mActivity.getImageFolder();
-        int n_files = getNFiles(folder);
+        int n_files = getNFiles();
         Log.d(TAG, "n_files at start: " + n_files);
 
         View takePhotoButton = mActivity.findViewById(net.sourceforge.opencamera.R.id.take_photo);
@@ -11549,17 +12240,17 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         Log.d(TAG, "check still taking video");
         assertTrue( mPreview.isVideoRecording() );
 
-        int n_new_files = getNFiles(folder) - n_files;
+        int n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
-        assertEquals(1, n_new_files);
+        // note, if using scoped storage without SAF (i.e., mediastore API), then the video file won't show up until after we've finished recording (IS_PENDING is set to 0)
+        assertEquals(MainActivity.useScopedStorage() && !mActivity.getStorageUtils().isUsingSAF() ? 0 : 1, n_new_files);
 
         Thread.sleep(3000);
 
         Log.d(TAG, "check stopped taking video");
         assertFalse(mPreview.isVideoRecording());
 
-        assertTrue( folder.exists() );
-        n_new_files = getNFiles(folder) - n_files;
+        n_new_files = getNFiles() - n_files;
         Log.d(TAG, "n_new_files: " + n_new_files);
         assertEquals(1, n_new_files);
 
@@ -11750,6 +12441,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
     }
 
     private void checkHistogramDetails(HistogramDetails hdrHistogramDetails, int exp_min_value, int exp_median_value, int exp_max_value) {
+        Log.d(TAG, "checkHistogramDetails");
         Log.d(TAG, "compare min value " + hdrHistogramDetails.min_value + " to expected " + exp_min_value);
         Log.d(TAG, "compare median value " + hdrHistogramDetails.median_value + " to expected " + exp_median_value);
         Log.d(TAG, "compare max value " + hdrHistogramDetails.max_value + " to expected " + exp_max_value);
@@ -11760,10 +12452,11 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         assertTrue(Math.abs(exp_max_value - hdrHistogramDetails.max_value) <= 3);
     }
 
-    final private String hdr_images_path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM) + "/testOpenCamera/testdata/hdrsamples/";
-    final private String avg_images_path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM) + "/testOpenCamera/testdata/avgsamples/";
-    final private String logprofile_images_path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM) + "/testOpenCamera/testdata/logprofilesamples/";
-    final private String panorama_images_path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM) + "/testOpenCamera/testdata/panoramasamples/";
+    final private String images_base_path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath();
+    final private String hdr_images_path = images_base_path + "/testOpenCamera/testdata/hdrsamples/";
+    final private String avg_images_path = images_base_path + "/testOpenCamera/testdata/avgsamples/";
+    final private String logprofile_images_path = images_base_path + "/testOpenCamera/testdata/logprofilesamples/";
+    final private String panorama_images_path = images_base_path + "/testOpenCamera/testdata/panoramasamples/";
 
     /** Tests HDR algorithm on test samples "saintpaul".
      */
@@ -11788,7 +12481,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         //checkHistogramDetails(hdrHistogramDetails, 1, 39, 253);
         //checkHistogramDetails(hdrHistogramDetails, 1, 44, 253);
         //checkHistogramDetails(hdrHistogramDetails, 1, 42, 253);
-        checkHistogramDetails(hdrHistogramDetails, 1, 24, 254);
+        //checkHistogramDetails(hdrHistogramDetails, 1, 24, 254);
+        checkHistogramDetails(hdrHistogramDetails, 2, 30, 254);
     }
 
     /** Tests HDR algorithm on test samples "saintpaul", but with 5 images.
@@ -12325,7 +13019,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         checkHDROffsets(exp_offsets_x, exp_offsets_y);
 
         //checkHistogramDetails(hdrHistogramDetails, 17, 81, 255);
-        checkHistogramDetails(hdrHistogramDetails, 32, 74, 255);
+        //checkHistogramDetails(hdrHistogramDetails, 32, 74, 255);
+        checkHistogramDetails(hdrHistogramDetails, 29, 68, 255);
     }
 
     /** Tests HDR algorithm on test samples "testHDR23", but with 4 images.
@@ -12374,7 +13069,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         checkHDROffsets(exp_offsets_x, exp_offsets_y);
 
         //checkHistogramDetails(hdrHistogramDetails, 17, 81, 255);
-        checkHistogramDetails(hdrHistogramDetails, 28, 82, 255);
+        //checkHistogramDetails(hdrHistogramDetails, 28, 82, 255);
+        checkHistogramDetails(hdrHistogramDetails, 21, 74, 255);
     }
 
     /** Tests HDR algorithm on test samples "testHDR23", but with 6 images.
@@ -12427,7 +13123,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         checkHDROffsets(exp_offsets_x, exp_offsets_y);
 
         //checkHistogramDetails(hdrHistogramDetails, 17, 81, 255);
-        checkHistogramDetails(hdrHistogramDetails, 28, 82, 255);
+        //checkHistogramDetails(hdrHistogramDetails, 28, 82, 255);
+        checkHistogramDetails(hdrHistogramDetails, 20, 72, 255);
     }
 
     /** Tests HDR algorithm on test samples "testHDR24".
@@ -12622,7 +13319,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         //checkHistogramDetails(hdrHistogramDetails, 3, 101, 251);
         //checkHistogramDetails(hdrHistogramDetails, 3, 109, 251);
-        checkHistogramDetails(hdrHistogramDetails, 6, 111, 252);
+        //checkHistogramDetails(hdrHistogramDetails, 6, 111, 252);
+        checkHistogramDetails(hdrHistogramDetails, 2, 111, 252);
     }
 
     /** Tests HDR algorithm on test samples "testHDR33".
@@ -13160,7 +13858,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         // ISO 100, exposure time 1/417s, but pass in -1 since these are HDRNTests
         HistogramDetails hdrHistogramDetails = subTestHDR(inputs, "testHDR49_output.jpg", false, -1, -1);
 
-        checkHistogramDetails(hdrHistogramDetails, 0, 75, 255);
+        //checkHistogramDetails(hdrHistogramDetails, 0, 75, 255);
+        checkHistogramDetails(hdrHistogramDetails, 0, 81, 254);
     }
 
     /** Tests HDR algorithm on test samples "testHDR49".
@@ -13179,7 +13878,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         HistogramDetails hdrHistogramDetails = subTestHDR(inputs, "testHDR49_exp4_output.jpg", false, -1, -1);
 
-        checkHistogramDetails(hdrHistogramDetails, 0, 100, 245);
+        //checkHistogramDetails(hdrHistogramDetails, 0, 100, 245);
+        checkHistogramDetails(hdrHistogramDetails, 0, 94, 244);
     }
 
     /** Tests HDR algorithm on test samples "testHDR49".
@@ -13199,7 +13899,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         HistogramDetails hdrHistogramDetails = subTestHDR(inputs, "testHDR49_exp5_output.jpg", false, -1, -1);
 
-        checkHistogramDetails(hdrHistogramDetails, 0, 72, 244);
+        //checkHistogramDetails(hdrHistogramDetails, 0, 72, 244);
+        checkHistogramDetails(hdrHistogramDetails, 0, 78, 243);
     }
 
     /** Tests HDR algorithm on test samples "testHDR50".
@@ -13271,7 +13972,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         HistogramDetails hdrHistogramDetails = subTestHDR(inputs, "testHDR53_output.jpg", false, 103, 1000000000L/5381);
 
-        checkHistogramDetails(hdrHistogramDetails, 0, 55, 254);
+        //checkHistogramDetails(hdrHistogramDetails, 0, 55, 254);
+        checkHistogramDetails(hdrHistogramDetails, 0, 64, 255);
     }
 
     /** Tests HDR algorithm on test samples "testHDR54".
@@ -13346,8 +14048,87 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         //checkHistogramDetails(hdrHistogramDetails, 0, 75, 255);
     }
 
+    /** Tests HDR algorithm on test samples "testHDR58".
+     */
+    public void testHDR58() throws IOException, InterruptedException {
+        Log.d(TAG, "testHDR58");
+
+        setToDefault();
+
+        // list assets
+        List<Bitmap> inputs = new ArrayList<>();
+        inputs.add( getBitmapFromFile(hdr_images_path + "testHDR58/IMG_20190911_210146_0.jpg") );
+        inputs.add( getBitmapFromFile(hdr_images_path + "testHDR58/IMG_20190911_210146_1.jpg") );
+        inputs.add( getBitmapFromFile(hdr_images_path + "testHDR58/IMG_20190911_210146_2.jpg") );
+
+        HistogramDetails hdrHistogramDetails = subTestHDR(inputs, "testHDR58_output.jpg", false, 1250, 1000000000L/10);
+        //HistogramDetails hdrHistogramDetails = subTestHDR(inputs, "testHDR58_output.jpg", false, 1250, 1000000000L/10, HDRProcessor.TonemappingAlgorithm.TONEMAPALGORITHM_CLAMP);
+
+        checkHistogramDetails(hdrHistogramDetails, 11, 119, 255);
+    }
+
+    /** Tests HDR algorithm on test samples "testHDR59".
+     */
+    public void testHDR59() throws IOException, InterruptedException {
+        Log.d(TAG, "testHDR59");
+
+        setToDefault();
+
+        // list assets
+        List<Bitmap> inputs = new ArrayList<>();
+        inputs.add( getBitmapFromFile(hdr_images_path + "testHDR59/IMG_20190911_210154_0.jpg") );
+        inputs.add( getBitmapFromFile(hdr_images_path + "testHDR59/IMG_20190911_210154_1.jpg") );
+        inputs.add( getBitmapFromFile(hdr_images_path + "testHDR59/IMG_20190911_210154_2.jpg") );
+
+        HistogramDetails hdrHistogramDetails = subTestHDR(inputs, "testHDR59_output.jpg", false, 1250, 1000000000L/10);
+        //HistogramDetails hdrHistogramDetails = subTestHDR(inputs, "testHDR59_output.jpg", false, 1250, 1000000000L/10, HDRProcessor.TonemappingAlgorithm.TONEMAPALGORITHM_CLAMP);
+
+        //checkHistogramDetails(hdrHistogramDetails, 0, 75, 255);
+    }
+
+    /** Tests HDR algorithm on test samples "testHDR60".
+     */
+    public void testHDR60() throws IOException, InterruptedException {
+        Log.d(TAG, "testHDR60");
+
+        setToDefault();
+
+        // list assets
+        List<Bitmap> inputs = new ArrayList<>();
+        inputs.add( getBitmapFromFile(hdr_images_path + "testHDR60/IMG_20200507_020319_0.jpg") );
+        inputs.add( getBitmapFromFile(hdr_images_path + "testHDR60/IMG_20200507_020319_1.jpg") );
+        inputs.add( getBitmapFromFile(hdr_images_path + "testHDR60/IMG_20200507_020319_2.jpg") );
+
+        HistogramDetails hdrHistogramDetails = subTestHDR(inputs, "testHDR60_output.jpg", false, 491, 1000000000L/10);
+        //HistogramDetails hdrHistogramDetails = subTestHDR(inputs, "testHDR60_output.jpg", false, 491, 1000000000L/10, HDRProcessor.TonemappingAlgorithm.TONEMAPALGORITHM_CLAMP);
+
+        //checkHistogramDetails(hdrHistogramDetails, 0, 75, 255);
+    }
+
+    /** Tests HDR algorithm on test samples "testHDR61".
+     */
+    public void testHDR61() throws IOException, InterruptedException {
+        Log.d(TAG, "testHDR61");
+
+        setToDefault();
+
+        // list assets
+        List<Bitmap> inputs = new ArrayList<>();
+        inputs.add( getBitmapFromFile(hdr_images_path + "testHDR61/IMG_20191111_145230_0.jpg") );
+        inputs.add( getBitmapFromFile(hdr_images_path + "testHDR61/IMG_20191111_145230_1.jpg") );
+        inputs.add( getBitmapFromFile(hdr_images_path + "testHDR61/IMG_20191111_145230_2.jpg") );
+
+        HistogramDetails hdrHistogramDetails = subTestHDR(inputs, "testHDR61_output.jpg", false, 50, 1000000000L/5025);
+
+        checkHistogramDetails(hdrHistogramDetails, 0, 86, 254);
+
+        int [] exp_offsets_x = {0, 0, 1};
+        int [] exp_offsets_y = {0, 0, -2};
+        checkHDROffsets(exp_offsets_x, exp_offsets_y);
+    }
+
     /** Tests HDR algorithm on test samples "testHDRtemp".
-     *  Used for one-off testing, or to recreate HDR images from the base exposures to test an updated alorithm.
+     *  Used for one-off testing, or to recreate HDR images from the base exposures to test an updated algorithm.
      *  The test images should be copied to the test device into DCIM/testOpenCamera/testdata/hdrsamples/testHDRtemp/ .
      */
     public void testHDRtemp() throws IOException, InterruptedException {
@@ -13505,7 +14286,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         try {
             // initialise allocation from first two bitmaps
             //int inSampleSize = mActivity.getApplicationInterface().getHDRProcessor().getAvgSampleSize(inputs.size());
-            int inSampleSize = mActivity.getApplicationInterface().getHDRProcessor().getAvgSampleSize(iso);
+            int inSampleSize = mActivity.getApplicationInterface().getHDRProcessor().getAvgSampleSize(iso, exposure_time);
             Bitmap bitmap0 = getBitmapFromFile(inputs.get(0), inSampleSize);
             Bitmap bitmap1 = getBitmapFromFile(inputs.get(1), inSampleSize);
             int width = bitmap0.getWidth();
@@ -13514,7 +14295,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             float avg_factor = 1.0f;
             List<Long> times = new ArrayList<>();
             long time_s = System.currentTimeMillis();
-            HDRProcessor.AvgData avg_data = mActivity.getApplicationInterface().getHDRProcessor().processAvg(bitmap0, bitmap1, avg_factor, iso, zoom_factor);
+            HDRProcessor.AvgData avg_data = mActivity.getApplicationInterface().getHDRProcessor().processAvg(bitmap0, bitmap1, avg_factor, iso, exposure_time, zoom_factor);
             Allocation allocation = avg_data.allocation_out;
             times.add(System.currentTimeMillis() - time_s);
             // processAvg recycles both bitmaps
@@ -13528,7 +14309,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
                 Bitmap new_bitmap = getBitmapFromFile(inputs.get(i), inSampleSize);
                 avg_factor = (float)i;
                 time_s = System.currentTimeMillis();
-                mActivity.getApplicationInterface().getHDRProcessor().updateAvg(avg_data, width, height, new_bitmap, avg_factor, iso, zoom_factor);
+                mActivity.getApplicationInterface().getHDRProcessor().updateAvg(avg_data, width, height, new_bitmap, avg_factor, iso, exposure_time, zoom_factor);
                 times.add(System.currentTimeMillis() - time_s);
                 // updateAvg recycles new_bitmap
                 if( cb != null ) {
@@ -13974,7 +14755,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         //checkHistogramDetails(hdrHistogramDetails, 12, 46, 205);
         //checkHistogramDetails(hdrHistogramDetails, 12, 44, 209);
         //checkHistogramDetails(hdrHistogramDetails, 12, 44, 202);
-        checkHistogramDetails(hdrHistogramDetails, 5, 16, 190);
+        //checkHistogramDetails(hdrHistogramDetails, 5, 16, 190);
+        checkHistogramDetails(hdrHistogramDetails, 5, 19, 199);
     }
 
     /** Tests Avg algorithm on test samples "testAvg7".
@@ -14298,7 +15080,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         //checkHistogramDetails(hdrHistogramDetails, 0, 30, 254);
         //checkHistogramDetails(hdrHistogramDetails, 0, 27, 255);
         //checkHistogramDetails(hdrHistogramDetails, 0, 20, 255);
-        checkHistogramDetails(hdrHistogramDetails, 0, 17, 254);
+        //checkHistogramDetails(hdrHistogramDetails, 0, 17, 254);
+        checkHistogramDetails(hdrHistogramDetails, 0, 31, 255);
     }
 
     /** Tests Avg algorithm on test samples "testAvg13".
@@ -14366,7 +15149,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             }
         });
 
-        //checkHistogramDetails(hdrHistogramDetails, 1, 39, 253);
+        checkHistogramDetails(hdrHistogramDetails, 0, 25, 245);
     }
 
     /** Tests Avg algorithm on test samples "testAvg15".
@@ -14391,7 +15174,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
             }
         });
 
-        //checkHistogramDetails(hdrHistogramDetails, 1, 39, 253);
+        checkHistogramDetails(hdrHistogramDetails, 0, 38, 254);
     }
 
     /** Tests Avg algorithm on test samples "testAvg16".
@@ -14708,7 +15491,6 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         inputs.add(avg_images_path + "testAvg25/input2.jpg");
         inputs.add(avg_images_path + "testAvg25/input3.jpg");
 
-        //noinspection unused
         HistogramDetails hdrHistogramDetails = subTestAvg(inputs, "testAvg25_output.jpg", 512, 1000000000L/20, 1.0f, new TestAvgCallback() {
             @Override
             public void doneProcessAvg(int index) {
@@ -14817,7 +15599,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         //checkHistogramDetails(hdrHistogramDetails, 0, 21, 255);
         //checkHistogramDetails(hdrHistogramDetails, 0, 18, 255);
-        checkHistogramDetails(hdrHistogramDetails, 0, 8, 255);
+        //checkHistogramDetails(hdrHistogramDetails, 0, 8, 255);
+        checkHistogramDetails(hdrHistogramDetails, 0, 13, 255);
     }
 
     /** Tests Avg algorithm on test samples "testAvg29".
@@ -14930,7 +15713,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         });
 
         //checkHistogramDetails(hdrHistogramDetails, 0, 24, 255);
-        checkHistogramDetails(hdrHistogramDetails, 0, 9, 255);
+        //checkHistogramDetails(hdrHistogramDetails, 0, 9, 255);
+        checkHistogramDetails(hdrHistogramDetails, 0, 13, 255);
     }
 
     /** Tests Avg algorithm on test samples "testAvg32".
@@ -14962,7 +15746,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         //checkHistogramDetails(hdrHistogramDetails, 0, 34, 255);
         //checkHistogramDetails(hdrHistogramDetails, 0, 13, 255);
-        checkHistogramDetails(hdrHistogramDetails, 0, 36, 255);
+        //checkHistogramDetails(hdrHistogramDetails, 0, 36, 255);
+        checkHistogramDetails(hdrHistogramDetails, 0, 61, 254);
     }
 
     /** Tests Avg algorithm on test samples "testAvg33".
@@ -15209,7 +15994,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
         //checkHistogramDetails(hdrHistogramDetails, 0, 50, 255);
         //checkHistogramDetails(hdrHistogramDetails, 0, 19, 255);
-        checkHistogramDetails(hdrHistogramDetails, 0, 50, 255);
+        //checkHistogramDetails(hdrHistogramDetails, 0, 50, 255);
+        checkHistogramDetails(hdrHistogramDetails, 0, 67, 255);
     }
 
     /** Tests Avg algorithm on test samples "testAvg41".
@@ -15243,7 +16029,8 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         });
 
         //checkHistogramDetails(hdrHistogramDetails, 0, 49, 255);
-        checkHistogramDetails(hdrHistogramDetails, 0, 37, 255);
+        //checkHistogramDetails(hdrHistogramDetails, 0, 37, 255);
+        checkHistogramDetails(hdrHistogramDetails, 0, 59, 254);
     }
 
     /** Tests Avg algorithm on test samples "testAvg42".
@@ -15686,7 +16473,18 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         HistogramDetails hdrHistogramDetails = subTestLogProfile(image_path, "testLogProfile2_output.jpg");
 
         //checkHistogramDetails(hdrHistogramDetails, 0, 58, 243);
-        checkHistogramDetails(hdrHistogramDetails, 0, 41, 241);
+
+        CameraController2 camera_controller2 = (CameraController2)mPreview.getCameraController();
+        TonemapCurve curve = camera_controller2.testGetTonemapCurve();
+        Log.d(TAG, "point count: " + curve.getPointCount(0));
+        if( curve.getPointCount(0) == 32 ) {
+            // special case codepath for Galaxy S10e tonemap curves bugs means we get slightly different
+            // result
+            checkHistogramDetails(hdrHistogramDetails, 0, 35, 241);
+        }
+        else {
+            checkHistogramDetails(hdrHistogramDetails, 0, 41, 241);
+        }
     }
 
     /** Tests video log profile algorithm on test samples in "testLogProfile3".
@@ -15726,7 +16524,18 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         HistogramDetails hdrHistogramDetails = subTestLogProfile(image_path, "testLogProfile1_extra_strong_output.jpg");
 
         //checkHistogramDetails(hdrHistogramDetails, 2, 67, 254);
-        checkHistogramDetails(hdrHistogramDetails, 0, 13, 254);
+
+        CameraController2 camera_controller2 = (CameraController2)mPreview.getCameraController();
+        TonemapCurve curve = camera_controller2.testGetTonemapCurve();
+        Log.d(TAG, "point count: " + curve.getPointCount(0));
+        if( curve.getPointCount(0) == 32 ) {
+            // special case codepath for Galaxy S10e tonemap curves bugs means we get slightly different
+            // result
+            checkHistogramDetails(hdrHistogramDetails, 0, 8, 254);
+        }
+        else {
+            checkHistogramDetails(hdrHistogramDetails, 0, 13, 254);
+        }
     }
 
     /** Tests video log profile algorithm on test samples in "testAvg20".
@@ -15746,7 +16555,18 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         HistogramDetails hdrHistogramDetails = subTestLogProfile(image_path, "testLogProfile2_extra_strong_output.jpg");
 
         //checkHistogramDetails(hdrHistogramDetails, 0, 126, 250);
-        checkHistogramDetails(hdrHistogramDetails, 0, 66, 244);
+
+        CameraController2 camera_controller2 = (CameraController2)mPreview.getCameraController();
+        TonemapCurve curve = camera_controller2.testGetTonemapCurve();
+        Log.d(TAG, "point count: " + curve.getPointCount(0));
+        if( curve.getPointCount(0) == 32 ) {
+            // special case codepath for Galaxy S10e tonemap curves bugs means we get slightly different
+            // result
+            checkHistogramDetails(hdrHistogramDetails, 0, 51, 244);
+        }
+        else {
+            checkHistogramDetails(hdrHistogramDetails, 0, 66, 244);
+        }
     }
 
     /** Tests video log profile algorithm on test samples in "testLogProfile3".
@@ -15769,12 +16589,92 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
         checkHistogramDetails(hdrHistogramDetails, 0, 170, 255);
     }
 
+    /** Returns the mediastore Uri for the supplied filename inside the supplied baseUri, or null
+     *  if an entry can't be found.
+     */
+    private Uri getUriFromName(Uri baseUri, String name) {
+        Uri uri = null;
+        String [] projection = new String[]{MediaStore.Images.ImageColumns._ID};
+        Cursor cursor = null;
+        try {
+            cursor = mActivity.getContentResolver().query(baseUri, projection, MediaStore.Images.ImageColumns.DISPLAY_NAME + " LIKE ?", new String[]{name}, null);
+            if( cursor != null && cursor.moveToFirst() ) {
+                Log.d(TAG, "found: " + cursor.getCount());
+                long id = cursor.getLong(0);
+                uri = ContentUris.withAppendedId(baseUri, id);
+                Log.d(TAG, "id: " + id);
+                Log.d(TAG, "uri: " + uri);
+            }
+        }
+        catch(Exception e) {
+            Log.e(TAG, "Exception trying to find uri from filename");
+            e.printStackTrace();
+        }
+        finally {
+            if( cursor != null ) {
+                cursor.close();
+            }
+        }
+        return uri;
+    }
+
     private void saveBitmap(Bitmap bitmap, String name) throws IOException {
-        File file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM) + "/" + name);
-        OutputStream outputStream = new FileOutputStream(file);
+        Log.d(TAG, "saveBitmap: " + name);
+
+        File file = null;
+        ContentValues contentValues = null;
+        Uri uri = null;
+        OutputStream outputStream;
+        if( MainActivity.useScopedStorage() ) {
+            Uri folder = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ?
+                    MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY) :
+                    MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+
+            // first try to delete pre-existing image
+            Uri old_uri = getUriFromName(folder, name);
+            if( old_uri != null ) {
+                Log.d(TAG, "delete: " + old_uri);
+                mActivity.getContentResolver().delete(old_uri, null, null);
+            }
+
+            contentValues = new ContentValues();
+            contentValues.put(MediaStore.Images.Media.DISPLAY_NAME, name);
+            String extension = name.substring(name.lastIndexOf("."));
+            String mime_type = mActivity.getStorageUtils().getImageMimeType(extension);
+            Log.d(TAG, "mime_type: " + mime_type);
+            contentValues.put(MediaStore.Images.Media.MIME_TYPE, mime_type);
+            if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
+                String relative_path = Environment.DIRECTORY_DCIM + File.separator;
+                Log.d(TAG, "relative_path: " + relative_path);
+                contentValues.put(MediaStore.Images.Media.RELATIVE_PATH, relative_path);
+                contentValues.put(MediaStore.Images.Media.IS_PENDING, 1);
+            }
+
+            uri = mActivity.getContentResolver().insert(folder, contentValues);
+            Log.d(TAG, "saveUri: " + uri);
+            if( uri == null ) {
+                throw new IOException();
+            }
+            outputStream = mActivity.getContentResolver().openOutputStream(uri);
+        }
+        else {
+            file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM) + File.separator + name);
+            outputStream = new FileOutputStream(file);
+        }
+
         bitmap.compress(Bitmap.CompressFormat.JPEG, 90, outputStream);
         outputStream.close();
-        mActivity.getStorageUtils().broadcastFile(file, true, false, true);
+
+        if( MainActivity.useScopedStorage() ) {
+            if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
+                contentValues.clear();
+                contentValues.put(MediaStore.Images.Media.IS_PENDING, 0);
+                mActivity.getContentResolver().update(uri, contentValues, null, null);
+            }
+        }
+        else {
+            mActivity.getStorageUtils().broadcastFile(file, true, false, true);
+        }
     }
 
     /**
@@ -15782,7 +16682,6 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
      * @param camera_angle_x The value of preview.getViewAngleX(for_preview=false) (in degrees) when taking the input photos (on the device used).
      * @param camera_angle_y The value of preview.getViewAngleY(for_preview=false) (in degrees) when taking the input photos (on the device used).
      */
-    @SuppressWarnings("unused")
     private void subTestPanorama(List<String> inputs, String output_name, String gyro_debug_info_filename, float panorama_pics_per_screen, float camera_angle_x, float camera_angle_y, float gyro_tol_degrees) throws IOException, InterruptedException {
         Log.d(TAG, "subTestPanorama");
 
diff --git a/app/src/androidTest/java/net/sourceforge/opencamera/test/MainTests.java b/app/src/androidTest/java/net/sourceforge/opencamera/test/MainTests.java
index 863a0915dd533ce5cd5ff60bf455a77cdead2ff6..782bebb9f8b691bf5364d5f5efc18abb6a141d23 100644
--- a/app/src/androidTest/java/net/sourceforge/opencamera/test/MainTests.java
+++ b/app/src/androidTest/java/net/sourceforge/opencamera/test/MainTests.java
@@ -16,6 +16,12 @@ public class MainTests {
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testSwitchVideo"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLocationSettings"));
         // other tests:
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testScopedStorageChecks1"));
+        if( !MainActivityTest.test_camera2 ) {
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testScopedStorageChecks2"));
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testScopedStorageChecks3"));
+        }
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testScopedStorageChecks4"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testPause"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testImmediatelyQuit"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testStartCameraPreviewCount"));
@@ -31,7 +37,9 @@ public class MainTests {
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testPreviewSize"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testPreviewSizeWYSIWYG"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testResolutionMaxMP"));
-        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testResolutionBurst"));
+        if( MainActivityTest.test_camera2 ) {
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testResolutionBurst"));
+        }
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testAutoFocus"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testAutoFocusCorners"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testPopup"));
diff --git a/app/src/androidTest/java/net/sourceforge/opencamera/test/Nexus7Tests.java b/app/src/androidTest/java/net/sourceforge/opencamera/test/Nexus7Tests.java
index 3494ec2ae3534fc35b6419f3e7c14d025a794c58..079a2ced56a476390f5773201230a701d69ab5a5 100644
--- a/app/src/androidTest/java/net/sourceforge/opencamera/test/Nexus7Tests.java
+++ b/app/src/androidTest/java/net/sourceforge/opencamera/test/Nexus7Tests.java
@@ -1,5 +1,7 @@
 package net.sourceforge.opencamera.test;
 
+import android.os.Build;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -9,13 +11,24 @@ public class Nexus7Tests {
         TestSuite suite = new TestSuite(MainTests.class.getName());
 
         // we run the following tests on the Nexus 7 as a device that supports SAF, but doesn't have Android 7+ (where we use alternative methods for read/writing Exif tags without needing File)
+        // update: we now (as of 1.48.2) use the same codepaths for exif tags for before and after Android 7, but might as well keep these tests here anyway
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoSAF"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testPhotoStampSAF"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testDirectionOnSAF"));
 
+        // tests useful for device with no flash, and only 1 camera
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testSwitchVideo"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testFocusFlashAvailability"));
 
+        // tests for testing Camera2 API with LEGACY Camera2 functionality
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhoto"));
+        if( MainActivityTest.isEmulator() && Build.VERSION.SDK_INT == Build.VERSION_CODES.M ) {
+            // video doesn't work on Android 6 emulator!
+        }
+        else {
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideo"));
+        }
+
         return suite;
     }
 }
diff --git a/app/src/androidTest/java/net/sourceforge/opencamera/test/OldDeviceTests.java b/app/src/androidTest/java/net/sourceforge/opencamera/test/OldDeviceTests.java
new file mode 100644
index 0000000000000000000000000000000000000000..8e6e1b1759699818496499258855bcca70913e5a
--- /dev/null
+++ b/app/src/androidTest/java/net/sourceforge/opencamera/test/OldDeviceTests.java
@@ -0,0 +1,39 @@
+package net.sourceforge.opencamera.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class OldDeviceTests {
+    // Small set of tests to run on very old devices.
+    public static Test suite() {
+        TestSuite suite = new TestSuite(MainTests.class.getName());
+
+        // put these tests first as they require various permissions be allowed, that can only be set by user action
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testSwitchVideo"));
+
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testPause"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testSaveModes"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testFocusFlashAvailability"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testGallery"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testSettings"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testSettingsSaveLoad"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testFolderChooserNew"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testFolderChooserInvalid"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testSaveFolderHistory"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testSettingsPrivacyPolicy"));
+
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLocationOn"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhoto"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoAutoLevel"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoAutoLevelLowMemory"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoAutoLevelAngles"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoAutoLevelAnglesLowMemory"));
+
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideo"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoSubtitles"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testIntentVideo"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testIntentVideoDurationLimit"));
+
+        return suite;
+    }
+}
diff --git a/app/src/androidTest/java/net/sourceforge/opencamera/test/PanoramaTests.java b/app/src/androidTest/java/net/sourceforge/opencamera/test/PanoramaTests.java
index 5e3c38d00d1286f2ae4a160bf3a758b0a8e5950d..554ac0b79e667ea01cffce5c68b51caa06682913 100644
--- a/app/src/androidTest/java/net/sourceforge/opencamera/test/PanoramaTests.java
+++ b/app/src/androidTest/java/net/sourceforge/opencamera/test/PanoramaTests.java
@@ -9,6 +9,7 @@ public class PanoramaTests {
      *  To use these tests, the testdata/ subfolder should be manually copied to the test device in the DCIM/testOpenCamera/
      *  folder (so you have DCIM/testOpenCamera/testdata/). We don't use assets/ as we'd end up with huge APK sizes which takes
      *  time to transfer to the device every time we run the tests.
+     *  On Android 10+, scoped storage permission needs to be given to Open Camera for the DCIM/testOpenCamera/ folder.
      */
     public static Test suite() {
         TestSuite suite = new TestSuite(MainTests.class.getName());
diff --git a/app/src/androidTest/java/net/sourceforge/opencamera/test/PhotoTests.java b/app/src/androidTest/java/net/sourceforge/opencamera/test/PhotoTests.java
index fb2a078780dfffdd84cd61e0a47f755f2da9117b..7f09028e0250a55cdc3ec33280d5feeb13026cec 100644
--- a/app/src/androidTest/java/net/sourceforge/opencamera/test/PhotoTests.java
+++ b/app/src/androidTest/java/net/sourceforge/opencamera/test/PhotoTests.java
@@ -26,9 +26,6 @@ public class PhotoTests {
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhoto"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoContinuous"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoContinuousNoTouch"));
-        if( !MainActivityTest.test_camera2 ) {
-            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoAutoStabilise"));
-        }
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoFlashAuto"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoFlashOn"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoFlashTorch"));
@@ -90,9 +87,11 @@ public class PhotoTests {
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoHDRPhotoStamp"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoExpo"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoPanorama"));
-        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoPanoramaMax"));
-        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoPanoramaCancel"));
-        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoPanoramaCancelBySettings"));
+        if( !MainActivityTest.test_camera2 ) {
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoPanoramaMax"));
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoPanoramaCancel"));
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakePhotoPanoramaCancelBySettings"));
+        }
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testCreateSaveFolder1"));
         if( !MainActivityTest.test_camera2 ) {
             suite.addTest(TestSuite.createTest(MainActivityTest.class, "testCreateSaveFolder2"));
diff --git a/app/src/androidTest/java/net/sourceforge/opencamera/test/TempTests.java b/app/src/androidTest/java/net/sourceforge/opencamera/test/TempTests.java
new file mode 100644
index 0000000000000000000000000000000000000000..fc808e7c1ac6670be32bf685d5bdde98d1cf2a47
--- /dev/null
+++ b/app/src/androidTest/java/net/sourceforge/opencamera/test/TempTests.java
@@ -0,0 +1,15 @@
+package net.sourceforge.opencamera.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class TempTests {
+    // Dummy test suite for running an arbitrary subset of tests.
+    public static Test suite() {
+        TestSuite suite = new TestSuite(MainTests.class.getName());
+
+        //suite.addTest(TestSuite.createTest(MainActivityTest.class, "testZoom"));
+
+        return suite;
+    }
+}
diff --git a/app/src/androidTest/java/net/sourceforge/opencamera/test/VideoTests.java b/app/src/androidTest/java/net/sourceforge/opencamera/test/VideoTests.java
index aa31823d24781e32192fb9b33e104b09f9650e80..4787ac2baef6b382d8b46ae9d0785d0f68dd9362 100644
--- a/app/src/androidTest/java/net/sourceforge/opencamera/test/VideoTests.java
+++ b/app/src/androidTest/java/net/sourceforge/opencamera/test/VideoTests.java
@@ -8,13 +8,24 @@ public class VideoTests {
     public static Test suite() {
         TestSuite suite = new TestSuite(MainTests.class.getName());
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideo"));
+        // put these tests first as they require various permissions be allowed, that can only be set by user action:
         if( !MainActivityTest.test_camera2 ) {
             suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoAudioControl"));
         }
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoSAF"));
         if( !MainActivityTest.test_camera2 ) {
             suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoSubtitles"));
-            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoSubtitlesGPS"));
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoSubtitlesSAF"));
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoSubtitlesGPSSAF"));
+        }
+        if( MainActivityTest.test_camera2 ) {
+            // tests for video log profile (but these don't actually record video)
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLogProfile1"));
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLogProfile2"));
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLogProfile3"));
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLogProfile1_extra_strong"));
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLogProfile2_extra_strong"));
+            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLogProfile3_extra_strong"));
         }
 
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testIntentVideo"));
@@ -58,6 +69,9 @@ public class VideoTests {
         }
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoTimeLapse"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoForceFailure"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoForceFailureSAF"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoForceIOException"));
+        suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoForceCameraControllerException"));
         if( MainActivityTest.test_camera2 ) {
             suite.addTest(TestSuite.createTest(MainActivityTest.class, "testVideoLogProfile"));
             suite.addTest(TestSuite.createTest(MainActivityTest.class, "testVideoJTLogProfile"));
@@ -74,15 +88,6 @@ public class VideoTests {
         /*suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideoBitrate"));
         suite.addTest(TestSuite.createTest(MainActivityTest.class, "testTakeVideo4K"));*/
 
-        // tests for video log profile (but these don't actually record video)
-        if( MainActivityTest.test_camera2 ) {
-            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLogProfile1"));
-            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLogProfile2"));
-            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLogProfile3"));
-            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLogProfile1_extra_strong"));
-            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLogProfile2_extra_strong"));
-            suite.addTest(TestSuite.createTest(MainActivityTest.class, "testLogProfile3_extra_strong"));
-        }
         return suite;
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b5366f48887f8231e940cac4867c1212353b6892..1a9fb772372ca5dcfcf0d0bcfac761f28f6e64c9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,21 +2,32 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="foundation.e.camera"
-    android:versionCode="77"
-    android:versionName="1.48.1"
+    android:versionCode="85"
+    android:versionName="1.50.1"
     android:installLocation="auto"
     tools:ignore="GoogleAppIndexingWarning">
     <!-- ignore GoogleAppIndexingWarning as we don't want to implement that -->
 
     <supports-screens android:xlargeScreens="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true" android:anyDensity="true"/>
 
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30"
+        />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30"
+        />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation"
+        />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.SYSTEM_CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.microphone" />
@@ -34,11 +45,10 @@
         <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
         <activity
             android:name="net.sourceforge.opencamera.MainActivity"
-            android:label="@string/app_name"
-            android:screenOrientation="landscape"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:theme="@style/AppTheme"
             android:clearTaskOnLaunch="true"
+            android:exported="true"
             >
             <!-- clearTaskOnLaunch set to true, so if user goes to gallery then returns to home, we return to the camera rather than remaining in gallery if user relaunches Open Camera -->
             <intent-filter>
@@ -75,11 +85,8 @@
         <activity
             android:name="net.sourceforge.opencamera.remotecontrol.DeviceScanner"
             android:label="@string/scan_ble"
+            android:exported="false"
         >
-            <intent-filter>
-                <action android:name="net.sourceforge.opencamera.Remotecontrol.DeviceScanner"/>
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </activity>
 
         <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
@@ -87,17 +94,18 @@
             android:name="net.sourceforge.opencamera.TakePhoto"
             android:label="@string/take_photo"
             android:icon="@mipmap/ic_launcher"
-            android:screenOrientation="landscape"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:taskAffinity=""
             android:excludeFromRecents="true"
+            android:exported="false"
             >
         </activity>
         <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
         <receiver
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
-            android:name="net.sourceforge.opencamera.MyWidgetProvider" >
+            android:name="net.sourceforge.opencamera.MyWidgetProvider"
+            android:exported="true">
             <intent-filter >
                  <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -112,7 +120,8 @@
         <receiver
             android:icon="@mipmap/ic_launcher"
             android:label="@string/take_photo"
-            android:name="net.sourceforge.opencamera.MyWidgetProviderTakePhoto" >
+            android:name="net.sourceforge.opencamera.MyWidgetProviderTakePhoto"
+            android:exported="true">
             <intent-filter >
                  <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -125,7 +134,8 @@
             android:name="net.sourceforge.opencamera.MyTileService"
             android:icon="@drawable/ic_switch_camera"
             android:label="@string/camera"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
@@ -135,7 +145,8 @@
             android:name="net.sourceforge.opencamera.MyTileServiceVideo"
             android:icon="@drawable/ic_switch_video"
             android:label="@string/record_video"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
@@ -145,11 +156,21 @@
             android:name="net.sourceforge.opencamera.MyTileServiceFrontCamera"
             android:icon="@drawable/ic_face"
             android:label="@string/selfie"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
-        <service android:name="net.sourceforge.opencamera.remotecontrol.BluetoothLeService" android:enabled="true"/>
+        <service android:name="net.sourceforge.opencamera.remotecontrol.BluetoothLeService"
+            android:enabled="true"
+            android:exported="false"
+            />
     </application>
+    <!-- needed for targetting Android 11 - see https://developer.android.com/about/versions/11/behavior-changes-11 -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.TTS_SERVICE" />
+        </intent>
+    </queries>
 </manifest>
diff --git a/app/src/main/assets/androidx_LICENSE-2.0.txt b/app/src/main/assets/androidx_LICENSE-2.0.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d645695673349e3947e8e5ae42332d0ac3164cd7
--- /dev/null
+++ b/app/src/main/assets/androidx_LICENSE-2.0.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/app/src/main/java/net/sourceforge/opencamera/AudioListener.java b/app/src/main/java/net/sourceforge/opencamera/AudioListener.java
index 2d5bf4a2335e28634c2bf651b58e43829d926bde..dee516502cf1862edebcab34a2fe2efe9eae9360 100644
--- a/app/src/main/java/net/sourceforge/opencamera/AudioListener.java
+++ b/app/src/main/java/net/sourceforge/opencamera/AudioListener.java
@@ -5,6 +5,8 @@ import android.media.AudioRecord;
 import android.media.MediaRecorder;
 import android.util.Log;
 
+import androidx.annotation.RequiresPermission;
+
 /** Sets up a listener to listen for noise level.
  */
 class AudioListener {
@@ -20,6 +22,7 @@ class AudioListener {
 
     /** Create a new AudioListener. The caller should call the start() method to start listening.
      */
+    @RequiresPermission(android.Manifest.permission.RECORD_AUDIO)
     AudioListener(final AudioListenerCallback cb) {
         if( MyDebug.LOG )
             Log.d(TAG, "new AudioListener");
diff --git a/app/src/main/java/net/sourceforge/opencamera/HDRProcessor.java b/app/src/main/java/net/sourceforge/opencamera/HDRProcessor.java
index f58882c5d9dfd13fff9a11e0614dd6fee994d584..7dec0c26096beaa991ca6af9d022526ad06b4e39 100644
--- a/app/src/main/java/net/sourceforge/opencamera/HDRProcessor.java
+++ b/app/src/main/java/net/sourceforge/opencamera/HDRProcessor.java
@@ -23,6 +23,9 @@ import android.renderscript.ScriptIntrinsicHistogram;
 //import android.renderscript.ScriptIntrinsicResize;
 import android.renderscript.Type;
 import androidx.annotation.RequiresApi;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 
 public class HDRProcessor {
@@ -39,10 +42,10 @@ public class HDRProcessor {
     private ScriptC_process_avg processAvgScript;
     private ScriptC_create_mtb createMTBScript;
     private ScriptC_align_mtb alignMTBScript;
-	/*private ScriptC_histogram_adjust histogramAdjustScript;
-	private ScriptC_histogram_compute histogramScript;
-	private ScriptC_avg_brighten avgBrightenScript;
-	private ScriptC_calculate_sharpness sharpnessScript;*/
+    /*private ScriptC_histogram_adjust histogramAdjustScript;
+    private ScriptC_histogram_compute histogramScript;
+    private ScriptC_avg_brighten avgBrightenScript;
+    private ScriptC_calculate_sharpness sharpnessScript;*/
 
     // public for access by testing
     public int [] offsets_x = null;
@@ -79,10 +82,10 @@ public class HDRProcessor {
         processAvgScript = null;
         createMTBScript = null;
         alignMTBScript = null;
-		/*histogramAdjustScript = null;
-		histogramScript = null;
-		avgBrightenScript = null;
-		sharpnessScript = null;*/
+        /*histogramAdjustScript = null;
+        histogramScript = null;
+        avgBrightenScript = null;
+        sharpnessScript = null;*/
     }
 
     public void onDestroy() {
@@ -258,9 +261,9 @@ public class HDRProcessor {
                 Log.d(TAG, "parameter_B = " + parameter_B);
             }
 
-            if( MyDebug.LOG ) {
+            /*if( MyDebug.LOG ) {
                 // log samples to a CSV file
-                File file = new File(Environment.getExternalStorageDirectory().getPath() + "/net.sourceforge.opencamera.hdr_samples_" + id + ".csv");
+                File file = new File(context.getExternalFilesDir(null).getPath() + "/net.sourceforge.opencamera.hdr_samples_" + id + ".csv");
                 if( file.exists() ) {
                     if( !file.delete() ) {
                         // keep FindBugs happy by checking return argument
@@ -296,7 +299,7 @@ public class HDRProcessor {
                     }
                 }
                 MediaScannerConnection.scanFile(context, new String[] { file.getAbsolutePath() }, null, null);
-            }
+            }*/
         }
     }
 
@@ -332,7 +335,7 @@ public class HDRProcessor {
      *                      this controls the level of the local contrast enhancement done in adjustHistogram().
      * @param n_tiles       A value of 1 or greater indicating how local the contrast enhancement algorithm should be.
      * @param ce_preserve_blacks
-     * 						If true (recommended), then we apply a modification to the contrast enhancement algorithm to avoid
+     *                      If true (recommended), then we apply a modification to the contrast enhancement algorithm to avoid
      *                      making darker pixels too dark. A value of false gives more contrast on the darker regions of the
      *                      resultant image.
      * @param tonemapping_algorithm
@@ -417,8 +420,8 @@ public class HDRProcessor {
             for(int x=0;x<n_w_samples;x++) {
                 double beta = ((double)x+1.0) / ((double)n_w_samples+1.0);
                 int x_coord = (int)(beta * in_bitmap.getWidth());
-				/*if( MyDebug.LOG )
-					Log.d(TAG, "sample response from " + x_coord + " , " + y_coord);*/
+                /*if( MyDebug.LOG )
+                    Log.d(TAG, "sample response from " + x_coord + " , " + y_coord);*/
                 if( x_coord + offset_x < 0 || x_coord + offset_x >= in_bitmap.getWidth() || y_coord + offset_y < 0 || y_coord + offset_y >= in_bitmap.getHeight() ) {
                     continue;
                 }
@@ -534,10 +537,10 @@ public class HDRProcessor {
         ResponseFunction [] response_functions = new ResponseFunction[n_bitmaps]; // ResponseFunction for each image (the ResponseFunction entry can be left null to indicate the Identity)
         offsets_x = new int[n_bitmaps];
         offsets_y = new int[n_bitmaps];
-		/*int [][] buffers = new int[n_bitmaps][];
-		for(int i=0;i<n_bitmaps;i++) {
-			buffers[i] = new int[bm.getWidth()];
-		}*/
+        /*int [][] buffers = new int[n_bitmaps][];
+        for(int i=0;i<n_bitmaps;i++) {
+            buffers[i] = new int[bm.getWidth()];
+        }*/
         //float [] hdr = new float[3];
         //int [] rgb = new int[3];
 
@@ -610,44 +613,44 @@ public class HDRProcessor {
             }
         }
 
-		/*
-		// calculate average luminance by sampling
-		final int n_samples_c = 100;
-		final int n_w_samples = (int)Math.sqrt(n_samples_c);
-		final int n_h_samples = n_samples_c/n_w_samples;
-
-		double sum_log_luminance = 0.0;
-		int count = 0;
-		for(int y=0;y<n_h_samples;y++) {
-			double alpha = ((double)y+1.0) / ((double)n_h_samples+1.0);
-			int y_coord = (int)(alpha * bm.getHeight());
-			for(int i=0;i<n_bitmaps;i++) {
-				bitmaps.get(i).getPixels(buffers[i], 0, bm.getWidth(), 0, y_coord, bm.getWidth(), 1);
-			}
-			for(int x=0;x<n_w_samples;x++) {
-				double beta = ((double)x+1.0) / ((double)n_w_samples+1.0);
-				int x_coord = (int)(beta * bm.getWidth());
-				if( MyDebug.LOG )
-					Log.d(TAG, "sample luminance from " + x_coord + " , " + y_coord);
-				calculateHDR(hdr, n_bitmaps, buffers, x_coord, response_functions);
-				double luminance = calculateLuminance(hdr[0], hdr[1], hdr[2]) + 1.0; // add 1 so we don't take log of 0..;
-				sum_log_luminance += Math.log(luminance);
-				count++;
-			}
-		}
-		float avg_luminance = (float)(Math.exp( sum_log_luminance / count ));
-		if( MyDebug.LOG )
-			Log.d(TAG, "avg_luminance: " + avg_luminance);
-		if( MyDebug.LOG )
-			Log.d(TAG, "time after calculating average luminance: " + (System.currentTimeMillis() - time_s));
-			*/
+        /*
+        // calculate average luminance by sampling
+        final int n_samples_c = 100;
+        final int n_w_samples = (int)Math.sqrt(n_samples_c);
+        final int n_h_samples = n_samples_c/n_w_samples;
+
+        double sum_log_luminance = 0.0;
+        int count = 0;
+        for(int y=0;y<n_h_samples;y++) {
+            double alpha = ((double)y+1.0) / ((double)n_h_samples+1.0);
+            int y_coord = (int)(alpha * bm.getHeight());
+            for(int i=0;i<n_bitmaps;i++) {
+                bitmaps.get(i).getPixels(buffers[i], 0, bm.getWidth(), 0, y_coord, bm.getWidth(), 1);
+            }
+            for(int x=0;x<n_w_samples;x++) {
+                double beta = ((double)x+1.0) / ((double)n_w_samples+1.0);
+                int x_coord = (int)(beta * bm.getWidth());
+                if( MyDebug.LOG )
+                    Log.d(TAG, "sample luminance from " + x_coord + " , " + y_coord);
+                calculateHDR(hdr, n_bitmaps, buffers, x_coord, response_functions);
+                double luminance = calculateLuminance(hdr[0], hdr[1], hdr[2]) + 1.0; // add 1 so we don't take log of 0..;
+                sum_log_luminance += Math.log(luminance);
+                count++;
+            }
+        }
+        float avg_luminance = (float)(Math.exp( sum_log_luminance / count ));
+        if( MyDebug.LOG )
+            Log.d(TAG, "avg_luminance: " + avg_luminance);
+        if( MyDebug.LOG )
+            Log.d(TAG, "time after calculating average luminance: " + (System.currentTimeMillis() - time_s));
+            */
 
         // write new hdr image
 
         // create RenderScript
-		/*if( processHDRScript == null ) {
-			processHDRScript = new ScriptC_process_hdr(rs);
-		}*/
+        /*if( processHDRScript == null ) {
+            processHDRScript = new ScriptC_process_hdr(rs);
+        }*/
         ScriptC_process_hdr processHDRScript = new ScriptC_process_hdr(rs);
 
         // set allocations
@@ -795,8 +798,17 @@ public class HDRProcessor {
             final float tonemap_denom = ((float)median_target)/(float)median_brightness - (255.0f / max_possible_value);
             if( MyDebug.LOG )
                 Log.d(TAG, "tonemap_denom: " + tonemap_denom);
-            if( tonemap_denom != 0.0f ) // just in case
+            if( tonemap_denom != 0.0f ) { // just in case
                 tonemap_scale_c = (255.0f - median_target) / tonemap_denom;
+                if( MyDebug.LOG )
+                    Log.d(TAG, "tonemap_scale_c (before setting min): " + tonemap_scale_c);
+                /*if( tonemap_scale_c < 0.5f*255.0f ) {
+                    throw new RuntimeException("tonemap_scale_c: " + tonemap_scale_c);
+                }*/
+                // important to set a min value, see testHDR58, testHDR59, testHDR60 - at least 0.25, but 0.5 works better:
+                //tonemap_scale_c = Math.max(tonemap_scale_c, 0.25f*255.0f);
+                tonemap_scale_c = Math.max(tonemap_scale_c, 0.5f*255.0f);
+            }
             //throw new RuntimeException(); // test
         }
         // Higher tonemap_scale_c values means darker results from the Reinhard tonemapping.
@@ -885,8 +897,8 @@ public class HDRProcessor {
         else {
             processHDRScript.forEach_hdr(allocations[base_bitmap], output_allocation);
         }
-		/*processHDRScript.set_n_bitmaps_g(n_bitmaps);
-		processHDRScript.forEach_hdr_n(allocations[base_bitmap], output_allocation);*/
+        /*processHDRScript.set_n_bitmaps_g(n_bitmaps);
+        processHDRScript.forEach_hdr_n(allocations[base_bitmap], output_allocation);*/
         if( MyDebug.LOG )
             Log.d(TAG, "### time after processHDRScript: " + (System.currentTimeMillis() - time_s));
 
@@ -992,7 +1004,7 @@ public class HDRProcessor {
                 if( MyDebug.LOG )
                     Log.d(TAG, "apply gain/gamma");
                 //if( true )
-                //	throw new HDRProcessorException(HDRProcessorException.UNEQUAL_SIZES); // test
+                //  throw new HDRProcessorException(HDRProcessorException.UNEQUAL_SIZES); // test
 
                 ScriptC_avg_brighten script = new ScriptC_avg_brighten(rs);
                 script.invoke_setBrightenParameters(gain, gamma, low_x, mid_x, max_brightness);
@@ -1081,15 +1093,32 @@ public class HDRProcessor {
         }
     }
 
+    public static boolean sceneIsLowLight(int iso, long exposure_time) {
+        final int ISO_FOR_DARK = 1100;
+        // For Nexus 6, max reported ISO is 1196, so the limit for dark scenes shouldn't be more than this
+        // Nokia 8's max reported ISO is 1551
+        // Note that OnePlus 3T has max reported ISO of 800, but this is a device bug
+        // The addition of the iso*exposure_time helps behaviour on Galaxy S10e which uses ISO >= 1600
+        // far more often, even for non-dark scenes. Potentially we could drop the requirement for
+        // "iso >= ISO_FOR_DARK" and instead have iso*exposure_time >= 91 to 115, but we need the
+        // dedicated iso check for Nexus 6 (iso 1196 exposure time 1/12s should be dark) and
+        // Nokia 8 testAvg23 (iso 1044 exposure time 0.1s shouldn't be dark).
+        // We also assume dark for long exposure times (which in practice is probably set in
+        // manual mode) - since long exposure times will give lower ISOs (e.g., on Galaxy S10e)
+        // (also useful for cameras where max ISO isn't as high as ISO_FOR_DARK)
+        //return iso >= ISO_FOR_DARK;
+        return ( iso >= ISO_FOR_DARK && iso*exposure_time >= 69*1000000000L ) || exposure_time >= (1000000000L/5-10000L);
+    }
+
     private int cached_avg_sample_size = 1;
 
     /** As part of the noise reduction process, the caller should scale the input images down by the factor returned
      *  by this method. This both provides a spatial smoothing, as well as improving performance and memory usage.
      */
-    public int getAvgSampleSize(int capture_result_iso) {
+    public int getAvgSampleSize(int capture_result_iso, long capture_result_exposure_tim) {
         // If changing this, may also want to change the radius of the spatial filter in avg_brighten.rs ?
         //this.cached_avg_sample_size = (n_images>=8) ? 2 : 1;
-        this.cached_avg_sample_size = (capture_result_iso >= 1100) ? 2 : 1;
+        this.cached_avg_sample_size = sceneIsLowLight(capture_result_iso, capture_result_exposure_tim) ? 2 : 1;
         //this.cached_avg_sample_size = 1;
         //this.cached_avg_sample_size = 2;
         if( MyDebug.LOG )
@@ -1105,11 +1134,15 @@ public class HDRProcessor {
         public Allocation allocation_out;
         Bitmap bitmap_avg_align;
         Allocation allocation_avg_align;
+        Bitmap bitmap_orig; // first bitmap, need to keep until all images are processed, due to being used for allocation_orig
+        Allocation allocation_orig; // saved version of the first allocation
 
-        AvgData(Allocation allocation_out, Bitmap bitmap_avg_align, Allocation allocation_avg_align) {
+        AvgData(Allocation allocation_out, Bitmap bitmap_avg_align, Allocation allocation_avg_align, Bitmap bitmap_orig, Allocation allocation_orig) {
             this.allocation_out = allocation_out;
             this.bitmap_avg_align = bitmap_avg_align;
             this.allocation_avg_align = allocation_avg_align;
+            this.bitmap_orig = bitmap_orig;
+            this.allocation_orig = allocation_orig;
         }
 
         public void destroy() {
@@ -1127,6 +1160,14 @@ public class HDRProcessor {
                 allocation_avg_align.destroy();
                 allocation_avg_align = null;
             }
+            if( bitmap_orig != null ) {
+                bitmap_orig.recycle();
+                bitmap_orig = null;
+            }
+            if( allocation_orig != null ) {
+                allocation_orig.destroy();
+                allocation_orig = null;
+            }
         }
     }
 
@@ -1142,10 +1183,11 @@ public class HDRProcessor {
      * @param bitmap_new     The other input image. The bitmap is recycled.
      * @param avg_factor     The weighting factor for bitmap_avg.
      * @param iso            The ISO used to take the photos.
+     * @param exposure_time  The exposure time used to take the photos.
      * @param zoom_factor    The digital zoom factor used to take the photos.
      */
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public AvgData processAvg(Bitmap bitmap_avg, Bitmap bitmap_new, float avg_factor, int iso, float zoom_factor) throws HDRProcessorException {
+    public AvgData processAvg(Bitmap bitmap_avg, Bitmap bitmap_new, float avg_factor, int iso, long exposure_time, float zoom_factor) throws HDRProcessorException {
         if( MyDebug.LOG ) {
             Log.d(TAG, "processAvg");
             Log.d(TAG, "avg_factor: " + avg_factor);
@@ -1167,40 +1209,40 @@ public class HDRProcessor {
         if( MyDebug.LOG )
             Log.d(TAG, "### time after creating renderscript: " + (System.currentTimeMillis() - time_s));
         // create allocations
-		/*Allocation allocation_avg = Allocation.createFromBitmap(rs, bitmap_avg);
-		//Allocation allocation_new = Allocation.createFromBitmap(rs, bitmap_new);
-		//Allocation allocation_out = Allocation.createTyped(rs, Type.createXY(rs, Element.F32_3(rs), width, height));
-		if( MyDebug.LOG )
-			Log.d(TAG, "### time after creating allocations from bitmaps: " + (System.currentTimeMillis() - time_s));
-			*/
-
-		/*final boolean use_sharpness_test = false; // disabled for now - takes about 1s extra, and no evidence this helps quality
-		if( use_sharpness_test ) {
-			float sharpness_avg = computeSharpness(allocation_avg, width, time_s);
-			float sharpness_new = computeSharpness(allocation_new, width, time_s);
-			if( sharpness_new > sharpness_avg ) {
-				if( MyDebug.LOG )
-					Log.d(TAG, "use new image as reference");
-				Allocation dummy_allocation = allocation_avg;
-				allocation_avg = allocation_new;
-				allocation_new = dummy_allocation;
-				Bitmap dummy_bitmap = bitmap_avg;
-				bitmap_avg = bitmap_new;
-				bitmap_new = dummy_bitmap;
-				sharp_index = 1;
-			}
-			else {
-				sharp_index = 0;
-			}
-			if( MyDebug.LOG )
-				Log.d(TAG, "sharp_index: " + sharp_index);
-		}*/
-
-		/*LuminanceInfo luminanceInfo = computeMedianLuminance(bitmap_avg, 0, 0, width, height);
-		if( MyDebug.LOG )
-			Log.d(TAG, "median: " + luminanceInfo.median_value);*/
-
-        AvgData avg_data = processAvgCore(null, null, bitmap_avg, bitmap_new, width, height, avg_factor, iso, zoom_factor, null, null, time_s);
+        /*Allocation allocation_avg = Allocation.createFromBitmap(rs, bitmap_avg);
+        //Allocation allocation_new = Allocation.createFromBitmap(rs, bitmap_new);
+        //Allocation allocation_out = Allocation.createTyped(rs, Type.createXY(rs, Element.F32_3(rs), width, height));
+        if( MyDebug.LOG )
+            Log.d(TAG, "### time after creating allocations from bitmaps: " + (System.currentTimeMillis() - time_s));
+            */
+
+        /*final boolean use_sharpness_test = false; // disabled for now - takes about 1s extra, and no evidence this helps quality
+        if( use_sharpness_test ) {
+            float sharpness_avg = computeSharpness(allocation_avg, width, time_s);
+            float sharpness_new = computeSharpness(allocation_new, width, time_s);
+            if( sharpness_new > sharpness_avg ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "use new image as reference");
+                Allocation dummy_allocation = allocation_avg;
+                allocation_avg = allocation_new;
+                allocation_new = dummy_allocation;
+                Bitmap dummy_bitmap = bitmap_avg;
+                bitmap_avg = bitmap_new;
+                bitmap_new = dummy_bitmap;
+                sharp_index = 1;
+            }
+            else {
+                sharp_index = 0;
+            }
+            if( MyDebug.LOG )
+                Log.d(TAG, "sharp_index: " + sharp_index);
+        }*/
+
+        /*LuminanceInfo luminanceInfo = computeMedianLuminance(bitmap_avg, 0, 0, width, height);
+        if( MyDebug.LOG )
+            Log.d(TAG, "median: " + luminanceInfo.median_value);*/
+
+        AvgData avg_data = processAvgCore(null, null, bitmap_avg, bitmap_new, width, height, avg_factor, iso, exposure_time, zoom_factor, null, null, null, time_s);
 
         //allocation_avg.copyTo(bitmap_avg);
 
@@ -1217,10 +1259,11 @@ public class HDRProcessor {
      * @param bitmap_new     The new input image. The bitmap is recycled.
      * @param avg_factor     The weighting factor for bitmap_avg.
      * @param iso            The ISO used to take the photos.
+     * @param exposure_time  The exposure time used to take the photos.
      * @param zoom_factor    The digital zoom factor used to take the photos.
      */
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    public void updateAvg(AvgData avg_data, int width, int height, Bitmap bitmap_new, float avg_factor, int iso, float zoom_factor) throws HDRProcessorException {
+    public void updateAvg(AvgData avg_data, int width, int height, Bitmap bitmap_new, float avg_factor, int iso, long exposure_time, float zoom_factor) throws HDRProcessorException {
         if( MyDebug.LOG ) {
             Log.d(TAG, "updateAvg");
             Log.d(TAG, "avg_factor: " + avg_factor);
@@ -1236,11 +1279,11 @@ public class HDRProcessor {
         long time_s = System.currentTimeMillis();
 
         // create allocations
-		/*Allocation allocation_new = Allocation.createFromBitmap(rs, bitmap_new);
-		if( MyDebug.LOG )
-			Log.d(TAG, "### time after creating allocations from bitmaps: " + (System.currentTimeMillis() - time_s));*/
+        /*Allocation allocation_new = Allocation.createFromBitmap(rs, bitmap_new);
+        if( MyDebug.LOG )
+            Log.d(TAG, "### time after creating allocations from bitmaps: " + (System.currentTimeMillis() - time_s));*/
 
-        processAvgCore(avg_data.allocation_out, avg_data.allocation_out, null, bitmap_new, width, height, avg_factor, iso, zoom_factor, avg_data.allocation_avg_align, avg_data.bitmap_avg_align, time_s);
+        processAvgCore(avg_data.allocation_out, avg_data.allocation_out, null, bitmap_new, width, height, avg_factor, iso, exposure_time, zoom_factor, avg_data.allocation_avg_align, avg_data.bitmap_avg_align, avg_data.allocation_orig, time_s);
 
         if( MyDebug.LOG )
             Log.d(TAG, "### time for updateAvg: " + (System.currentTimeMillis() - time_s));
@@ -1251,8 +1294,8 @@ public class HDRProcessor {
      *                       new one will be created.
      * @param allocation_avg If non-null, an allocation for the averaged image so far. If null, the
      *                       first bitmap should be supplied as bitmap_avg.
-     * @param bitmap_avg     If non-null, the first bitmap (which will be recycled). If null, an
-     *                       allocation_avg should be supplied.
+     * @param bitmap_avg     If non-null, the first bitmap (which will be recycled when the returned
+     *                       AvgData is destroyed). If null, an allocation_avg should be supplied.
      * @param bitmap_new     The new bitmap to combined. The bitmap will be recycled.
      * @param width          The width of the bitmaps.
      * @param height         The height of the bitmaps.
@@ -1262,10 +1305,12 @@ public class HDRProcessor {
      * @param allocation_avg_align If non-null, use this allocation for alignment for averaged image.
      * @param bitmap_avg_align Should be supplied if allocation_avg_align is non-null, and stores
      *                         the bitmap corresponding to the allocation_avg_align.
+     * @param allocation_orig
+     *                       If non-null, this is an allocation representing the first image.
      * @param time_s         Time, for debugging.
      */
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    private AvgData processAvgCore(Allocation allocation_out, Allocation allocation_avg, Bitmap bitmap_avg, Bitmap bitmap_new, int width, int height, float avg_factor, int iso, float zoom_factor, Allocation allocation_avg_align, Bitmap bitmap_avg_align, long time_s) {
+    private AvgData processAvgCore(Allocation allocation_out, Allocation allocation_avg, Bitmap bitmap_avg, Bitmap bitmap_new, int width, int height, float avg_factor, int iso, long exposure_time, float zoom_factor, Allocation allocation_avg_align, Bitmap bitmap_avg_align, Allocation allocation_orig, long time_s) {
         if( MyDebug.LOG ) {
             Log.d(TAG, "processAvgCore");
             Log.d(TAG, "iso: " + iso);
@@ -1299,7 +1344,7 @@ public class HDRProcessor {
             //final int scale_align_size = Math.max(4 / this.cached_avg_sample_size, 1);
             final int scale_align_size = (zoom_factor > 3.9f) ?
                     1 :
-                    Math.max(4 / this.getAvgSampleSize(iso), 1);
+                    Math.max(4 / this.getAvgSampleSize(iso, exposure_time), 1);
             if( MyDebug.LOG )
                 Log.d(TAG, "scale_align_size: " + scale_align_size);
             boolean crop_to_centre = true;
@@ -1367,25 +1412,25 @@ public class HDRProcessor {
 
             // misalignment more likely in "dark" images with more images and/or longer exposures
             // using max_align_scale=2 needed to prevent misalignment in testAvg51; also helps testAvg14
-            boolean wider = iso >= 1100;
+            boolean wider = sceneIsLowLight(iso, exposure_time);
             autoAlignment(offsets_x, offsets_y, allocations, alignment_width, alignment_height, align_bitmaps, 0, true, null, false, floating_point_align, 1, crop_to_centre, wider ? 2 : 1, full_alignment_width, full_alignment_height, time_s);
 
-			/*
-			// compute allocation_diffs
-			// if enabling this, should also:
-			// - set full_align above to true
-			// - set filter_align above to true
-			if( processAvgScript == null ) {
-				processAvgScript = new ScriptC_process_avg(rs);
-			}
-			processAvgScript.set_bitmap_align_new(allocations[1]);
-			processAvgScript.set_offset_x_new(offsets_x[1]);
-			processAvgScript.set_offset_y_new(offsets_y[1]);
-			allocation_diffs = Allocation.createTyped(rs, Type.createXY(rs, Element.F32(rs), alignment_width, alignment_height));
-			processAvgScript.forEach_compute_diff(allocations[0], allocation_diffs);
-			processAvgScript.set_scale_align_size(scale_align_size);
-			processAvgScript.set_allocation_diffs(allocation_diffs);
-			*/
+            /*
+            // compute allocation_diffs
+            // if enabling this, should also:
+            // - set full_align above to true
+            // - set filter_align above to true
+            if( processAvgScript == null ) {
+                processAvgScript = new ScriptC_process_avg(rs);
+            }
+            processAvgScript.set_bitmap_align_new(allocations[1]);
+            processAvgScript.set_offset_x_new(offsets_x[1]);
+            processAvgScript.set_offset_y_new(offsets_y[1]);
+            allocation_diffs = Allocation.createTyped(rs, Type.createXY(rs, Element.F32(rs), alignment_width, alignment_height));
+            processAvgScript.forEach_compute_diff(allocations[0], allocation_diffs);
+            processAvgScript.set_scale_align_size(scale_align_size);
+            processAvgScript.set_allocation_diffs(allocation_diffs);
+            */
 
             if( scale_align ) {
                 for(int i=0;i<offsets_x.length;i++) {
@@ -1434,24 +1479,24 @@ public class HDRProcessor {
         }
         //ScriptC_process_avg processAvgScript = new ScriptC_process_avg(rs);
 
-		/*final boolean separate_first_pass = false; // whether to convert the first two images in separate passes (reduces memory)
-		if( first && separate_first_pass ) {
-			if( MyDebug.LOG )
-				Log.d(TAG, "### time before convert_to_f: " + (System.currentTimeMillis() - time_s));
-			processAvgScript.forEach_convert_to_f(allocation_avg, allocation_out);
-			if( MyDebug.LOG )
-				Log.d(TAG, "### time after convert_to_f: " + (System.currentTimeMillis() - time_s));
-			if( free_allocation_avg ) {
-				allocation_avg.destroy();
-				free_allocation_avg = false;
-			}
-			if( MyDebug.LOG )
-				Log.d(TAG, "release bitmap_avg");
-			bitmap_avg.recycle();
-			bitmap_avg = null;
-			allocation_avg = allocation_out;
-			first = false;
-		}*/
+        /*final boolean separate_first_pass = false; // whether to convert the first two images in separate passes (reduces memory)
+        if( first && separate_first_pass ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "### time before convert_to_f: " + (System.currentTimeMillis() - time_s));
+            processAvgScript.forEach_convert_to_f(allocation_avg, allocation_out);
+            if( MyDebug.LOG )
+                Log.d(TAG, "### time after convert_to_f: " + (System.currentTimeMillis() - time_s));
+            if( free_allocation_avg ) {
+                allocation_avg.destroy();
+                free_allocation_avg = false;
+            }
+            if( MyDebug.LOG )
+                Log.d(TAG, "release bitmap_avg");
+            //bitmap_avg.recycle();
+            //bitmap_avg = null;
+            allocation_avg = allocation_out;
+            first = false;
+        }*/
 
         if( allocation_new == null ) {
             allocation_new = Allocation.createFromBitmap(rs, bitmap_new);
@@ -1460,7 +1505,21 @@ public class HDRProcessor {
         }
 
         // set allocations
-        //processAvgScript.set_bitmap_avg(allocation_avg);
+
+        if( allocation_orig == null ) {
+            // allocation_orig should only be null for the first pair of images, which should be when we
+            // have the avg image not in floating point format
+            if( floating_point ) {
+                throw new RuntimeException("is in floating point mode, but no allocation_orig supplied");
+            }
+            if( MyDebug.LOG )
+                Log.d(TAG, "create allocation_avg");
+            allocation_orig = Allocation.createFromBitmap(rs, bitmap_avg);
+        }
+        if( MyDebug.LOG ) {
+            Log.d(TAG, "allocation_orig: " + allocation_orig);
+        }
+        processAvgScript.set_bitmap_orig(allocation_orig);
         processAvgScript.set_bitmap_new(allocation_new);
 
         // set offsets
@@ -1471,6 +1530,7 @@ public class HDRProcessor {
 
         processAvgScript.set_avg_factor(avg_factor);
 
+        // higher wiener_C (and higher wiener_cutoff_factor) means more averaging (but more risk of ghosting)
         // if changing this, pay close attention to tests testAvg6, testAvg8, testAvg17, testAvg23
         float limited_iso = Math.min(iso, 400);
         float wiener_cutoff_factor = 1.0f;
@@ -1511,11 +1571,11 @@ public class HDRProcessor {
         processAvgScript.set_wiener_C(wiener_C);
         processAvgScript.set_wiener_C_cutoff(wiener_C_cutoff);
 
-		/*final float max_weight = 0.9375f;
-		if( MyDebug.LOG ) {
-			Log.d(TAG, "max_weight: " + max_weight);
-		}
-		processAvgScript.set_max_weight(max_weight);*/
+        /*final float max_weight = 0.9375f;
+        if( MyDebug.LOG ) {
+            Log.d(TAG, "max_weight: " + max_weight);
+        }
+        processAvgScript.set_max_weight(max_weight);*/
 
         if( MyDebug.LOG )
             Log.d(TAG, "call processAvgScript");
@@ -1528,21 +1588,25 @@ public class HDRProcessor {
         if( MyDebug.LOG )
             Log.d(TAG, "### time after processAvgScript: " + (System.currentTimeMillis() - time_s));
 
-		/*if( allocation_diffs != null ) {
-			allocation_diffs.destroy();
-			allocation_diffs = null;
-		}*/
+        /*if( allocation_diffs != null ) {
+            allocation_diffs.destroy();
+            allocation_diffs = null;
+        }*/
         allocation_new.destroy();
         if( free_allocation_avg ) {
             allocation_avg.destroy();
         }
-        if( bitmap_avg != null ) {
+        // N.B., we don't recycle bitmap_avg (if non-null), as it shares memory with allocation_orig that
+        // we need to use when processing later iterations. Instead the first bitmap is recycled in
+        // AvgData.destroy(). Also note that if we did recycle bitmap_avg, we get a native crash in
+        // process_avg.rs when reading from bitmap_orig, but only on some devices (crash can be
+        // reproduced on Android 11 with Android emulator, e.g., running testTakePhotoNR).
+        /*if( bitmap_avg != null ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "release bitmap_avg");
             bitmap_avg.recycle();
-            //noinspection UnusedAssignment
             bitmap_avg = null;
-        }
+        }*/
         if( bitmap_new != null ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "release bitmap_new");
@@ -1553,7 +1617,7 @@ public class HDRProcessor {
 
         if( MyDebug.LOG )
             Log.d(TAG, "### time for processAvgCore: " + (System.currentTimeMillis() - time_s));
-        return new AvgData(allocation_out, bitmap_avg_align, allocation_avg_align);
+        return new AvgData(allocation_out, bitmap_avg_align, allocation_avg_align, bitmap_avg, allocation_orig);
     }
 
     /** Combines multiple images by averaging them.
@@ -1606,28 +1670,28 @@ public class HDRProcessor {
             Log.d(TAG, "### time after creating allocations from bitmaps: " + (System.currentTimeMillis() - time_s));
 
         // perform auto-alignment
-		/*for(int i=1;i<bitmaps.size();i++) {
-		{
-			List<Bitmap> bitmaps2 = new ArrayList<>();
-			bitmaps2.add(bitmaps.get(0));
-			bitmaps2.add(bitmap.get(i));
-			Allocation [] allocations = new Allocation[2];
-			allocations[0] = allocation_avg;
-			allocations[1] = allocation_new;
-			BrightnessDetails brightnessDetails = autoAlignment(offsets_x, offsets_y, allocations, width, height, bitmaps, 0, true, null, true, time_s);
-			int median_brightness = brightnessDetails.median_brightness;
-			if( MyDebug.LOG ) {
-				Log.d(TAG, "### time after autoAlignment: " + (System.currentTimeMillis() - time_s));
-				Log.d(TAG, "median_brightness: " + median_brightness);
-			}
-		}*/
+        /*for(int i=1;i<bitmaps.size();i++) {
+        {
+            List<Bitmap> bitmaps2 = new ArrayList<>();
+            bitmaps2.add(bitmaps.get(0));
+            bitmaps2.add(bitmap.get(i));
+            Allocation [] allocations = new Allocation[2];
+            allocations[0] = allocation_avg;
+            allocations[1] = allocation_new;
+            BrightnessDetails brightnessDetails = autoAlignment(offsets_x, offsets_y, allocations, width, height, bitmaps, 0, true, null, true, time_s);
+            int median_brightness = brightnessDetails.median_brightness;
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "### time after autoAlignment: " + (System.currentTimeMillis() - time_s));
+                Log.d(TAG, "median_brightness: " + median_brightness);
+            }
+        }*/
 
         // write new avg image
 
         // create RenderScript
-		/*if( processAvgScript == null ) {
-			processAvgScript = new ScriptC_process_avg(rs);
-		}*/
+        /*if( processAvgScript == null ) {
+            processAvgScript = new ScriptC_process_avg(rs);
+        }*/
         ScriptC_process_avg processAvgScript = new ScriptC_process_avg(rs);
 
         // set allocations
@@ -1807,10 +1871,18 @@ public class HDRProcessor {
                 BitmapInfo bitmapInfo = new BitmapInfo(luminanceInfos[i], bitmaps.get(i), allocations[i], i);
                 bitmapInfos.add(bitmapInfo);
             }
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "before sorting:");
+                for(int i=0;i<allocations.length;i++) {
+                    Log.d(TAG, "    " + i + ": " + luminanceInfos[i]);
+                }
+            }
             Collections.sort(bitmapInfos, new Comparator<BitmapInfo>() {
                 @Override
                 public int compare(BitmapInfo o1, BitmapInfo o2) {
-                    return o1.luminanceInfo.median_value - o2.luminanceInfo.median_value;
+                    // important to use the code in LuminanceInfo.compareTo(), as that's also tested via the unit test
+                    // sortLuminanceInfo()
+                    return o1.luminanceInfo.compareTo(o2.luminanceInfo);
                 }
             });
             bitmaps.clear();
@@ -1820,8 +1892,9 @@ public class HDRProcessor {
                 allocations[i] = bitmapInfos.get(i).allocation;
             }
             if( MyDebug.LOG ) {
+                Log.d(TAG, "after sorting:");
                 for(int i=0;i<allocations.length;i++) {
-                    Log.d(TAG, i + ": median_value: " + luminanceInfos[i].median_value);
+                    Log.d(TAG, "    " + i + ": " + luminanceInfos[i]);
                 }
             }
             if( sort_cb != null ) {
@@ -1834,6 +1907,14 @@ public class HDRProcessor {
                 sort_cb.sortOrder(sort_order);
             }
         }
+        /*{
+            // test
+            for(int i = 0; i < luminanceInfos.length-1; i++) {
+                if( luminanceInfos[i].compareTo(luminanceInfos[i+1]) == 0 ) {
+                    throw new RuntimeException("this: " + luminanceInfos[i] + " , that: " + luminanceInfos[i+1]);
+                }
+            }
+        }*/
 
         int median_brightness = -1;
         if( use_mtb ) {
@@ -1849,14 +1930,14 @@ public class HDRProcessor {
                 if( MyDebug.LOG )
                     Log.d(TAG, i + ": median_value: " + median_value);
 
-				/*if( median_value < 16 ) {
-					// needed for testHDR2, testHDR28
-					if( MyDebug.LOG )
-						Log.d(TAG, "image too dark to do alignment");
-					mtb_allocations[i] = null;
+                /*if( median_value < 16 ) {
+                    // needed for testHDR2, testHDR28
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "image too dark to do alignment");
+                    mtb_allocations[i] = null;
 
-					continue;
-				}*/
+                    continue;
+                }*/
             }
 
             if( use_mtb && luminanceInfos[i].noisy ) {
@@ -1868,6 +1949,16 @@ public class HDRProcessor {
 
             mtb_allocations[i] = Allocation.createTyped(rs, Type.createXY(rs, Element.U8(rs), mtb_width, mtb_height));
 
+            // avoid too low/high median_values, otherwise we'll detect dark or light pixels as "noisy" - needed for testHDR61
+            final int min_diff_c = 4; // should be same value as in create_mtb.rs/create_mtb()
+            /*if( median_value < min_diff_c+1 || median_value > 255-(min_diff_c+1) ) {
+                throw new RuntimeException("image " + i + " has median_value: " + median_value); // test
+            }*/
+            median_value = Math.max(median_value, min_diff_c+1);
+            median_value = Math.min(median_value, 255-(min_diff_c+1));
+            if( MyDebug.LOG )
+                Log.d(TAG, i + ": median_value is now: " + median_value);
+
             // set parameters
             if( use_mtb )
                 createMTBScript.set_median_value(median_value);
@@ -1894,31 +1985,31 @@ public class HDRProcessor {
             if( MyDebug.LOG )
                 Log.d(TAG, "time after createMTBScript: " + (System.currentTimeMillis() - time_s));
 
-			/*if( MyDebug.LOG ) {
-				// debugging
-				byte [] mtb_bytes = new byte[mtb_width*mtb_height];
-				mtb_allocations[i].copyTo(mtb_bytes);
-				int [] pixels = new int[mtb_width*mtb_height];
-				for(int j=0;j<mtb_width*mtb_height;j++) {
-					int b = mtb_bytes[j];
-					if( b < 0 )
-						b += 255;
-					pixels[j] = Color.argb(255, b, b, b);
-				}
-				Bitmap mtb_bitmap = Bitmap.createBitmap(pixels, mtb_width, mtb_height, Bitmap.Config.ARGB_8888);
-				File file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM) + "/mtb_bitmap" + i + ".jpg");
-				try {
-					OutputStream outputStream = new FileOutputStream(file);
-					mtb_bitmap.compress(Bitmap.CompressFormat.JPEG, 90, outputStream);
-					outputStream.close();
-					MainActivity mActivity = (MainActivity) context;
-					mActivity.getStorageUtils().broadcastFile(file, true, false, true);
-				}
-				catch(IOException e) {
-					e.printStackTrace();
-				}
-				mtb_bitmap.recycle();
-			}*/
+            /*if( MyDebug.LOG ) {
+                // debugging
+                byte [] mtb_bytes = new byte[mtb_width*mtb_height];
+                mtb_allocations[i].copyTo(mtb_bytes);
+                int [] pixels = new int[mtb_width*mtb_height];
+                for(int j=0;j<mtb_width*mtb_height;j++) {
+                    int b = mtb_bytes[j];
+                    if( b < 0 )
+                        b += 255;
+                    pixels[j] = Color.argb(255, b, b, b);
+                }
+                Bitmap mtb_bitmap = Bitmap.createBitmap(pixels, mtb_width, mtb_height, Bitmap.Config.ARGB_8888);
+                File file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM) + "/mtb_bitmap" + i + ".jpg");
+                try {
+                    OutputStream outputStream = new FileOutputStream(file);
+                    mtb_bitmap.compress(Bitmap.CompressFormat.JPEG, 90, outputStream);
+                    outputStream.close();
+                    MainActivity mActivity = (MainActivity) context;
+                    mActivity.getStorageUtils().broadcastFile(file, true, false, true);
+                }
+                catch(IOException e) {
+                    e.printStackTrace();
+                }
+                mtb_bitmap.recycle();
+            }*/
         }
         if( MyDebug.LOG )
             Log.d(TAG, "### time after all createMTBScript: " + (System.currentTimeMillis() - time_s));
@@ -1998,37 +2089,37 @@ public class HDRProcessor {
 
                 final boolean use_pyramid = false;
                 //final boolean use_pyramid = true;
-				/*if( use_pyramid ) {
-					// downscale by step_size
-					Allocation [] scaled_allocations = new Allocation[2];
-					for(int j=0;j<2;j++) {
-						int scaled_width = mtb_width/step_size;
-						int scaled_height = mtb_height/step_size;
-						if( MyDebug.LOG ) {
-							Log.d(TAG, "create scaled image: " + j);
-							Log.d(TAG, "    scaled_width: " + scaled_width);
-							Log.d(TAG, "    scaled_height: " + scaled_height);
-						}
-						Allocation allocation_to_scale = mtb_allocations[(j==0) ? base_bitmap : i];
-						Type type = Type.createXY(rs, allocation_to_scale.getElement(), scaled_width, scaled_height);
-						scaled_allocations[j] = Allocation.createTyped(rs, type);
-						ScriptIntrinsicResize theIntrinsic = ScriptIntrinsicResize.create(rs);
-						theIntrinsic.setInput(allocation_to_scale);
-						theIntrinsic.forEach_bicubic(scaled_allocations[j]);
-					}
-					alignMTBScript.set_bitmap0(scaled_allocations[0]);
-					alignMTBScript.set_bitmap1(scaled_allocations[1]);
-					int off_x = offsets_x[i]/step_size;
-					int off_y = offsets_y[i]/step_size;
-					if( MyDebug.LOG ) {
-						Log.d(TAG, "off_x: " + off_x);
-						Log.d(TAG, "off_y: " + off_y);
-					}
-					alignMTBScript.set_off_x( off_x );
-					alignMTBScript.set_off_y( off_y );
-					alignMTBScript.set_step_size( 1 );
-				}
-				else*/ {
+                /*if( use_pyramid ) {
+                    // downscale by step_size
+                    Allocation [] scaled_allocations = new Allocation[2];
+                    for(int j=0;j<2;j++) {
+                        int scaled_width = mtb_width/step_size;
+                        int scaled_height = mtb_height/step_size;
+                        if( MyDebug.LOG ) {
+                            Log.d(TAG, "create scaled image: " + j);
+                            Log.d(TAG, "    scaled_width: " + scaled_width);
+                            Log.d(TAG, "    scaled_height: " + scaled_height);
+                        }
+                        Allocation allocation_to_scale = mtb_allocations[(j==0) ? base_bitmap : i];
+                        Type type = Type.createXY(rs, allocation_to_scale.getElement(), scaled_width, scaled_height);
+                        scaled_allocations[j] = Allocation.createTyped(rs, type);
+                        ScriptIntrinsicResize theIntrinsic = ScriptIntrinsicResize.create(rs);
+                        theIntrinsic.setInput(allocation_to_scale);
+                        theIntrinsic.forEach_bicubic(scaled_allocations[j]);
+                    }
+                    alignMTBScript.set_bitmap0(scaled_allocations[0]);
+                    alignMTBScript.set_bitmap1(scaled_allocations[1]);
+                    int off_x = offsets_x[i]/step_size;
+                    int off_y = offsets_y[i]/step_size;
+                    if( MyDebug.LOG ) {
+                        Log.d(TAG, "off_x: " + off_x);
+                        Log.d(TAG, "off_y: " + off_y);
+                    }
+                    alignMTBScript.set_off_x( off_x );
+                    alignMTBScript.set_off_y( off_y );
+                    alignMTBScript.set_step_size( 1 );
+                }
+                else*/ {
                     alignMTBScript.set_off_x( offsets_x[i] );
                     alignMTBScript.set_off_y( offsets_y[i] );
                     alignMTBScript.set_step_size( pixel_step_size );
@@ -2082,33 +2173,33 @@ public class HDRProcessor {
                     Log.e(TAG, "    auto-alignment failed due to overflow");
                     // hitting overflow means behaviour will be unstable under SMP, and auto-alignment won't be reliable anyway
                     best_id = 4; // default to centre
-					if( is_test ) {
-						throw new RuntimeException();
-					}
+                    if( is_test ) {
+                        throw new RuntimeException();
+                    }
                 }
-				/*if( best_id != 4 ) {
-					int this_off_x = best_id % 3;
-					int this_off_y = best_id/3;
-					this_off_x--;
-					this_off_y--;
-					for(int j=0;j<9;j++) {
-						int that_off_x = j % 3;
-						int that_off_y = j/3;
-						that_off_x--;
-						that_off_y--;
-						if( this_off_x * that_off_x == -1 || this_off_y * that_off_y == -1 ) {
-							float diff = ((float)(best_error - errors[j]))/(float)errors[j];
-							if( MyDebug.LOG )
-								Log.d(TAG, "    opposite errors[" + j + "] diff: " + diff);
-							if( Math.abs(diff) <= 0.02f ) {
-								if( MyDebug.LOG )
-									Log.d(TAG, "    reject auto-alignment");
-								best_id = 4;
-								break;
-							}
-						}
-					}
-				}*/
+                /*if( best_id != 4 ) {
+                    int this_off_x = best_id % 3;
+                    int this_off_y = best_id/3;
+                    this_off_x--;
+                    this_off_y--;
+                    for(int j=0;j<9;j++) {
+                        int that_off_x = j % 3;
+                        int that_off_y = j/3;
+                        that_off_x--;
+                        that_off_y--;
+                        if( this_off_x * that_off_x == -1 || this_off_y * that_off_y == -1 ) {
+                            float diff = ((float)(best_error - errors[j]))/(float)errors[j];
+                            if( MyDebug.LOG )
+                                Log.d(TAG, "    opposite errors[" + j + "] diff: " + diff);
+                            if( Math.abs(diff) <= 0.02f ) {
+                                if( MyDebug.LOG )
+                                    Log.d(TAG, "    reject auto-alignment");
+                                best_id = 4;
+                                break;
+                            }
+                        }
+                    }
+                }*/
                 if( best_id != -1 ) {
                     int this_off_x = best_id % 3;
                     int this_off_y = best_id/3;
@@ -2124,9 +2215,9 @@ public class HDRProcessor {
                         Log.d(TAG, "offsets_x is now: " + offsets_x[i]);
                         Log.d(TAG, "offsets_y is now: " + offsets_y[i]);
                     }
-					/*if( wider && step_size == initial_step_size/2 && (this_off_x != 0 || this_off_y != 0 ) ) {
-						throw new RuntimeException(); // test
-					}*/
+                    /*if( wider && step_size == initial_step_size/2 && (this_off_x != 0 || this_off_y != 0 ) ) {
+                        throw new RuntimeException(); // test
+                    }*/
                 }
             }
             if( MyDebug.LOG ) {
@@ -2136,10 +2227,10 @@ public class HDRProcessor {
             }
         }
 
-		/*for(int i=0;i<allocations.length;i++) {
-			offsets_x[i] = 0;
-			offsets_y[i] = 0;
-		}*/
+        /*for(int i=0;i<allocations.length;i++) {
+            offsets_x[i] = 0;
+            offsets_y[i] = 0;
+        }*/
         for(int i=0;i<mtb_allocations.length;i++) {
             if( mtb_allocations[i] != null ) {
                 mtb_allocations[i].destroy();
@@ -2149,14 +2240,38 @@ public class HDRProcessor {
         return new BrightnessDetails(median_brightness);
     }
 
-    private static class LuminanceInfo {
+    public static class LuminanceInfo implements Comparable<LuminanceInfo> {
+        final int min_value;
         final int median_value;
+        final int hi_value;
         final boolean noisy;
 
-        LuminanceInfo(int median_value, boolean noisy) {
+        public LuminanceInfo(int min_value, int median_value, int hi_value, boolean noisy) {
+            this.min_value = min_value;
             this.median_value = median_value;
+            this.hi_value = hi_value;
             this.noisy = noisy;
         }
+
+        @Override
+        @NonNull
+        public String toString() {
+            return "min: " + min_value + " , median: " + median_value + " , hi: " + hi_value + " , noisy: " + noisy;
+        }
+
+        @Override
+        public int compareTo(LuminanceInfo o) {
+            int value = this.median_value - o.median_value;
+            if( value == 0 ) {
+                // fall back to using min_value
+                value = this.min_value - o.min_value;
+            }
+            if( value == 0 ) {
+                // fall back to using hi_value
+                value = this.hi_value - o.hi_value;
+            }
+            return value;
+        }
     }
 
     private LuminanceInfo computeMedianLuminance(Bitmap bitmap, int mtb_x, int mtb_y, int mtb_width, int mtb_height) {
@@ -2184,8 +2299,8 @@ public class HDRProcessor {
                 double beta = ((double) x + 1.0) / ((double) n_w_samples + 1.0);
                 //int x_coord = (int) (beta * bitmap.getWidth());
                 int x_coord = mtb_x + (int) (beta * mtb_width);
-				/*if( MyDebug.LOG )
-					Log.d(TAG, "sample value from " + x_coord + " , " + y_coord);*/
+                /*if( MyDebug.LOG )
+                    Log.d(TAG, "sample value from " + x_coord + " , " + y_coord);*/
                 int color = bitmap.getPixel(x_coord, y_coord);
                 int r = (color & 0xFF0000) >> 16;
                 int g = (color & 0xFF00) >> 8;
@@ -2197,14 +2312,39 @@ public class HDRProcessor {
                 total++;
             }
         }
-		/*float avg_luminance = (float)(Math.exp( sum_log_luminance / total ));
-		if( MyDebug.LOG )
-			Log.d(TAG, "avg_luminance: " + avg_luminance);*/
+        /*float avg_luminance = (float)(Math.exp( sum_log_luminance / total ));
+        if( MyDebug.LOG )
+            Log.d(TAG, "avg_luminance: " + avg_luminance);*/
         int middle = total/2;
         int count = 0;
         boolean noisy = false;
+        int min_value = -1, hi_value = -1;
+        // first count backwards to get hi_value
+        for(int i=255;i>=0;i--) {
+            /*if( histo[i] > 0 ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "max luminance " + i);
+                max_value = i;
+                break;
+            }*/
+            count += histo[i];
+            if( count >= total/10 ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "hi luminance " + i);
+                hi_value = i;
+                break;
+            }
+        }
+
+        // then count forwards to get min and median values
+        count = 0;
         for(int i=0;i<256;i++) {
             count += histo[i];
+            if( min_value == -1 && histo[i] > 0 ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "min luminance " + i);
+                min_value = i;
+            }
             if( count >= middle ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "median luminance " + i);
@@ -2232,11 +2372,11 @@ public class HDRProcessor {
                         Log.d(TAG, "too dark/noisy");
                     noisy = true;
                 }
-                return new LuminanceInfo(i, noisy);
+                return new LuminanceInfo(min_value, i, hi_value, noisy);
             }
         }
         Log.e(TAG, "computeMedianLuminance failed");
-        return new LuminanceInfo(127, true);
+        return new LuminanceInfo(min_value, 127, hi_value, true);
     }
 
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@@ -2256,50 +2396,50 @@ public class HDRProcessor {
                 Log.d(TAG, "time after creating histogram: " + (System.currentTimeMillis() - time_s));
             histogramAllocation.copyTo(histogram);
 
-				/*if( MyDebug.LOG ) {
-					// compare/adjust
-					allocations[0].copyTo(bm);
-					int [] debug_histogram = new int[256];
-					for(int i=0;i<256;i++) {
-						debug_histogram[i] = 0;
-					}
-					int [] debug_buffer = new int[width];
-					for(int y=0;y<height;y++) {
-						bm.getPixels(debug_buffer, 0, width, 0, y, width, 1);
-						for(int x=0;x<width;x++) {
-							int color = debug_buffer[x];
-							float r = (float)((color & 0xFF0000) >> 16);
-							float g = (float)((color & 0xFF00) >> 8);
-							float b = (float)(color & 0xFF);
-							//float value = 0.299f*r + 0.587f*g + 0.114f*b; // matches ScriptIntrinsicHistogram default behaviour
-							float value = Math.max(r, g);
-							value = Math.max(value, b);
-							int i_value = (int)value;
-							i_value = Math.min(255, i_value); // just in case
-							debug_histogram[i_value]++;
-						}
-					}
-					for(int x=0;x<256;x++) {
-						Log.d(TAG, "histogram[" + x + "] = " + histogram[x] + " debug_histogram: " + debug_histogram[x]);
-						//histogram[x] = debug_histogram[x];
-					}
-				}*/
+                /*if( MyDebug.LOG ) {
+                    // compare/adjust
+                    allocations[0].copyTo(bm);
+                    int [] debug_histogram = new int[256];
+                    for(int i=0;i<256;i++) {
+                        debug_histogram[i] = 0;
+                    }
+                    int [] debug_buffer = new int[width];
+                    for(int y=0;y<height;y++) {
+                        bm.getPixels(debug_buffer, 0, width, 0, y, width, 1);
+                        for(int x=0;x<width;x++) {
+                            int color = debug_buffer[x];
+                            float r = (float)((color & 0xFF0000) >> 16);
+                            float g = (float)((color & 0xFF00) >> 8);
+                            float b = (float)(color & 0xFF);
+                            //float value = 0.299f*r + 0.587f*g + 0.114f*b; // matches ScriptIntrinsicHistogram default behaviour
+                            float value = Math.max(r, g);
+                            value = Math.max(value, b);
+                            int i_value = (int)value;
+                            i_value = Math.min(255, i_value); // just in case
+                            debug_histogram[i_value]++;
+                        }
+                    }
+                    for(int x=0;x<256;x++) {
+                        Log.d(TAG, "histogram[" + x + "] = " + histogram[x] + " debug_histogram: " + debug_histogram[x]);
+                        //histogram[x] = debug_histogram[x];
+                    }
+                }*/
 
             int [] c_histogram = new int[256];
             c_histogram[0] = histogram[0];
             for(int x=1;x<256;x++) {
                 c_histogram[x] = c_histogram[x-1] + histogram[x];
             }
-				/*if( MyDebug.LOG ) {
-					for(int x=0;x<256;x++) {
-						Log.d(TAG, "histogram[" + x + "] = " + histogram[x] + " cumulative: " + c_histogram[x]);
-					}
-				}*/
+                /*if( MyDebug.LOG ) {
+                    for(int x=0;x<256;x++) {
+                        Log.d(TAG, "histogram[" + x + "] = " + histogram[x] + " cumulative: " + c_histogram[x]);
+                    }
+                }*/
             histogramAllocation.copyFrom(c_histogram);
 
-			/*if( histogramAdjustScript == null ) {
-				histogramAdjustScript = new ScriptC_histogram_adjust(rs);
-			}*/
+            /*if( histogramAdjustScript == null ) {
+                histogramAdjustScript = new ScriptC_histogram_adjust(rs);
+            }*/
             ScriptC_histogram_adjust histogramAdjustScript = new ScriptC_histogram_adjust(rs);
             histogramAdjustScript.set_c_histogram(histogramAllocation);
             histogramAdjustScript.set_hdr_alpha(hdr_alpha);
@@ -2325,11 +2465,11 @@ public class HDRProcessor {
 
             // create histograms
             Allocation histogramAllocation = Allocation.createSized(rs, Element.I32(rs), 256);
-			/*if( histogramScript == null ) {
-				if( MyDebug.LOG )
-					Log.d(TAG, "create histogramScript");
-				histogramScript = new ScriptC_histogram_compute(rs);
-			}*/
+            /*if( histogramScript == null ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "create histogramScript");
+                histogramScript = new ScriptC_histogram_compute(rs);
+            }*/
             if( MyDebug.LOG )
                 Log.d(TAG, "create histogramScript");
             ScriptC_histogram_compute histogramScript = new ScriptC_histogram_compute(rs);
@@ -2356,14 +2496,14 @@ public class HDRProcessor {
                     int stop_y = (int)(b1 * height);
                     if( stop_y == start_y )
                         continue;
-						/*if( MyDebug.LOG )
-							Log.d(TAG, i + " , " + j + " : " + start_x + " , " + start_y + " to " + stop_x + " , " + stop_y);*/
+                        /*if( MyDebug.LOG )
+                            Log.d(TAG, i + " , " + j + " : " + start_x + " , " + start_y + " to " + stop_x + " , " + stop_y);*/
                     Script.LaunchOptions launch_options = new Script.LaunchOptions();
                     launch_options.setX(start_x, stop_x);
                     launch_options.setY(start_y, stop_y);
 
-						/*if( MyDebug.LOG )
-							Log.d(TAG, "call histogramScript");*/
+                        /*if( MyDebug.LOG )
+                            Log.d(TAG, "call histogramScript");*/
                     histogramScript.invoke_init_histogram();
                     // We compute a histogram based on the max RGB value, so this matches with the scaling we do in histogram_adjust.rs.
                     // This improves the look of the grass in testHDR24, testHDR27.
@@ -2372,39 +2512,39 @@ public class HDRProcessor {
                     int [] histogram = new int[256];
                     histogramAllocation.copyTo(histogram);
 
-						/*if( MyDebug.LOG ) {
-							// compare/adjust
-							allocations[0].copyTo(bm);
-							int [] debug_histogram = new int[256];
-							for(int k=0;k<256;k++) {
-								debug_histogram[k] = 0;
-							}
-							int [] debug_buffer = new int[width];
-							for(int y=start_y;y<stop_y;y++) {
-								bm.getPixels(debug_buffer, 0, width, 0, y, width, 1);
-								for(int x=start_x;x<stop_x;x++) {
-									int color = debug_buffer[x];
-									float r = (float)((color & 0xFF0000) >> 16);
-									float g = (float)((color & 0xFF00) >> 8);
-									float b = (float)(color & 0xFF);
-									//float value = 0.299f*r + 0.587f*g + 0.114f*b; // matches ScriptIntrinsicHistogram default behaviour
-									float value = Math.max(r, g);
-									value = Math.max(value, b);
-									int i_value = (int)value;
-									i_value = Math.min(255, i_value); // just in case
-									debug_histogram[i_value]++;
-								}
-							}
-							for(int x=0;x<256;x++) {
-								Log.d(TAG, "histogram[" + x + "] = " + histogram[x] + " debug_histogram: " + debug_histogram[x]);
-								//histogram[x] = debug_histogram[x];
-							}
-						}*/
+                        /*if( MyDebug.LOG ) {
+                            // compare/adjust
+                            allocations[0].copyTo(bm);
+                            int [] debug_histogram = new int[256];
+                            for(int k=0;k<256;k++) {
+                                debug_histogram[k] = 0;
+                            }
+                            int [] debug_buffer = new int[width];
+                            for(int y=start_y;y<stop_y;y++) {
+                                bm.getPixels(debug_buffer, 0, width, 0, y, width, 1);
+                                for(int x=start_x;x<stop_x;x++) {
+                                    int color = debug_buffer[x];
+                                    float r = (float)((color & 0xFF0000) >> 16);
+                                    float g = (float)((color & 0xFF00) >> 8);
+                                    float b = (float)(color & 0xFF);
+                                    //float value = 0.299f*r + 0.587f*g + 0.114f*b; // matches ScriptIntrinsicHistogram default behaviour
+                                    float value = Math.max(r, g);
+                                    value = Math.max(value, b);
+                                    int i_value = (int)value;
+                                    i_value = Math.min(255, i_value); // just in case
+                                    debug_histogram[i_value]++;
+                                }
+                            }
+                            for(int x=0;x<256;x++) {
+                                Log.d(TAG, "histogram[" + x + "] = " + histogram[x] + " debug_histogram: " + debug_histogram[x]);
+                                //histogram[x] = debug_histogram[x];
+                            }
+                        }*/
 
                     // clip histogram, for Contrast Limited AHE algorithm
                     int n_pixels = (stop_x - start_x) * (stop_y - start_y);
                     int clip_limit = (5 * n_pixels) / 256;
-					/*if( MyDebug.LOG ) {
+                    /*if( MyDebug.LOG ) {
                         Log.d(TAG, "clip_limit: " + clip_limit);
                         Log.d(TAG, "    relative clip limit: " + clip_limit*256.0f/n_pixels);
                     }*/
@@ -2441,10 +2581,10 @@ public class HDRProcessor {
                         }
                     }
                     int n_clipped_per_bucket = n_clipped / 256;
-						/*if( MyDebug.LOG ) {
-							Log.d(TAG, "n_clipped: " + n_clipped);
-							Log.d(TAG, "n_clipped_per_bucket: " + n_clipped_per_bucket);
-						}*/
+                        /*if( MyDebug.LOG ) {
+                            Log.d(TAG, "n_clipped: " + n_clipped);
+                            Log.d(TAG, "n_clipped_per_bucket: " + n_clipped_per_bucket);
+                        }*/
                     for(int x=0;x<256;x++) {
                         histogram[x] += n_clipped_per_bucket;
                     }
@@ -2494,8 +2634,8 @@ public class HDRProcessor {
                             if( MyDebug.LOG )
                                 Log.d(TAG, "x: " + x + " ; limit: " + limit);
                             /*histogram[x] = Math.max(histogram[x], limit);
-							if( MyDebug.LOG )
-								Log.d(TAG, "    histogram pulled up to: "  + histogram[x]);*/
+                            if( MyDebug.LOG )
+                                Log.d(TAG, "    histogram pulled up to: "  + histogram[x]);*/
                             if( histogram[x] < limit ) {
                                 // top up by redistributing later values
                                 for(int y=x+1;y<256 && histogram[x] < limit;y++) {
@@ -2508,8 +2648,8 @@ public class HDRProcessor {
                                 }
                                 if( MyDebug.LOG )
                                     Log.d(TAG, "    histogram pulled up to: "  + histogram[x]);
-	                        	/*if( temp_c_histogram[x] >= c_equal_limit )
-                        			throw new RuntimeException(); // test*/
+                                /*if( temp_c_histogram[x] >= c_equal_limit )
+                                    throw new RuntimeException(); // test*/
                             }
                         }
                     }
@@ -2533,9 +2673,9 @@ public class HDRProcessor {
 
             Allocation c_histogramAllocation = Allocation.createSized(rs, Element.I32(rs), n_tiles*n_tiles*256);
             c_histogramAllocation.copyFrom(c_histogram);
-			/*if( histogramAdjustScript == null ) {
-				histogramAdjustScript = new ScriptC_histogram_adjust(rs);
-			}*/
+            /*if( histogramAdjustScript == null ) {
+                histogramAdjustScript = new ScriptC_histogram_adjust(rs);
+            }*/
             ScriptC_histogram_adjust histogramAdjustScript = new ScriptC_histogram_adjust(rs);
             histogramAdjustScript.set_c_histogram(c_histogramAllocation);
             histogramAdjustScript.set_hdr_alpha(hdr_alpha);
@@ -2568,11 +2708,11 @@ public class HDRProcessor {
         //final boolean use_custom_histogram = false;
         final boolean use_custom_histogram = true;
         if( use_custom_histogram ) {
-			/*if( histogramScript == null ) {
-				if( MyDebug.LOG )
-					Log.d(TAG, "create histogramScript");
-				histogramScript = new ScriptC_histogram_compute(rs);
-			}*/
+            /*if( histogramScript == null ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "create histogramScript");
+                histogramScript = new ScriptC_histogram_compute(rs);
+            }*/
             if( MyDebug.LOG )
                 Log.d(TAG, "create histogramScript");
             ScriptC_histogram_compute histogramScript = new ScriptC_histogram_compute(rs);
@@ -2681,6 +2821,26 @@ public class HDRProcessor {
     }
 
     private static int getBrightnessTarget(int brightness, float max_gain_factor, int ideal_brightness) {
+        if( brightness > 0 ) {
+            // At least try to achieve a minimum brightness.
+            // Increasing max_gain_factor helps the following tests significantly: testAvg12, testAvg14, testAvg15,
+            // testAvg28, testAvg31, testAvg32.
+            // Other tests also helped to a lesser degree are: testAvg1, testAvg5, testAvg6, testAvg40, testAvg41,
+            // testAvg42, testHDR1, testHDR1_exp5, testHDR11 (DRO example), testHDR20 (DRO example), testHDR28 (DRO example),
+            // testHDR48, testHDR49, testHDR49_exp5, testHDR53.
+            // We need to be careful of increasing max_gain_factor too high in some cases - for AvgTests, see comment in
+            // computeBrightenFactors() for examples of tests that would be affected.
+
+            final float min_brightness_c = 42.0f;
+            float min_max_gain_factor = min_brightness_c / brightness;
+            max_gain_factor = Math.max(max_gain_factor, min_max_gain_factor);
+
+            // still set some maximum max_gain_factor - highest max_gain_factor in tests is
+            // testAvg14 with max_gain_factor=14.0, which benefits from this, but some parts starting
+            // to look overblown
+            max_gain_factor = Math.min(max_gain_factor, 15.0f);
+        }
+
         if( brightness <= 0 )
             brightness = 1;
         if( MyDebug.LOG ) {
@@ -2709,11 +2869,13 @@ public class HDRProcessor {
     /** Computes various factors used in the avg_brighten.rs script.
      */
     public static BrightenFactors computeBrightenFactors(boolean has_iso_exposure, int iso, long exposure_time, int brightness, int max_brightness) {
-        // for outdoor/bright images, don't want max_gain_factor 4, otherwise we lose variation in grass colour in testAvg42
+        // For outdoor/bright images, don't want max_gain_factor 4, otherwise we lose variation in grass colour in testAvg42
         // and having max_gain_factor at 1.5 prevents testAvg43, testAvg44 being too bright and oversaturated
         // for other images, we also don't want max_gain_factor 4, as makes cases too bright and overblown if it would
         // take the max_possible_value over 255. Especially testAvg46, but also testAvg25, testAvg31, testAvg38,
-        // testAvg39
+        // testAvg39.
+        // Note however that we now do allow increasing the max_gain_factor in getBrightnessTarget(), depending on
+        // brightness levels.
         float max_gain_factor = 1.5f;
         int ideal_brightness = 119;
         if( has_iso_exposure && iso < 1100 && exposure_time < 1000000000L/59 ) {
@@ -2724,6 +2886,9 @@ public class HDRProcessor {
         int brightness_target = getBrightnessTarget(brightness, max_gain_factor, ideal_brightness);
         //int max_target = Math.min(255, (int)((max_brightness*brightness_target)/(float)brightness + 0.5f) );
         if( MyDebug.LOG ) {
+            Log.d(TAG, "brightness: " + brightness);
+            Log.d(TAG, "max_brightness: " + max_brightness);
+            Log.d(TAG, "ideal_brightness: " + ideal_brightness);
             Log.d(TAG, "brightness target: " + brightness_target);
             //Log.d(TAG, "max target: " + max_target);
         }
@@ -2753,35 +2918,35 @@ public class HDRProcessor {
         if( MyDebug.LOG )
             Log.d(TAG, "max_possible_value: " + max_possible_value);
 
-		/*if( max_possible_value > 255.0f ) {
-			gain = 255.0f / max_brightness;
-			if( MyDebug.LOG )
-				Log.d(TAG, "limit gain to: " + gain);
-			// use gamma correction for the remainder
-			if( brightness_target > gain * brightness ) {
-				gamma = (float) (Math.log(brightness_target / 255.0f) / Math.log(gain * brightness / 255.0f));
-			}
-		}
-
-		//float gamma = (float)(Math.log(brightness_target/255.0f) / Math.log(brightness/255.0f));
-		if( MyDebug.LOG )
-			Log.d(TAG, "gamma " + gamma);
-		final float min_gamma_non_bright_c = 0.75f;
-		//final float min_gamma_non_bright_c = 0.5f;
-		if( gamma > 1.0f ) {
-			gamma = 1.0f;
-			if( MyDebug.LOG ) {
-				Log.d(TAG, "clamped gamma to : " + gamma);
-			}
-		}
-		else if( has_iso_exposure && iso > 150 && gamma < min_gamma_non_bright_c ) {
-			// too small gamma on non-bright reduces contrast too much (e.g., see testAvg9)
-			// however we can't clamp too much, see testAvg28, testAvg32
-			gamma = min_gamma_non_bright_c;
-			if( MyDebug.LOG ) {
-				Log.d(TAG, "clamped gamma to : " + gamma);
-			}
-		}*/
+        /*if( max_possible_value > 255.0f ) {
+            gain = 255.0f / max_brightness;
+            if( MyDebug.LOG )
+                Log.d(TAG, "limit gain to: " + gain);
+            // use gamma correction for the remainder
+            if( brightness_target > gain * brightness ) {
+                gamma = (float) (Math.log(brightness_target / 255.0f) / Math.log(gain * brightness / 255.0f));
+            }
+        }
+
+        //float gamma = (float)(Math.log(brightness_target/255.0f) / Math.log(brightness/255.0f));
+        if( MyDebug.LOG )
+            Log.d(TAG, "gamma " + gamma);
+        final float min_gamma_non_bright_c = 0.75f;
+        //final float min_gamma_non_bright_c = 0.5f;
+        if( gamma > 1.0f ) {
+            gamma = 1.0f;
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "clamped gamma to : " + gamma);
+            }
+        }
+        else if( has_iso_exposure && iso > 150 && gamma < min_gamma_non_bright_c ) {
+            // too small gamma on non-bright reduces contrast too much (e.g., see testAvg9)
+            // however we can't clamp too much, see testAvg28, testAvg32
+            gamma = min_gamma_non_bright_c;
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "clamped gamma to : " + gamma);
+            }
+        }*/
 
         float mid_x = 255.5f;
         if( max_possible_value > 255.0f ) {
@@ -2867,27 +3032,27 @@ public class HDRProcessor {
         float gamma = brighten_factors.gamma;
 
         //float gain = brightness_target / (float)brightness;
-		/*float gamma = (float)(Math.log(max_target/(float)brightness_target) / Math.log(max_brightness/(float)brightness));
-		float gain = brightness_target / ((float)Math.pow(brightness/255.0f, gamma) * 255.0f);
-		if( MyDebug.LOG ) {
-			Log.d(TAG, "gamma " + gamma);
-			Log.d(TAG, "gain " + gain);
-			Log.d(TAG, "gain2 " + max_target / ((float)Math.pow(max_brightness/255.0f, gamma) * 255.0f));
-		}*/
-		/*float gain = brightness_target / (float)brightness;
-		if( MyDebug.LOG ) {
-			Log.d(TAG, "gain: " + gain);
-		}
-		if( gain < 1.0f ) {
-			gain = 1.0f;
-			if( MyDebug.LOG ) {
-				Log.d(TAG, "clamped gain to : " + gain);
-			}
-		}*/
-
-		/*if( avgBrightenScript == null ) {
-			avgBrightenScript = new ScriptC_avg_brighten(rs);
-		}*/
+        /*float gamma = (float)(Math.log(max_target/(float)brightness_target) / Math.log(max_brightness/(float)brightness));
+        float gain = brightness_target / ((float)Math.pow(brightness/255.0f, gamma) * 255.0f);
+        if( MyDebug.LOG ) {
+            Log.d(TAG, "gamma " + gamma);
+            Log.d(TAG, "gain " + gain);
+            Log.d(TAG, "gain2 " + max_target / ((float)Math.pow(max_brightness/255.0f, gamma) * 255.0f));
+        }*/
+        /*float gain = brightness_target / (float)brightness;
+        if( MyDebug.LOG ) {
+            Log.d(TAG, "gain: " + gain);
+        }
+        if( gain < 1.0f ) {
+            gain = 1.0f;
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "clamped gain to : " + gain);
+            }
+        }*/
+
+        /*if( avgBrightenScript == null ) {
+            avgBrightenScript = new ScriptC_avg_brighten(rs);
+        }*/
         ScriptC_avg_brighten avgBrightenScript = new ScriptC_avg_brighten(rs);
         avgBrightenScript.set_bitmap(input);
         float black_level = 0.0f;
@@ -2923,47 +3088,47 @@ public class HDRProcessor {
         avgBrightenScript.set_median_filter_strength(median_filter_strength);
         avgBrightenScript.invoke_setBrightenParameters(gain, gamma, low_x, mid_x, max_brightness);
 
-		/*float tonemap_scale_c = 255.0f;
-		if( MyDebug.LOG )
-			Log.d(TAG, "tonemap_scale_c: " + tonemap_scale_c);
-		avgBrightenScript.set_tonemap_scale(tonemap_scale_c);
-
-		float max_possible_value = gain*max_brightness;
-		if( MyDebug.LOG )
-			Log.d(TAG, "max_possible_value: " + max_possible_value);
-		if( max_possible_value < 255.0f ) {
-			max_possible_value = 255.0f; // don't make dark images too bright
-			if( MyDebug.LOG )
-				Log.d(TAG, "clamp max_possible_value to: " + max_possible_value);
-		}
-		float linear_scale = (max_possible_value + tonemap_scale_c) / max_possible_value;
-		if( MyDebug.LOG )
-			Log.d(TAG, "linear_scale: " + linear_scale);
-		avgBrightenScript.set_linear_scale(linear_scale);*/
-
-		/*{
-			max_possible_value = max_brightness;
-			float tonemap_scale_c = 255.0f;
-			if( 255.0f / max_possible_value < ((float)brightness_target)/(float)brightness + brightness_target / 255.0f - 1.0f ) {
-				final float tonemap_denom = ((float)brightness_target)/(float)brightness - (255.0f / max_possible_value);
-				if( MyDebug.LOG )
-					Log.d(TAG, "tonemap_denom: " + tonemap_denom);
-				if( tonemap_denom != 0.0f ) // just in case
-					tonemap_scale_c = (255.0f - brightness_target) / tonemap_denom;
-				//throw new RuntimeException(); // test
-			}
-			// Higher tonemap_scale_c values means darker results from the Reinhard tonemapping.
-			// Colours brighter than 255-tonemap_scale_c will be made darker, colours darker than 255-tonemap_scale_c will be made brighter
-			// (tonemap_scale_c==255 means therefore that colours will only be made darker).
-			if( MyDebug.LOG )
-				Log.d(TAG, "tonemap_scale_c: " + tonemap_scale_c);
-			avgBrightenScript.set_tonemap_scale(tonemap_scale_c);
-
-			float linear_scale = (max_possible_value + tonemap_scale_c) / max_possible_value;
-			if( MyDebug.LOG )
-				Log.d(TAG, "linear_scale: " + linear_scale);
-			avgBrightenScript.set_linear_scale(linear_scale);
-		}*/
+        /*float tonemap_scale_c = 255.0f;
+        if( MyDebug.LOG )
+            Log.d(TAG, "tonemap_scale_c: " + tonemap_scale_c);
+        avgBrightenScript.set_tonemap_scale(tonemap_scale_c);
+
+        float max_possible_value = gain*max_brightness;
+        if( MyDebug.LOG )
+            Log.d(TAG, "max_possible_value: " + max_possible_value);
+        if( max_possible_value < 255.0f ) {
+            max_possible_value = 255.0f; // don't make dark images too bright
+            if( MyDebug.LOG )
+                Log.d(TAG, "clamp max_possible_value to: " + max_possible_value);
+        }
+        float linear_scale = (max_possible_value + tonemap_scale_c) / max_possible_value;
+        if( MyDebug.LOG )
+            Log.d(TAG, "linear_scale: " + linear_scale);
+        avgBrightenScript.set_linear_scale(linear_scale);*/
+
+        /*{
+            max_possible_value = max_brightness;
+            float tonemap_scale_c = 255.0f;
+            if( 255.0f / max_possible_value < ((float)brightness_target)/(float)brightness + brightness_target / 255.0f - 1.0f ) {
+                final float tonemap_denom = ((float)brightness_target)/(float)brightness - (255.0f / max_possible_value);
+                if( MyDebug.LOG )
+                    Log.d(TAG, "tonemap_denom: " + tonemap_denom);
+                if( tonemap_denom != 0.0f ) // just in case
+                    tonemap_scale_c = (255.0f - brightness_target) / tonemap_denom;
+                //throw new RuntimeException(); // test
+            }
+            // Higher tonemap_scale_c values means darker results from the Reinhard tonemapping.
+            // Colours brighter than 255-tonemap_scale_c will be made darker, colours darker than 255-tonemap_scale_c will be made brighter
+            // (tonemap_scale_c==255 means therefore that colours will only be made darker).
+            if( MyDebug.LOG )
+                Log.d(TAG, "tonemap_scale_c: " + tonemap_scale_c);
+            avgBrightenScript.set_tonemap_scale(tonemap_scale_c);
+
+            float linear_scale = (max_possible_value + tonemap_scale_c) / max_possible_value;
+            if( MyDebug.LOG )
+                Log.d(TAG, "linear_scale: " + linear_scale);
+            avgBrightenScript.set_linear_scale(linear_scale);
+        }*/
 
         Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
         Allocation allocation_out = Allocation.createFromBitmap(rs, bitmap);
@@ -3006,16 +3171,16 @@ public class HDRProcessor {
         if( MyDebug.LOG )
             Log.d(TAG, "### time after copying to bitmap: " + (System.currentTimeMillis() - time_s));
 
-		/*int sample_size = getAvgSampleSize();
-		if( MyDebug.LOG )
-			Log.d(TAG, "sample_size: " + sample_size);
-		if( sample_size > 1 ) {
-			Matrix matrix = new Matrix();
-			matrix.postScale(sample_size, sample_size);
-			Bitmap new_bitmap = Bitmap.createBitmap(bitmap, 0, 0, width, height, matrix, true);
-			bitmap.recycle();
-			bitmap = new_bitmap;
-		}*/
+        /*int sample_size = getAvgSampleSize();
+        if( MyDebug.LOG )
+            Log.d(TAG, "sample_size: " + sample_size);
+        if( sample_size > 1 ) {
+            Matrix matrix = new Matrix();
+            matrix.postScale(sample_size, sample_size);
+            Bitmap new_bitmap = Bitmap.createBitmap(bitmap, 0, 0, width, height, matrix, true);
+            bitmap.recycle();
+            bitmap = new_bitmap;
+        }*/
 
         freeScripts();
         if( MyDebug.LOG )
@@ -3029,7 +3194,6 @@ public class HDRProcessor {
      * @param allocation_in The input allocation.
      * @param width         The width of the allocation.
      */
-    @SuppressWarnings("unused")
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private float computeSharpness(Allocation allocation_in, int width, long time_s) {
         if( MyDebug.LOG )
@@ -3039,11 +3203,11 @@ public class HDRProcessor {
         Allocation sumsAllocation = Allocation.createSized(rs, Element.I32(rs), width);
         if( MyDebug.LOG )
             Log.d(TAG, "### time after createSized: " + (System.currentTimeMillis() - time_s));
-		/*if( sharpnessScript == null ) {
-			sharpnessScript = new ScriptC_calculate_sharpness(rs);
-			if( MyDebug.LOG )
-				Log.d(TAG, "### time after create sharpnessScript: " + (System.currentTimeMillis() - time_s));
-		}*/
+        /*if( sharpnessScript == null ) {
+            sharpnessScript = new ScriptC_calculate_sharpness(rs);
+            if( MyDebug.LOG )
+                Log.d(TAG, "### time after create sharpnessScript: " + (System.currentTimeMillis() - time_s));
+        }*/
         ScriptC_calculate_sharpness sharpnessScript = new ScriptC_calculate_sharpness(rs);
         if( MyDebug.LOG )
             Log.d(TAG, "### time after create sharpnessScript: " + (System.currentTimeMillis() - time_s));
@@ -3066,8 +3230,8 @@ public class HDRProcessor {
         sumsAllocation.destroy();
         float total_sum = 0.0f;
         for(int i=0;i<width;i++) {
-			/*if( MyDebug.LOG )
-				Log.d(TAG, "sums[" + i + "] = " + sums[i]);*/
+            /*if( MyDebug.LOG )
+                Log.d(TAG, "sums[" + i + "] = " + sums[i]);*/
             total_sum += (float)sums[i];
         }
         if( MyDebug.LOG )
diff --git a/app/src/main/java/net/sourceforge/opencamera/ImageSaver.java b/app/src/main/java/net/sourceforge/opencamera/ImageSaver.java
index 50b58313132d65cca0d8d9f20f0a9a6d64e0dcb7..dbe2b33801fe81e85ac1020a372a470482849a7b 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ImageSaver.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ImageSaver.java
@@ -6,7 +6,6 @@ import net.sourceforge.opencamera.cameracontroller.RawImage;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileDescriptor;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -29,7 +28,7 @@ import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
-import android.content.Context;
+import android.content.ContentValues;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -38,17 +37,24 @@ import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
-import android.location.Address;
-import android.location.Geocoder;
+//import android.location.Address; // don't use until we have info for data privacy!
+//import android.location.Geocoder; // don't use until we have info for data privacy!
 import android.location.Location;
-import android.media.ExifInterface;
+import androidx.exifinterface.media.ExifInterface;
 import android.net.Uri;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
+import android.provider.MediaStore;
 import android.renderscript.Allocation;
 import androidx.annotation.RequiresApi;
 import android.util.Log;
+import android.util.TypedValue;
 import android.util.Xml;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlSerializer;
@@ -60,12 +66,6 @@ import foundation.e.camera.R;
 public class ImageSaver extends Thread {
     private static final String TAG = "ImageSaver";
 
-    // note that ExifInterface now has fields for these types, but that requires Android 6 or 7
-    private static final String TAG_GPS_IMG_DIRECTION = "GPSImgDirection";
-    private static final String TAG_GPS_IMG_DIRECTION_REF = "GPSImgDirectionRef";
-    private static final String TAG_DATETIME_ORIGINAL = "DateTimeOriginal";
-    private static final String TAG_DATETIME_DIGITIZED = "DateTimeDigitized";
-
     private final Paint p = new Paint();
 
     private final MainActivity main_activity;
@@ -90,6 +90,11 @@ public class ImageSaver extends Thread {
     private final static int queue_cost_dng_c = 6;
     //private final static int queue_cost_dng_c = 1;
 
+    // Should be same as MainActivity.app_is_paused, but we keep our own copy to make threading easier (otherwise, all
+    // accesses of MainActivity.app_is_paused would need to be synchronized).
+    // Access to app_is_paused should always be synchronized to this (i.e., the ImageSaver class).
+    private boolean app_is_paused = true;
+
     // for testing; must be volatile for test project reading the state
     // n.b., avoid using static, as static variables are shared between different instances of an application,
     // and won't be reset in subsequent tests in a suite!
@@ -130,6 +135,7 @@ public class ImageSaver extends Thread {
         final boolean image_capture_intent;
         final Uri image_capture_intent_uri;
         final boolean using_camera2;
+        final boolean using_camera_extensions;
         /* image_format allows converting the standard JPEG image into another file format.
 #		 */
         enum ImageFormat {
@@ -160,7 +166,7 @@ public class ImageSaver extends Thread {
         final String preference_stamp_dateformat;
         final String preference_stamp_timeformat;
         final String preference_stamp_gpsformat;
-        final String preference_stamp_geo_address;
+        //final String preference_stamp_geo_address;
         final String preference_units_distance;
         final boolean panorama_crop; // used for panorama
         final boolean store_location;
@@ -181,7 +187,7 @@ public class ImageSaver extends Thread {
                 List<byte []> jpeg_images,
                 RawImage raw_image,
                 boolean image_capture_intent, Uri image_capture_intent_uri,
-                boolean using_camera2,
+                boolean using_camera2, boolean using_camera_extensions,
                 ImageFormat image_format, int image_quality,
                 boolean do_auto_stabilise, double level_angle, List<float []> gyro_rotation_matrix,
                 boolean is_front_facing,
@@ -191,7 +197,9 @@ public class ImageSaver extends Thread {
                 int iso,
                 long exposure_time,
                 float zoom_factor,
-                String preference_stamp, String preference_textstamp, int font_size, int color, String pref_style, String preference_stamp_dateformat, String preference_stamp_timeformat, String preference_stamp_gpsformat, String preference_stamp_geo_address, String preference_units_distance,
+                String preference_stamp, String preference_textstamp, int font_size, int color, String pref_style, String preference_stamp_dateformat, String preference_stamp_timeformat, String preference_stamp_gpsformat,
+                //String preference_stamp_geo_address,
+                String preference_units_distance,
                 boolean panorama_crop,
                 boolean store_location, Location location, boolean store_geo_direction, double geo_direction,
                 double pitch_angle, boolean store_ypr,
@@ -208,6 +216,7 @@ public class ImageSaver extends Thread {
             this.image_capture_intent = image_capture_intent;
             this.image_capture_intent_uri = image_capture_intent_uri;
             this.using_camera2 = using_camera2;
+            this.using_camera_extensions = using_camera_extensions;
             this.image_format = image_format;
             this.image_quality = image_quality;
             this.do_auto_stabilise = do_auto_stabilise;
@@ -228,7 +237,7 @@ public class ImageSaver extends Thread {
             this.preference_stamp_dateformat = preference_stamp_dateformat;
             this.preference_stamp_timeformat = preference_stamp_timeformat;
             this.preference_stamp_gpsformat = preference_stamp_gpsformat;
-            this.preference_stamp_geo_address = preference_stamp_geo_address;
+            //this.preference_stamp_geo_address = preference_stamp_geo_address;
             this.preference_units_distance = preference_units_distance;
             this.panorama_crop = panorama_crop;
             this.store_location = store_location;
@@ -254,7 +263,7 @@ public class ImageSaver extends Thread {
                     this.jpeg_images,
                     this.raw_image,
                     this.image_capture_intent, this.image_capture_intent_uri,
-                    this.using_camera2,
+                    this.using_camera2, this.using_camera_extensions,
                     this.image_format, this.image_quality,
                     this.do_auto_stabilise, this.level_angle, this.gyro_rotation_matrix,
                     this.is_front_facing,
@@ -264,7 +273,9 @@ public class ImageSaver extends Thread {
                     this.iso,
                     this.exposure_time,
                     this.zoom_factor,
-                    this.preference_stamp, this.preference_textstamp, this.font_size, this.color, this.pref_style, this.preference_stamp_dateformat, this.preference_stamp_timeformat, this.preference_stamp_gpsformat, this.preference_stamp_geo_address, this.preference_units_distance,
+                    this.preference_stamp, this.preference_textstamp, this.font_size, this.color, this.pref_style, this.preference_stamp_dateformat, this.preference_stamp_timeformat, this.preference_stamp_gpsformat,
+                    //this.preference_stamp_geo_address,
+                    this.preference_units_distance,
                     this.panorama_crop, this.store_location, this.location, this.store_geo_direction, this.geo_direction,
                     this.pitch_angle, this.store_ypr,
                     this.custom_tag_artist,
@@ -445,6 +456,22 @@ public class ImageSaver extends Thread {
         return n_real_images_to_save;
     }
 
+    /** Application has paused.
+     */
+    void onPause() {
+        synchronized(this) {
+            app_is_paused = true;
+        }
+    }
+
+    /** Application has resumed.
+     */
+    void onResume() {
+        synchronized(this) {
+            app_is_paused = false;
+        }
+    }
+
     void onDestroy() {
         if( MyDebug.LOG )
             Log.d(TAG, "onDestroy");
@@ -493,6 +520,8 @@ public class ImageSaver extends Thread {
                         break;
                 }
                 if( test_slow_saving ) {
+                    // ignore warning about "Call to Thread.sleep in a loop", this is only activated in test code
+                    //noinspection BusyWait
                     Thread.sleep(2000);
                 }
                 if( MyDebug.LOG ) {
@@ -545,7 +574,7 @@ public class ImageSaver extends Thread {
                           boolean save_expo,
                           List<byte []> images,
                           boolean image_capture_intent, Uri image_capture_intent_uri,
-                          boolean using_camera2,
+                          boolean using_camera2, boolean using_camera_extensions,
                           Request.ImageFormat image_format, int image_quality,
                           boolean do_auto_stabilise, double level_angle,
                           boolean is_front_facing,
@@ -555,7 +584,9 @@ public class ImageSaver extends Thread {
                           int iso,
                           long exposure_time,
                           float zoom_factor,
-                          String preference_stamp, String preference_textstamp, int font_size, int color, String pref_style, String preference_stamp_dateformat, String preference_stamp_timeformat, String preference_stamp_gpsformat, String preference_stamp_geo_address, String preference_units_distance,
+                          String preference_stamp, String preference_textstamp, int font_size, int color, String pref_style, String preference_stamp_dateformat, String preference_stamp_timeformat, String preference_stamp_gpsformat,
+                          //String preference_stamp_geo_address,
+                          String preference_units_distance,
                           boolean panorama_crop,
                           boolean store_location, Location location, boolean store_geo_direction, double geo_direction,
                           double pitch_angle, boolean store_ypr,
@@ -576,7 +607,7 @@ public class ImageSaver extends Thread {
                 images,
                 null,
                 image_capture_intent, image_capture_intent_uri,
-                using_camera2,
+                using_camera2, using_camera_extensions,
                 image_format, image_quality,
                 do_auto_stabilise, level_angle,
                 is_front_facing,
@@ -586,7 +617,9 @@ public class ImageSaver extends Thread {
                 iso,
                 exposure_time,
                 zoom_factor,
-                preference_stamp, preference_textstamp, font_size, color, pref_style, preference_stamp_dateformat, preference_stamp_timeformat, preference_stamp_gpsformat, preference_stamp_geo_address, preference_units_distance,
+                preference_stamp, preference_textstamp, font_size, color, pref_style, preference_stamp_dateformat, preference_stamp_timeformat, preference_stamp_gpsformat,
+                //preference_stamp_geo_address,
+                preference_units_distance,
                 panorama_crop, store_location, location, store_geo_direction, geo_direction,
                 pitch_angle, store_ypr,
                 custom_tag_artist,
@@ -618,7 +651,7 @@ public class ImageSaver extends Thread {
                 null,
                 raw_image,
                 false, null,
-                false,
+                false, false,
                 Request.ImageFormat.STD, 0,
                 false, 0.0,
                 false,
@@ -628,7 +661,9 @@ public class ImageSaver extends Thread {
                 0,
                 0,
                 1.0f,
-                null, null, 0, 0, null, null, null, null, null, null,
+                null, null, 0, 0, null, null, null, null,
+                //null,
+                null,
                 false, false, null, false, 0.0,
                 0.0, false,
                 null, null,
@@ -644,7 +679,7 @@ public class ImageSaver extends Thread {
                            Request.ProcessType processType,
                            Request.SaveBase save_base,
                            boolean image_capture_intent, Uri image_capture_intent_uri,
-                           boolean using_camera2,
+                           boolean using_camera2, boolean using_camera_extensions,
                            Request.ImageFormat image_format, int image_quality,
                            boolean do_auto_stabilise, double level_angle, boolean want_gyro_matrices,
                            boolean is_front_facing,
@@ -653,7 +688,9 @@ public class ImageSaver extends Thread {
                            int iso,
                            long exposure_time,
                            float zoom_factor,
-                           String preference_stamp, String preference_textstamp, int font_size, int color, String pref_style, String preference_stamp_dateformat, String preference_stamp_timeformat, String preference_stamp_gpsformat, String preference_stamp_geo_address, String preference_units_distance,
+                           String preference_stamp, String preference_textstamp, int font_size, int color, String pref_style, String preference_stamp_dateformat, String preference_stamp_timeformat, String preference_stamp_gpsformat,
+                           //String preference_stamp_geo_address,
+                           String preference_units_distance,
                            boolean panorama_crop,
                            boolean store_location, Location location, boolean store_geo_direction, double geo_direction,
                            double pitch_angle, boolean store_ypr,
@@ -669,12 +706,12 @@ public class ImageSaver extends Thread {
                 false,
                 0,
                 save_base,
-                new ArrayList<byte[]>(),
+                new ArrayList<>(),
                 null,
                 image_capture_intent, image_capture_intent_uri,
-                using_camera2,
+                using_camera2, using_camera_extensions,
                 image_format, image_quality,
-                do_auto_stabilise, level_angle, want_gyro_matrices ? new ArrayList<float []>() : null,
+                do_auto_stabilise, level_angle, want_gyro_matrices ? new ArrayList<>() : null,
                 is_front_facing,
                 mirror,
                 current_date,
@@ -682,7 +719,9 @@ public class ImageSaver extends Thread {
                 iso,
                 exposure_time,
                 zoom_factor,
-                preference_stamp, preference_textstamp, font_size, color, pref_style, preference_stamp_dateformat, preference_stamp_timeformat, preference_stamp_gpsformat, preference_stamp_geo_address, preference_units_distance,
+                preference_stamp, preference_textstamp, font_size, color, pref_style, preference_stamp_dateformat, preference_stamp_timeformat, preference_stamp_gpsformat,
+                //preference_stamp_geo_address,
+                preference_units_distance,
                 panorama_crop, store_location, location, store_geo_direction, geo_direction,
                 pitch_angle, store_ypr,
                 custom_tag_artist,
@@ -751,7 +790,7 @@ public class ImageSaver extends Thread {
                               List<byte []> jpeg_images,
                               RawImage raw_image,
                               boolean image_capture_intent, Uri image_capture_intent_uri,
-                              boolean using_camera2,
+                              boolean using_camera2, boolean using_camera_extensions,
                               Request.ImageFormat image_format, int image_quality,
                               boolean do_auto_stabilise, double level_angle,
                               boolean is_front_facing,
@@ -761,7 +800,9 @@ public class ImageSaver extends Thread {
                               int iso,
                               long exposure_time,
                               float zoom_factor,
-                              String preference_stamp, String preference_textstamp, int font_size, int color, String pref_style, String preference_stamp_dateformat, String preference_stamp_timeformat, String preference_stamp_gpsformat, String preference_stamp_geo_address, String preference_units_distance,
+                              String preference_stamp, String preference_textstamp, int font_size, int color, String pref_style, String preference_stamp_dateformat, String preference_stamp_timeformat, String preference_stamp_gpsformat,
+                              //String preference_stamp_geo_address,
+                              String preference_units_distance,
                               boolean panorama_crop,
                               boolean store_location, Location location, boolean store_geo_direction, double geo_direction,
                               double pitch_angle, boolean store_ypr,
@@ -784,7 +825,7 @@ public class ImageSaver extends Thread {
                 jpeg_images,
                 raw_image,
                 image_capture_intent, image_capture_intent_uri,
-                using_camera2,
+                using_camera2, using_camera_extensions,
                 image_format, image_quality,
                 do_auto_stabilise, level_angle, null,
                 is_front_facing,
@@ -794,7 +835,9 @@ public class ImageSaver extends Thread {
                 iso,
                 exposure_time,
                 zoom_factor,
-                preference_stamp, preference_textstamp, font_size, color, pref_style, preference_stamp_dateformat, preference_stamp_timeformat, preference_stamp_gpsformat, preference_stamp_geo_address, preference_units_distance,
+                preference_stamp, preference_textstamp, font_size, color, pref_style, preference_stamp_dateformat, preference_stamp_timeformat, preference_stamp_gpsformat,
+                //preference_stamp_geo_address,
+                preference_units_distance,
                 panorama_crop, store_location, location, store_geo_direction, geo_direction,
                 pitch_angle, store_ypr,
                 custom_tag_artist,
@@ -895,7 +938,7 @@ public class ImageSaver extends Thread {
                 null,
                 null,
                 false, null,
-                false,
+                false, false,
                 Request.ImageFormat.STD, 0,
                 false, 0.0, null,
                 false,
@@ -905,7 +948,9 @@ public class ImageSaver extends Thread {
                 0,
                 0,
                 1.0f,
-                null, null, 0, 0, null, null, null, null, null, null,
+                null, null, 0, 0, null, null, null, null,
+                //null,
+                null,
                 false, false, null, false, 0.0,
                 0.0, false,
                 null, null,
@@ -1095,7 +1140,7 @@ public class ImageSaver extends Thread {
                 default:
                     // Using local contrast enhancement helps scenes where the dynamic range is very large, which tends to be when we choose
                     // a short exposure time, due to fixing problems where some regions are too dark.
-                    // This helps: testHDR11, testHDR19, testHDR34, testHDR53.
+                    // This helps: testHDR11, testHDR19, testHDR34, testHDR53, testHDR61.
                     // Using local contrast enhancement in all cases can increase noise in darker scenes. This problem would occur
                     // (if we used local contrast enhancement) is: testHDR2, testHDR12, testHDR17, testHDR43, testHDR50, testHDR51,
                     // testHDR54, testHDR55, testHDR56.
@@ -1179,7 +1224,6 @@ public class ImageSaver extends Thread {
 
     @SuppressWarnings("WeakerAccess")
     public static class GyroDebugInfo {
-        @SuppressWarnings("unused")
         public static class GyroImageDebugInfo {
             public float [] vectorRight; // X axis
             public float [] vectorUp; // Y axis
@@ -1341,7 +1385,7 @@ public class ImageSaver extends Thread {
                     long time_s = System.currentTimeMillis();
                     // initialise allocation from first two bitmaps
                     //int inSampleSize = hdrProcessor.getAvgSampleSize(request.jpeg_images.size());
-                    int inSampleSize = hdrProcessor.getAvgSampleSize(request.iso);
+                    int inSampleSize = hdrProcessor.getAvgSampleSize(request.iso, request.exposure_time);
                     //final boolean use_smp = false;
                     final boolean use_smp = true;
                     // n_smp_images is how many bitmaps to decompress at once if use_smp==true. Beware of setting too high -
@@ -1386,7 +1430,7 @@ public class ImageSaver extends Thread {
                     int height = bitmap0.getHeight();
                     float avg_factor = 1.0f;
                     this_time_s = System.currentTimeMillis();
-                    HDRProcessor.AvgData avg_data = hdrProcessor.processAvg(bitmap0, bitmap1, avg_factor, request.iso, request.zoom_factor);
+                    HDRProcessor.AvgData avg_data = hdrProcessor.processAvg(bitmap0, bitmap1, avg_factor, request.iso, request.exposure_time, request.zoom_factor);
                     if( bitmaps != null ) {
                         bitmaps.set(0, null);
                         bitmaps.set(1, null);
@@ -1438,7 +1482,7 @@ public class ImageSaver extends Thread {
                         }
                         avg_factor = (float)i;
                         this_time_s = System.currentTimeMillis();
-                        hdrProcessor.updateAvg(avg_data, width, height, new_bitmap, avg_factor, request.iso, request.zoom_factor);
+                        hdrProcessor.updateAvg(avg_data, width, height, new_bitmap, avg_factor, request.iso, request.exposure_time, request.zoom_factor);
                         // updateAvg recycles new_bitmap
                         if( bitmaps != null ) {
                             bitmaps.set(i, null);
@@ -1617,7 +1661,7 @@ public class ImageSaver extends Thread {
                     writeGyroDebugXml(writer, request);
 
                     StorageUtils storageUtils = main_activity.getStorageUtils();
-                    File saveFile = null;
+                    /*File saveFile = null;
 					Uri saveUri = null;
 					if( storageUtils.isUsingSAF() ) {
 						saveUri = storageUtils.createOutputMediaFileSAF(StorageUtils.MEDIA_TYPE_GYRO_INFO, "", "xml", request.current_date);
@@ -1626,7 +1670,16 @@ public class ImageSaver extends Thread {
                         saveFile = storageUtils.createOutputMediaFile(StorageUtils.MEDIA_TYPE_GYRO_INFO, "", "xml", request.current_date);
                         if( MyDebug.LOG )
                             Log.d(TAG, "save to: " + saveFile.getAbsolutePath());
-                    }
+                    }*/
+					// We save to the application specific folder so this works on Android 10 with scoped storage, without having to
+                    // rewrite the non-SAF codepath to use MediaStore API (which would also have problems that the gyro debug files would
+                    // show up in the MediaStore, hence gallery applications!)
+                    // We use this for older Android versions for consistency, plus not a bad idea of to have debug files in the application
+                    // folder anyway.
+                    File saveFile = storageUtils.createOutputMediaFile(main_activity.getExternalFilesDir(null), StorageUtils.MEDIA_TYPE_GYRO_INFO, "", "xml", request.current_date);
+                    Uri saveUri = null;
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "save to: " + saveFile.getAbsolutePath());
 
                     OutputStream outputStream;
                     if( saveFile != null )
@@ -1646,7 +1699,7 @@ public class ImageSaver extends Thread {
                         storageUtils.broadcastFile(saveFile, false, false, false);
                     }
                     else {
-                        broadcastSAFFile(saveUri, false);
+                        broadcastSAFFile(saveUri, false, false);
                     }
                 }
                 catch(IOException e) {
@@ -1685,10 +1738,9 @@ public class ImageSaver extends Thread {
             }
 
             // rotate the bitmaps if necessary for exif tags
-            File exifTempFile = getExifTempFile(request.jpeg_images.get(0));
             for(int i=0;i<bitmaps.size();i++) {
                 Bitmap bitmap = bitmaps.get(i);
-                bitmap = rotateForExif(bitmap, request.jpeg_images.get(0), exifTempFile);
+                bitmap = rotateForExif(bitmap, request.jpeg_images.get(0));
                 bitmaps.set(i, bitmap);
             }
             if( MyDebug.LOG ) {
@@ -1708,9 +1760,9 @@ public class ImageSaver extends Thread {
             catch(PanoramaProcessorException e) {
                 Log.e(TAG, "PanoramaProcessorException from panorama: " + e.getCode());
                 e.printStackTrace();
-                if( e.getCode() == PanoramaProcessorException.UNEQUAL_SIZES ) {
+                if( e.getCode() == PanoramaProcessorException.UNEQUAL_SIZES || e.getCode() == PanoramaProcessorException.FAILED_TO_CROP ) {
                     main_activity.getPreview().showToast(null, R.string.failed_to_process_panorama);
-                    Log.e(TAG, "UNEQUAL_SIZES");
+                    Log.e(TAG, "panorama failed: " + e.getCode());
                     bitmaps.clear();
                     System.gc();
                     main_activity.savingImage(false);
@@ -1739,11 +1791,6 @@ public class ImageSaver extends Thread {
                 Log.e(TAG, "saveSingleImageNow failed for panorama image");
             panorama.recycle();
             System.gc();
-
-            if( exifTempFile != null && !exifTempFile.delete() ) {
-                if( MyDebug.LOG )
-                    Log.e(TAG, "failed to delete temp " + exifTempFile.getAbsolutePath());
-            }
         }
         else {
             // see note above how we used to use "_EXP" for the suffix for multiple images
@@ -1838,11 +1885,11 @@ public class ImageSaver extends Thread {
         double sin_theta = Math.sin(level_angle_rad_abs);
         double denom = ( h0/w0 + tan_theta );
         double alt_denom = ( w0/h0 + tan_theta );
-        if( denom == 0.0 || denom < 1.0e-14 ) {
+        if( denom < 1.0e-14 ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "zero denominator?!");
         }
-        else if( alt_denom == 0.0 || alt_denom < 1.0e-14 ) {
+        else if( alt_denom < 1.0e-14 ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "zero alt denominator?!");
         }
@@ -1884,10 +1931,9 @@ public class ImageSaver extends Thread {
      * @param bitmap Optional argument - the bitmap if already unpacked from the jpeg data.
      * @param level_angle The angle in degrees to rotate the image.
      * @param is_front_facing Whether the camera is front-facing.
-     * @param exifTempFile Temporary file that can be used to read exif tags (for orientation)
      * @return A bitmap representing the auto-stabilised jpeg.
      */
-    private Bitmap autoStabilise(byte [] data, Bitmap bitmap, double level_angle, boolean is_front_facing, File exifTempFile) {
+    private Bitmap autoStabilise(byte [] data, Bitmap bitmap, double level_angle, boolean is_front_facing) {
         if( MyDebug.LOG ) {
             Log.d(TAG, "autoStabilise");
             Log.d(TAG, "level_angle: " + level_angle);
@@ -1903,7 +1949,7 @@ public class ImageSaver extends Thread {
             if( MyDebug.LOG )
                 Log.d(TAG, "need to decode bitmap to auto-stabilise");
             // bitmap doesn't need to be mutable here, as this won't be the final bitmap returned from the auto-stabilise code
-            bitmap = loadBitmapWithRotation(data, false, exifTempFile);
+            bitmap = loadBitmapWithRotation(data, false);
             if( bitmap == null ) {
                 main_activity.getPreview().showToast(null, R.string.failed_to_auto_stabilise);
                 System.gc();
@@ -1985,19 +2031,24 @@ public class ImageSaver extends Thread {
                 if( MyDebug.LOG ) {
                     Log.d(TAG, "x0 = " + x0 + " , y0 = " + y0);
                 }
-                // We need the bitmap to be mutable for photostamp to work - contrary to the documentation for Bitmap.createBitmap
-                // (which says it returns an immutable bitmap), we seem to always get a mutable bitmap anyway. A mutable bitmap
-                // would result in an exception "java.lang.IllegalStateException: Immutable bitmap passed to Canvas constructor"
-                // from the Canvas(bitmap) constructor call in the photostamp code, and I've yet to see this from Google Play.
                 new_bitmap = Bitmap.createBitmap(bitmap, x0, y0, w2, h2);
                 if( new_bitmap != bitmap ) {
                     bitmap.recycle();
                     bitmap = new_bitmap;
                 }
-                if( MyDebug.LOG )
-                    Log.d(TAG, "bitmap is mutable?: " + bitmap.isMutable());
                 System.gc();
             }
+
+            if( MyDebug.LOG )
+                Log.d(TAG, "bitmap is mutable?: " + bitmap.isMutable());
+            // Usually createBitmap will return a mutable bitmap, but not if the source bitmap (which we set as immutable)
+            // is returned (if the level angle is (tolerantly) 0.
+            // see testPhotoStamp() for testing this.
+            if( !bitmap.isMutable() ) {
+                new_bitmap = bitmap.copy(bitmap.getConfig(), true);
+                bitmap.recycle();
+                bitmap = new_bitmap;
+            }
         }
         return bitmap;
     }
@@ -2005,10 +2056,9 @@ public class ImageSaver extends Thread {
     /** Mirrors the image.
      * @param data The jpeg data.
      * @param bitmap Optional argument - the bitmap if already unpacked from the jpeg data.
-     * @param exifTempFile Temporary file that can be used to read exif tags (for orientation)
      * @return A bitmap representing the mirrored jpeg.
      */
-    private Bitmap mirrorImage(byte [] data, Bitmap bitmap, File exifTempFile) {
+    private Bitmap mirrorImage(byte [] data, Bitmap bitmap) {
         if( MyDebug.LOG ) {
             Log.d(TAG, "mirrorImage");
         }
@@ -2016,7 +2066,7 @@ public class ImageSaver extends Thread {
             if( MyDebug.LOG )
                 Log.d(TAG, "need to decode bitmap to mirror");
             // bitmap doesn't need to be mutable here, as this won't be the final bitmap returned from the mirroring code
-            bitmap = loadBitmapWithRotation(data, false, exifTempFile);
+            bitmap = loadBitmapWithRotation(data, false);
             if( bitmap == null ) {
                 // don't bother warning to the user - we simply won't mirror the image
                 System.gc();
@@ -2042,22 +2092,21 @@ public class ImageSaver extends Thread {
     /** Applies any photo stamp options (if they exist).
      * @param data The jpeg data.
      * @param bitmap Optional argument - the bitmap if already unpacked from the jpeg data.
-     * @param exifTempFile Temporary file that can be used to read exif tags (for orientation)
      * @return A bitmap representing the stamped jpeg. Will be null if the input bitmap is null and
      *         no photo stamp is applied.
      */
-    private Bitmap stampImage(final Request request, byte [] data, Bitmap bitmap, File exifTempFile) {
+    private Bitmap stampImage(final Request request, byte [] data, Bitmap bitmap) {
         if( MyDebug.LOG ) {
             Log.d(TAG, "stampImage");
         }
-        final MyApplicationInterface applicationInterface = main_activity.getApplicationInterface();
+        //final MyApplicationInterface applicationInterface = main_activity.getApplicationInterface();
         boolean dategeo_stamp = request.preference_stamp.equals("preference_stamp_yes");
         boolean text_stamp = request.preference_textstamp.length() > 0;
         if( dategeo_stamp || text_stamp ) {
             if( bitmap == null ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "decode bitmap in order to stamp info");
-                bitmap = loadBitmapWithRotation(data, true, exifTempFile);
+                bitmap = loadBitmapWithRotation(data, true);
                 if( bitmap == null ) {
                     main_activity.getPreview().showToast(null, R.string.failed_to_stamp);
                     System.gc();
@@ -2068,6 +2117,12 @@ public class ImageSaver extends Thread {
                     Log.d(TAG, "stamp info to bitmap: " + bitmap);
                 if( MyDebug.LOG )
                     Log.d(TAG, "bitmap is mutable?: " + bitmap.isMutable());
+
+                String stamp_string = "";
+                /* We now stamp via a TextView instead of using MyApplicationInterface.drawTextWithBackground().
+                 * This is important in order to satisfy the Google emoji policy...
+                 */
+
                 int font_size = request.font_size;
                 int color = request.color;
                 String pref_style = request.pref_style;
@@ -2133,18 +2188,32 @@ public class ImageSaver extends Thread {
                                 datetime_stamp += " ";
                             datetime_stamp += time_stamp;
                         }
-                        applicationInterface.drawTextWithBackground(canvas, p, datetime_stamp, color, Color.BLACK, width - offset_x, ypos, MyApplicationInterface.Alignment.ALIGNMENT_BOTTOM, null, draw_shadowed);
+                        //applicationInterface.drawTextWithBackground(canvas, p, datetime_stamp, color, Color.BLACK, width - offset_x, ypos, MyApplicationInterface.Alignment.ALIGNMENT_BOTTOM, null, draw_shadowed);
+                        if( stamp_string.length() == 0 )
+                            stamp_string = datetime_stamp;
+                        else
+                            stamp_string = datetime_stamp + "\n" + stamp_string;
                     }
                     ypos -= diff_y;
                     String gps_stamp = main_activity.getTextFormatter().getGPSString(preference_stamp_gpsformat, request.preference_units_distance, request.store_location, request.location, request.store_geo_direction, request.geo_direction);
                     if( gps_stamp.length() > 0 ) {
                         // don't log gps_stamp, in case of privacy!
 
-                        Address address = null;
+                        /*Address address = null;
                         if( request.store_location && !request.preference_stamp_geo_address.equals("preference_stamp_geo_address_no") ) {
+                            boolean block_geocoder;
+                            synchronized(this) {
+                                block_geocoder = app_is_paused;
+                            }
                             // try to find an address
                             // n.b., if we update the class being used, consider whether the info on Geocoder in preference_stamp_geo_address_summary needs updating
-                            if( Geocoder.isPresent() ) {
+                            if( block_geocoder ) {
+                                // seems safer to not try to initiate potential network connections (via geocoder) if Open Camera
+                                // has paused and we're still saving images
+                                if( MyDebug.LOG )
+                                    Log.d(TAG, "don't call geocoder for photostamp as app is paused");
+                            }
+                            else if( Geocoder.isPresent() ) {
                                 if( MyDebug.LOG )
                                     Log.d(TAG, "geocoder is present");
                                 Geocoder geocoder = new Geocoder(main_activity, Locale.getDefault());
@@ -2167,45 +2236,96 @@ public class ImageSaver extends Thread {
                                 if( MyDebug.LOG )
                                     Log.d(TAG, "geocoder not present");
                             }
-                        }
+                        }*/
 
-                        if( address == null || request.preference_stamp_geo_address.equals("preference_stamp_geo_address_both") ) {
+                        //if( address == null || request.preference_stamp_geo_address.equals("preference_stamp_geo_address_both") )
+                        {
                             if( MyDebug.LOG )
                                 Log.d(TAG, "display gps coords");
                             // want GPS coords (either in addition to the address, or we don't have an address)
                             // we'll also enter here if store_location is false, but we have geo direction to display
-                            applicationInterface.drawTextWithBackground(canvas, p, gps_stamp, color, Color.BLACK, width - offset_x, ypos, MyApplicationInterface.Alignment.ALIGNMENT_BOTTOM, null, draw_shadowed);
+                            //applicationInterface.drawTextWithBackground(canvas, p, gps_stamp, color, Color.BLACK, width - offset_x, ypos, MyApplicationInterface.Alignment.ALIGNMENT_BOTTOM, null, draw_shadowed);
+                            if( stamp_string.length() == 0 )
+                                stamp_string = gps_stamp;
+                            else
+                                stamp_string = gps_stamp + "\n" + stamp_string;
                             ypos -= diff_y;
                         }
-                        else if( request.store_geo_direction ) {
+                        /*else if( request.store_geo_direction ) {
                             if( MyDebug.LOG )
                                 Log.d(TAG, "not displaying gps coords, but need to display geo direction");
                             // we are displaying an address instead of GPS coords, but we still need to display the geo direction
                             gps_stamp = main_activity.getTextFormatter().getGPSString(preference_stamp_gpsformat, request.preference_units_distance, false, null, request.store_geo_direction, request.geo_direction);
                             if( gps_stamp.length() > 0 ) {
                                 // don't log gps_stamp, in case of privacy!
-                                applicationInterface.drawTextWithBackground(canvas, p, gps_stamp, color, Color.BLACK, width - offset_x, ypos, MyApplicationInterface.Alignment.ALIGNMENT_BOTTOM, null, draw_shadowed);
+                                //applicationInterface.drawTextWithBackground(canvas, p, gps_stamp, color, Color.BLACK, width - offset_x, ypos, MyApplicationInterface.Alignment.ALIGNMENT_BOTTOM, null, draw_shadowed);
+                                if( stamp_string.length() == 0 )
+                                    stamp_string = gps_stamp;
+                                else
+                                    stamp_string = gps_stamp + "\n" + stamp_string;
                                 ypos -= diff_y;
                             }
-                        }
+                        }*/
 
-                        if( address != null ) {
+                        /*if( address != null ) {
                             for(int i=0;i<=address.getMaxAddressLineIndex();i++) {
                                 // write in reverse order
                                 String addressLine = address.getAddressLine(address.getMaxAddressLineIndex()-i);
-                                applicationInterface.drawTextWithBackground(canvas, p, addressLine, color, Color.BLACK, width - offset_x, ypos, MyApplicationInterface.Alignment.ALIGNMENT_BOTTOM, null, draw_shadowed);
+                                //applicationInterface.drawTextWithBackground(canvas, p, addressLine, color, Color.BLACK, width - offset_x, ypos, MyApplicationInterface.Alignment.ALIGNMENT_BOTTOM, null, draw_shadowed);
+                                if( stamp_string.length() == 0 )
+                                    stamp_string = addressLine;
+                                else
+                                    stamp_string = addressLine + "\n" + stamp_string;
                                 ypos -= diff_y;
                             }
-                        }
+                        }*/
                     }
                 }
                 if( text_stamp ) {
                     if( MyDebug.LOG )
                         Log.d(TAG, "stamp text");
-                    applicationInterface.drawTextWithBackground(canvas, p, request.preference_textstamp, color, Color.BLACK, width - offset_x, ypos, MyApplicationInterface.Alignment.ALIGNMENT_BOTTOM, null, draw_shadowed);
+
+                    //applicationInterface.drawTextWithBackground(canvas, p, request.preference_textstamp, color, Color.BLACK, width - offset_x, ypos, MyApplicationInterface.Alignment.ALIGNMENT_BOTTOM, null, draw_shadowed);
+                    if( stamp_string.length() == 0 )
+                        stamp_string = request.preference_textstamp;
+                    else
+                        stamp_string = request.preference_textstamp + "\n" + stamp_string;
+
                     //noinspection UnusedAssignment
                     ypos -= diff_y;
                 }
+
+                if( stamp_string.length() > 0 ) {
+                    // don't log stamp_string, in case of privacy!
+
+                    @SuppressLint("InflateParams")
+                    final View stamp_view = LayoutInflater.from(main_activity).inflate(R.layout.stamp_image_text, null);
+                    final LinearLayout layout = stamp_view.findViewById(R.id.layout);
+                    final TextView textview = stamp_view.findViewById(R.id.text_view);
+
+                    textview.setVisibility(View.VISIBLE);
+                    textview.setTextColor(color);
+                    textview.setTextSize(TypedValue.COMPLEX_UNIT_PX, font_size_pixel);
+                    textview.setText(stamp_string);
+                    if( draw_shadowed == MyApplicationInterface.Shadow.SHADOW_OUTLINE ) {
+                        //noinspection PointlessArithmeticExpression
+                        float shadow_radius = (1.0f * scale + 0.5f); // convert pt to pixels
+                        shadow_radius = Math.max(shadow_radius, 1.0f);
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "shadow_radius: " + shadow_radius);
+                        textview.setShadowLayer(shadow_radius, 0.0f, 0.0f, Color.BLACK);
+                    }
+                    else if( draw_shadowed == MyApplicationInterface.Shadow.SHADOW_BACKGROUND ) {
+                        textview.setBackgroundColor(Color.argb(64, 0, 0, 0));
+                    }
+                    //textview.setBackgroundColor(Color.BLACK); // test
+                    textview.setGravity(Gravity.END); // so text is right-aligned - important when there are multiple lines
+
+                    layout.measure(canvas.getWidth(), canvas.getHeight());
+                    layout.layout(0, 0, canvas.getWidth(), canvas.getHeight());
+                    canvas.translate(width - offset_x - textview.getWidth(), height - offset_y - textview.getHeight());
+                    layout.draw(canvas);
+                }
             }
         }
         return bitmap;
@@ -2213,41 +2333,12 @@ public class ImageSaver extends Thread {
 
     private static class PostProcessBitmapResult {
         final Bitmap bitmap;
-        final File exifTempFile;
 
-        PostProcessBitmapResult(Bitmap bitmap, File exifTempFile) {
+        PostProcessBitmapResult(Bitmap bitmap) {
             this.bitmap = bitmap;
-            this.exifTempFile = exifTempFile;
         }
     }
 
-    private File getExifTempFile(byte [] data) {
-        File exifTempFile = null;
-        // need to rotate the bitmap according to the exif orientation (which some devices use, e.g., Samsung)
-        // so need to write to a temp file for this - we also use this later on to transfer the exif tags
-        // on Android 7+, we can now read exif tags direct from the jpeg data
-        if( Build.VERSION.SDK_INT < Build.VERSION_CODES.N ) {
-            try {
-                if( MyDebug.LOG )
-                    Log.d(TAG, "write temp file to record EXIF data");
-                exifTempFile = File.createTempFile("opencamera_exif", "");
-                OutputStream tempOutputStream = new FileOutputStream(exifTempFile);
-                try {
-                    tempOutputStream.write(data);
-                }
-                finally {
-                    tempOutputStream.close();
-                }
-            }
-            catch(IOException e) {
-                if (MyDebug.LOG)
-                    Log.e(TAG, "exception writing to temp file");
-                e.printStackTrace();
-            }
-        }
-        return exifTempFile;
-    }
-
     /** Performs post-processing on the data, or bitmap if non-null, for saveSingleImageNow.
      */
     private PostProcessBitmapResult postProcessBitmap(final Request request, byte [] data, Bitmap bitmap, boolean ignore_exif_orientation) throws IOException {
@@ -2257,51 +2348,41 @@ public class ImageSaver extends Thread {
 
         boolean dategeo_stamp = request.preference_stamp.equals("preference_stamp_yes");
         boolean text_stamp = request.preference_textstamp.length() > 0;
-        File exifTempFile = null;
         if( bitmap != null || request.image_format != Request.ImageFormat.STD || request.do_auto_stabilise || request.mirror || dategeo_stamp || text_stamp ) {
             // either we have a bitmap, or will need to decode the bitmap to do post-processing
             if( !ignore_exif_orientation ) {
-                exifTempFile = getExifTempFile(data);
-                if( MyDebug.LOG ) {
-                    Log.d(TAG, "Save single image performance: time after saving temp photo for EXIF: " + (System.currentTimeMillis() - time_s));
-                }
-
                 if( bitmap != null ) {
                     // rotate the bitmap if necessary for exif tags
                     if( MyDebug.LOG )
                         Log.d(TAG, "rotate pre-existing bitmap for exif tags?");
-                    bitmap = rotateForExif(bitmap, data, exifTempFile);
+                    bitmap = rotateForExif(bitmap, data);
                 }
             }
         }
         if( request.do_auto_stabilise ) {
-            bitmap = autoStabilise(data, bitmap, request.level_angle, request.is_front_facing, exifTempFile);
+            bitmap = autoStabilise(data, bitmap, request.level_angle, request.is_front_facing);
         }
         if( MyDebug.LOG ) {
             Log.d(TAG, "Save single image performance: time after auto-stabilise: " + (System.currentTimeMillis() - time_s));
         }
         if( request.mirror ) {
-            bitmap = mirrorImage(data, bitmap, exifTempFile);
+            bitmap = mirrorImage(data, bitmap);
         }
         if( request.image_format != Request.ImageFormat.STD && bitmap == null ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "need to decode bitmap to convert file format");
-            bitmap = loadBitmapWithRotation(data, true, exifTempFile);
+            bitmap = loadBitmapWithRotation(data, true);
             if( bitmap == null ) {
                 // if we can't load bitmap for converting file formats, don't want to continue
                 System.gc();
-                if( exifTempFile != null && !exifTempFile.delete() ) {
-                    if( MyDebug.LOG )
-                        Log.e(TAG, "failed to delete temp " + exifTempFile.getAbsolutePath());
-                }
                 throw new IOException();
             }
         }
-        bitmap = stampImage(request, data, bitmap, exifTempFile);
+        bitmap = stampImage(request, data, bitmap);
         if( MyDebug.LOG ) {
             Log.d(TAG, "Save single image performance: time after photostamp: " + (System.currentTimeMillis() - time_s));
         }
-        return new PostProcessBitmapResult(bitmap, exifTempFile);
+        return new PostProcessBitmapResult(bitmap);
     }
 
     /** May be run in saver thread or picture callback thread (depending on whether running in background).
@@ -2360,18 +2441,16 @@ public class ImageSaver extends Thread {
 
         main_activity.savingImage(true);
 
-        File exifTempFile = null;
-
-        // If saveUri is non-null, then:
-        //     Before Android 7, picFile is a temporary file which we use for saving exif tags too, and then we redirect the picFile to saveUri.
-        //     On Android 7+, picFile is null - we can write the exif tags direct to the saveUri.
+        // If using SAF or image_capture_intent is true, or using scoped storage, only saveUri is non-null
+        // Otherwise, only picFile is non-null
         File picFile = null;
         Uri saveUri = null;
+        boolean use_media_store = false;
+        ContentValues contentValues = null; // used if using scoped storage
         try {
             if( !raw_only ) {
                 PostProcessBitmapResult postProcessBitmapResult = postProcessBitmap(request, data, bitmap, ignore_exif_orientation);
                 bitmap = postProcessBitmapResult.bitmap;
-                exifTempFile = postProcessBitmapResult.exifTempFile;
             }
 
             if( raw_only ) {
@@ -2398,7 +2477,7 @@ public class ImageSaver extends Thread {
                         if( MyDebug.LOG )
                             Log.d(TAG, "create bitmap");
                         // bitmap we return doesn't need to be mutable
-                        bitmap = loadBitmapWithRotation(data, false, exifTempFile);
+                        bitmap = loadBitmapWithRotation(data, false);
                     }
                     if( bitmap != null ) {
                         int width = bitmap.getWidth();
@@ -2433,17 +2512,64 @@ public class ImageSaver extends Thread {
                     }
                     if( bitmap != null )
                         main_activity.setResult(Activity.RESULT_OK, new Intent("inline-data").putExtra("data", bitmap));
-                    if( exifTempFile != null && !exifTempFile.delete() ) {
-                        if( MyDebug.LOG )
-                            Log.e(TAG, "failed to delete temp " + exifTempFile.getAbsolutePath());
-                    }
-                    exifTempFile = null;
                     main_activity.finish();
                 }
             }
             else if( storageUtils.isUsingSAF() ) {
                 saveUri = storageUtils.createOutputMediaFileSAF(StorageUtils.MEDIA_TYPE_IMAGE, filename_suffix, extension, request.current_date);
             }
+            else if( MainActivity.useScopedStorage() ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "use media store");
+                use_media_store = true;
+                Uri folder = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ?
+                        MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY) :
+                        MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+                contentValues = new ContentValues();
+                String picName = storageUtils.createMediaFilename(StorageUtils.MEDIA_TYPE_IMAGE, filename_suffix, 0, "." + extension, request.current_date);
+                if( MyDebug.LOG )
+                    Log.d(TAG, "picName: " + picName);
+                contentValues.put(MediaStore.Images.Media.DISPLAY_NAME, picName);
+                String mime_type = storageUtils.getImageMimeType(extension);
+                if( MyDebug.LOG )
+                    Log.d(TAG, "mime_type: " + mime_type);
+                contentValues.put(MediaStore.Images.Media.MIME_TYPE, mime_type);
+                if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
+                    String relative_path = storageUtils.getSaveRelativeFolder();
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "relative_path: " + relative_path);
+                    contentValues.put(MediaStore.Images.Media.RELATIVE_PATH, relative_path);
+                    contentValues.put(MediaStore.Images.Media.IS_PENDING, 1);
+                }
+
+                // Note, we catch exceptions specific to insert() here and rethrow as IOException,
+                // rather than catching below, to avoid catching things too broadly - e.g.,
+                // IllegalStateException can also be thrown via "new Canvas" (from
+                // postProcessBitmap()) but this is a programming error that we shouldn't catch.
+                // Catching too broadly could mean we miss genuine problems that should be fixed.
+                try {
+                    saveUri = main_activity.getContentResolver().insert(folder, contentValues);
+                }
+                catch(IllegalArgumentException e) {
+                    // can happen for mediastore method if invalid ContentResolver.insert() call
+                    if( MyDebug.LOG )
+                        Log.e(TAG, "IllegalArgumentException inserting to mediastore: " + e.getMessage());
+                    e.printStackTrace();
+                    throw new IOException();
+                }
+                catch(IllegalStateException e) {
+                    // have received Google Play crashes from ContentResolver.insert() call for mediastore method
+                    if( MyDebug.LOG )
+                        Log.e(TAG, "IllegalStateException inserting to mediastore: " + e.getMessage());
+                    e.printStackTrace();
+                    throw new IOException();
+                }
+                if( MyDebug.LOG )
+                    Log.d(TAG, "saveUri: " + saveUri);
+                if( saveUri == null ) {
+                    throw new IOException();
+                }
+            }
             else {
                 picFile = storageUtils.createOutputMediaFile(StorageUtils.MEDIA_TYPE_IMAGE, filename_suffix, extension, request.current_date);
                 if( MyDebug.LOG )
@@ -2452,11 +2578,6 @@ public class ImageSaver extends Thread {
 
             if( MyDebug.LOG )
                 Log.d(TAG, "saveUri: " + saveUri);
-            if( saveUri != null && picFile == null && Build.VERSION.SDK_INT < Build.VERSION_CODES.N ) {
-                picFile = File.createTempFile("picFile", "jpg", main_activity.getCacheDir());
-                if( MyDebug.LOG )
-                    Log.d(TAG, "temp picFile: " + picFile.getAbsolutePath());
-            }
 
             if( picFile != null || saveUri != null ) {
                 OutputStream outputStream;
@@ -2503,14 +2624,14 @@ public class ImageSaver extends Thread {
                     // handle transferring/setting Exif tags (JPEG format only)
                     if( bitmap != null ) {
                         // need to update EXIF data! (only supported for JPEG image formats)
-                        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "set Exif tags from data");
-                            if( picFile != null ) {
-                                setExifFromData(request, data, picFile);
-                            }
-                            else {
-                                ParcelFileDescriptor parcelFileDescriptor = main_activity.getContentResolver().openFileDescriptor(saveUri, "rw");
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "set Exif tags from data");
+                        if( picFile != null ) {
+                            setExifFromData(request, data, picFile);
+                        }
+                        else {
+                            ParcelFileDescriptor parcelFileDescriptor = main_activity.getContentResolver().openFileDescriptor(saveUri, "rw");
+                            try {
                                 if( parcelFileDescriptor != null ) {
                                     FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();
                                     setExifFromData(request, data, fileDescriptor);
@@ -2519,23 +2640,16 @@ public class ImageSaver extends Thread {
                                     Log.e(TAG, "failed to create ParcelFileDescriptor for saveUri: " + saveUri);
                                 }
                             }
-                        }
-                        else {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "set Exif tags from file");
-                            if( picFile == null ) {
-                                throw new RuntimeException("should have set picFile on pre-Android 7!");
-                            }
-                            if( exifTempFile != null ) {
-                                setExifFromFile(request, exifTempFile, picFile);
-                                if( MyDebug.LOG ) {
-                                    Log.d(TAG, "Save single image performance: time after copying EXIF: " + (System.currentTimeMillis() - time_s));
+                            finally {
+                                if( parcelFileDescriptor != null ) {
+                                    try {
+                                        parcelFileDescriptor.close();
+                                    }
+                                    catch(IOException e) {
+                                        e.printStackTrace();
+                                    }
                                 }
                             }
-                            else {
-                                if( MyDebug.LOG )
-                                    Log.d(TAG, "can't set Exif tags without file pre-Android 7");
-                            }
                         }
                     }
                     else {
@@ -2546,6 +2660,11 @@ public class ImageSaver extends Thread {
                     }
                 }
 
+                if( update_thumbnail ) {
+                    // clear just in case we're unable to update this - don't want an out of date cached uri
+                    storageUtils.clearLastMediaScanned();
+                }
+
                 if( picFile != null && saveUri == null ) {
                     // broadcast for SAF is done later, when we've actually written out the file
                     storageUtils.broadcastFile(picFile, true, false, update_thumbnail);
@@ -2558,17 +2677,36 @@ public class ImageSaver extends Thread {
                     main_activity.setResult(Activity.RESULT_OK);
                     main_activity.finish();
                 }
-                if( storageUtils.isUsingSAF() ) {
-                    // most Gallery apps don't seem to recognise the SAF-format Uri, so just clear the field
-                    storageUtils.clearLastMediaScanned();
-                }
 
                 if( saveUri != null ) {
-                    if( picFile != null ) {
-                        copyFileToUri(main_activity, saveUri, picFile);
-                    }
                     success = true;
-                    broadcastSAFFile(saveUri, request.image_capture_intent);
+
+                    if( use_media_store ) {
+                        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
+                            contentValues.clear();
+                            contentValues.put(MediaStore.Images.Media.IS_PENDING, 0);
+                            main_activity.getContentResolver().update(saveUri, contentValues, null, null);
+                        }
+
+                        // no need to broadcast when using mediastore method
+                        if( !request.image_capture_intent ) {
+                            if( MyDebug.LOG )
+                                Log.d(TAG, "announce mediastore uri");
+                            // in theory this is pointless, as announceUri no longer does anything on Android 7+,
+                            // and mediastore method is only used on Android 10+, but keep this just in case
+                            // announceUri does something in future
+                            storageUtils.announceUri(saveUri, true, false);
+                            if( update_thumbnail ) {
+                                // we also want to save the uri - we can use the media uri directly, rather than having to scan it
+                                storageUtils.setLastMediaScanned(saveUri, false);
+                            }
+                        }
+                    }
+                    else {
+                        broadcastSAFFile(saveUri, update_thumbnail, request.image_capture_intent);
+                    }
+
+                    main_activity.test_last_saved_imageuri = saveUri;
                 }
             }
         }
@@ -2586,17 +2724,13 @@ public class ImageSaver extends Thread {
         }
         catch(SecurityException e) {
             // received security exception from copyFileToUri()->openOutputStream() from Google Play
+            // update: no longer have copyFileToUri() (as no longer use temporary files for SAF), but might as well keep this
             if( MyDebug.LOG )
                 Log.e(TAG, "security exception writing file: " + e.getMessage());
             e.printStackTrace();
             main_activity.getPreview().showToast(null, R.string.failed_to_save_photo);
         }
 
-        if( exifTempFile != null && !exifTempFile.delete() ) {
-            if( MyDebug.LOG )
-                Log.e(TAG, "failed to delete temp " + exifTempFile.getAbsolutePath());
-        }
-
         if( raw_only ) {
             // no saved image to record
         }
@@ -2606,6 +2740,9 @@ public class ImageSaver extends Thread {
         else if( success && storageUtils.isUsingSAF() ){
             applicationInterface.addLastImageSAF(saveUri, share_image);
         }
+        else if( success && use_media_store ){
+            applicationInterface.addLastImageMediaStore(saveUri, share_image);
+        }
 
         // I have received crashes where camera_controller was null - could perhaps happen if this thread was running just as the camera is closing?
         if( success && main_activity.getPreview().getCameraController() != null && update_thumbnail ) {
@@ -2637,7 +2774,7 @@ public class ImageSaver extends Thread {
                 // now get the rotation from the Exif data
                 if( MyDebug.LOG )
                     Log.d(TAG, "rotate thumbnail for exif tags?");
-                thumbnail = rotateForExif(thumbnail, data, picFile);
+                thumbnail = rotateForExif(thumbnail, data);
             }
             else {
                 int width = bitmap.getWidth();
@@ -2689,15 +2826,6 @@ public class ImageSaver extends Thread {
             bitmap.recycle();
         }
 
-        if( picFile != null && saveUri != null ) {
-            if( MyDebug.LOG )
-                Log.d(TAG, "delete temp picFile: " + picFile);
-            if( !picFile.delete() ) {
-                if( MyDebug.LOG )
-                    Log.e(TAG, "failed to delete temp picFile: " + picFile);
-            }
-        }
-
         System.gc();
 
         main_activity.savingImage(false);
@@ -2710,7 +2838,6 @@ public class ImageSaver extends Thread {
 
     /** As setExifFromFile, but can read the Exif tags directly from the jpeg data rather than a file.
      */
-    @RequiresApi(api = Build.VERSION_CODES.N)
     private void setExifFromData(final Request request, byte [] data, File to_file) throws IOException {
         if( MyDebug.LOG ) {
             Log.d(TAG, "setExifFromData");
@@ -2730,42 +2857,15 @@ public class ImageSaver extends Thread {
         }
     }
 
-    private void broadcastSAFFile(Uri saveUri, boolean image_capture_intent) {
+    private void broadcastSAFFile(Uri saveUri, boolean set_last_scanned, boolean image_capture_intent) {
         if( MyDebug.LOG )
             Log.d(TAG, "broadcastSAFFile");
-        /* We still need to broadcastFile for SAF for two reasons:
-            1. To call storageUtils.announceUri() to broadcast NEW_PICTURE etc.
-               Whilst in theory we could do this directly, it seems external apps that use such broadcasts typically
-               won't know what to do with a SAF based Uri (e.g, Owncloud crashes!) so better to broadcast the Uri
-               corresponding to the real file, if it exists.
-            2. Whilst the new file seems to be known by external apps such as Gallery without having to call media
-               scanner, I've had reports this doesn't happen when saving to external SD cards. So better to explicitly
-               scan.
-            Note this will no longer work on Android Q's scoped storage (getFileFromDocumentUriSAF will return null).
-            But NEW_PICTURE etc are no longer sent on Android 7+ anyway.
-        */
         StorageUtils storageUtils = main_activity.getStorageUtils();
-        File real_file = storageUtils.getFileFromDocumentUriSAF(saveUri, false);
-        if( MyDebug.LOG )
-            Log.d(TAG, "real_file: " + real_file);
-        if( real_file != null ) {
-            if( MyDebug.LOG )
-                Log.d(TAG, "broadcast file");
-            storageUtils.broadcastFile(real_file, true, false, true);
-            main_activity.test_last_saved_image = real_file.getAbsolutePath();
-        }
-        else if( !image_capture_intent ) {
-            if( MyDebug.LOG )
-                Log.d(TAG, "announce SAF uri");
-            // announce the SAF Uri
-            // (shouldn't do this for a capture intent - e.g., causes crash when calling from Google Keep)
-            storageUtils.announceUri(saveUri, true, false);
-        }
+        storageUtils.broadcastUri(saveUri, true, false, set_last_scanned, image_capture_intent);
     }
 
     /** As setExifFromFile, but can read the Exif tags directly from the jpeg data, and to a file descriptor, rather than a file.
      */
-    @RequiresApi(api = Build.VERSION_CODES.N)
     private void setExifFromData(final Request request, byte [] data, FileDescriptor to_file_descriptor) throws IOException {
         if( MyDebug.LOG ) {
             Log.d(TAG, "setExifFromData");
@@ -2785,31 +2885,6 @@ public class ImageSaver extends Thread {
         }
     }
 
-    /** Used to transfer exif tags, if we had to convert the jpeg info to a bitmap (for post-processing such as
-     *  auto-stabilise or photo stamp). Also then applies the Exif tags according to the preferences in the request.
-     *  Note that we use several ExifInterface tags that are now deprecated in API level 23 and 24. These are replaced with new tags that have
-     *  the same string value (e.g., TAG_APERTURE replaced with TAG_F_NUMBER, but both have value "FNumber"). We use the deprecated versions
-     *  to avoid complicating the code (we'd still have to read the deprecated values for older devices).
-     */
-    private void setExifFromFile(final Request request, File from_file, File to_file) throws IOException {
-        if( MyDebug.LOG ) {
-            Log.d(TAG, "setExifFromFile");
-            Log.d(TAG, "from_file: " + from_file);
-            Log.d(TAG, "to_file: " + to_file);
-        }
-        try {
-            ExifInterface exif = new ExifInterface(from_file.getAbsolutePath());
-            ExifInterface exif_new = new ExifInterface(to_file.getAbsolutePath());
-            setExif(request, exif, exif_new);
-        }
-        catch(NoClassDefFoundError exception) {
-            // have had Google Play crashes from new ExifInterface() for Galaxy Ace4 (vivalto3g)
-            if( MyDebug.LOG )
-                Log.e(TAG, "exif orientation NoClassDefFoundError");
-            exception.printStackTrace();
-        }
-    }
-
     /** Transfers exif tags from exif to exif_new, and then applies any extra Exif tags according to the preferences in the request.
      *  Note that we use several ExifInterface tags that are now deprecated in API level 23 and 24. These are replaced with new tags that have
      *  the same string value (e.g., TAG_APERTURE replaced with TAG_F_NUMBER, but both have value "FNumber"). We use the deprecated versions
@@ -2821,7 +2896,7 @@ public class ImageSaver extends Thread {
 
         if( MyDebug.LOG )
             Log.d(TAG, "read back EXIF data");
-        String exif_aperture = exif.getAttribute(ExifInterface.TAG_APERTURE); // same as TAG_F_NUMBER
+        String exif_aperture = exif.getAttribute(ExifInterface.TAG_F_NUMBER); // previously TAG_APERTURE
         String exif_datetime = exif.getAttribute(ExifInterface.TAG_DATETIME);
         String exif_exposure_time = exif.getAttribute(ExifInterface.TAG_EXPOSURE_TIME);
         String exif_flash = exif.getAttribute(ExifInterface.TAG_FLASH);
@@ -2836,66 +2911,69 @@ public class ImageSaver extends Thread {
         String exif_gps_processing_method = exif.getAttribute(ExifInterface.TAG_GPS_PROCESSING_METHOD);
         String exif_gps_timestamp = exif.getAttribute(ExifInterface.TAG_GPS_TIMESTAMP);
         // leave width/height, as this may have changed! similarly TAG_IMAGE_LENGTH?
-        String exif_iso = exif.getAttribute(ExifInterface.TAG_ISO); // same as TAG_ISO_SPEED_RATINGS
+        //noinspection deprecation
+        String exif_iso = exif.getAttribute(ExifInterface.TAG_ISO_SPEED_RATINGS); // previously TAG_ISO
         String exif_make = exif.getAttribute(ExifInterface.TAG_MAKE);
         String exif_model = exif.getAttribute(ExifInterface.TAG_MODEL);
         // leave orientation - since we rotate bitmaps to account for orientation, we don't want to write it to the saved image!
         String exif_white_balance = exif.getAttribute(ExifInterface.TAG_WHITE_BALANCE);
 
-        String exif_datetime_digitized = null;
-        String exif_subsec_time = null;
-        String exif_subsec_time_dig = null;
-        String exif_subsec_time_orig = null;
-        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
+        String exif_datetime_digitized;
+        String exif_subsec_time;
+        String exif_subsec_time_dig;
+        String exif_subsec_time_orig;
+        {
             // tags that are new in Android M - note we skip tags unlikely to be relevant for camera photos
+            // update, now available in all Android versions thanks to using AndroidX ExifInterface
             exif_datetime_digitized = exif.getAttribute(ExifInterface.TAG_DATETIME_DIGITIZED);
             exif_subsec_time = exif.getAttribute(ExifInterface.TAG_SUBSEC_TIME);
-            exif_subsec_time_dig = exif.getAttribute(ExifInterface.TAG_SUBSEC_TIME_DIG); // same as TAG_SUBSEC_TIME_DIGITIZED
-            exif_subsec_time_orig = exif.getAttribute(ExifInterface.TAG_SUBSEC_TIME_ORIG); // same as TAG_SUBSEC_TIME_ORIGINAL
-        }
-
-        String exif_aperture_value = null;
-        String exif_brightness_value = null;
-        String exif_cfa_pattern = null;
-        String exif_color_space = null;
-        String exif_components_configuration = null;
-        String exif_compressed_bits_per_pixel = null;
-        String exif_compression = null;
-        String exif_contrast = null;
-        String exif_datetime_original = null;
-        String exif_device_setting_description = null;
-        String exif_digital_zoom_ratio = null;
-        String exif_exposure_bias_value = null;
-        String exif_exposure_index = null;
-        String exif_exposure_mode = null;
-        String exif_exposure_program = null;
-        String exif_flash_energy = null;
-        String exif_focal_length_in_35mm_film = null;
-        String exif_focal_plane_resolution_unit = null;
-        String exif_focal_plane_x_resolution = null;
-        String exif_focal_plane_y_resolution = null;
-        String exif_gain_control = null;
-        String exif_gps_area_information = null;
-        String exif_gps_differential = null;
-        String exif_gps_dop = null;
-        String exif_gps_measure_mode = null;
-        String exif_image_description = null;
-        String exif_light_source = null;
-        String exif_maker_note = null;
-        String exif_max_aperture_value = null;
-        String exif_metering_mode = null;
-        String exif_oecf = null;
-        String exif_photometric_interpretation = null;
-        String exif_saturation = null;
-        String exif_scene_capture_type = null;
-        String exif_scene_type = null;
-        String exif_sensing_method = null;
-        String exif_sharpness = null;
-        String exif_shutter_speed_value = null;
-        String exif_software = null;
-        String exif_user_comment = null;
-        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
+            exif_subsec_time_dig = exif.getAttribute(ExifInterface.TAG_SUBSEC_TIME_DIGITIZED); // previously TAG_SUBSEC_TIME_DIG
+            exif_subsec_time_orig = exif.getAttribute(ExifInterface.TAG_SUBSEC_TIME_ORIGINAL); // previously TAG_SUBSEC_TIME_ORIG
+        }
+
+        String exif_aperture_value;
+        String exif_brightness_value;
+        String exif_cfa_pattern;
+        String exif_color_space;
+        String exif_components_configuration;
+        String exif_compressed_bits_per_pixel;
+        String exif_compression;
+        String exif_contrast;
+        String exif_datetime_original;
+        String exif_device_setting_description;
+        String exif_digital_zoom_ratio;
+        String exif_exposure_bias_value;
+        String exif_exposure_index;
+        String exif_exposure_mode;
+        String exif_exposure_program;
+        String exif_flash_energy;
+        String exif_focal_length_in_35mm_film;
+        String exif_focal_plane_resolution_unit;
+        String exif_focal_plane_x_resolution;
+        String exif_focal_plane_y_resolution;
+        String exif_gain_control;
+        String exif_gps_area_information;
+        String exif_gps_differential;
+        String exif_gps_dop;
+        String exif_gps_measure_mode;
+        String exif_image_description;
+        String exif_light_source;
+        String exif_maker_note;
+        String exif_max_aperture_value;
+        String exif_metering_mode;
+        String exif_oecf;
+        String exif_photometric_interpretation;
+        String exif_saturation;
+        String exif_scene_capture_type;
+        String exif_scene_type;
+        String exif_sensing_method;
+        String exif_sharpness;
+        String exif_shutter_speed_value;
+        String exif_software;
+        String exif_user_comment;
+        {
             // tags that are new in Android N - note we skip tags unlikely to be relevant for camera photos
+            // update, now available in all Android versions thanks to using AndroidX ExifInterface
             exif_aperture_value = exif.getAttribute(ExifInterface.TAG_APERTURE_VALUE);
             exif_brightness_value = exif.getAttribute(ExifInterface.TAG_BRIGHTNESS_VALUE);
             exif_cfa_pattern = exif.getAttribute(ExifInterface.TAG_CFA_PATTERN);
@@ -2967,7 +3045,7 @@ public class ImageSaver extends Thread {
         if( MyDebug.LOG )
             Log.d(TAG, "now write new EXIF data");
         if( exif_aperture != null )
-            exif_new.setAttribute(ExifInterface.TAG_APERTURE, exif_aperture);
+            exif_new.setAttribute(ExifInterface.TAG_F_NUMBER, exif_aperture);
         if( exif_datetime != null )
             exif_new.setAttribute(ExifInterface.TAG_DATETIME, exif_datetime);
         if( exif_exposure_time != null )
@@ -2995,7 +3073,8 @@ public class ImageSaver extends Thread {
         if( exif_gps_timestamp != null )
             exif_new.setAttribute(ExifInterface.TAG_GPS_TIMESTAMP, exif_gps_timestamp);
         if( exif_iso != null )
-            exif_new.setAttribute(ExifInterface.TAG_ISO, exif_iso);
+            //noinspection deprecation
+            exif_new.setAttribute(ExifInterface.TAG_ISO_SPEED_RATINGS, exif_iso);
         if( exif_make != null )
             exif_new.setAttribute(ExifInterface.TAG_MAKE, exif_make);
         if( exif_model != null )
@@ -3003,18 +3082,18 @@ public class ImageSaver extends Thread {
         if( exif_white_balance != null )
             exif_new.setAttribute(ExifInterface.TAG_WHITE_BALANCE, exif_white_balance);
 
-        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
+        {
             if( exif_datetime_digitized != null )
                 exif_new.setAttribute(ExifInterface.TAG_DATETIME_DIGITIZED, exif_datetime_digitized);
             if( exif_subsec_time != null )
                 exif_new.setAttribute(ExifInterface.TAG_SUBSEC_TIME, exif_subsec_time);
             if( exif_subsec_time_dig != null )
-                exif_new.setAttribute(ExifInterface.TAG_SUBSEC_TIME_DIG, exif_subsec_time_dig);
+                exif_new.setAttribute(ExifInterface.TAG_SUBSEC_TIME_DIGITIZED, exif_subsec_time_dig);
             if( exif_subsec_time_orig != null )
-                exif_new.setAttribute(ExifInterface.TAG_SUBSEC_TIME_ORIG, exif_subsec_time_orig);
+                exif_new.setAttribute(ExifInterface.TAG_SUBSEC_TIME_ORIGINAL, exif_subsec_time_orig);
         }
 
-        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
+        {
             if( exif_aperture_value != null )
                 exif_new.setAttribute(ExifInterface.TAG_APERTURE_VALUE, exif_aperture_value);
             if( exif_brightness_value != null )
@@ -3097,7 +3176,7 @@ public class ImageSaver extends Thread {
                 exif_new.setAttribute(ExifInterface.TAG_USER_COMMENT, exif_user_comment);
         }
 
-        modifyExif(exif_new, request.type == Request.Type.JPEG, request.using_camera2, request.current_date, request.store_location, request.store_geo_direction, request.geo_direction, request.custom_tag_artist, request.custom_tag_copyright, request.level_angle, request.pitch_angle, request.store_ypr);
+        modifyExif(exif_new, request.type == Request.Type.JPEG, request.using_camera2, request.using_camera_extensions, request.current_date, request.store_location, request.location, request.store_geo_direction, request.geo_direction, request.custom_tag_artist, request.custom_tag_copyright, request.level_angle, request.pitch_angle, request.store_ypr);
         setDateTimeExif(exif_new);
         exif_new.saveAttributes();
     }
@@ -3124,6 +3203,8 @@ public class ImageSaver extends Thread {
         try {
             File picFile = null;
             Uri saveUri = null;
+            boolean use_media_store = false;
+            ContentValues contentValues = null; // used if using scoped storage
 
             String suffix = "_";
             String filename_suffix = (request.force_suffix) ? suffix + (request.suffix_offset) : "";
@@ -3134,6 +3215,44 @@ public class ImageSaver extends Thread {
                 // When using SAF, we don't save to a temp file first (unlike for JPEGs). Firstly we don't need to modify Exif, so don't
                 // need a real file; secondly copying to a temp file is much slower for RAW.
             }
+            else if( MainActivity.useScopedStorage() ) {
+                use_media_store = true;
+                Uri folder = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ?
+                        MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY) :
+                        MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+                contentValues = new ContentValues();
+                String picName = storageUtils.createMediaFilename(StorageUtils.MEDIA_TYPE_IMAGE, filename_suffix, 0, ".dng", request.current_date);
+                contentValues.put(MediaStore.Images.Media.DISPLAY_NAME, picName);
+                contentValues.put(MediaStore.Images.Media.MIME_TYPE, "image/dng");
+                if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
+                    contentValues.put(MediaStore.Images.Media.RELATIVE_PATH, storageUtils.getSaveRelativeFolder());
+                    contentValues.put(MediaStore.Images.Media.IS_PENDING, 1);
+                }
+
+                // Note, we catch exceptions specific to insert() here and rethrow as IOException,
+                // rather than catching below, to avoid catching things too broadly.
+                // Catching too broadly could mean we miss genuine problems that should be fixed.
+                try {
+                    saveUri = main_activity.getContentResolver().insert(folder, contentValues);
+                }
+                catch(IllegalArgumentException e) {
+                    // can happen for mediastore method if invalid ContentResolver.insert() call
+                    if( MyDebug.LOG )
+                        Log.e(TAG, "IllegalArgumentException inserting to mediastore: " + e.getMessage());
+                    e.printStackTrace();
+                    throw new IOException();
+                }
+                catch(IllegalStateException e) {
+                    if( MyDebug.LOG )
+                        Log.e(TAG, "IllegalStateException inserting to mediastore: " + e.getMessage());
+                    e.printStackTrace();
+                    throw new IOException();
+                }
+                if( MyDebug.LOG )
+                    Log.d(TAG, "saveUri: " + saveUri);
+                if( saveUri == null )
+                    throw new IOException();
+            }
             else {
                 picFile = storageUtils.createOutputMediaFile(StorageUtils.MEDIA_TYPE_IMAGE, filename_suffix, "dng", request.current_date);
                 if( MyDebug.LOG )
@@ -3167,12 +3286,40 @@ public class ImageSaver extends Thread {
             else if( storageUtils.isUsingSAF() ){
                 applicationInterface.addLastImageSAF(saveUri, raw_only);
             }
+            else if( success && use_media_store ){
+                applicationInterface.addLastImageMediaStore(saveUri, raw_only);
+            }
+
+            // if RAW only, need to update the cached uri
+            if( raw_only ) {
+                // clear just in case we're unable to update this - don't want an out of date cached uri
+                storageUtils.clearLastMediaScanned();
+            }
 
             if( saveUri == null ) {
-                storageUtils.broadcastFile(picFile, true, false, false);
+                storageUtils.broadcastFile(picFile, true, false, raw_only);
+            }
+            else if( use_media_store ) {
+                if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
+                    contentValues.clear();
+                    contentValues.put(MediaStore.Images.Media.IS_PENDING, 0);
+                    main_activity.getContentResolver().update(saveUri, contentValues, null, null);
+                }
+
+                // no need to broadcast when using mediastore method
+
+                // in theory this is pointless, as announceUri no longer does anything on Android 7+,
+                // and mediastore method is only used on Android 10+, but keep this just in case
+                // announceUri does something in future
+                storageUtils.announceUri(saveUri, true, false);
+
+                if( raw_only ) {
+                    // we also want to save the uri - we can use the media uri directly, rather than having to scan it
+                    storageUtils.setLastMediaScanned(saveUri, true);
+                }
             }
             else {
-                storageUtils.broadcastUri(saveUri, true, false, false);
+                storageUtils.broadcastUri(saveUri, true, false, raw_only, false);
             }
         }
         catch(FileNotFoundException e) {
@@ -3210,38 +3357,22 @@ public class ImageSaver extends Thread {
         return success;
     }
 
-    /** Rotates the supplied bitmap according to the orientation tag stored in the exif data. On
-     *  Android 7 onwards, we use the jpeg data; on earlier versions the supplied exifTimeFile is
-     *  used. If no rotation is required, the input bitmap is returned.
+    /** Rotates the supplied bitmap according to the orientation tag stored in the exif data. If no
+     *  rotation is required, the input bitmap is returned. If rotation is required, the input
+     *  bitmap is recycled.
      * @param data Jpeg data containing the Exif information to use.
-     * @param exifTempFile Ignored on Android 7+. If this is null on older versions, the bitmap is
-     *                     returned without rotation.
      */
-    private Bitmap rotateForExif(Bitmap bitmap, byte [] data, File exifTempFile) {
+    private Bitmap rotateForExif(Bitmap bitmap, byte [] data) {
         if( MyDebug.LOG )
             Log.d(TAG, "rotateForExif");
         InputStream inputStream = null;
         try {
             ExifInterface exif;
 
-            if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
-                if( MyDebug.LOG )
-                    Log.d(TAG, "Android 7: use data stream to read exif tags");
-                inputStream = new ByteArrayInputStream(data);
-                exif = new ExifInterface(inputStream);
-            }
-            else {
-                if( MyDebug.LOG )
-                    Log.d(TAG, "pre-Android 7: use file to read exif tags: " + exifTempFile);
-                if( exifTempFile != null ) {
-                    exif = new ExifInterface(exifTempFile.getAbsolutePath());
-                }
-                else {
-                    if( MyDebug.LOG )
-                        Log.d(TAG, "but no file available to read exif tags from");
-                    return bitmap;
-                }
-            }
+            if( MyDebug.LOG )
+                Log.d(TAG, "use data stream to read exif tags");
+            inputStream = new ByteArrayInputStream(data);
+            exif = new ExifInterface(inputStream);
 
             int exif_orientation_s = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED);
             if( MyDebug.LOG )
@@ -3316,36 +3447,75 @@ public class ImageSaver extends Thread {
      *  supplied EXIF orientation tag.
      * @param data The jpeg data.
      * @param mutable Whether to create a mutable bitmap.
-     * @param exifTempFile Temporary file that can be used to read exif tags (for orientation).
      * @return A bitmap representing the correctly rotated jpeg.
      */
-    private Bitmap loadBitmapWithRotation(byte [] data, boolean mutable, File exifTempFile) {
+    private Bitmap loadBitmapWithRotation(byte [] data, boolean mutable) {
         Bitmap bitmap = loadBitmap(data, mutable, 1);
         if( bitmap != null ) {
             // rotate the bitmap if necessary for exif tags
             if( MyDebug.LOG )
                 Log.d(TAG, "rotate bitmap for exif tags?");
-            bitmap = rotateForExif(bitmap, data, exifTempFile);
+            bitmap = rotateForExif(bitmap, data);
         }
         return bitmap;
     }
 
+    /* In some cases we may create an ExifInterface with a FileDescriptor obtained from a
+     * ParcelFileDescriptor (via getFileDescriptor()). It's important to keep a reference to the
+     * ParcelFileDescriptor object for as long as the exif interface, otherwise there's a risk of
+     * the ParcelFileDescriptor being garbage collected, invalidating the file descriptor still
+     * being used by the ExifInterface!
+     * This didn't cause any known bugs, but good practice to fix, similar to the issue reported in
+     * https://sourceforge.net/p/opencamera/tickets/417/ .
+     * Also important to call the close() method when done with it, to close the
+     * ParcelFileDescriptor (if one was created).
+     */
+    private static class ExifInterfaceHolder {
+        // see documentation above about keeping hold of pdf due to the garbage collector!
+        private final ParcelFileDescriptor pfd;
+        private final ExifInterface exif;
+
+        ExifInterfaceHolder(ParcelFileDescriptor pfd, ExifInterface exif) {
+            this.pfd = pfd;
+            this.exif = exif;
+        }
+
+        ExifInterface getExif() {
+            return this.exif;
+        }
+
+        void close()  {
+            if( this.pfd != null ) {
+                try {
+                    this.pfd.close();
+                }
+                catch(IOException e) {
+                    Log.e(TAG, "failed to close parcelfiledescriptor");
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
     /** Creates a new exif interface for reading and writing.
-     *  If picFile==null, then saveUri must be non-null (and the Android version must be Android 7
-     *  or later), and will be used instead to write the exif tags too.
-     *  May return null if unable to create the exif interface.
+     *  If picFile==null, then saveUri must be non-null, and will be used instead to write the exif
+     *  tags too.
+     *  The returned ExifInterfaceHolder will always be non-null, but the contained getExif() may
+     *  return null if this method was unable to create the exif interface.
+     *  The caller should call close() on the returned ExifInterfaceHolder when no longer required.
      */
-    private ExifInterface createExifInterface(File picFile, Uri saveUri) throws IOException {
+    private ExifInterfaceHolder createExifInterface(File picFile, Uri saveUri) throws IOException {
+        ParcelFileDescriptor parcelFileDescriptor = null;
         ExifInterface exif = null;
         if( picFile != null ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "write to picFile: " + picFile);
             exif = new ExifInterface(picFile.getAbsolutePath());
         }
-        else if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
+        else {
             if( MyDebug.LOG )
                 Log.d(TAG, "write direct to saveUri: " + saveUri);
-            ParcelFileDescriptor parcelFileDescriptor = main_activity.getContentResolver().openFileDescriptor(saveUri, "rw");
+            parcelFileDescriptor = main_activity.getContentResolver().openFileDescriptor(saveUri, "rw");
             if( parcelFileDescriptor != null ) {
                 FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();
                 exif = new ExifInterface(fileDescriptor);
@@ -3354,30 +3524,32 @@ public class ImageSaver extends Thread {
                 Log.e(TAG, "failed to create ParcelFileDescriptor for saveUri: " + saveUri);
             }
         }
-        else {
-            // throw runtimeexception, as this is a programming error
-            throw new RuntimeException("picFile==null but Android version is not 7 or later");
-        }
-        return exif;
+        return new ExifInterfaceHolder(parcelFileDescriptor, exif);
     }
 
     /** Makes various modifications to the saved image file, according to the preferences in request.
      *  This method is used when saving directly from the JPEG data rather than a bitmap.
-     *  If picFile==null, then saveUri must be non-null (and the Android version must be Android 7
-     *  or later), and will be used instead to write the exif tags too.
+     *  If picFile==null, then saveUri must be non-null, and will be used instead to write the exif
+     *  tags too.
      */
     private void updateExif(Request request, File picFile, Uri saveUri) throws IOException {
         if( MyDebug.LOG )
             Log.d(TAG, "updateExif: " + picFile);
-        if( request.store_geo_direction || request.store_ypr || hasCustomExif(request.custom_tag_artist, request.custom_tag_copyright) ) {
+        if( request.store_geo_direction || request.store_ypr || hasCustomExif(request.custom_tag_artist, request.custom_tag_copyright) || request.using_camera_extensions ) {
             long time_s = System.currentTimeMillis();
             if( MyDebug.LOG )
                 Log.d(TAG, "add additional exif info");
             try {
-                ExifInterface exif = createExifInterface(picFile, saveUri);
-                if( exif != null ) {
-                    modifyExif(exif, request.type == Request.Type.JPEG, request.using_camera2, request.current_date, request.store_location, request.store_geo_direction, request.geo_direction, request.custom_tag_artist, request.custom_tag_copyright, request.level_angle, request.pitch_angle, request.store_ypr);
-                    exif.saveAttributes();
+                ExifInterfaceHolder exif_holder = createExifInterface(picFile, saveUri);
+                try {
+                    ExifInterface exif = exif_holder.getExif();
+                    if( exif != null ) {
+                        modifyExif(exif, request.type == Request.Type.JPEG, request.using_camera2, request.using_camera_extensions, request.current_date, request.store_location, request.location, request.store_geo_direction, request.geo_direction, request.custom_tag_artist, request.custom_tag_copyright, request.level_angle, request.pitch_angle, request.store_ypr);
+                        exif.saveAttributes();
+                    }
+                }
+                finally {
+                    exif_holder.close();
                 }
             }
             catch(NoClassDefFoundError exception) {
@@ -3393,10 +3565,16 @@ public class ImageSaver extends Thread {
             if( MyDebug.LOG )
                 Log.d(TAG, "remove GPS timestamp hack");
             try {
-                ExifInterface exif = createExifInterface(picFile, saveUri);
-                if( exif != null ) {
-                    fixGPSTimestamp(exif, request.current_date);
-                    exif.saveAttributes();
+                ExifInterfaceHolder exif_holder = createExifInterface(picFile, saveUri);
+                try {
+                    ExifInterface exif = exif_holder.getExif();
+                    if( exif != null ) {
+                        fixGPSTimestamp(exif, request.current_date);
+                        exif.saveAttributes();
+                    }
+                }
+                finally {
+                    exif_holder.close();
                 }
             }
             catch(NoClassDefFoundError exception) {
@@ -3414,11 +3592,11 @@ public class ImageSaver extends Thread {
 
     /** Makes various modifications to the exif data, if necessary.
      */
-    private void modifyExif(ExifInterface exif, boolean is_jpeg, boolean using_camera2, Date current_date, boolean store_location, boolean store_geo_direction, double geo_direction, String custom_tag_artist, String custom_tag_copyright, double level_angle, double pitch_angle, boolean store_ypr) {
+    private void modifyExif(ExifInterface exif, boolean is_jpeg, boolean using_camera2, boolean using_camera_extensions, Date current_date, boolean store_location, Location location, boolean store_geo_direction, double geo_direction, String custom_tag_artist, String custom_tag_copyright, double level_angle, double pitch_angle, boolean store_ypr) {
         if( MyDebug.LOG )
             Log.d(TAG, "modifyExif");
-        setGPSDirectionExif(exif, store_geo_direction, geo_direction, level_angle, pitch_angle, store_ypr);
-        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && store_ypr ){
+        setGPSDirectionExif(exif, store_geo_direction, geo_direction);
+        if( store_ypr ) {
             float geo_angle = (float)Math.toDegrees(geo_direction);
             if( geo_angle < 0.0f ) {
                 geo_angle += 360.0f;
@@ -3430,12 +3608,19 @@ public class ImageSaver extends Thread {
                 Log.d(TAG, "UserComment: " + exif.getAttribute(ExifInterface.TAG_USER_COMMENT));
         }
         setCustomExif(exif, custom_tag_artist, custom_tag_copyright);
-        if( needGPSTimestampHack(is_jpeg, using_camera2, store_location) ) {
+        if( using_camera_extensions ) {
+            addDateTimeExif(exif, current_date);
+            if( store_location ) {
+                // also need to store geotagging, since Camera API doesn't support doing this for camera extensions
+                exif.setGpsInfo(location);
+            }
+        }
+        else if( needGPSTimestampHack(is_jpeg, using_camera2, store_location) ) {
             fixGPSTimestamp(exif, current_date);
         }
     }
 
-    private void setGPSDirectionExif(ExifInterface exif, boolean store_geo_direction, double geo_direction, double level_angle, double pitch_angle, boolean store_ypr) {
+    private void setGPSDirectionExif(ExifInterface exif, boolean store_geo_direction, double geo_direction) {
         if( MyDebug.LOG )
             Log.d(TAG, "setGPSDirectionExif");
         if( store_geo_direction ) {
@@ -3449,17 +3634,17 @@ public class ImageSaver extends Thread {
             String GPSImgDirection_string = Math.round(geo_angle*100) + "/100";
             if( MyDebug.LOG )
                 Log.d(TAG, "GPSImgDirection_string: " + GPSImgDirection_string);
-            exif.setAttribute(TAG_GPS_IMG_DIRECTION, GPSImgDirection_string);
-            exif.setAttribute(TAG_GPS_IMG_DIRECTION_REF, "M");
+            exif.setAttribute(ExifInterface.TAG_GPS_IMG_DIRECTION, GPSImgDirection_string);
+            exif.setAttribute(ExifInterface.TAG_GPS_IMG_DIRECTION_REF, "M");
         }
     }
 
     /** Whether custom exif tags need to be applied to the image file.
      */
     private boolean hasCustomExif(String custom_tag_artist, String custom_tag_copyright) {
-        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && custom_tag_artist != null && custom_tag_artist.length() > 0 )
+        if( custom_tag_artist != null && custom_tag_artist.length() > 0 )
             return true;
-        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && custom_tag_copyright != null && custom_tag_copyright.length() > 0 )
+        if( custom_tag_copyright != null && custom_tag_copyright.length() > 0 )
             return true;
         return false;
     }
@@ -3469,12 +3654,12 @@ public class ImageSaver extends Thread {
     private void setCustomExif(ExifInterface exif, String custom_tag_artist, String custom_tag_copyright) {
         if( MyDebug.LOG )
             Log.d(TAG, "setCustomExif");
-        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && custom_tag_artist != null && custom_tag_artist.length() > 0 ) {
+        if( custom_tag_artist != null && custom_tag_artist.length() > 0 ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "apply TAG_ARTIST: " + custom_tag_artist);
             exif.setAttribute(ExifInterface.TAG_ARTIST, custom_tag_artist);
         }
-        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && custom_tag_copyright != null && custom_tag_copyright.length() > 0 ) {
+        if( custom_tag_copyright != null && custom_tag_copyright.length() > 0 ) {
             exif.setAttribute(ExifInterface.TAG_COPYRIGHT, custom_tag_copyright);
             if( MyDebug.LOG )
                 Log.d(TAG, "apply TAG_COPYRIGHT: " + custom_tag_copyright);
@@ -3495,8 +3680,44 @@ public class ImageSaver extends Thread {
         if( exif_datetime != null ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "write datetime tags: " + exif_datetime);
-            exif.setAttribute(TAG_DATETIME_ORIGINAL, exif_datetime);
-            exif.setAttribute(TAG_DATETIME_DIGITIZED, exif_datetime);
+            exif.setAttribute(ExifInterface.TAG_DATETIME_ORIGINAL, exif_datetime);
+            exif.setAttribute(ExifInterface.TAG_DATETIME_DIGITIZED, exif_datetime);
+        }
+    }
+
+    /** Adds exif tags for datetime from the supplied date, if not present. Needed for camera vendor
+     *  extensions which (at least on Galaxy S10e) don't seem to have these tags set at all!
+     */
+    private void addDateTimeExif(ExifInterface exif, Date current_date) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "addDateTimeExif");
+        String exif_datetime = exif.getAttribute(ExifInterface.TAG_DATETIME);
+        if( MyDebug.LOG )
+            Log.d(TAG, "existing exif TAG_DATETIME: " + exif_datetime);
+        if( exif_datetime == null ) {
+            SimpleDateFormat date_fmt = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss", Locale.US);
+            date_fmt.setTimeZone(TimeZone.getDefault()); // need local timezone for TAG_DATETIME
+            exif_datetime = date_fmt.format(current_date);
+            if( MyDebug.LOG )
+                Log.d(TAG, "new TAG_DATETIME: " + exif_datetime);
+
+            exif.setAttribute(ExifInterface.TAG_DATETIME, exif_datetime);
+            // set these tags too (even if already present, overwrite to be consistent)
+            exif.setAttribute(ExifInterface.TAG_DATETIME_ORIGINAL, exif_datetime);
+            exif.setAttribute(ExifInterface.TAG_DATETIME_DIGITIZED, exif_datetime);
+
+            if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
+                // XXX requires Android 7
+                // needs to be -/+HH:mm format, which is given by XXX
+                date_fmt = new SimpleDateFormat("XXX", Locale.US);
+                date_fmt.setTimeZone(TimeZone.getDefault());
+                String timezone = date_fmt.format(current_date);
+                if( MyDebug.LOG )
+                    Log.d(TAG, "timezone: " + timezone);
+                exif.setAttribute(ExifInterface.TAG_OFFSET_TIME, timezone);
+                exif.setAttribute(ExifInterface.TAG_OFFSET_TIME_ORIGINAL, timezone);
+                exif.setAttribute(ExifInterface.TAG_OFFSET_TIME_DIGITIZED, timezone);
+            }
         }
     }
 
@@ -3517,7 +3738,7 @@ public class ImageSaver extends Thread {
         // So now hopefully fixed properly...
         // Note, this problem also occurs on OnePlus 3T and Gallery ICS, if we don't have this function called
         SimpleDateFormat date_fmt = new SimpleDateFormat("yyyy:MM:dd", Locale.US);
-        date_fmt.setTimeZone(TimeZone.getTimeZone("UTC")); // needs to be UTC time
+        date_fmt.setTimeZone(TimeZone.getTimeZone("UTC")); // needs to be UTC time for the GPS datetime tags
         String datestamp = date_fmt.format(current_date);
 
         SimpleDateFormat time_fmt = new SimpleDateFormat("HH:mm:ss", Locale.US);
@@ -3542,36 +3763,6 @@ public class ImageSaver extends Thread {
         return false;
     }
 
-    /** Reads from picFile and writes the contents to saveUri.
-     */
-    private void copyFileToUri(Context context, Uri saveUri, File picFile) throws IOException {
-        if( MyDebug.LOG ) {
-            Log.d(TAG, "copyFileToUri");
-            Log.d(TAG, "saveUri: " + saveUri);
-            Log.d(TAG, "picFile: " + saveUri);
-        }
-        InputStream inputStream = null;
-        OutputStream realOutputStream = null;
-        try {
-            inputStream = new FileInputStream(picFile);
-            realOutputStream = context.getContentResolver().openOutputStream(saveUri);
-            // Transfer bytes from in to out
-            byte [] buffer = new byte[1024];
-            int len;
-            while( (len = inputStream.read(buffer)) > 0 ) {
-                realOutputStream.write(buffer, 0, len);
-            }
-        }
-        finally {
-            if( inputStream != null ) {
-                inputStream.close();
-            }
-            if( realOutputStream != null ) {
-                realOutputStream.close();
-            }
-        }
-    }
-
     // for testing:
 
     HDRProcessor getHDRProcessor() {
diff --git a/app/src/main/java/net/sourceforge/opencamera/LocationSupplier.java b/app/src/main/java/net/sourceforge/opencamera/LocationSupplier.java
index 3ecebb605f348b49e6ecc3c02370998b14ab3591..f998ef7afc2b29ba2a4e2838c369ca0841768048 100644
--- a/app/src/main/java/net/sourceforge/opencamera/LocationSupplier.java
+++ b/app/src/main/java/net/sourceforge/opencamera/LocationSupplier.java
@@ -11,6 +11,8 @@ import android.location.LocationProvider;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+
+import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 import android.util.Log;
 
@@ -74,12 +76,16 @@ public class LocationSupplier {
         }
     }
 
+    /** If adding extra calls to this, consider whether explicit user permission is required, and whether
+     *  privacy policy or data privacy section needs updating.
+     * @return Returns null if location not available.
+     */
     public Location getLocation() {
         return getLocation(null);
     }
 
     /** If adding extra calls to this, consider whether explicit user permission is required, and whether
-     *  privacy policy needs updating.
+     *  privacy policy or data privacy section needs updating.
      * @param locationInfo Optional class to return additional information about the location.
      * @return Returns null if location not available.
      */
@@ -115,7 +121,7 @@ public class LocationSupplier {
             return location;
         }
 
-        public void onLocationChanged(Location location) {
+        public void onLocationChanged(@NonNull Location location) {
             if( MyDebug.LOG )
                 Log.d(TAG, "onLocationChanged");
             this.test_has_received_location = true;
@@ -123,8 +129,8 @@ public class LocationSupplier {
             // also check for not being null just in case - had a nullpointerexception on Google Play!
             if( location != null && ( location.getLatitude() != 0.0d || location.getLongitude() != 0.0d ) ) {
                 if( MyDebug.LOG ) {
-                    Log.d(TAG, "received location:");
-                    Log.d(TAG, "lat " + location.getLatitude() + " long " + location.getLongitude() + " accuracy " + location.getAccuracy());
+                    Log.d(TAG, "received location");
+                    // don't log location, in case of privacy!
                 }
                 this.location = location;
                 cacheLocation();
@@ -152,10 +158,10 @@ public class LocationSupplier {
             }
         }
 
-        public void onProviderEnabled(String provider) {
+        public void onProviderEnabled(@NonNull String provider) {
         }
 
-        public void onProviderDisabled(String provider) {
+        public void onProviderDisabled(@NonNull String provider) {
             if( MyDebug.LOG )
                 Log.d(TAG, "onProviderDisabled");
             this.location = null;
@@ -166,6 +172,8 @@ public class LocationSupplier {
 
     /* Best to only call this from MainActivity.initLocation().
      * @return Returns false if location permission not available for either coarse or fine.
+     *         Important to only return false if we actually want/need to ask the user for location
+     *         permission!
      */
     boolean setupLocationListener() {
         if( MyDebug.LOG )
@@ -180,23 +188,34 @@ public class LocationSupplier {
             // the user. However on Galaxy Nexus Android 4.3 and Nexus 7 (2013) Android 5.1.1, ACCESS_COARSE_LOCATION returns
             // PERMISSION_DENIED! So we keep the checks to Android Marshmallow or later (where we need them), and avoid
             // checking behaviour for earlier devices.
+            boolean has_coarse_location_permission;
+            boolean has_fine_location_permission;
             if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "check for location permissions");
-                boolean has_coarse_location_permission = ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED;
-                boolean has_fine_location_permission = ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+                has_coarse_location_permission = ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+                has_fine_location_permission = ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
                 if( MyDebug.LOG ) {
                     Log.d(TAG, "has_coarse_location_permission? " + has_coarse_location_permission);
                     Log.d(TAG, "has_fine_location_permission? " + has_fine_location_permission);
                 }
-                // require both permissions to be present
-                if( !has_coarse_location_permission || !has_fine_location_permission ) {
+                //has_coarse_location_permission = false; // test
+                //has_fine_location_permission = false; // test
+                // require at least one permission to be present
+                // will be important for Android 12+ where user can grant only coarse permission - we still
+                // want to support geotagging in such cases
+                if( !has_coarse_location_permission && !has_fine_location_permission ) {
                     if( MyDebug.LOG )
                         Log.d(TAG, "location permission not available");
                     // return false, which tells caller to request permission - we'll call this function again if permission is granted
                     return false;
                 }
             }
+            else {
+                // permissions always available pre-Android 6
+                has_coarse_location_permission = true;
+                has_fine_location_permission = true;
+            }
 
             locationListeners = new MyLocationListener[2];
             locationListeners[0] = new MyLocationListener();
@@ -205,28 +224,31 @@ public class LocationSupplier {
             // location listeners should be stored in order best to worst
             // also see https://sourceforge.net/p/opencamera/tickets/1/ - need to check provider is available
             // now also need to check for permissions - need to support devices that might have one but not both of fine and coarse permissions supplied
-            if( locationManager.getAllProviders().contains(LocationManager.NETWORK_PROVIDER) ) {
+            if( has_coarse_location_permission && locationManager.getAllProviders().contains(LocationManager.NETWORK_PROVIDER) ) {
                 locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 1000, 0, locationListeners[1]);
                 if( MyDebug.LOG )
                     Log.d(TAG, "created coarse (network) location listener");
             }
             else {
                 if( MyDebug.LOG )
-                    Log.e(TAG, "don't have a NETWORK_PROVIDER");
+                    Log.d(TAG, "don't have a NETWORK_PROVIDER");
             }
-            if( locationManager.getAllProviders().contains(LocationManager.GPS_PROVIDER) ) {
+            if( has_fine_location_permission && locationManager.getAllProviders().contains(LocationManager.GPS_PROVIDER) ) {
                 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 0, locationListeners[0]);
                 if( MyDebug.LOG )
                     Log.d(TAG, "created fine (gps) location listener");
             }
             else {
                 if( MyDebug.LOG )
-                    Log.e(TAG, "don't have a GPS_PROVIDER");
+                    Log.d(TAG, "don't have a GPS_PROVIDER");
             }
         }
         else if( !store_location ) {
             freeLocationListeners();
         }
+        // important to return true even if we didn't set up decide the location listeners - as
+        // returning false indicates to ask user for location permission (which we don't want to
+        // do if PreferenceKeys.LocationPreferenceKey preference isn't true)
         return true;
     }
 
diff --git a/app/src/main/java/net/sourceforge/opencamera/MainActivity.java b/app/src/main/java/net/sourceforge/opencamera/MainActivity.java
index 1c114f63a1ad7c1cda29eeab2512f0b67156db67..cf2f527a7a874c8ea740b218fdd6dccf350151ea 100644
--- a/app/src/main/java/net/sourceforge/opencamera/MainActivity.java
+++ b/app/src/main/java/net/sourceforge/opencamera/MainActivity.java
@@ -1,5 +1,29 @@
 package net.sourceforge.opencamera;
 
+import net.sourceforge.opencamera.cameracontroller.CameraController;
+import net.sourceforge.opencamera.cameracontroller.CameraControllerManager;
+import net.sourceforge.opencamera.cameracontroller.CameraControllerManager2;
+import net.sourceforge.opencamera.preview.Preview;
+import net.sourceforge.opencamera.preview.VideoProfile;
+import net.sourceforge.opencamera.remotecontrol.BluetoothRemoteControl;
+import net.sourceforge.opencamera.ui.FolderChooserDialog;
+import net.sourceforge.opencamera.ui.MainUI;
+import net.sourceforge.opencamera.ui.ManualSeekbars;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.List;
+//import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
 import android.Manifest;
 import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;
@@ -34,24 +58,53 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.hardware.display.DisplayManager;
+import android.media.MediaMetadataRetriever;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.ParcelFileDescriptor;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
+import android.animation.ArgbEvaluator;
+import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.app.KeyguardManager;
+import android.content.ActivityNotFoundException;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.renderscript.RenderScript;
 import android.speech.tts.TextToSpeech;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+import androidx.exifinterface.media.ExifInterface;
+
+import android.text.InputFilter;
+import android.text.InputType;
+import android.text.Spanned;
 import android.util.Log;
 import android.view.Display;
 import android.view.GestureDetector;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MotionEvent;
 import android.view.OrientationEventListener;
+import android.view.Surface;
 import android.view.TextureView;
 import android.view.View;
 import android.view.ViewConfiguration;
@@ -96,8 +149,11 @@ import foundation.e.camera.R;
 
 /**
  * The main Activity for Open Camera.
+import androidx.appcompat.app.AppCompatActivity;
+
+/** The main Activity for Open Camera.
  */
-public class MainActivity extends Activity {
+public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
 
     private static int activity_count = 0;
@@ -117,7 +173,7 @@ public class MainActivity extends Activity {
     private TextFormatter textFormatter;
     private SoundPoolManager soundPoolManager;
     private MagneticSensor magneticSensor;
-    private SpeechControl speechControl;
+    //private SpeechControl speechControl;
 
     private Preview preview;
     private OrientationEventListener orientationEventListener;
@@ -135,6 +191,7 @@ public class MainActivity extends Activity {
     private ValueAnimator gallery_save_anim;
     private boolean last_continuous_fast_burst; // whether the last photo operation was a continuous_fast_burst
     private boolean should_run_continuous_fast_burst = false;
+    private Future<?> update_gallery_future;
 
     private TextToSpeech textToSpeech;
     private boolean textToSpeechSuccess;
@@ -167,6 +224,7 @@ public class MainActivity extends Activity {
     private final ToastBoxer white_balance_lock_toast = new ToastBoxer();
     private final ToastBoxer exposure_lock_toast = new ToastBoxer();
     private final ToastBoxer audio_control_toast = new ToastBoxer();
+    private final ToastBoxer store_location_toast = new ToastBoxer();
     private boolean block_startup_toast = false; // used when returning from Settings/Popup - if we're displaying a toast anyway, don't want to display the info toast too
     private String push_info_toast_text; // can be used to "push" extra text to the info text for showPhotoVideoToast()
 
@@ -189,7 +247,8 @@ public class MainActivity extends Activity {
     public volatile boolean test_low_memory;
     public volatile boolean test_have_angle;
     public volatile float test_angle;
-    public volatile String test_last_saved_image;
+    public volatile Uri test_last_saved_imageuri; // uri of last image; set if using scoped storage OR using SAF
+    public volatile String test_last_saved_image; // filename (including full path) of last image; set if not using scoped storage nor using SAF (i.e., writing using File API)
     public static boolean test_force_supports_camera2; // okay to be static, as this is set for an entire test suite
     public volatile String test_save_settings_file;
 
@@ -202,6 +261,30 @@ public class MainActivity extends Activity {
     private float mWaterDensity = 1.0f;
     private ImageButton switchVideoButton;
 
+    // whether to lock to landscape orientation, or allow switching between portrait and landscape orientations
+    //public static final boolean lock_to_landscape = true;
+    public static final boolean lock_to_landscape = false;
+
+    // handling for lock_to_landscape==false:
+
+    public enum SystemOrientation {
+        LANDSCAPE,
+        PORTRAIT,
+        REVERSE_LANDSCAPE
+    }
+
+    private MyDisplayListener displayListener;
+
+    private boolean has_cached_system_orientation;
+    private SystemOrientation cached_system_orientation;
+
+    private boolean hasOldSystemOrientation;
+    private SystemOrientation oldSystemOrientation;
+
+    private boolean has_cached_display_rotation;
+    private long cached_display_rotation_time_ms;
+    private int cached_display_rotation;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         long debug_time = 0;
@@ -214,13 +297,6 @@ public class MainActivity extends Activity {
             Log.d(TAG, "activity_count: " + activity_count);
         super.onCreate(savedInstanceState);
 
-        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 ) {
-            // don't show orientation animations
-            WindowManager.LayoutParams layout = getWindow().getAttributes();
-            layout.rotationAnimation = WindowManager.LayoutParams.ROTATION_ANIMATION_CROSSFADE;
-            getWindow().setAttributes(layout);
-        }
-
         setContentView(R.layout.activity_main);
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false); // initialise any unset preferences to their default values
 
@@ -283,7 +359,7 @@ public class MainActivity extends Activity {
         textFormatter = new TextFormatter(this);
         soundPoolManager = new SoundPoolManager(this);
         magneticSensor = new MagneticSensor(this);
-        speechControl = new SpeechControl(this);
+        //speechControl = new SpeechControl(this);
 
         // determine whether we support Camera2 API
         initCamera2Support();
@@ -293,11 +369,12 @@ public class MainActivity extends Activity {
         if( MyDebug.LOG )
             Log.d(TAG, "onCreate: time after setting window flags: " + (System.currentTimeMillis() - debug_time));
 
-        save_location_history = new SaveLocationHistory(this, "save_location_history", getStorageUtils().getSaveLocation());
+        save_location_history = new SaveLocationHistory(this, PreferenceKeys.SaveLocationHistoryBasePreferenceKey, getStorageUtils().getSaveLocation());
+        checkSaveLocations();
         if( applicationInterface.getStorageUtils().isUsingSAF() ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "create new SaveLocationHistory for SAF");
-            save_location_history_saf = new SaveLocationHistory(this, "save_location_history_saf", getStorageUtils().getSaveLocationSAF());
+            save_location_history_saf = new SaveLocationHistory(this, PreferenceKeys.SaveLocationHistorySAFBasePreferenceKey, getStorageUtils().getSaveLocationSAF());
         }
         if( MyDebug.LOG )
             Log.d(TAG, "onCreate: time after updating folder history: " + (System.currentTimeMillis() - debug_time));
@@ -327,10 +404,30 @@ public class MainActivity extends Activity {
         mainUI.closeExposureUI();
 
         // set up the camera and its preview
-        preview = new Preview(applicationInterface, ((ViewGroup) this.findViewById(R.id.preview)));
+        preview = new Preview(applicationInterface, (this.findViewById(R.id.preview)));
         if( MyDebug.LOG )
             Log.d(TAG, "onCreate: time after creating preview: " + (System.currentTimeMillis() - debug_time));
 
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 ) {
+            // don't show orientation animations
+            // must be done after creating Preview (so we know if Camera2 API or not)
+            WindowManager.LayoutParams layout = getWindow().getAttributes();
+            // If locked to landscape, ROTATION_ANIMATION_SEAMLESS/JUMPCUT has the problem that when going to
+            // Settings in portrait, we briefly see the UI change - this is because we set the flag
+            // to no longer lock to landscape, and that change happens too quickly.
+            // This isn't a problem when lock_to_landscape==false, and we want
+            // ROTATION_ANIMATION_SEAMLESS so that there is no/minimal pause from the preview when
+            // rotating the device. However if using old camera API, we get an ugly transition with
+            // ROTATION_ANIMATION_SEAMLESS (probably related to not using TextureView?)
+            if( lock_to_landscape || !preview.usingCamera2API() )
+                layout.rotationAnimation = WindowManager.LayoutParams.ROTATION_ANIMATION_CROSSFADE;
+            else if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O )
+                layout.rotationAnimation = WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS;
+            else
+                layout.rotationAnimation = WindowManager.LayoutParams.ROTATION_ANIMATION_JUMPCUT;
+            getWindow().setAttributes(layout);
+        }
+
         // Setup multi-camera buttons (must be done after creating preview so we know which Camera API is being used,
         // and before initialising on-screen visibility).
         // We only allow the separate icon for switching cameras if:
@@ -516,7 +613,7 @@ public class MainActivity extends Activity {
             });
         }
         if( MyDebug.LOG )
-            Log.d(TAG, "onCreate: time after setting immersive mode listener: " + (System.currentTimeMillis() - debug_time));
+            Log.d(TAG, "onCreate: time after setting system ui visibility listener: " + (System.currentTimeMillis() - debug_time));
 
         // show "about" dialog for first time use; also set some per-device defaults
         boolean has_done_first_time = sharedPreferences.contains(PreferenceKeys.FirstTimePreferenceKey);
@@ -553,7 +650,7 @@ public class MainActivity extends Activity {
                     // E.g., we have a "What's New" for 1.44 (64), but then push out a quick fix for 1.44.1 (65). We don't want to
                     // show the dialog again to people who already received 1.44 (64), but we still want to show the dialog to people
                     // upgrading from earlier versions.
-                    int whats_new_version = 75; // 1.48
+                    int whats_new_version = 84; // 1.50
                     whats_new_version = Math.min(whats_new_version, version_code); // whats_new_version should always be <= version_code, but just in case!
                     if( MyDebug.LOG ) {
                         Log.d(TAG, "whats_new_version: " + whats_new_version);
@@ -683,12 +780,20 @@ public class MainActivity extends Activity {
      * if sdk>=R & can't draw navigation bar, means the DecorFitsSystemWindows=true, then we can ignore navigationGap.
      */
     public int getNavigationGap() {
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !can_draw_nav_bar) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !can_draw_nav_bar) {
             return 0;
         }
         return want_no_limits ? navigation_gap : 0;
     }
 
+    /** Whether to use codepaths that are compatible with scoped storage.
+     */
+    public static boolean useScopedStorage() {
+        //return false;
+        //return true;
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
+    }
+
     /** Whether this is a multi camera device, and the user preference is set to enable the multi-camera button.
      */
     public boolean isMultiCamEnabled() {
@@ -758,35 +863,32 @@ public class MainActivity extends Activity {
     void setDeviceDefaults() {
         if( MyDebug.LOG )
             Log.d(TAG, "setDeviceDefaults");
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        boolean is_samsung = Build.MANUFACTURER.toLowerCase(Locale.US).contains("samsung");
-        boolean is_oneplus = Build.MANUFACTURER.toLowerCase(Locale.US).contains("oneplus");
+        //SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        //boolean is_samsung = Build.MANUFACTURER.toLowerCase(Locale.US).contains("samsung");
+        //boolean is_oneplus = Build.MANUFACTURER.toLowerCase(Locale.US).contains("oneplus");
         //boolean is_nexus = Build.MODEL.toLowerCase(Locale.US).contains("nexus");
         //boolean is_nexus6 = Build.MODEL.toLowerCase(Locale.US).contains("nexus 6");
         //boolean is_pixel_phone = Build.DEVICE != null && Build.DEVICE.equals("sailfish");
         //boolean is_pixel_xl_phone = Build.DEVICE != null && Build.DEVICE.equals("marlin");
-        if( MyDebug.LOG ) {
-            Log.d(TAG, "is_samsung? " + is_samsung);
-            Log.d(TAG, "is_oneplus? " + is_oneplus);
+        /*if( MyDebug.LOG ) {
+            //Log.d(TAG, "is_samsung? " + is_samsung);
+            //Log.d(TAG, "is_oneplus? " + is_oneplus);
             //Log.d(TAG, "is_nexus? " + is_nexus);
             //Log.d(TAG, "is_nexus6? " + is_nexus6);
             //Log.d(TAG, "is_pixel_phone? " + is_pixel_phone);
             //Log.d(TAG, "is_pixel_xl_phone? " + is_pixel_xl_phone);
-        }
-        if( is_samsung || is_oneplus ) {
-            // workaround needed for Samsung Galaxy S7 at least (tested on Samsung RTL)
-            // workaround needed for OnePlus 3 at least (see http://forum.xda-developers.com/oneplus-3/help/camera2-support-t3453103 )
-            // update for v1.37: significant improvements have been made for standard flash and Camera2 API. But OnePlus 3T still has problem
-            // that photos come out with a blue tinge if flash is on, and the scene is bright enough not to need it; Samsung devices also seem
-            // to work okay, testing on S7 on RTL, but still keeping the fake flash mode in place for these devices, until we're sure of good
-            // behaviour
-            // update for testing on Galaxy S10e: still needs fake flash
+        }*/
+        /*if( is_samsung || is_oneplus ) {
+            // The problems we used to have on Samsung Galaxy devices are now fixed, by setting
+            // TEMPLATE_PREVIEW for the precaptureBuilder in CameraController2. This also fixes the
+            // problems with OnePlus 3T having blue tinge if flash is on, and the scene is bright
+            // enough not to need it
             if( MyDebug.LOG )
                 Log.d(TAG, "set fake flash for camera2");
             SharedPreferences.Editor editor = sharedPreferences.edit();
             editor.putBoolean(PreferenceKeys.Camera2FakeFlashPreferenceKey, true);
             editor.apply();
-        }
+        }*/
 		/*if( is_nexus6 ) {
 			// Nexus 6 captureBurst() started having problems with Android 7 upgrade - images appeared in wrong order (and with wrong order of shutter speeds in exif info), as well as problems with the camera failing with serious errors
 			// we set this even for Nexus 6 devices not on Android 7, as at some point they'll likely be upgraded to Android 7
@@ -957,6 +1059,154 @@ public class MainActivity extends Activity {
         }
     }
 
+    /** Handles users updating to a version with scoped storage (this could be Android 10 users upgrading
+     *  to the version of Open Camera with scoped storage; or users who later upgrade to Android 10).
+     *  With scoped storage, we no longer support saving outside of DCIM/ when not using SAF.
+     *  This updates if necessary both the current save location, and the save folder history.
+     */
+    private void checkSaveLocations() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "checkSaveLocations");
+        if( useScopedStorage() ) {
+            SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+            boolean any_changes = false;
+            String save_location = getStorageUtils().getSaveLocation();
+            CheckSaveLocationResult res = checkSaveLocation(save_location);
+            if( !res.res ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "save_location not valid with scoped storage: " + save_location);
+                String new_folder;
+                if( res.alt == null ) {
+                    // no alternative, fall back to default
+                    new_folder = "OpenCamera";
+                }
+                else {
+                    // replace with the alternative
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "alternative: " + res.alt);
+                    new_folder = res.alt;
+                }
+                SharedPreferences.Editor editor = sharedPreferences.edit();
+                editor.putString(PreferenceKeys.SaveLocationPreferenceKey, new_folder);
+                editor.apply();
+                any_changes = true;
+            }
+
+            // now check history
+            // go backwards so we can remove easily
+            for(int i=save_location_history.size()-1;i>=0;i--) {
+                String this_location = save_location_history.get(i);
+                res = checkSaveLocation(this_location);
+                if( !res.res ) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "save_location in history " + i + " not valid with scoped storage: " + this_location);
+                    if( res.alt == null ) {
+                        // no alternative, remove
+                        save_location_history.remove(i);
+                    }
+                    else {
+                        // replace with the alternative
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "alternative: " + res.alt);
+                        save_location_history.set(i, res.alt);
+                    }
+                    any_changes = true;
+                }
+            }
+
+            if( any_changes ) {
+                this.save_location_history.updateFolderHistory(this.getStorageUtils().getSaveLocation(), false);
+            }
+        }
+    }
+
+    /** Result from checkSaveLocation. Ideally we'd just use android.util.Pair, but that's not mocked
+     *  for use in unit tests.
+     *  See checkSaveLocation() for documentation.
+     */
+    public static class CheckSaveLocationResult {
+        final boolean res;
+        final String alt;
+
+        public CheckSaveLocationResult(boolean res, String alt) {
+            this.res = res;
+            this.alt = alt;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if( !(o instanceof CheckSaveLocationResult) ) {
+                return false;
+            }
+            CheckSaveLocationResult that = (CheckSaveLocationResult)o;
+            // stop dumb inspection that suggests replacing warning with an error(!) (Objects class is not available on all API versions)
+            // and the other inspection suggests replacing with code that would cause a nullpointerexception
+            //noinspection EqualsReplaceableByObjectsCall,StringEquality
+            return that.res == this.res && ( (that.alt == this.alt) || (that.alt != null && that.alt.equals(this.alt) ) );
+            //return that.res == this.res && ( (that.alt == this.alt) || (that.alt != null && that.alt.equals(this.alt) ) );
+        }
+
+        @Override
+        public int hashCode() {
+            return (res ? 1249 : 1259) ^ (alt == null ? 0 : alt.hashCode());
+        }
+
+        @NonNull
+        @Override
+        public String toString() {
+            return "CheckSaveLocationResult{" + res + " , " + alt + "}";
+        }
+    }
+
+    public static CheckSaveLocationResult checkSaveLocation(final String folder) {
+        return checkSaveLocation(folder, null);
+    }
+
+    /** Checks to see if the supplied folder (in the format as used by our preferences) is supported
+     *  with scoped storage.
+     * @return The Boolean is always non-null, and returns whether the save location is valid.
+     *         If the return is false, then if the String is non-null, this stores an alternative
+     *         form that is valid. If null, there is no valid alternative.
+     * @param base_folder This should normally be null, but can be used to specify manually the
+     *                    folder instead of using StorageUtils.getBaseFolder() - needed for unit
+     *                    tests as Environment class (for Environment.getExternalStoragePublicDirectory())
+     *                    is not mocked.
+     */
+    public static CheckSaveLocationResult checkSaveLocation(final String folder, String base_folder) {
+        /*if( MyDebug.LOG )
+            Log.d(TAG, "DCIM path: " + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath());*/
+        if( StorageUtils.saveFolderIsFull(folder) ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "checkSaveLocation for full path: " + folder);
+            // But still check to see if the full path is part of DCIM. Since when using the
+            // file dialog method with non-scoped storage, if the user specifies multiple subfolders
+            // e.g. DCIM/blah_a/blah_b, we don't spot that in FolderChooserDialog.useFolder(), and
+            // instead still store that as the full path.
+
+            if( base_folder == null )
+                base_folder = StorageUtils.getBaseFolder().getAbsolutePath();
+            // strip '/' as last character - makes it easier to also spot cases where the folder is the
+            // DCIM folder, but doesn't have a '/' last character
+            if( base_folder.length() >= 1 && base_folder.charAt(base_folder.length()-1) == '/' )
+                base_folder = base_folder.substring(0, base_folder.length()-1);
+            if( MyDebug.LOG )
+                Log.d(TAG, "    compare to base_folder: " + base_folder);
+            String alt_folder = null;
+            if( folder.startsWith(base_folder) ) {
+                alt_folder = folder.substring(base_folder.length());
+                // also need to strip the first '/' if it exists
+                if( alt_folder.length() >= 1 && alt_folder.charAt(0) == '/' )
+                    alt_folder = alt_folder.substring(1);
+            }
+
+            return new CheckSaveLocationResult(false, alt_folder);
+        }
+        else {
+            // already in expected format (indicates a sub-folder of DCIM)
+            return new CheckSaveLocationResult(true, null);
+        }
+    }
+
     private void preloadIcons(int icons_id) {
         long debug_time = 0;
         if( MyDebug.LOG ) {
@@ -1165,20 +1415,51 @@ public class MainActivity extends Activity {
         return super.onKeyUp(keyCode, event);
     }
 
+    private void zoomByStep(int change) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "zoomByStep: " + change);
+        if( preview.supportsZoom() && change != 0 ) {
+            if( preview.getCameraController() != null ) {
+                // If the minimum zoom is < 1.0, the seekbar will have repeated entries for 1x zoom
+                // (so it's easier for the user to zoom to exactly 1.0x). But if using the -/+ buttons,
+                // volume keys etc to zoom, we want to skip over these repeated values.
+                int zoom_factor = preview.getCameraController().getZoom();
+                int new_zoom_factor = zoom_factor + change;
+                if( MyDebug.LOG )
+                    Log.d(TAG, "new_zoom_factor: " + new_zoom_factor);
+                while( new_zoom_factor > 0 && new_zoom_factor < preview.getMaxZoom() && preview.getZoomRatio(new_zoom_factor) == preview.getZoomRatio() ) {
+                    if( change > 0 )
+                        change++;
+                    else
+                        change--;
+                    new_zoom_factor = zoom_factor + change;
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "skip over constant region: " + new_zoom_factor);
+                }
+            }
+
+            mainUI.changeSeekbar(R.id.zoom_seekbar, -change); // seekbar is opposite direction to zoom array
+        }
+    }
+
     public void zoomIn() {
-        mainUI.changeSeekbar(R.id.zoom_seekbar, 1);
+        zoomByStep(-1);
     }
 
     public void zoomOut() {
-        mainUI.changeSeekbar(R.id.zoom_seekbar, -1);
+        zoomByStep(1);
     }
 
     public void changeExposure(int change) {
-        mainUI.changeSeekbar(R.id.exposure_seekbar, change);
+        if( preview.supportsExposures() ) {
+            mainUI.changeSeekbar(R.id.exposure_seekbar, change);
+        }
     }
 
     public void changeISO(int change) {
-        mainUI.changeSeekbar(R.id.iso_seekbar, change);
+        if( preview.supportsISORange() ) {
+            mainUI.changeSeekbar(R.id.iso_seekbar, change);
+        }
     }
 
     public void changeFocusDistance(int change, boolean is_target_distance) {
@@ -1196,19 +1477,6 @@ public class MainActivity extends Activity {
         }
     };
 
-    /* To support https://play.google.com/store/apps/details?id=com.miband2.mibandselfie .
-     * Allows using the Mi Band 2 as a Bluetooth remote for Open Camera to take photos or start/stop
-     * videos.
-     */
-    private final BroadcastReceiver cameraReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if( MyDebug.LOG )
-                Log.d(TAG, "cameraReceiver.onReceive");
-            MainActivity.this.takePicture(false);
-        }
-    };
-
     public float getWaterDensity() {
         return this.mWaterDensity;
     }
@@ -1223,35 +1491,44 @@ public class MainActivity extends Activity {
         super.onResume();
         this.app_is_paused = false; // must be set before initLocation() at least
 
+        // this is intentionally true, not false, as the uncovering happens in DrawPreview when we receive frames from the camera after it's opened
+        // (this should already have been set from the call in onPause(), but we set it here again just in case)
+        applicationInterface.getDrawPreview().setCoverPreview(true);
+
         cancelImageSavingNotification();
 
         // Set black window background; also needed if we hide the virtual buttons in immersive mode
         // Note that we do it here rather than customising the theme's android:windowBackground, so this doesn't affect other views - in particular, the MyPreferenceFragment settings
         getWindow().getDecorView().getRootView().setBackgroundColor(Color.BLACK);
 
+        registerDisplayListener();
+
         mSensorManager.registerListener(accelerometerListener, mSensorAccelerometer, SensorManager.SENSOR_DELAY_NORMAL);
         magneticSensor.registerMagneticListener(mSensorManager);
         orientationEventListener.enable();
 
-        registerReceiver(cameraReceiver, new IntentFilter("com.miband2.action.CAMERA"));
-
         // if BLE remote control is enabled, then start the background BLE service
         bluetoothRemoteControl.startRemoteControl();
 
-        speechControl.initSpeechRecognizer();
+        //speechControl.initSpeechRecognizer();
         initLocation();
         initGyroSensors();
+        applicationInterface.getImageSaver().onResume();
         soundPoolManager.initSound();
         soundPoolManager.loadSound(R.raw.mybeep);
         soundPoolManager.loadSound(R.raw.mybeep_hi);
 
+        resetCachedSystemOrientation(); // just in case?
         mainUI.layoutUI();
 
         updateGalleryIcon(); // update in case images deleted whilst idle
 
         applicationInterface.reset(false); // should be called before opening the camera in preview.onResume()
 
-        preview.onResume();
+        if( !camera_in_background ) {
+            // don't restart camera if we're showing a dialog or settings
+            preview.onResume();
+        }
 
         {
             // show a toast for the camera if it's not the first for front of back facing (otherwise on multi-front/back camera
@@ -1312,31 +1589,31 @@ public class MainActivity extends Activity {
         this.app_is_paused = true;
 
         mainUI.destroyPopup(); // important as user could change/reset settings from Android settings when pausing
+        unregisterDisplayListener();
         mSensorManager.unregisterListener(accelerometerListener);
         magneticSensor.unregisterMagneticListener(mSensorManager);
         orientationEventListener.disable();
-        try {
-            unregisterReceiver(cameraReceiver);
-        }
-        catch(IllegalArgumentException e) {
-            // this can happen if not registered - simplest to just catch the exception
-            e.printStackTrace();
-        }
         bluetoothRemoteControl.stopRemoteControl();
         freeAudioListener(false);
-        speechControl.stopSpeechRecognizer();
+        //speechControl.stopSpeechRecognizer();
         applicationInterface.getLocationSupplier().freeLocationListeners();
         applicationInterface.stopPanorama(true); // in practice not needed as we should stop panorama when camera is closed, but good to do it explicitly here, before disabling the gyro sensors
         applicationInterface.getGyroSensor().disableSensors();
+        applicationInterface.getImageSaver().onPause();
         soundPoolManager.releaseSound();
         applicationInterface.clearLastImages(); // this should happen when pausing the preview, but call explicitly just to be safe
         applicationInterface.getDrawPreview().clearGhostImage();
         preview.onPause();
+        applicationInterface.getDrawPreview().setCoverPreview(true); // must be after we've closed the preview (otherwise risk that further frames from preview will unset the cover_preview flag in DrawPreview)
 
         if( applicationInterface.getImageSaver().getNImagesToSave() > 0) {
             createImageSavingNotification();
         }
 
+        if( update_gallery_future != null ) {
+            update_gallery_future.cancel(true);
+        }
+
         // intentionally do this again, just in case something turned location on since - keep this right at the end:
         applicationInterface.getLocationSupplier().freeLocationListeners();
 
@@ -1345,16 +1622,241 @@ public class MainActivity extends Activity {
         }
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
+    private class MyDisplayListener implements DisplayManager.DisplayListener {
+        private int old_rotation;
+
+        private MyDisplayListener() {
+            int rotation = MainActivity.this.getWindowManager().getDefaultDisplay().getRotation();
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "MyDisplayListener");
+                Log.d(TAG, "rotation: " + rotation);
+            }
+            old_rotation = rotation;
+        }
+
+        @Override
+        public void onDisplayAdded(int displayId) {
+        }
+
+        @Override
+        public void onDisplayRemoved(int displayId) {
+        }
+
+        @Override
+        public void onDisplayChanged(int displayId) {
+            int rotation = MainActivity.this.getWindowManager().getDefaultDisplay().getRotation();
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "onDisplayChanged: " + displayId);
+                Log.d(TAG, "rotation: " + rotation);
+                Log.d(TAG, "old_rotation: " + rotation);
+            }
+            if( ( rotation == Surface.ROTATION_0 && old_rotation == Surface.ROTATION_180 ) ||
+                    ( rotation == Surface.ROTATION_180 && old_rotation == Surface.ROTATION_0 ) ||
+                    ( rotation == Surface.ROTATION_90 && old_rotation == Surface.ROTATION_270 ) ||
+                    ( rotation == Surface.ROTATION_270 && old_rotation == Surface.ROTATION_90 )
+            ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "switched between landscape and reverse orientation");
+                onSystemOrientationChanged();
+            }
+
+            old_rotation = rotation;
+        }
+    }
+
+    /** Creates and registers a display listener, needed to handle switches between landscape and
+     *  reverse landscape (without going via portrait) when lock_to_landscape==false.
+     */
+    private void registerDisplayListener() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "registerDisplayListener");
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && !lock_to_landscape ) {
+            displayListener = new MyDisplayListener();
+            DisplayManager displayManager = (DisplayManager) this.getSystemService(Context.DISPLAY_SERVICE);
+            displayManager.registerDisplayListener(displayListener, null);
+        }
+    }
+
+    private void unregisterDisplayListener() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "unregisterDisplayListener");
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && displayListener != null ) {
+            DisplayManager displayManager = (DisplayManager) this.getSystemService(Context.DISPLAY_SERVICE);
+            displayManager.unregisterDisplayListener(displayListener);
+            displayListener = null;
+        }
+    }
+
     @Override
-    public void onConfigurationChanged(Configuration newConfig) {
+    public void onConfigurationChanged(@NonNull Configuration newConfig) {
         if( MyDebug.LOG )
-            Log.d(TAG, "onConfigurationChanged()");
+            Log.d(TAG, "onConfigurationChanged(): " + newConfig.orientation);
         // configuration change can include screen orientation (landscape/portrait) when not locked (when settings is open)
         // needed if app is paused/resumed when settings is open and device is in portrait mode
-        preview.setCameraDisplayOrientation();
+        // update: need this all the time when lock_to_landscape==false
+        onSystemOrientationChanged();
         super.onConfigurationChanged(newConfig);
     }
 
+    private void onSystemOrientationChanged() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "onSystemOrientationChanged");
+
+        // n.b., need to call this first, before preview.setCameraDisplayOrientation(), since
+        // preview.setCameraDisplayOrientation() will call getDisplayRotation() and we don't want
+        // to be using the outdated cached value now that the rotation has changed!
+        resetCachedSystemOrientation();
+
+        preview.setCameraDisplayOrientation();
+        if( !lock_to_landscape ) {
+            SystemOrientation newSystemOrientation = getSystemOrientation();
+            if( hasOldSystemOrientation && oldSystemOrientation == newSystemOrientation ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "onSystemOrientationChanged: orientation hasn't changed");
+            }
+            else {
+                if( hasOldSystemOrientation ) {
+                    // handle rotation animation
+                    int start_rotation = getRotationFromSystemOrientation(oldSystemOrientation) - getRotationFromSystemOrientation(newSystemOrientation);
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "start_rotation: " + start_rotation);
+                    if( start_rotation < -180 )
+                        start_rotation += 360;
+                    else if( start_rotation > 180 )
+                        start_rotation -= 360;
+                    mainUI.layoutUIWithRotation(start_rotation);
+                }
+                else {
+                    mainUI.layoutUI();
+                }
+                applicationInterface.getDrawPreview().updateSettings();
+
+                hasOldSystemOrientation = true;
+                oldSystemOrientation = newSystemOrientation;
+            }
+        }
+    }
+
+    /** Returns the current system orientation.
+     *  Note if lock_to_landscape is true, this always returns LANDSCAPE even if called when we're
+     *  allowing configuration changes (e.g., in Settings or a dialog is showing). (This method,
+     *  and hence calls to it, were added to support lock_to_landscape==false behaviour, and we
+     *  want to avoid changing behaviour for lock_to_landscape==true behaviour.)
+     *  Note that this also caches the orientation: firstly for performance (as this is called from
+     *  DrawPreview), secondly to support REVERSE_LANDSCAPE, we don't want a sudden change if
+     *  getDefaultDisplay().getRotation() changes after the configuration changes.
+     */
+    public SystemOrientation getSystemOrientation() {
+        if( lock_to_landscape ) {
+            return SystemOrientation.LANDSCAPE;
+        }
+        if( has_cached_system_orientation ) {
+            return cached_system_orientation;
+        }
+        SystemOrientation result;
+        int system_orientation = getResources().getConfiguration().orientation;
+        if( MyDebug.LOG )
+            Log.d(TAG, "system orientation: " + system_orientation);
+        switch( system_orientation ) {
+            case Configuration.ORIENTATION_LANDSCAPE:
+                result = SystemOrientation.LANDSCAPE;
+                // now try to distinguish between landscape and reverse landscape
+
+                // check whether the display matches the landscape configuration, in case this is inconsistent?
+                Point display_size = new Point();
+                Display display = getWindowManager().getDefaultDisplay();
+                display.getSize(display_size);
+                if( display_size.x > display_size.y ) {
+                    int rotation = getWindowManager().getDefaultDisplay().getRotation();
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "rotation: " + rotation);
+                    switch( rotation ) {
+                        case Surface.ROTATION_0:
+                        case Surface.ROTATION_90:
+                            // landscape
+                            if( MyDebug.LOG )
+                                Log.d(TAG, "landscape");
+                            break;
+                        case Surface.ROTATION_180:
+                        case Surface.ROTATION_270:
+                            // reverse landscape
+                            if( MyDebug.LOG )
+                                Log.d(TAG, "reverse landscape");
+                            result = SystemOrientation.REVERSE_LANDSCAPE;
+                            break;
+                        default:
+                            if( MyDebug.LOG )
+                                Log.e(TAG, "unknown rotation: " + rotation);
+                            break;
+                    }
+                }
+                else {
+                    if( MyDebug.LOG )
+                        Log.e(TAG, "display size not landscape: " + display_size);
+                }
+                break;
+            case Configuration.ORIENTATION_PORTRAIT:
+                result = SystemOrientation.PORTRAIT;
+                break;
+            case Configuration.ORIENTATION_SQUARE:
+            case Configuration.ORIENTATION_UNDEFINED:
+            default:
+                if( MyDebug.LOG )
+                    Log.e(TAG, "unknown system orientation: " + system_orientation);
+                result = SystemOrientation.LANDSCAPE;
+                break;
+        }
+        if( MyDebug.LOG )
+            Log.d(TAG, "system orientation is now: " + result);
+        this.has_cached_system_orientation = true;
+        this.cached_system_orientation = result;
+        return result;
+    }
+
+    /** Returns rotation in degrees (as a multiple of 90 degrees) corresponding to the supplied
+     *  system orientation.
+     */
+    public static int getRotationFromSystemOrientation(SystemOrientation system_orientation) {
+        int rotation;
+        if( system_orientation == MainActivity.SystemOrientation.PORTRAIT )
+            rotation = 270;
+        else if( system_orientation == MainActivity.SystemOrientation.REVERSE_LANDSCAPE )
+            rotation = 180;
+        else
+            rotation = 0;
+        return rotation;
+    }
+
+    private void resetCachedSystemOrientation() {
+        this.has_cached_system_orientation = false;
+        this.has_cached_display_rotation = false;
+    }
+
+    /** A wrapper for getWindowManager().getDefaultDisplay().getRotation(), except if
+     *  lock_to_landscape==false, this checks for the display being inconsistent with the system
+     *  orientation, and if so, returns a cached value.
+     */
+    public int getDisplayRotation() {
+        if( lock_to_landscape ) {
+            return getWindowManager().getDefaultDisplay().getRotation();
+        }
+        // we cache to reduce effect of annoying problem where rotation changes shortly before the
+        // configuration actually changes (several frames), so on-screen elements would briefly show
+        // in wrong location when device rotates from/to portrait and landscape; also not a bad idea
+        // to cache for performance anyway, to avoid calling
+        // getWindowManager().getDefaultDisplay().getRotation() every frame
+        long time_ms = System.currentTimeMillis();
+        if( has_cached_display_rotation && time_ms < cached_display_rotation_time_ms + 1000 ) {
+            return cached_display_rotation;
+        }
+        has_cached_display_rotation = true;
+        int rotation = getWindowManager().getDefaultDisplay().getRotation();
+        cached_display_rotation = rotation;
+        cached_display_rotation_time_ms = time_ms;
+        return rotation;
+    }
+
     public void waitUntilImageQueueEmpty() {
         if( MyDebug.LOG )
             Log.d(TAG, "waitUntilImageQueueEmpty");
@@ -1479,6 +1981,9 @@ public class MainActivity extends Activity {
         applicationInterface.getDrawPreview().updateSettings(); // because we cache the geotagging setting
         initLocation(); // required to enable or disable GPS, also requests permission if necessary
         this.closePopup();
+
+        String message = getResources().getString(R.string.preference_location) + ": " + getResources().getString(value ? R.string.on : R.string.off);
+        preview.showToast(store_location_toast, message);
     }
 
     public void clickedTextStamp(View view) {
@@ -1489,9 +1994,12 @@ public class MainActivity extends Activity {
         AlertDialog.Builder alertDialog = new AlertDialog.Builder(this);
         alertDialog.setTitle(R.string.preference_textstamp);
 
-        final EditText editText = new EditText(this);
+        final View dialog_view = LayoutInflater.from(this).inflate(R.layout.alertdialog_edittext, null);
+        final EditText editText = dialog_view.findViewById(R.id.edit_text);
+        // set hint instead of content description for EditText, see https://support.google.com/accessibility/android/answer/6378120
+        editText.setHint(getResources().getString(R.string.preference_textstamp));
         editText.setText(applicationInterface.getTextStampPref());
-        alertDialog.setView(editText);
+        alertDialog.setView(dialog_view);
         alertDialog.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialogInterface, int i) {
@@ -1631,7 +2139,7 @@ public class MainActivity extends Activity {
         this.closePopup();
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         String audio_control = sharedPreferences.getString(PreferenceKeys.AudioControlPreferenceKey, "none");
-        if( audio_control.equals("voice") && speechControl.hasSpeechRecognition() ) {
+        /*if( audio_control.equals("voice") && speechControl.hasSpeechRecognition() ) {
             if( speechControl.isStarted() ) {
                 speechControl.stopListening();
             }
@@ -1649,15 +2157,13 @@ public class MainActivity extends Activity {
                     }
                 }
                 if( has_audio_permission ) {
-                    String toast_string = this.getResources().getString(R.string.speech_recognizer_started) + "\n" +
-                            this.getResources().getString(R.string.speech_recognizer_extra_info);
-                    preview.showToast(audio_control_toast, toast_string);
+                    speechControl.showToast(true);
                     speechControl.startSpeechRecognizerIntent();
                     speechControl.speechRecognizerStarted();
                 }
             }
         }
-        else if( audio_control.equals("noise") ){
+        else*/ if( audio_control.equals("noise") ){
             if( audio_listener != null ) {
                 freeAudioListener(false);
             }
@@ -1953,6 +2459,12 @@ public class MainActivity extends Activity {
             if( MyDebug.LOG )
                 Log.d(TAG, "onSharedPreferenceChanged: " + key);
 
+            if( key == null ) {
+                // on Android 11+, when targetting Android 11+, this method is called with key==null
+                // if preferences are cleared (see testSettings(), or when doing "Reset settings")
+                return;
+            }
+
             any_change = true;
 
             switch( key ) {
@@ -2132,6 +2644,9 @@ public class MainActivity extends Activity {
         bundle.putInt("nCameras", preview.getCameraControllerManager().getNumberOfCameras());
         bundle.putString("camera_api", this.preview.getCameraAPI());
         bundle.putBoolean("using_android_l", this.preview.usingCamera2API());
+        if( this.preview.getCameraController() != null ) {
+            bundle.putInt("camera_orientation", this.preview.getCameraController().getCameraOrientation());
+        }
         bundle.putString("photo_mode_string", getPhotoModeString(applicationInterface.getPhotoMode(), true));
         bundle.putBoolean("supports_auto_stabilise", this.supports_auto_stabilise);
         bundle.putBoolean("supports_flash", this.preview.supportsFlash());
@@ -2172,6 +2687,8 @@ public class MainActivity extends Activity {
         bundle.putBoolean("supports_photo_video_recording", this.preview.supportsPhotoVideoRecording());
         bundle.putFloat("camera_view_angle_x", preview.getViewAngleX(false));
         bundle.putFloat("camera_view_angle_y", preview.getViewAngleY(false));
+        bundle.putFloat("min_zoom_factor", preview.getMinZoomRatio());
+        bundle.putFloat("max_zoom_factor", preview.getMaxZoomRatio());
 
         putBundleExtra(bundle, "color_effects", this.preview.getSupportedColorEffects());
         putBundleExtra(bundle, "scene_modes", this.preview.getSupportedSceneModes());
@@ -2358,7 +2875,7 @@ public class MainActivity extends Activity {
         preferencesListener.startListening();
 
         showPreview(false);
-        setWindowFlagsForSettings();
+        setWindowFlagsForSettings(); // important to do after passing camera info into bundle, since this will close the camera
         MyPreferenceFragment fragment = new MyPreferenceFragment();
         fragment.setArguments(bundle);
         // use commitAllowingStateLoss() instead of commit(), does to "java.lang.IllegalStateException: Can not perform this action after onSaveInstanceState" crash seen on Google Play
@@ -2366,23 +2883,25 @@ public class MainActivity extends Activity {
         getFragmentManager().beginTransaction().add(android.R.id.content, fragment, "PREFERENCE_FRAGMENT").addToBackStack(null).commitAllowingStateLoss();
     }
 
-    public void updateForSettings() {
-        updateForSettings(null, false);
+    public void updateForSettings(boolean update_camera) {
+        updateForSettings(update_camera, null, false);
     }
 
-    public void updateForSettings(String toast_message) {
-        updateForSettings(toast_message, false);
+    public void updateForSettings(boolean update_camera, String toast_message) {
+        updateForSettings(update_camera, toast_message, false);
     }
 
     /** Must be called when an settings (as stored in SharedPreferences) are made, so we can update the
      *  camera, and make any other necessary changes.
+     * @param update_camera Whether the camera needs to be updated. Can be set to false if we know changes
+     *                      haven't been made to the camera settings, or we already reopened it.
      * @param toast_message If non-null, display this toast instead of the usual camera "startup" toast
      *                      that's shown in showPhotoVideoToast(). If non-null but an empty string, then
      *                      this means no toast is shown at all.
      * @param keep_popup If false, the popup will be closed and destroyed. Set to true if you're sure
      *                   that the changed setting isn't one that requires the PopupView to be recreated
      */
-    public void updateForSettings(String toast_message, boolean keep_popup) {
+    public void updateForSettings(boolean update_camera, String toast_message, boolean keep_popup) {
         if( MyDebug.LOG ) {
             Log.d(TAG, "updateForSettings()");
             if( toast_message != null ) {
@@ -2422,13 +2941,17 @@ public class MainActivity extends Activity {
         // doesn't happen if we allow using Camera2 API on Nexus 7, but reopen for consistency (and changing scene modes via
         // popup menu no longer should be calling updateForSettings() for Camera2, anyway)
         boolean need_reopen = false;
-        if( preview.getCameraController() != null ) {
+        if( update_camera && preview.getCameraController() != null ) {
             SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
             String scene_mode = preview.getCameraController().getSceneMode();
             if( MyDebug.LOG )
                 Log.d(TAG, "scene mode was: " + scene_mode);
             String key = PreferenceKeys.SceneModePreferenceKey;
             String value = sharedPreferences.getString(key, CameraController.SCENE_MODE_DEFAULT);
+            // n.b., on Android 4.3 emulator, scene mode is returned as null (this may be because it doesn't support
+            // scene modes at all) - treat this the same as auto
+            if( scene_mode == null )
+                scene_mode = CameraController.SCENE_MODE_DEFAULT;
             if( !value.equals(scene_mode) ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "scene mode changed to: " + value);
@@ -2461,8 +2984,29 @@ public class MainActivity extends Activity {
                     }
                 }
             }
+
+            if( !need_reopen ) {
+                boolean old_is_extension = preview.getCameraController().isCameraExtension();
+                boolean new_is_extension = applicationInterface.isCameraExtensionPref();
+                if( old_is_extension || new_is_extension ) {
+                    // At least on Galaxy S10e, we have problems stopping and starting a camera extension session,
+                    // e.g., when changing resolutions whilst in an extension mode (XHDR or bokeh) or switching
+                    // from XHDR to other modes (including non-extension modes like STD). Problems such as preview
+                    // no longer receiving frames, or the call to createExtensionSession() (or createCaptureSession)
+                    // hanging. So therefore we should reopen the camera if at least
+                    // old_is_extension==true.
+                    // This isn't required if old_is_extension==false but new_is_extension==true,
+                    // but we still do so since reopening the camera occurs on a background thread
+                    // (opening an extension session seems to take longer, so better not to block
+                    // the UI thread).
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "need to reopen camera for changes to extension session");
+                    need_reopen = true;
+                }
+            }
         }
         if( MyDebug.LOG ) {
+            Log.d(TAG, "need_reopen: " + need_reopen);
             Log.d(TAG, "updateForSettings: time after check need_reopen: " + (System.currentTimeMillis() - debug_time));
         }
 
@@ -2476,12 +3020,16 @@ public class MainActivity extends Activity {
         checkDisableGUIIcons();
 
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        if( sharedPreferences.getString(PreferenceKeys.AudioControlPreferenceKey, "none").equals("none") ) {
+        String audio_control = sharedPreferences.getString(PreferenceKeys.AudioControlPreferenceKey, "none");
+        // better to only display the audio control icon if it matches specific known supported types
+        // (important now that "voice" is no longer supported)
+        //if( !audio_control.equals("voice") && !audio_control.equals("noise") ) {
+        if( !audio_control.equals("noise") ) {
             View speechRecognizerButton = findViewById(R.id.audio_control);
             speechRecognizerButton.setVisibility(View.GONE);
         }
 
-        speechControl.initSpeechRecognizer(); // in case we've enabled or disabled speech recognizer
+        //speechControl.initSpeechRecognizer(); // in case we've enabled or disabled speech recognizer
 
         // we no longer call initLocation() here (for having enabled or disabled geotagging), as that's
         // done in setWindowFlagsForCamera() - important not to call it here as well, otherwise if
@@ -2495,7 +3043,10 @@ public class MainActivity extends Activity {
         }
         if( toast_message != null )
             block_startup_toast = true;
-        if( need_reopen || preview.getCameraController() == null ) { // if camera couldn't be opened before, might as well try again
+        if( !update_camera ) {
+            // don't try to update camera
+        }
+        else if( need_reopen || preview.getCameraController() == null ) { // if camera couldn't be opened before, might as well try again
             preview.reopenCamera();
             if( MyDebug.LOG ) {
                 Log.d(TAG, "updateForSettings: time after reopen: " + (System.currentTimeMillis() - debug_time));
@@ -2542,6 +3093,11 @@ public class MainActivity extends Activity {
         if( MyDebug.LOG )
             Log.d(TAG, "checkDisableGUIIcons");
         boolean changed = false;
+        if( !supportsExposureButton() ) {
+            View button = findViewById(R.id.exposure);
+            changed = changed || (button.getVisibility() != View.GONE);
+            button.setVisibility(View.GONE);
+        }
         if( !mainUI.showExposureLockIcon() ) {
             View button = findViewById(R.id.exposure_lock);
             changed = changed || (button.getVisibility() != View.GONE);
@@ -2594,6 +3150,8 @@ public class MainActivity extends Activity {
             changed = changed || (button.getVisibility() != View.GONE);
             button.setVisibility(View.GONE);
         }
+        if( MyDebug.LOG )
+            Log.d(TAG, "checkDisableGUIIcons: " + changed);
         return changed;
     }
 
@@ -2628,7 +3186,8 @@ public class MainActivity extends Activity {
         }
 
         if( preferencesListener.anySignificantChange() ) {
-            updateForSettings();
+            // don't need to update camera, as we now pause/resume camera when going to settings
+            updateForSettings(false);
         }
         else {
             if( MyDebug.LOG )
@@ -2667,14 +3226,207 @@ public class MainActivity extends Activity {
         super.onBackPressed();
     }
 
-    public void initImmersiveMode() {
-        setImmersiveMode(true);
+    /** Whether to allow the application to show under the navigation bar, or not.
+     *  Arguably we could enable this all the time, but in practice we only enable for cases when
+     *  want_no_limits==true and navigation_gap!=0 (if want_no_limits==false, there's no need to
+     *  show under the navigation bar; if navigation_gap==0, there is no navigation bar).
+     */
+    private void showUnderNavigation(boolean enable) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "showUnderNavigation: " + enable);
+
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN ) {
+            // We used to use window flag FLAG_LAYOUT_NO_LIMITS, but this didn't work properly on
+            // Android 11 (didn't take effect until orientation changed or application paused/resumed).
+            // Although system ui visibility flags are deprecated on Android 11, this still works better
+            // than the FLAG_LAYOUT_NO_LIMITS flag (which was not well documented anyway).
+            int flags = getWindow().getDecorView().getSystemUiVisibility();
+            if( enable ) {
+                getWindow().getDecorView().setSystemUiVisibility(flags | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+            }
+            else {
+                getWindow().getDecorView().setSystemUiVisibility(flags & ~View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+            }
+        }
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ) {
+            getWindow().setNavigationBarColor(enable ? Color.TRANSPARENT : Color.BLACK);
+        }
     }
 
-    void setImmersiveMode(boolean on) {
+    /** The system is now such that we have entered or exited immersive mode. If visible is true,
+     *  system UI is now visible such that we should exit immersive mode. If visible is false, the
+     *  system has entered immersive mode.
+     */
+    private void immersiveModeChanged(boolean visible) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "immersiveModeChanged: " + visible);
+        if( !usingKitKatImmersiveMode() )
+            return;
+
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(MainActivity.this);
+        String immersive_mode = sharedPreferences.getString(PreferenceKeys.ImmersiveModePreferenceKey, "immersive_mode_low_profile");
+        boolean hide_ui = immersive_mode.equals("immersive_mode_gui") || immersive_mode.equals("immersive_mode_everything");
+
+        if( visible ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "system bars now visible");
+            // change UI due to having exited immersive mode
+            if( hide_ui )
+                mainUI.setImmersiveMode(false);
+            setImmersiveTimer();
+        }
+        else {
+            if( MyDebug.LOG )
+                Log.d(TAG, "system bars now NOT visible");
+            // change UI due to having entered immersive mode
+            if( hide_ui )
+                mainUI.setImmersiveMode(true);
+        }
+    }
+
+    /** Set up listener to handle listening for system ui changes (for immersive mode), and setting
+      * a WindowsInsetsListener to find the navigation_gap.
+      */
+    private void setupSystemUiVisibilityListener() {
+        View decorView = getWindow().getDecorView();
+
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ) {
+            // set a window insets listener to find the navigation_gap
+            if( MyDebug.LOG )
+                Log.d(TAG, "set a window insets listener");
+            this.set_window_insets_listener = true;
+            decorView.getRootView().setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {
+                @Override
+                public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
+                    if( MyDebug.LOG ) {
+                        Log.d(TAG, "inset right: " + insets.getSystemWindowInsetRight());
+                        Log.d(TAG, "inset bottom: " + insets.getSystemWindowInsetBottom());
+                    }
+                    if( navigation_gap == 0 ) {
+                        SystemOrientation system_orientation = getSystemOrientation();
+                        boolean system_orientation_portrait = system_orientation == SystemOrientation.PORTRAIT;
+                        navigation_gap = system_orientation_portrait ? insets.getSystemWindowInsetBottom() : insets.getSystemWindowInsetRight();
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "navigation_gap is " + navigation_gap);
+                        // Sometimes when this callback is called, the navigation_gap may still be 0 even if
+                        // the device doesn't have physical navigation buttons - we need to wait
+                        // until we have found a non-zero value before switching to no limits.
+                        // On devices with physical navigation bar, navigation_gap should remain 0
+                        // (and there's no point setting FLAG_LAYOUT_NO_LIMITS)
+                        if( want_no_limits && navigation_gap != 0 ) {
+                            if( MyDebug.LOG )
+                                Log.d(TAG, "set FLAG_LAYOUT_NO_LIMITS");
+                            showUnderNavigation(true);
+                        }
+                    }
+
+                    // see comments in MainUI.layoutUI() for why we don't use this
+                    /*if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && getSystemOrientation() == SystemOrientation.LANDSCAPE ) {
+                        Rect privacy_indicator_rect = insets.getPrivacyIndicatorBounds();
+                        if( privacy_indicator_rect != null ) {
+                            Rect window_bounds = getWindowManager().getCurrentWindowMetrics().getBounds();
+                            if( MyDebug.LOG ) {
+                                Log.d(TAG, "privacy_indicator_rect: " + privacy_indicator_rect);
+                                Log.d(TAG, "window_bounds: " + window_bounds);
+                            }
+                            privacy_indicator_gap = window_bounds.right - privacy_indicator_rect.left;
+                            if( privacy_indicator_gap < 0 )
+                                privacy_indicator_gap = 0; // just in case??
+                            if( MyDebug.LOG )
+                                Log.d(TAG, "privacy_indicator_gap: " + privacy_indicator_gap);
+                        }
+                    }
+                    else {
+                        privacy_indicator_gap = 0;
+                    }*/
+                    return getWindow().getDecorView().getRootView().onApplyWindowInsets(insets);
+                }
+            });
+        }
+
+        decorView.setOnSystemUiVisibilityChangeListener
+                (new View.OnSystemUiVisibilityChangeListener() {
+                    @Override
+                    public void onSystemUiVisibilityChange(int visibility) {
+                        // Note that system bars will only be "visible" if none of the
+                        // LOW_PROFILE, HIDE_NAVIGATION, or FULLSCREEN flags are set.
+
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "onSystemUiVisibilityChange: " + visibility);
+
+                        // Note that Android example code says to test against SYSTEM_UI_FLAG_FULLSCREEN,
+                        // but this stopped working on Android 11, as when calling setSystemUiVisibility(0)
+                        // to exit immersive mode, when we arrive here the flag SYSTEM_UI_FLAG_FULLSCREEN
+                        // is still set. Fixed by checking for SYSTEM_UI_FLAG_HIDE_NAVIGATION instead -
+                        // which makes some sense since we run in fullscreen mode all the time anyway.
+                        //if( (visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0 ) {
+                        if( (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0 ) {
+                            immersiveModeChanged(true);
+                        }
+                        else {
+                            immersiveModeChanged(false);
+                        }
+                    }
+                });
+    }
+
+    public boolean usingKitKatImmersiveMode() {
+        // whether we are using a Kit Kat style immersive mode (either hiding navigation bar, GUI, or everything)
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT ) {
+            SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+            String immersive_mode = sharedPreferences.getString(PreferenceKeys.ImmersiveModePreferenceKey, "immersive_mode_low_profile");
+            if( immersive_mode.equals("immersive_mode_navigation") || immersive_mode.equals("immersive_mode_gui") || immersive_mode.equals("immersive_mode_everything") )
+                return true;
+        }
+        return false;
+    }
+
+    public boolean usingKitKatImmersiveModeEverything() {
+        // whether we are using a Kit Kat style immersive mode for everything
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT ) {
+            SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+            String immersive_mode = sharedPreferences.getString(PreferenceKeys.ImmersiveModePreferenceKey, "immersive_mode_low_profile");
+            if( immersive_mode.equals("immersive_mode_everything") )
+                return true;
+        }
+        return false;
+    }
+
+
+    private Handler immersive_timer_handler = null;
+    private Runnable immersive_timer_runnable = null;
+
+    private void setImmersiveTimer() {
+        if( immersive_timer_handler != null && immersive_timer_runnable != null ) {
+            immersive_timer_handler.removeCallbacks(immersive_timer_runnable);
+        }
+        immersive_timer_handler = new Handler();
+        immersive_timer_handler.postDelayed(immersive_timer_runnable = new Runnable(){
+            @Override
+            public void run(){
+                if( MyDebug.LOG )
+                    Log.d(TAG, "setImmersiveTimer: run");
+                if( !camera_in_background && !popupIsOpen() && usingKitKatImmersiveMode() )
+                    setImmersiveMode(true);
+            }
+        }, 5000);
+    }
+
+    public void initImmersiveMode() {
+        setImmersiveMode(true);
+    }
+
+    void setImmersiveMode(boolean on) {
         if( MyDebug.LOG )
             Log.d(TAG, "setImmersiveMode: " + on);
         // n.b., preview.setImmersiveMode() is called from onSystemUiVisibilityChange()
+        int saved_flags = 0;
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN ) {
+            // save whether we set SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+            saved_flags = getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
+        }
+        if( MyDebug.LOG )
+            Log.d(TAG, "saved_flags?: " + saved_flags);
         if (on) {
             getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
         } else {
@@ -2761,12 +3513,19 @@ public class MainActivity extends Activity {
     	}*/
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
 
-        // force to landscape mode
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        //setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE); // testing for devices with unusual sensor orientation (e.g., Nexus 5X)
+        if( lock_to_landscape ) {
+            // force to landscape mode
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+            //setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE); // testing for devices with unusual sensor orientation (e.g., Nexus 5X)
+        }
+        else {
+            // allow orientation to change for camera, even if user has locked orientation
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+        }
         if( preview != null ) {
-            // also need to call setCameraDisplayOrientation, as this handles if the user switched from portrait to reverse landscape whilst in settings/etc
+            // also need to call preview.setCameraDisplayOrientation, as this handles if the user switched from portrait to reverse landscape whilst in settings/etc
             // as switching from reverse landscape back to landscape isn't detected in onConfigurationChanged
+            // update: now probably irrelevant now that we close/reopen the camera, but keep it here anyway
             preview.setCameraDisplayOrientation();
         }
         if( preview != null && mainUI != null ) {
@@ -2793,7 +3552,7 @@ public class MainActivity extends Activity {
                 Log.d(TAG, "don't keep screen on");
             this.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         }
-        if( sharedPreferences.getBoolean(PreferenceKeys.ShowWhenLockedPreferenceKey, true) ) {
+        if( sharedPreferences.getBoolean(PreferenceKeys.ShowWhenLockedPreferenceKey, false) ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "do show when locked");
             // keep Open Camera on top of screen-lock (will still need to unlock when going to gallery or settings)
@@ -2808,7 +3567,7 @@ public class MainActivity extends Activity {
         if( want_no_limits && navigation_gap != 0 ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "set FLAG_LAYOUT_NO_LIMITS");
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+            showUnderNavigation(true);
         }
 
         setBrightnessForCamera(false);
@@ -2824,6 +3583,11 @@ public class MainActivity extends Activity {
             // app is paused. It can happen here because setWindowFlagsForCamera() is called from
             // onCreate()
             initLocation();
+
+            // Similarly only want to reopen the camera if no longer paused
+            if( preview != null ) {
+                preview.onResume();
+            }
         }
     }
 
@@ -2850,7 +3614,7 @@ public class MainActivity extends Activity {
         if( want_no_limits && navigation_gap != 0 ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "clear FLAG_LAYOUT_NO_LIMITS");
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+            showUnderNavigation(false);
         }
         if( set_lock_protect ) {
             // settings should still be protected by screen lock
@@ -2869,6 +3633,9 @@ public class MainActivity extends Activity {
 
         // we disable location listening when showing settings or a dialog etc - saves battery life, also better for privacy
         applicationInterface.getLocationSupplier().freeLocationListeners();
+
+        // similarly we close the camera
+        preview.onPause(false);
     }
 
     private void showWhenLocked(boolean show) {
@@ -2922,6 +3689,145 @@ public class MainActivity extends Activity {
         container.setVisibility(show ? View.GONE : View.VISIBLE);
     }
 
+    /** Rotates the supplied bitmap according to the orientation tag stored in the exif data. If no
+     *  rotation is required, the input bitmap is returned. If rotation is required, the input
+     *  bitmap is recycled.
+     * @param uri Uri containing the JPEG with Exif information to use.
+     */
+    public Bitmap rotateForExif(Bitmap bitmap, Uri uri) throws IOException {
+        ExifInterface exif;
+        InputStream inputStream = null;
+        try {
+            inputStream = this.getContentResolver().openInputStream(uri);
+            exif = new ExifInterface(inputStream);
+        }
+        finally {
+            if( inputStream != null )
+                inputStream.close();
+        }
+
+        if( exif != null ) {
+            int exif_orientation_s = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED);
+            boolean needs_tf = false;
+            int exif_orientation = 0;
+            // see http://jpegclub.org/exif_orientation.html
+            // and http://stackoverflow.com/questions/20478765/how-to-get-the-correct-orientation-of-the-image-selected-from-the-default-image
+            if( exif_orientation_s == ExifInterface.ORIENTATION_UNDEFINED || exif_orientation_s == ExifInterface.ORIENTATION_NORMAL ) {
+                // leave unchanged
+            }
+            else if( exif_orientation_s == ExifInterface.ORIENTATION_ROTATE_180 ) {
+                needs_tf = true;
+                exif_orientation = 180;
+            }
+            else if( exif_orientation_s == ExifInterface.ORIENTATION_ROTATE_90 ) {
+                needs_tf = true;
+                exif_orientation = 90;
+            }
+            else if( exif_orientation_s == ExifInterface.ORIENTATION_ROTATE_270 ) {
+                needs_tf = true;
+                exif_orientation = 270;
+            }
+            else {
+                // just leave unchanged for now
+                if( MyDebug.LOG )
+                    Log.e(TAG, "    unsupported exif orientation: " + exif_orientation_s);
+            }
+            if( MyDebug.LOG )
+                Log.d(TAG, "    exif orientation: " + exif_orientation);
+
+            if( needs_tf ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "    need to rotate bitmap due to exif orientation tag");
+                Matrix m = new Matrix();
+                m.setRotate(exif_orientation, bitmap.getWidth() * 0.5f, bitmap.getHeight() * 0.5f);
+                Bitmap rotated_bitmap = Bitmap.createBitmap(bitmap, 0, 0,bitmap.getWidth(), bitmap.getHeight(), m, true);
+                if( rotated_bitmap != bitmap ) {
+                    bitmap.recycle();
+                    bitmap = rotated_bitmap;
+                }
+            }
+        }
+        return bitmap;
+    }
+
+    /** Loads a thumbnail from the supplied image uri (not videos). Note this loads from the bitmap
+     *  rather than reading from MediaStore. Therefore this works with SAF uris as well as
+     *  MediaStore uris, as well as allowing control over the resolution of the thumbnail.
+     *  If sample_factor is 1, this returns a bitmap scaled to match the display resolution. If
+     *  sample_factor is greater than 1, it will be scaled down to a lower resolution.
+     * @param mediastore Whether the uri is for a mediastore uri or not.
+     */
+    private Bitmap loadThumbnailFromUri(Uri uri, int sample_factor, boolean mediastore) {
+        Bitmap thumbnail = null;
+        try {
+            //thumbnail = MediaStore.Images.Media.getBitmap(getContentResolver(), media.uri);
+            // only need to load a bitmap as large as the screen size
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            InputStream is = getContentResolver().openInputStream(uri);
+            // get dimensions
+            options.inJustDecodeBounds = true;
+            BitmapFactory.decodeStream(is, null, options);
+            int bitmap_width = options.outWidth;
+            int bitmap_height = options.outHeight;
+            Point display_size = new Point();
+            Display display = getWindowManager().getDefaultDisplay();
+            display.getSize(display_size);
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "bitmap_width: " + bitmap_width);
+                Log.d(TAG, "bitmap_height: " + bitmap_height);
+                Log.d(TAG, "display width: " + display_size.x);
+                Log.d(TAG, "display height: " + display_size.y);
+            }
+            // align dimensions
+            if( display_size.x < display_size.y ) {
+                //noinspection SuspiciousNameCombination
+                display_size.set(display_size.y, display_size.x);
+            }
+            if( bitmap_width < bitmap_height ) {
+                int dummy = bitmap_width;
+                //noinspection SuspiciousNameCombination
+                bitmap_width = bitmap_height;
+                bitmap_height = dummy;
+            }
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "bitmap_width: " + bitmap_width);
+                Log.d(TAG, "bitmap_height: " + bitmap_height);
+                Log.d(TAG, "display width: " + display_size.x);
+                Log.d(TAG, "display height: " + display_size.y);
+            }
+            // only care about height, to save worrying about different aspect ratios
+            options.inSampleSize = 1;
+            while( bitmap_height / (2*options.inSampleSize) >= display_size.y ) {
+                options.inSampleSize *= 2;
+            }
+            options.inSampleSize *= sample_factor;
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "inSampleSize: " + options.inSampleSize);
+            }
+            options.inJustDecodeBounds = false;
+            // need a new inputstream, see https://stackoverflow.com/questions/2503628/bitmapfactory-decodestream-returning-null-when-options-are-set
+            is.close();
+            is = getContentResolver().openInputStream(uri);
+            thumbnail = BitmapFactory.decodeStream(is, null, options);
+            if( thumbnail == null ) {
+                Log.e(TAG, "decodeStream returned null bitmap for ghost image last");
+            }
+            is.close();
+
+            if( !mediastore ) {
+                // When loading from a mediastore, the bitmap already seems to have the correct orientation.
+                // But when loading from a saf uri, we need to apply the rotation.
+                // E.g., test on Galaxy S10e with ghost image last image option, when using SAF, in portrait orientation, after pause/resume.
+                thumbnail = rotateForExif(thumbnail, uri);
+            }
+        }
+        catch(IOException e) {
+            Log.e(TAG, "failed to load bitmap for ghost image last");
+            e.printStackTrace();
+        }
+        return thumbnail;
+    }
+
     /** Shows the default "blank" gallery icon, when we don't have a thumbnail available.
      */
     private void updateGalleryIconToBlank() {
@@ -2942,17 +3848,24 @@ public class MainActivity extends Activity {
         gallery_bitmap = null;
     }
 
-    /** Shows a thumbnail for the gallery icon.
     /** Shows a thumbnail for the gallery icon.
      */
     void updateGalleryIcon(Bitmap thumbnail) {
         if( MyDebug.LOG )
             Log.d(TAG, "updateGalleryIcon: " + thumbnail);
-           CircleImageView galleryButton = this.findViewById(R.id.gallery);
-            galleryButton.setImageBitmap(thumbnail);
-            galleryButton.setBorderWidth(6);
-            gallery_bitmap = thumbnail;
-
+        // If we're currently running the background task to update the gallery (see updateGalleryIcon()), we should cancel that!
+        // Otherwise if user takes a photo whilst the background task is still running, the thumbnail from the latest photo will
+        // be overridden when the background task completes. This is more likely when using SAF on Android 10+ with scoped storage,
+        // due to SAF's poor performance for folders with large number of files.
+        if( update_gallery_future != null ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "cancel update_gallery_future");
+            update_gallery_future.cancel(true);
+        }
+        CircleImageView galleryButton = this.findViewById(R.id.gallery);
+        galleryButton.setImageBitmap(thumbnail);
+        galleryButton.setBorderWidth(6);
+        gallery_bitmap = thumbnail;
     }
 
     /** Updates the gallery icon by searching for the most recent photo.
@@ -2964,17 +3877,27 @@ public class MainActivity extends Activity {
             Log.d(TAG, "updateGalleryIcon");
             debug_time = System.currentTimeMillis();
         }
+        if( update_gallery_future != null ) {
+            Log.d(TAG, "previous updateGalleryIcon task already running");
+            return;
+        }
 
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         String ghost_image_pref = sharedPreferences.getString(PreferenceKeys.GhostImagePreferenceKey, "preference_ghost_image_off");
         final boolean ghost_image_last = ghost_image_pref.equals("preference_ghost_image_last");
-        new AsyncTask<Void, Void, Bitmap>() {
-            private static final String TAG = "MainActivity/AsyncTask";
+
+        final Handler handler = new Handler(Looper.getMainLooper());
+
+        //new AsyncTask<Void, Void, Bitmap>() {
+        Runnable runnable = new Runnable() {
+            private static final String TAG = "updateGalleryIcon";
+            private Uri uri;
+            private boolean is_raw;
             private boolean is_video;
 
-            /** The system calls this to perform work in a worker thread and
-             * delivers it the parameters given to AsyncTask.execute() */
-            protected Bitmap doInBackground(Void... params) {
+            @Override
+            //protected Bitmap doInBackground(Void... params) {
+            public void run() {
                 if( MyDebug.LOG )
                     Log.d(TAG, "doInBackground");
                 StorageUtils.Media media = applicationInterface.getStorageUtils().getLatestMedia();
@@ -2985,75 +3908,60 @@ public class MainActivity extends Activity {
                     Log.d(TAG, "is_locked?: " + is_locked);
                 if( media != null && getContentResolver() != null && !is_locked ) {
                     // check for getContentResolver() != null, as have had reported Google Play crashes
+
+                    uri = media.getMediaStoreUri(MainActivity.this);
+                    is_raw = media.filename != null && StorageUtils.filenameIsRaw(media.filename);
+                    is_video = media.video;
+
                     if( ghost_image_last && !media.video ) {
                         if( MyDebug.LOG )
                             Log.d(TAG, "load full size bitmap for ghost image last photo");
-                        try {
-                            //thumbnail = MediaStore.Images.Media.getBitmap(getContentResolver(), media.uri);
-                            // only need to load a bitmap as large as the screen size
-                            BitmapFactory.Options options = new BitmapFactory.Options();
-                            InputStream is = getContentResolver().openInputStream(media.uri);
-                            // get dimensions
-                            options.inJustDecodeBounds = true;
-                            BitmapFactory.decodeStream(is, null, options);
-                            int bitmap_width = options.outWidth;
-                            int bitmap_height = options.outHeight;
-                            Point display_size = new Point();
-                            Display display = getWindowManager().getDefaultDisplay();
-                            display.getSize(display_size);
-                            if( MyDebug.LOG ) {
-                                Log.d(TAG, "bitmap_width: " + bitmap_width);
-                                Log.d(TAG, "bitmap_height: " + bitmap_height);
-                                Log.d(TAG, "display width: " + display_size.x);
-                                Log.d(TAG, "display height: " + display_size.y);
-                            }
-                            // align dimensions
-                            if( display_size.x < display_size.y ) {
-                                //noinspection SuspiciousNameCombination
-                                display_size.set(display_size.y, display_size.x);
-                            }
-                            if( bitmap_width < bitmap_height ) {
-                                int dummy = bitmap_width;
-                                //noinspection SuspiciousNameCombination
-                                bitmap_width = bitmap_height;
-                                bitmap_height = dummy;
-                            }
-                            if( MyDebug.LOG ) {
-                                Log.d(TAG, "bitmap_width: " + bitmap_width);
-                                Log.d(TAG, "bitmap_height: " + bitmap_height);
-                                Log.d(TAG, "display width: " + display_size.x);
-                                Log.d(TAG, "display height: " + display_size.y);
-                            }
-                            // only care about height, to save worrying about different aspect ratios
-                            options.inSampleSize = 1;
-                            while( bitmap_height / (2*options.inSampleSize) >= display_size.y ) {
-                                options.inSampleSize *= 2;
-                            }
-                            if( MyDebug.LOG ) {
-                                Log.d(TAG, "inSampleSize: " + options.inSampleSize);
-                            }
-                            options.inJustDecodeBounds = false;
-                            // need a new inputstream, see https://stackoverflow.com/questions/2503628/bitmapfactory-decodestream-returning-null-when-options-are-set
-                            is.close();
-                            is = getContentResolver().openInputStream(media.uri);
-                            thumbnail = BitmapFactory.decodeStream(is, null, options);
-                            if( thumbnail == null ) {
-                                Log.e(TAG, "decodeStream returned null bitmap for ghost image last");
-                            }
-                            is.close();
-                        }
-                        catch(IOException e) {
-                            Log.e(TAG, "failed to load bitmap for ghost image last");
-                            e.printStackTrace();
-                        }
+                        thumbnail = loadThumbnailFromUri(media.uri, 1, media.mediastore);
                     }
                     if( thumbnail == null ) {
                         try {
-                            if( media.video ) {
+                            if( !media.mediastore ) {
+                                if( media.video ) {
+                                    if( MyDebug.LOG )
+                                        Log.d(TAG, "load thumbnail for video from SAF uri");
+                                    ParcelFileDescriptor pfd_saf = null; // keep a reference to this as long as retriever, to avoid risk of pfd_saf being garbage collected
+                                    MediaMetadataRetriever retriever = new MediaMetadataRetriever();
+                                    try {
+                                        pfd_saf = getContentResolver().openFileDescriptor(media.uri, "r");
+                                        retriever.setDataSource(pfd_saf.getFileDescriptor());
+                                        thumbnail = retriever.getFrameAtTime(-1);
+                                    }
+                                    catch(Exception e) {
+                                        Log.d(TAG, "failed to load video thumbnail");
+                                        e.printStackTrace();
+                                    }
+                                    finally {
+                                        try {
+                                            retriever.release();
+                                        }
+                                        catch(RuntimeException ex) {
+                                            // ignore
+                                        }
+                                        try {
+                                            if( pfd_saf != null ) {
+                                                pfd_saf.close();
+                                            }
+                                        }
+                                        catch(IOException e) {
+                                            e.printStackTrace();
+                                        }
+                                    }
+                                }
+                                else {
+                                    if( MyDebug.LOG )
+                                        Log.d(TAG, "load thumbnail for photo from SAF uri");
+                                    thumbnail = loadThumbnailFromUri(media.uri, 4, media.mediastore);
+                                }
+                            }
+                            else if( media.video ) {
                                 if( MyDebug.LOG )
                                     Log.d(TAG, "load thumbnail for video");
                                 thumbnail = MediaStore.Video.Thumbnails.getThumbnail(getContentResolver(), media.id, MediaStore.Video.Thumbnails.MINI_KIND, null);
-                                is_video = true;
                             }
                             else {
                                 if( MyDebug.LOG )
@@ -3092,16 +4000,37 @@ public class MainActivity extends Activity {
                         }
                     }
                 }
-                return thumbnail;
+                //return thumbnail;
+
+                final Bitmap thumbnail_f = thumbnail;
+                handler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onPostExecute(thumbnail_f);
+                    }
+                });
             }
 
-            /** The system calls this to perform work in the UI thread and delivers
-             * the result from doInBackground() */
-            protected void onPostExecute(Bitmap thumbnail) {
+            /** Runs on UI thread, after background work is complete.
+             */
+            private void onPostExecute(Bitmap thumbnail) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "onPostExecute");
+                if( update_gallery_future != null && update_gallery_future.isCancelled() ) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "was cancelled");
+                    update_gallery_future = null;
+                    return;
+                }
                 // since we're now setting the thumbnail to the latest media on disk, we need to make sure clicking the Gallery goes to this
                 applicationInterface.getStorageUtils().clearLastMediaScanned();
+                if( uri != null ) {
+                    if( MyDebug.LOG ) {
+                        Log.d(TAG, "found media uri: " + uri);
+                        Log.d(TAG, "    is_raw?: " + is_raw);
+                    }
+                    applicationInterface.getStorageUtils().setLastMediaScanned(uri, is_raw);
+                }
                 if( thumbnail != null ) {
                     if( MyDebug.LOG )
                         Log.d(TAG, "set gallery button to thumbnail");
@@ -3113,8 +4042,15 @@ public class MainActivity extends Activity {
                         Log.d(TAG, "set gallery button to blank");
                     updateGalleryIconToBlank();
                 }
+
+                update_gallery_future = null;
             }
-        }.execute();
+        //}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        };
+
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        //executor.execute(runnable);
+        update_gallery_future = executor.submit(runnable);
 
         if( MyDebug.LOG )
             Log.d(TAG, "updateGalleryIcon: total time to update gallery icon: " + (System.currentTimeMillis() - debug_time));
@@ -3214,23 +4150,33 @@ public class MainActivity extends Activity {
             Log.d(TAG, "openGallery");
         //Intent intent = new Intent(Intent.ACTION_VIEW, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
         Uri uri = applicationInterface.getStorageUtils().getLastMediaScanned();
-        boolean is_raw = false; // note that getLastMediaScanned() will never return RAW images, as we only record JPEGs
+        boolean is_raw = uri != null && applicationInterface.getStorageUtils().getLastMediaScannedIsRaw();
+        if( MyDebug.LOG && uri != null ) {
+            Log.d(TAG, "found cached most recent uri: " + uri);
+            Log.d(TAG, "    is_raw: " + is_raw);
+        }
         if( uri == null ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "go to latest media");
             StorageUtils.Media media = applicationInterface.getStorageUtils().getLatestMedia();
             if( media != null ) {
-                uri = media.uri;
-                is_raw = media.filename != null && media.filename.toLowerCase(Locale.US).endsWith(".dng");
+                if( MyDebug.LOG ) {
+                    Log.d(TAG, "latest uri:" + media.uri);
+                    Log.d(TAG, "filename: " + media.filename);
+                }
+                uri = media.getMediaStoreUri(this);
+                if( MyDebug.LOG )
+                    Log.d(TAG, "media uri:" + uri);
+                is_raw = media.filename != null && StorageUtils.filenameIsRaw(media.filename);
+                if( MyDebug.LOG )
+                    Log.d(TAG, "is_raw:" + is_raw);
             }
         }
 
-        if( uri != null ) {
+        if( uri != null && !MainActivity.useScopedStorage() ) {
             // check uri exists
-            if( MyDebug.LOG ) {
-                Log.d(TAG, "found most recent uri: " + uri);
-                Log.d(TAG, "is_raw: " + is_raw);
-            }
+            // note, with scoped storage this isn't reliable when using SAF - since we don't actually have permission to access mediastore URIs that
+            // were created via Storage Access Framework, even though Open Camera was the application that saved them(!)
             try {
                 ContentResolver cr = getContentResolver();
                 ParcelFileDescriptor pfd = cr.openFileDescriptor(uri, "r");
@@ -3262,9 +4208,11 @@ public class MainActivity extends Activity {
             final String REVIEW_ACTION = "com.android.camera.action.REVIEW";
             boolean done = false;
             if( !is_raw ) {
-                // REVIEW_ACTION means we can view video files without autoplaying
-                // however, Google Photos at least has problems with going to a RAW photo (in RAW only mode),
-                // unless we first pause and resume Open Camera
+                // REVIEW_ACTION means we can view video files without autoplaying.
+                // However, Google Photos at least has problems with going to a RAW photo (in RAW only mode),
+                // unless we first pause and resume Open Camera.
+                // Update: on Galaxy S10e with Android 11 at least, no longer seem to have problems, but leave
+                // the check for is_raw just in case for older devices.
                 if( MyDebug.LOG )
                     Log.d(TAG, "try REVIEW_ACTION");
                 try {
@@ -3279,22 +4227,19 @@ public class MainActivity extends Activity {
             if( !done ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "try ACTION_VIEW");
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                // see http://stackoverflow.com/questions/11073832/no-activity-found-to-handle-intent - needed to fix crash if no gallery app installed
-                //Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("blah")); // test
-                if( intent.resolveActivity(getPackageManager()) != null ) {
-                    try {
-                        this.startActivity(intent);
-                    }
-                    catch(SecurityException e2) {
-                        // have received this crash from Google Play - don't display a toast, simply do nothing
-                        Log.e(TAG, "SecurityException from ACTION_VIEW startActivity");
-                        e2.printStackTrace();
-                    }
+                try {
+                    Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                    this.startActivity(intent);
                 }
-                else{
+                catch(ActivityNotFoundException e) {
+                    e.printStackTrace();
                     preview.showToast(null, R.string.no_gallery_app);
                 }
+                catch(SecurityException e) {
+                    // have received this crash from Google Play - don't display a toast, simply do nothing
+                    Log.e(TAG, "SecurityException from ACTION_VIEW startActivity");
+                    e.printStackTrace();
+                }
             }
         }
     }
@@ -3379,13 +4324,16 @@ public class MainActivity extends Activity {
         if (MyDebug.LOG) {
             Log.d(TAG, "onActivityResult: " + requestCode);
         }
+
+        super.onActivityResult(requestCode, resultCode, resultData);
+
         switch( requestCode ) {
             case CHOOSE_SAVE_FOLDER_SAF_CODE:
                 if( resultCode == RESULT_OK && resultData != null ) {
                     Uri treeUri = resultData.getData();
                     if( MyDebug.LOG )
                         Log.d(TAG, "returned treeUri: " + treeUri);
-                    // see https://developer.android.com/guide/topics/providers/document-provider.html#permissions :
+                    // see https://developer.android.com/training/data-storage/shared/documents-files#persist-permissions :
                     final int takeFlags = resultData.getFlags() & (Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
                     try {
 					/*if( true )
@@ -3401,9 +4349,9 @@ public class MainActivity extends Activity {
                             Log.d(TAG, "update folder history for saf");
                         updateFolderHistorySAF(treeUri.toString());
 
-                        File file = applicationInterface.getStorageUtils().getImageFolder();
+                        String file = applicationInterface.getStorageUtils().getImageFolderPath();
                         if( file != null ) {
-                            preview.showToast(null, getResources().getString(R.string.changed_save_location) + "\n" + file.getAbsolutePath());
+                            preview.showToast(null, getResources().getString(R.string.changed_save_location) + "\n" + file);
                         }
                     }
                     catch(SecurityException e) {
@@ -3450,8 +4398,7 @@ public class MainActivity extends Activity {
                         Log.d(TAG, "returned single fileUri: " + fileUri);
                     // persist permission just in case?
                     final int takeFlags = resultData.getFlags()
-                            & (Intent.FLAG_GRANT_READ_URI_PERMISSION
-                            | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                            & (Intent.FLAG_GRANT_READ_URI_PERMISSION);
                     try {
 					/*if( true )
 						throw new SecurityException(); // test*/
@@ -3506,8 +4453,7 @@ public class MainActivity extends Activity {
                         Log.d(TAG, "returned single fileUri: " + fileUri);
                     // persist permission just in case?
                     final int takeFlags = resultData.getFlags()
-                            & (Intent.FLAG_GRANT_READ_URI_PERMISSION
-                            | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                            & (Intent.FLAG_GRANT_READ_URI_PERMISSION);
                     try {
 					/*if( true )
 						throw new SecurityException(); // test*/
@@ -3535,6 +4481,8 @@ public class MainActivity extends Activity {
         }
     }
 
+    /** Update the save folder (for non-SAF methods).
+     */
     void updateSaveFolder(String new_save_location) {
         if( MyDebug.LOG )
             Log.d(TAG, "updateSaveFolder: " + new_save_location);
@@ -3550,7 +4498,8 @@ public class MainActivity extends Activity {
                 editor.apply();
 
                 this.save_location_history.updateFolderHistory(this.getStorageUtils().getSaveLocation(), true);
-                this.preview.showToast(null, getResources().getString(R.string.changed_save_location) + "\n" + this.applicationInterface.getStorageUtils().getSaveLocation());
+                String save_folder_name = getHumanReadableSaveFolder(this.applicationInterface.getStorageUtils().getSaveLocation());
+                this.preview.showToast(null, getResources().getString(R.string.changed_save_location) + "\n" + save_folder_name);
             }
         }
     }
@@ -3579,6 +4528,84 @@ public class MainActivity extends Activity {
         }
     }
 
+    /** Processes a user specified save folder. This should be used with the non-SAF scoped storage
+     *  method, where the user types a folder directly.
+     */
+    public static String processUserSaveLocation(String folder) {
+        // filter repeated '/', e.g., replace // with /:
+        String strip = "//";
+        while( folder.length() >= 1 && folder.contains(strip) ) {
+            folder = folder.replaceAll(strip, "/");
+        }
+
+        if( folder.length() >= 1 && folder.charAt(0) == '/' ) {
+            // strip '/' as first character - as absolute paths not allowed with scoped storage
+            // whilst we do block entering a '/' as first character in the InputFilter, users could
+            // get around this (e.g., put a '/' as second character, then delete the first character)
+            folder = folder.substring(1);
+        }
+
+        if( folder.length() >= 1 && folder.charAt(folder.length()-1) == '/' ) {
+            // strip '/' as last character - MediaStore will ignore it, but seems cleaner to strip it out anyway
+            // (we still need to allow '/' as last character in the InputFilter, otherwise users won't be able to type it whilst writing a subfolder)
+            folder = folder.substring(0, folder.length()-1);
+        }
+
+        return folder;
+    }
+
+    /** Creates a dialog builder for specifying a save folder dialog (used when not using SAF,
+     *  and on scoped storage, as an alternative to using FolderChooserDialog).
+     */
+    public AlertDialog.Builder createSaveFolderDialog() {
+        final AlertDialog.Builder alertDialog = new AlertDialog.Builder(this);
+        alertDialog.setTitle(R.string.preference_save_location);
+
+        final View dialog_view = LayoutInflater.from(this).inflate(R.layout.alertdialog_edittext, null);
+        final EditText editText = dialog_view.findViewById(R.id.edit_text);
+
+        // set hint instead of content description for EditText, see https://support.google.com/accessibility/android/answer/6378120
+        editText.setHint(getResources().getString(R.string.preference_save_location));
+        editText.setInputType(InputType.TYPE_CLASS_TEXT);
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        editText.setText(sharedPreferences.getString(PreferenceKeys.SaveLocationPreferenceKey, "OpenCamera"));
+        InputFilter filter = new InputFilter() {
+            // whilst Android seems to allow any characters on internal memory, SD cards are typically formatted with FAT32
+            final String disallowed = "|\\?*<\":>";
+            public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+                for(int i=start;i<end;i++) {
+                    if( disallowed.indexOf( source.charAt(i) ) != -1 ) {
+                        return "";
+                    }
+                }
+                // also check for '/', not allowed at start
+                if( dstart == 0 && start < source.length() && source.charAt(start) == '/' ) {
+                    return "";
+                }
+                return null;
+            }
+        };
+        editText.setFilters(new InputFilter[]{filter});
+
+        alertDialog.setView(dialog_view);
+
+        alertDialog.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialogInterface, int i) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "save location clicked okay");
+
+                String folder = editText.getText().toString();
+                folder = processUserSaveLocation(folder);
+
+                updateSaveFolder(folder);
+            }
+        });
+        alertDialog.setNegativeButton(android.R.string.cancel, null);
+
+        return alertDialog;
+    }
+
     /** Opens Open Camera's own (non-Storage Access Framework) dialog to select a folder.
      */
     private void openFolderChooserDialog() {
@@ -3587,14 +4614,51 @@ public class MainActivity extends Activity {
         showPreview(false);
         setWindowFlagsForSettings();
 
-        File start_folder = getStorageUtils().getImageFolder();
+        if( MainActivity.useScopedStorage() ) {
+            AlertDialog.Builder alertDialog = createSaveFolderDialog();
+            final AlertDialog alert = alertDialog.create();
+            // AlertDialog.Builder.setOnDismissListener() requires API level 17, so do it this way instead
+            alert.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                @Override
+                public void onDismiss(DialogInterface arg0) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "save folder dialog dismissed");
+                    setWindowFlagsForCamera();
+                    showPreview(true);
+                }
+            });
+            alert.show();
+        }
+        else {
+            File start_folder = getStorageUtils().getImageFolder();
+
+            FolderChooserDialog fragment = new MyFolderChooserDialog();
+            fragment.setStartFolder(start_folder);
+            // use commitAllowingStateLoss() instead of fragment.show(), does to "java.lang.IllegalStateException: Can not perform this action after onSaveInstanceState" crash seen on Google Play
+            // see https://stackoverflow.com/questions/14262312/java-lang-illegalstateexception-can-not-perform-this-action-after-onsaveinstanc
+            //fragment.show(getFragmentManager(), "FOLDER_FRAGMENT");
+            getFragmentManager().beginTransaction().add(fragment, "FOLDER_FRAGMENT").commitAllowingStateLoss();
+        }
+    }
 
-        FolderChooserDialog fragment = new MyFolderChooserDialog();
-        fragment.setStartFolder(start_folder);
-        // use commitAllowingStateLoss() instead of fragment.show(), does to "java.lang.IllegalStateException: Can not perform this action after onSaveInstanceState" crash seen on Google Play
-        // see https://stackoverflow.com/questions/14262312/java-lang-illegalstateexception-can-not-perform-this-action-after-onsaveinstanc
-        //fragment.show(getFragmentManager(), "FOLDER_FRAGMENT");
-        getFragmentManager().beginTransaction().add(fragment, "FOLDER_FRAGMENT").commitAllowingStateLoss();
+    /** Returns a human readable string for the save_folder (as stored in the preferences).
+     */
+    private String getHumanReadableSaveFolder(String save_folder) {
+        if( applicationInterface.getStorageUtils().isUsingSAF() ) {
+            // try to get human readable form if possible
+            String file_name = applicationInterface.getStorageUtils().getFilePathFromDocumentUriSAF(Uri.parse(save_folder), true);
+            if( file_name != null ) {
+                save_folder = file_name;
+            }
+        }
+        else {
+            // The strings can either be a sub-folder of DCIM, or (pre-scoped-storage) a full path, so normally either can be displayed.
+            // But with scoped storage, an empty string is used to mean DCIM, so seems clearer to say that instead of displaying a blank line!
+            if( MainActivity.useScopedStorage() && save_folder.length() == 0 ) {
+                save_folder = "DCIM";
+            }
+        }
+        return save_folder;
     }
 
     /** User can long-click on gallery to select a recent save location from the history, of if not available,
@@ -3629,13 +4693,7 @@ public class MainActivity extends Activity {
         // history is stored in order most-recent-last
         for(int i=0;i<history.size();i++) {
             String folder_name = history.get(history.size() - 1 - i);
-            if( applicationInterface.getStorageUtils().isUsingSAF() ) {
-                // try to get human readable form if possible
-                File file = applicationInterface.getStorageUtils().getFileFromDocumentUriSAF(Uri.parse(folder_name), true);
-                if( file != null ) {
-                    folder_name = file.getAbsolutePath();
-                }
-            }
+            folder_name = getHumanReadableSaveFolder(folder_name);
             items[index++] = folder_name;
         }
         final int clear_index = index;
@@ -3703,14 +4761,7 @@ public class MainActivity extends Activity {
                         String save_folder = history.get(history.size() - 1 - which);
                         if( MyDebug.LOG )
                             Log.d(TAG, "changed save_folder from history to: " + save_folder);
-                        String save_folder_name = save_folder;
-                        if( applicationInterface.getStorageUtils().isUsingSAF() ) {
-                            // try to get human readable form if possible
-                            File file = applicationInterface.getStorageUtils().getFileFromDocumentUriSAF(Uri.parse(save_folder), true);
-                            if( file != null ) {
-                                save_folder_name = file.getAbsolutePath();
-                            }
-                        }
+                        String save_folder_name = getHumanReadableSaveFolder(save_folder);
                         preview.showToast(null, getResources().getString(R.string.changed_save_location) + "\n" + save_folder_name);
                         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(MainActivity.this);
                         SharedPreferences.Editor editor = sharedPreferences.edit();
@@ -3906,7 +4957,7 @@ public class MainActivity extends Activity {
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle state) {
+    protected void onSaveInstanceState(@NonNull Bundle state) {
         if( MyDebug.LOG )
             Log.d(TAG, "onSaveInstanceState");
         super.onSaveInstanceState(state);
@@ -3919,13 +4970,15 @@ public class MainActivity extends Activity {
     }
 
     public boolean supportsExposureButton() {
-        if( preview.getCameraController() == null )
-            return false;
         if( preview.isVideoHighSpeed() ) {
             // manual ISO/exposure not supported for high speed video mode
             // it's safer not to allow opening the panel at all (otherwise the user could open it, and switch to manual)
             return false;
         }
+        if( applicationInterface.isCameraExtensionPref() ) {
+            // nothing in this UI (exposure compensation, manual ISO/exposure, manual white balance) is supported for camera extensions
+            return false;
+        }
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         String iso_value = sharedPreferences.getString(PreferenceKeys.ISOPreferenceKey, CameraController.ISO_DEFAULT);
         boolean manual_iso = !iso_value.equals(CameraController.ISO_DEFAULT);
@@ -3971,7 +5024,7 @@ public class MainActivity extends Activity {
                         // already have navigation gap, can go straight into no limits mode
                         if( MyDebug.LOG )
                             Log.d(TAG, "set FLAG_LAYOUT_NO_LIMITS");
-                        getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+                        showUnderNavigation(true);
                         // need to layout the UI again due to now taking the navigation gap into account
                         mainUI.layoutUI();
                     }
@@ -3984,7 +5037,7 @@ public class MainActivity extends Activity {
             else if( old_want_no_limits && navigation_gap != 0 ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "clear FLAG_LAYOUT_NO_LIMITS");
-                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+                showUnderNavigation(false);
                 // need to layout the UI again due to no longer taking the navigation gap into account
                 mainUI.layoutUI();
             }
@@ -4209,10 +5262,13 @@ public class MainActivity extends Activity {
 
         // On-screen icons such as exposure lock, white balance lock, face detection etc are made visible if necessary in
         // MainUI.showGUI()
-        // However still nee to update visibility of icons where visibility depends on camera setup - e.g., exposure button
+        // However still need to enable visibility of icons where visibility depends on camera setup - e.g., exposure button
         // not supported for high speed video frame rates - see testTakeVideoFPSHighSpeedManual().
+        // (Disabling is done in checkDisableGUIIcons(), called below.)
         View exposureButton = findViewById(R.id.exposure);
-        exposureButton.setVisibility(supportsExposureButton() && !mainUI.inImmersiveMode() ? View.VISIBLE : View.GONE);
+        //exposureButton.setVisibility(supportsExposureButton() && !mainUI.inImmersiveMode() ? View.VISIBLE : View.GONE);
+        if( supportsExposureButton() && !mainUI.inImmersiveMode() )
+            exposureButton.setVisibility(View.VISIBLE);
 
         // needed as availability of some icons is per-camera (e.g., flash, RAW)
         // for making icons visible, this is done elsewhere in call to MainUI.showGUI()
@@ -4293,7 +5349,7 @@ public class MainActivity extends Activity {
         setManualFocusSeekBarVisibility(is_target_distance);
     }
 
-    private boolean showManualFocusSeekbar(final boolean is_target_distance) {
+    public boolean showManualFocusSeekbar(final boolean is_target_distance) {
         boolean is_visible = preview.getCurrentFocusValue() != null && this.getPreview().getCurrentFocusValue().equals("focus_mode_manual2");
         if( is_target_distance ) {
             is_visible = is_visible && (applicationInterface.getPhotoMode() == MyApplicationInterface.PhotoMode.FocusBracketing) && !preview.isVideo();
@@ -4306,6 +5362,9 @@ public class MainActivity extends Activity {
         SeekBar focusSeekBar = findViewById(is_target_distance ? R.id.focus_bracketing_target_seekbar : R.id.focus_seekbar);
         final int visibility = is_visible ? View.VISIBLE : View.GONE;
         focusSeekBar.setVisibility(visibility);
+        if( is_visible ) {
+            applicationInterface.getDrawPreview().updateSettings(); // needed so that we reset focus_seekbars_margin_left, as the focus seekbars can only be updated when visible
+        }
     }
 
     public void setManualWBSeekbar() {
@@ -4404,6 +5463,13 @@ public class MainActivity extends Activity {
         //return false; // currently blocked for release
     }
 
+    /** Whether the Camera vendor extension is supported (see
+     * https://developer.android.com/reference/android/hardware/camera2/CameraExtensionCharacteristics ).
+     */
+    public boolean supportsCameraExtension(int extension) {
+        return preview.supportsCameraExtension(extension);
+    }
+
     /** Whether RAW mode would be supported for various burst modes (expo bracketing etc).
      *  Note that caller should still separately check preview.supportsRaw() if required.
      */
@@ -4444,6 +5510,10 @@ public class MainActivity extends Activity {
         return this.camera_in_background;
     }
 
+    public boolean isAppPaused() {
+        return this.app_is_paused;
+    }
+
     public BluetoothRemoteControl getBluetoothRemoteControl() {
         return bluetoothRemoteControl;
     }
@@ -4526,6 +5596,21 @@ public class MainActivity extends Activity {
             case Panorama:
                 photo_mode_string = getResources().getString(R.string.photo_mode_panorama_full);
                 break;
+            case X_Auto:
+                photo_mode_string = getResources().getString(R.string.photo_mode_x_auto_full);
+                break;
+            case X_HDR:
+                photo_mode_string = getResources().getString(R.string.photo_mode_x_hdr_full);
+                break;
+            case X_Night:
+                photo_mode_string = getResources().getString(R.string.photo_mode_x_night_full);
+                break;
+            case X_Bokeh:
+                photo_mode_string = getResources().getString(R.string.photo_mode_x_bokeh_full);
+                break;
+            case X_Beauty:
+                photo_mode_string = getResources().getString(R.string.photo_mode_x_beauty_full);
+                break;
         }
         return photo_mode_string;
     }
@@ -4870,10 +5955,10 @@ public class MainActivity extends Activity {
     public boolean hasAudioControl() {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         String audio_control = sharedPreferences.getString(PreferenceKeys.AudioControlPreferenceKey, "none");
-        if( audio_control.equals("voice") ) {
+        /*if( audio_control.equals("voice") ) {
             return speechControl.hasSpeechRecognition();
         }
-        else if( audio_control.equals("noise") ) {
+        else*/ if( audio_control.equals("noise") ) {
             return true;
         }
         return false;
@@ -4886,18 +5971,22 @@ public class MainActivity extends Activity {
 
     public void stopAudioListeners() {
         freeAudioListener(true);
-        if( speechControl.hasSpeechRecognition() ) {
+        /*if( speechControl.hasSpeechRecognition() ) {
             // no need to free the speech recognizer, just stop it
             speechControl.stopListening();
-        }
+        }*/
     }
 
     public void initLocation() {
         if( MyDebug.LOG )
             Log.d(TAG, "initLocation");
         if( app_is_paused ) {
-            Log.e(TAG, "initLocation: app is paused!");
+            if( MyDebug.LOG )
+                Log.d(TAG, "initLocation: app is paused!");
             // we shouldn't need this (as we only call initLocation() when active), but just in case we end up here after onPause...
+            // in fact this happens when we need to grant permission for location - the call to initLocation() from
+            // MainActivity.onRequestPermissionsResult()->PermissionsHandler.onRequestPermissionsResult() will be when the application
+            // is still paused - so we won't do anything here, but instead initLocation() will be called after when resuming.
         }
         else if( camera_in_background ) {
             if( MyDebug.LOG )
@@ -4932,6 +6021,7 @@ public class MainActivity extends Activity {
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         if( MyDebug.LOG )
             Log.d(TAG, "onRequestPermissionsResult: requestCode " + requestCode);
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         permissionHandler.onRequestPermissionsResult(requestCode, grantResults);
     }
 
diff --git a/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java b/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java
index 2726706faa1e5e618befa4e3c9c7bf57e2bee897..22454e4351ae37f48748ffef2348368a33df2c42 100644
--- a/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java
+++ b/app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java
@@ -2,6 +2,7 @@ package net.sourceforge.opencamera;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
+import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -10,8 +11,9 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Rect;
-import android.location.Address;
-import android.location.Geocoder;
+//import android.location.Address; // don't use until we have info for data privacy!
+//import android.location.Geocoder; // don't use until we have info for data privacy!
+import android.hardware.camera2.CameraExtensionCharacteristics;
 import android.location.Location;
 import android.media.MediaMetadataRetriever;
 import android.media.MediaPlayer;
@@ -29,9 +31,12 @@ import android.provider.Settings;
 import android.util.Log;
 import android.util.Pair;
 import android.view.MotionEvent;
+import android.view.Surface;
 import android.view.View;
 import android.widget.ImageButton;
 
+import androidx.annotation.RequiresApi;
+
 import net.sourceforge.opencamera.cameracontroller.CameraController;
 import net.sourceforge.opencamera.cameracontroller.RawImage;
 import net.sourceforge.opencamera.preview.ApplicationInterface;
@@ -70,7 +75,13 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         FocusBracketing, // take multiple focus bracketed images, without combining to a single image
         FastBurst,
         NoiseReduction,
-        Panorama
+        Panorama,
+        // camera vendor extensions:
+        X_Auto,
+        X_HDR,
+        X_Night,
+        X_Bokeh,
+        X_Beauty
     }
 
     private final MainActivity main_activity;
@@ -89,7 +100,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     private boolean panorama_dir_left_to_right = true; // direction of panorama (set after we've captured two images)
 
     private File last_video_file = null;
-    private Uri last_video_file_saf = null;
+    private Uri last_video_file_uri = null;
 
     private final Timer subtitleVideoTimer = new Timer();
     private TimerTask subtitleVideoTimerTask;
@@ -100,7 +111,12 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     // store to avoid calling PreferenceManager.getDefaultSharedPreferences() repeatedly
     private final SharedPreferences sharedPreferences;
 
-    private boolean last_images_saf; // whether the last images array are using SAF or not
+    private enum LastImagesType {
+        FILE,
+        SAF,
+        MEDIASTORE
+    }
+    private LastImagesType last_images_type = LastImagesType.FILE; // whether the last images array are using File API, SAF or MediaStore
 
     /** This class keeps track of the images saved in this batch, for use with Pause Preview option, so we can share or trash images.
      */
@@ -143,7 +159,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     private final static float aperture_default = -1.0f;
     private float aperture = aperture_default;
     // camera properties that aren't saved even in the bundle; these should be initialised/reset in reset()
-    private int zoom_factor; // don't save zoom, as doing so tends to confuse users; other camera applications don't seem to save zoom when pause/resuming
+    private int zoom_factor = -1; // don't save zoom, as doing so tends to confuse users; other camera applications don't seem to save zoom when pause/resuming
 
     // for testing:
     public volatile int test_n_videos_scanned;
@@ -256,7 +272,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     }
 
     /** If adding extra calls to this, consider whether explicit user permission is required, and whether
-     *  privacy policy needs updating.
+     *  privacy policy or data privacy section needs updating.
      *  Returns null if location not available.
      */
     @Override
@@ -265,7 +281,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     }
 
     /** If adding extra calls to this, consider whether explicit user permission is required, and whether
-     *  privacy policy needs updating.
+     *  privacy policy or data privacy section  needs updating.
      *  Returns null if location not available.
      */
     public Location getLocation(LocationSupplier.LocationInfo locationInfo) {
@@ -273,9 +289,8 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     }
 
     @Override
-    public int createOutputVideoMethod() {
-        String action = main_activity.getIntent().getAction();
-        if( MediaStore.ACTION_VIDEO_CAPTURE.equals(action) ) {
+    public VideoMethod createOutputVideoMethod() {
+        if( isVideoCaptureIntent() ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "from video capture intent");
             Bundle myExtras = main_activity.getIntent().getExtras();
@@ -284,17 +299,30 @@ public class MyApplicationInterface extends BasicApplicationInterface {
                 if( intent_uri != null ) {
                     if( MyDebug.LOG )
                         Log.d(TAG, "save to: " + intent_uri);
-                    return VIDEOMETHOD_URI;
+                    return VideoMethod.URI;
                 }
             }
             // if no EXTRA_OUTPUT, we should save to standard location, and will pass back the Uri of that location
             if( MyDebug.LOG )
                 Log.d(TAG, "intent uri not specified");
-            // note that SAF URIs don't seem to work for calling applications (tested with Grabilla and "Photo Grabber Image From Video" (FreezeFrame)), so we use standard folder with non-SAF method
-            return VIDEOMETHOD_FILE;
+            if( MainActivity.useScopedStorage() ) {
+                // can't use file method with scoped storage
+                return VideoMethod.MEDIASTORE;
+            }
+            else {
+                // note that SAF URIs don't seem to work for calling applications (tested with Grabilla and "Photo Grabber Image From Video" (FreezeFrame)), so we use standard folder with non-SAF method
+                return VideoMethod.FILE;
+            }
+        }
+        else if( storageUtils.isUsingSAF() ) {
+            return VideoMethod.SAF;
+        }
+        else if( MainActivity.useScopedStorage() ) {
+            return VideoMethod.MEDIASTORE;
+        }
+        else {
+            return VideoMethod.FILE;
         }
-        boolean using_saf = storageUtils.isUsingSAF();
-        return using_saf ? VIDEOMETHOD_SAF : VIDEOMETHOD_FILE;
     }
 
     @Override
@@ -305,14 +333,61 @@ public class MyApplicationInterface extends BasicApplicationInterface {
 
     @Override
     public Uri createOutputVideoSAF(String extension) throws IOException {
-        last_video_file_saf = storageUtils.createOutputMediaFileSAF(StorageUtils.MEDIA_TYPE_VIDEO, "", extension, new Date());
-        return last_video_file_saf;
+        last_video_file_uri = storageUtils.createOutputMediaFileSAF(StorageUtils.MEDIA_TYPE_VIDEO, "", extension, new Date());
+        return last_video_file_uri;
+    }
+
+    @Override
+    public Uri createOutputVideoMediaStore(String extension) throws IOException {
+        Uri folder = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ?
+                MediaStore.Video.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY) :
+                MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+        ContentValues contentValues = new ContentValues();
+        String filename = storageUtils.createMediaFilename(StorageUtils.MEDIA_TYPE_VIDEO, "", 0, "." + extension, new Date());
+        if( MyDebug.LOG )
+            Log.d(TAG, "filename: " + filename);
+        contentValues.put(MediaStore.Video.Media.DISPLAY_NAME, filename);
+        String mime_type = storageUtils.getVideoMimeType(extension);
+        if( MyDebug.LOG )
+            Log.d(TAG, "mime_type: " + mime_type);
+        contentValues.put(MediaStore.Video.Media.MIME_TYPE, mime_type);
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
+            String relative_path = storageUtils.getSaveRelativeFolder();
+            if( MyDebug.LOG )
+                Log.d(TAG, "relative_path: " + relative_path);
+            contentValues.put(MediaStore.Video.Media.RELATIVE_PATH, relative_path);
+            contentValues.put(MediaStore.Video.Media.IS_PENDING, 1);
+        }
+
+        try {
+            last_video_file_uri = main_activity.getContentResolver().insert(folder, contentValues);
+            if( MyDebug.LOG )
+                Log.d(TAG, "uri: " + last_video_file_uri);
+        }
+        catch(IllegalArgumentException e) {
+            // can happen for mediastore method if invalid ContentResolver.insert() call
+            if( MyDebug.LOG )
+                Log.e(TAG, "IllegalArgumentException writing video file: " + e.getMessage());
+            e.printStackTrace();
+            throw new IOException();
+        }
+        catch(IllegalStateException e) {
+            // have received Google Play crashes from ContentResolver.insert() call for mediastore method
+            if( MyDebug.LOG )
+                Log.e(TAG, "IllegalStateException writing video file: " + e.getMessage());
+            e.printStackTrace();
+            throw new IOException();
+        }
+        if( last_video_file_uri == null ) {
+            throw new IOException();
+        }
+
+        return last_video_file_uri;
     }
 
     @Override
     public Uri createOutputVideoUri() {
-        String action = main_activity.getIntent().getAction();
-        if( MediaStore.ACTION_VIDEO_CAPTURE.equals(action) ) {
+        if( isVideoCaptureIntent() ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "from video capture intent");
             Bundle myExtras = main_activity.getIntent().getExtras();
@@ -581,6 +656,10 @@ public class MyApplicationInterface extends BasicApplicationInterface {
 
     @Override
     public boolean getFaceDetectionPref() {
+        if( isCameraExtensionPref() ) {
+            // not supported for camera extensions
+            return false;
+        }
         return sharedPreferences.getBoolean(PreferenceKeys.FaceDetectionPreferenceKey, false);
     }
 
@@ -593,8 +672,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
 
     @Override
     public String getVideoQualityPref() {
-        String action = main_activity.getIntent().getAction();
-        if( MediaStore.ACTION_VIDEO_CAPTURE.equals(action) ) {
+        if( isVideoCaptureIntent() ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "from video capture intent");
             if( main_activity.getIntent().hasExtra(MediaStore.EXTRA_VIDEO_QUALITY) ) {
@@ -647,8 +725,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     @Override
     public String getVideoFPSPref() {
         // if check for EXTRA_VIDEO_QUALITY, if set, best to fall back to default FPS - see corresponding code in getVideoQualityPref
-        String action = main_activity.getIntent().getAction();
-        if( MediaStore.ACTION_VIDEO_CAPTURE.equals(action) ) {
+        if( isVideoCaptureIntent() ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "from video capture intent");
             if( main_activity.getIntent().hasExtra(MediaStore.EXTRA_VIDEO_QUALITY) ) {
@@ -847,15 +924,14 @@ public class MyApplicationInterface extends BasicApplicationInterface {
 
     @Override
     public long getVideoMaxDurationPref() {
-        String action = main_activity.getIntent().getAction();
-        if( MediaStore.ACTION_VIDEO_CAPTURE.equals(action) ) {
+        if( isVideoCaptureIntent() ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "from video capture intent");
             if( main_activity.getIntent().hasExtra(MediaStore.EXTRA_DURATION_LIMIT) ) {
                 int intent_duration_limit = main_activity.getIntent().getIntExtra(MediaStore.EXTRA_DURATION_LIMIT, 0);
                 if( MyDebug.LOG )
                     Log.d(TAG, "intent_duration_limit: " + intent_duration_limit);
-                return intent_duration_limit * 1000;
+                return intent_duration_limit * 1000L;
             }
         }
 
@@ -893,8 +969,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         if( MyDebug.LOG )
             Log.d(TAG, "getVideoMaxFileSizeUserPref");
 
-        String action = main_activity.getIntent().getAction();
-        if( MediaStore.ACTION_VIDEO_CAPTURE.equals(action) ) {
+        if( isVideoCaptureIntent() ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "from video capture intent");
             if( main_activity.getIntent().hasExtra(MediaStore.EXTRA_SIZE_LIMIT) ) {
@@ -916,14 +991,14 @@ public class MyApplicationInterface extends BasicApplicationInterface {
             e.printStackTrace();
             video_max_filesize = 0;
         }
+        //video_max_filesize = 1024*1024; // test
         if( MyDebug.LOG )
             Log.d(TAG, "video_max_filesize: " + video_max_filesize);
         return video_max_filesize;
     }
 
     private boolean getVideoRestartMaxFileSizeUserPref() {
-        String action = main_activity.getIntent().getAction();
-        if( MediaStore.ACTION_VIDEO_CAPTURE.equals(action) ) {
+        if( isVideoCaptureIntent() ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "from video capture intent");
             if( main_activity.getIntent().hasExtra(MediaStore.EXTRA_SIZE_LIMIT) ) {
@@ -958,11 +1033,11 @@ public class MyApplicationInterface extends BasicApplicationInterface {
             if( MyDebug.LOG )
                 Log.d(TAG, "saving to: " + folder_name);
             boolean is_internal = false;
-            if( !folder_name.startsWith("/") ) {
+            if( !StorageUtils.saveFolderIsFull(folder_name) ) {
                 is_internal = true;
             }
             else {
-                // if save folder path is a full path, see if it matches the "external" storage (which actually means "primary", which typically isn't an SD card these days)
+                // If save folder path is a full path, see if it matches the "external" storage (which actually means "primary", which typically isn't an SD card these days).
                 File storage = Environment.getExternalStorageDirectory();
                 if( MyDebug.LOG )
                     Log.d(TAG, "compare to: " + storage.getAbsolutePath());
@@ -1032,11 +1107,6 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         return sharedPreferences.getString(PreferenceKeys.PreviewSizePreferenceKey, "preference_preview_size_wysiwyg");
     }
 
-    @Override
-    public String getPreviewRotationPref() {
-        return sharedPreferences.getString(PreferenceKeys.RotatePreviewPreferenceKey, "0");
-    }
-
     @Override
     public String getLockOrientationPref() {
         if( getPhotoMode() == PhotoMode.Panorama )
@@ -1210,9 +1280,9 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         return sharedPreferences.getString(PreferenceKeys.StampGPSFormatPreferenceKey, "preference_stamp_gpsformat_default");
     }
 
-    private String getStampGeoAddressPref() {
+    /*private String getStampGeoAddressPref() {
         return sharedPreferences.getString(PreferenceKeys.StampGeoAddressPreferenceKey, "preference_stamp_geo_address_no");
-    }
+    }*/
 
     private String getUnitsDistancePref() {
         return sharedPreferences.getString(PreferenceKeys.UnitsDistancePreferenceKey, "preference_units_distance_m");
@@ -1239,7 +1309,17 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         return font_size;
     }
 
-    private String getVideoSubtitlePref() {
+    /** Whether the Mediastore API supports saving subtitle files.
+     */
+    static boolean mediastoreSupportsVideoSubtitles() {
+        // Android 11+ no longer allows mediastore API to save types that Android doesn't support!
+        return Build.VERSION.SDK_INT < Build.VERSION_CODES.R;
+    }
+
+    private String getVideoSubtitlePref(VideoMethod video_method) {
+        if( video_method == VideoMethod.MEDIASTORE && !mediastoreSupportsVideoSubtitles() ) {
+            return "preference_video_subtitle_no";
+        }
         return sharedPreferences.getString(PreferenceKeys.VideoSubtitlePref, "preference_video_subtitle_no");
     }
 
@@ -1368,6 +1448,34 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         return imageSaver.queueWouldBlock(n_raw, n_jpegs);
     }
 
+    /** Returns the ROTATION_* enum of the display relative to the natural device orientation, but
+     *  also checks for the preview being rotated due to user preference
+     *  RotatePreviewPreferenceKey.
+     */
+    @Override
+    public int getDisplayRotation() {
+        // important to use cached rotation to reduce issues of incorrect focus square location when
+        // rotating device, due to strange Android behaviour where rotation changes shortly before
+        // the configuration actually changes
+        int rotation = main_activity.getDisplayRotation();
+
+        String rotate_preview = sharedPreferences.getString(PreferenceKeys.RotatePreviewPreferenceKey, "0");
+        if( MyDebug.LOG )
+            Log.d(TAG, "    rotate_preview = " + rotate_preview);
+        if( rotate_preview.equals("180") ) {
+            switch (rotation) {
+                case Surface.ROTATION_0: rotation = Surface.ROTATION_180; break;
+                case Surface.ROTATION_90: rotation = Surface.ROTATION_270; break;
+                case Surface.ROTATION_180: rotation = Surface.ROTATION_0; break;
+                case Surface.ROTATION_270: rotation = Surface.ROTATION_90; break;
+                default:
+                    break;
+            }
+        }
+
+        return rotation;
+    }
+
     @Override
     public long getExposureTimePref() {
         return sharedPreferences.getLong(PreferenceKeys.ExposureTimePreferenceKey, CameraController.EXPOSURE_TIME_DEFAULT);
@@ -1444,6 +1552,34 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         return NRModePref.NRMODE_NORMAL;
     }
 
+    @Override
+    public boolean isCameraExtensionPref() {
+        PhotoMode photo_mode = getPhotoMode();
+        return photo_mode == PhotoMode.X_Auto || photo_mode == PhotoMode.X_HDR || photo_mode == PhotoMode.X_Night || photo_mode == PhotoMode.X_Bokeh || photo_mode == PhotoMode.X_Beauty;
+    }
+
+    @Override
+    @RequiresApi(api = Build.VERSION_CODES.S)
+    public int getCameraExtensionPref() {
+        PhotoMode photo_mode = getPhotoMode();
+        if( photo_mode == PhotoMode.X_Auto ) {
+            return CameraExtensionCharacteristics.EXTENSION_AUTOMATIC;
+        }
+        else if( photo_mode == PhotoMode.X_HDR ) {
+            return CameraExtensionCharacteristics.EXTENSION_HDR;
+        }
+        else if( photo_mode == PhotoMode.X_Night ) {
+            return CameraExtensionCharacteristics.EXTENSION_NIGHT;
+        }
+        else if( photo_mode == PhotoMode.X_Bokeh ) {
+            return CameraExtensionCharacteristics.EXTENSION_BOKEH;
+        }
+        else if( photo_mode == PhotoMode.X_Beauty ) {
+            return CameraExtensionCharacteristics.EXTENSION_BEAUTY;
+        }
+        return 0;
+    }
+
     public void setAperture(float aperture) {
         this.aperture = aperture;
     }
@@ -1559,6 +1695,21 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         boolean panorama = photo_mode_pref.equals("preference_photo_mode_panorama");
         if( panorama && !main_activity.getPreview().isVideo() && main_activity.supportsPanorama() )
             return PhotoMode.Panorama;
+        boolean x_auto = photo_mode_pref.equals("preference_photo_mode_x_auto");
+        if( x_auto && !main_activity.getPreview().isVideo() && main_activity.supportsCameraExtension(CameraExtensionCharacteristics.EXTENSION_AUTOMATIC) )
+            return PhotoMode.X_Auto;
+        boolean x_hdr = photo_mode_pref.equals("preference_photo_mode_x_hdr");
+        if( x_hdr && !main_activity.getPreview().isVideo() && main_activity.supportsCameraExtension(CameraExtensionCharacteristics.EXTENSION_HDR) )
+            return PhotoMode.X_HDR;
+        boolean x_night = photo_mode_pref.equals("preference_photo_mode_x_night");
+        if( x_night && !main_activity.getPreview().isVideo() && main_activity.supportsCameraExtension(CameraExtensionCharacteristics.EXTENSION_NIGHT) )
+            return PhotoMode.X_Night;
+        boolean x_bokeh = photo_mode_pref.equals("preference_photo_mode_x_bokeh");
+        if( x_bokeh && !main_activity.getPreview().isVideo() && main_activity.supportsCameraExtension(CameraExtensionCharacteristics.EXTENSION_BOKEH) )
+            return PhotoMode.X_Bokeh;
+        boolean x_beauty = photo_mode_pref.equals("preference_photo_mode_x_beauty");
+        if( x_beauty && !main_activity.getPreview().isVideo() && main_activity.supportsCameraExtension(CameraExtensionCharacteristics.EXTENSION_BEAUTY) )
+            return PhotoMode.X_Beauty;
         return PhotoMode.Standard;
     }
 
@@ -1607,6 +1758,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
                     main_activity.supportsBurstRaw();
         }
         // not supported for panorama mode
+        // not supported for camera vendor extensions
         return false;
     }
 
@@ -1659,6 +1811,11 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         return sharedPreferences.getBoolean(PreferenceKeys.Camera2FakeFlashPreferenceKey, false);
     }
 
+    @Override
+    public boolean useCamera2DummyCaptureHack() {
+        return sharedPreferences.getBoolean(PreferenceKeys.Camera2DummyCaptureHackPreferenceKey, false);
+    }
+
     @Override
     public boolean useCamera2FastBurst() {
         return sharedPreferences.getBoolean(PreferenceKeys.Camera2FastBurstPreferenceKey, true);
@@ -1679,8 +1836,9 @@ public class MyApplicationInterface extends BasicApplicationInterface {
 
     @Override
     public boolean allowZoom() {
-        if( getPhotoMode() == PhotoMode.Panorama ) {
+        if( getPhotoMode() == PhotoMode.Panorama || isCameraExtensionPref() ) {
             // don't allow zooming in panorama mode, the algorithm isn't set up to support this!
+            // zoom also not supported for camera extensions
             return false;
         }
         return true;
@@ -1795,6 +1953,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         if( MyDebug.LOG )
             Log.d(TAG, "setNextPanoramaPoint : " + x + " , " + y + " , " + z);
 
+        @SuppressWarnings("PointlessArithmeticExpression")
         final float target_angle = 1.0f * 0.01745329252f;
         //final float target_angle = 0.5f * 0.01745329252f;
         final float upright_angle_tol = 2.0f * 0.017452406437f;
@@ -1853,6 +2012,9 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     public void touchEvent(MotionEvent event) {
         main_activity.getMainUI().closeExposureUI();
         main_activity.getMainUI().closePopup();
+        if( main_activity.usingKitKatImmersiveMode() ) {
+            main_activity.setImmersiveMode(false);
+        }
     }
 
     @Override
@@ -1868,236 +2030,316 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         main_activity.getMainUI().destroyPopup(); // as the available popup options change while recording video
     }
 
-    @Override
-    public void startedVideo() {
-        if( MyDebug.LOG )
-            Log.d(TAG, "startedVideo()");
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            View pauseVideoButton = main_activity.findViewById(R.id.pause_video);
-            pauseVideoButton.setVisibility(View.VISIBLE);
-            main_activity.getMainUI().setPauseVideoContentDescription();
-        }
-        if (main_activity.getPreview().supportsPhotoVideoRecording() && this.usePhotoVideoRecording()) {
-            View takePhotoVideoButton = main_activity.findViewById(R.id.take_photo_when_video_recording);
-            takePhotoVideoButton.setVisibility(View.VISIBLE);
-        }
-        if( main_activity.getMainUI().isExposureUIOpen() ) {
-            if( MyDebug.LOG )
-                Log.d(TAG, "need to update exposure UI for start video recording");
-            // need to update the exposure UI when starting/stopping video recording, to remove/add
-            // ability to switch between auto and manual
-            main_activity.getMainUI().setupExposureUI();
-        }
+    private void startVideoSubtitlesTask(final VideoMethod video_method) {
+        final String preference_stamp_dateformat = this.getStampDateFormatPref();
+        final String preference_stamp_timeformat = this.getStampTimeFormatPref();
+        final String preference_stamp_gpsformat = this.getStampGPSFormatPref();
+        final String preference_units_distance = this.getUnitsDistancePref();
+        //final String preference_stamp_geo_address = this.getStampGeoAddressPref();
+        final boolean store_location = getGeotaggingPref();
+        final boolean store_geo_direction = getGeodirectionPref();
+        class SubtitleVideoTimerTask extends TimerTask {
+            // need to keep a reference to pfd_saf for as long as writer, to avoid getting garbage collected - see https://sourceforge.net/p/opencamera/tickets/417/
+            private ParcelFileDescriptor pfd_saf;
+            private OutputStreamWriter writer;
+            private Uri uri;
+            private int count = 1;
+            private long min_video_time_from = 0;
+
+            private String getSubtitleFilename(String video_filename) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "getSubtitleFilename");
+                int indx = video_filename.indexOf('.');
+                if( indx != -1 ) {
+                    video_filename = video_filename.substring(0, indx);
+                }
+                video_filename = video_filename + ".srt";
+                if( MyDebug.LOG )
+                    Log.d(TAG, "return filename: " + video_filename);
+                return video_filename;
+            }
 
-        ImageButton view = main_activity.findViewById(R.id.take_photo);
-        view.setImageResource(R.drawable.ic_camera_video_recording);
-        final int video_method = this.createOutputVideoMethod();
-        boolean dategeo_subtitles = getVideoSubtitlePref().equals("preference_video_subtitle_yes");
-        if( dategeo_subtitles && video_method != ApplicationInterface.VIDEOMETHOD_URI ) {
-            final String preference_stamp_dateformat = this.getStampDateFormatPref();
-            final String preference_stamp_timeformat = this.getStampTimeFormatPref();
-            final String preference_stamp_gpsformat = this.getStampGPSFormatPref();
-            final String preference_units_distance = this.getUnitsDistancePref();
-            final String preference_stamp_geo_address = this.getStampGeoAddressPref();
-            final boolean store_location = getGeotaggingPref();
-            final boolean store_geo_direction = getGeodirectionPref();
-            class SubtitleVideoTimerTask extends TimerTask {
-                OutputStreamWriter writer;
-                private int count = 1;
-                private long min_video_time_from = 0;
-
-                private String getSubtitleFilename(String video_filename) {
-                    if( MyDebug.LOG )
-                        Log.d(TAG, "getSubtitleFilename");
-                    int indx = video_filename.indexOf('.');
-                    if( indx != -1 ) {
-                        video_filename = video_filename.substring(0, indx);
-                    }
-                    video_filename = video_filename + ".srt";
+            public void run() {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "SubtitleVideoTimerTask run");
+                long video_time = main_activity.getPreview().getVideoTime(true); // n.b., in case of restarts due to max filesize, we only want the time for this video file!
+                if( !main_activity.getPreview().isVideoRecording() ) {
                     if( MyDebug.LOG )
-                        Log.d(TAG, "return filename: " + video_filename);
-                    return video_filename;
+                        Log.d(TAG, "no longer video recording");
+                    return;
                 }
-
-                public void run() {
+                if( main_activity.getPreview().isVideoRecordingPaused() ) {
                     if( MyDebug.LOG )
-                        Log.d(TAG, "SubtitleVideoTimerTask run");
-                    long video_time = main_activity.getPreview().getVideoTime();
-                    if( !main_activity.getPreview().isVideoRecording() ) {
-                        if( MyDebug.LOG )
-                            Log.d(TAG, "no longer video recording");
-                        return;
-                    }
-                    if( main_activity.getPreview().isVideoRecordingPaused() ) {
-                        if( MyDebug.LOG )
-                            Log.d(TAG, "video recording is paused");
-                        return;
-                    }
-                    Date current_date = new Date();
-                    Calendar current_calendar = Calendar.getInstance();
-                    int offset_ms = current_calendar.get(Calendar.MILLISECOND);
-                    // We subtract an offset, because if the current time is say 00:00:03.425 and the video has been recording for
-                    // 1s, we instead need to record the video time when it became 00:00:03.000. This does mean that the GPS
-                    // location is going to be off by up to 1s, but that should be less noticeable than the clock being off.
-                    if( MyDebug.LOG ) {
-                        Log.d(TAG, "count: " + count);
-                        Log.d(TAG, "offset_ms: " + offset_ms);
-                        Log.d(TAG, "video_time: " + video_time);
-                    }
-                    String date_stamp = TextFormatter.getDateString(preference_stamp_dateformat, current_date);
-                    String time_stamp = TextFormatter.getTimeString(preference_stamp_timeformat, current_date);
-                    Location location = store_location ? getLocation() : null;
-                    double geo_direction = store_geo_direction && main_activity.getPreview().hasGeoDirection() ? main_activity.getPreview().getGeoDirection() : 0.0;
-                    String gps_stamp = main_activity.getTextFormatter().getGPSString(preference_stamp_gpsformat, preference_units_distance, store_location && location!=null, location, store_geo_direction && main_activity.getPreview().hasGeoDirection(), geo_direction);
-                    if( MyDebug.LOG ) {
-                        Log.d(TAG, "date_stamp: " + date_stamp);
-                        Log.d(TAG, "time_stamp: " + time_stamp);
-                        // don't log gps_stamp, in case of privacy!
-                    }
-
-                    String datetime_stamp = "";
-                    if( date_stamp.length() > 0 )
-                        datetime_stamp += date_stamp;
-                    if( time_stamp.length() > 0 ) {
-                        if( datetime_stamp.length() > 0 )
-                            datetime_stamp += " ";
-                        datetime_stamp += time_stamp;
-                    }
+                        Log.d(TAG, "video recording is paused");
+                    return;
+                }
+                Date current_date = new Date();
+                Calendar current_calendar = Calendar.getInstance();
+                int offset_ms = current_calendar.get(Calendar.MILLISECOND);
+                // We subtract an offset, because if the current time is say 00:00:03.425 and the video has been recording for
+                // 1s, we instead need to record the video time when it became 00:00:03.000. This does mean that the GPS
+                // location is going to be off by up to 1s, but that should be less noticeable than the clock being off.
+                if( MyDebug.LOG ) {
+                    Log.d(TAG, "count: " + count);
+                    Log.d(TAG, "offset_ms: " + offset_ms);
+                    Log.d(TAG, "video_time: " + video_time);
+                }
+                String date_stamp = TextFormatter.getDateString(preference_stamp_dateformat, current_date);
+                String time_stamp = TextFormatter.getTimeString(preference_stamp_timeformat, current_date);
+                Location location = store_location ? getLocation() : null;
+                double geo_direction = store_geo_direction && main_activity.getPreview().hasGeoDirection() ? main_activity.getPreview().getGeoDirection() : 0.0;
+                String gps_stamp = main_activity.getTextFormatter().getGPSString(preference_stamp_gpsformat, preference_units_distance, store_location && location!=null, location, store_geo_direction && main_activity.getPreview().hasGeoDirection(), geo_direction);
+                if( MyDebug.LOG ) {
+                    Log.d(TAG, "date_stamp: " + date_stamp);
+                    Log.d(TAG, "time_stamp: " + time_stamp);
+                    // don't log gps_stamp, in case of privacy!
+                }
 
-                    // build subtitles
-                    StringBuilder subtitles = new StringBuilder();
+                String datetime_stamp = "";
+                if( date_stamp.length() > 0 )
+                    datetime_stamp += date_stamp;
+                if( time_stamp.length() > 0 ) {
                     if( datetime_stamp.length() > 0 )
-                        subtitles.append(datetime_stamp).append("\n");
+                        datetime_stamp += " ";
+                    datetime_stamp += time_stamp;
+                }
 
-                    if( gps_stamp.length() > 0 ) {
-                        Address address = null;
-                        if( store_location && !preference_stamp_geo_address.equals("preference_stamp_geo_address_no") ) {
-                            // try to find an address
-                            if( Geocoder.isPresent() ) {
-                                if( MyDebug.LOG )
-                                    Log.d(TAG, "geocoder is present");
-                                Geocoder geocoder = new Geocoder(main_activity, Locale.getDefault());
-                                try {
-                                    List<Address> addresses = geocoder.getFromLocation(location.getLatitude(), location.getLongitude(), 1);
-                                    if( addresses != null && addresses.size() > 0 ) {
-                                        address = addresses.get(0);
-                                        // don't log address, in case of privacy!
-                                        if( MyDebug.LOG ) {
-                                            Log.d(TAG, "max line index: " + address.getMaxAddressLineIndex());
-                                        }
+                // build subtitles
+                StringBuilder subtitles = new StringBuilder();
+                if( datetime_stamp.length() > 0 )
+                    subtitles.append(datetime_stamp).append("\n");
+
+                if( gps_stamp.length() > 0 ) {
+                    /*Address address = null;
+                    if( store_location && !preference_stamp_geo_address.equals("preference_stamp_geo_address_no") ) {
+                        // try to find an address
+                        if( main_activity.isAppPaused() ) {
+                            // seems safer to not try to initiate potential network connections (via geocoder) if Open Camera
+                            // is paused - this shouldn't happen, since we stop video when paused, but just to be safe
+                            if( MyDebug.LOG )
+                                Log.d(TAG, "don't call geocoder for video subtitles  as app is paused?!");
+                        }
+                        else if( Geocoder.isPresent() ) {
+                            if( MyDebug.LOG )
+                                Log.d(TAG, "geocoder is present");
+                            Geocoder geocoder = new Geocoder(main_activity, Locale.getDefault());
+                            try {
+                                List<Address> addresses = geocoder.getFromLocation(location.getLatitude(), location.getLongitude(), 1);
+                                if( addresses != null && addresses.size() > 0 ) {
+                                    address = addresses.get(0);
+                                    // don't log address, in case of privacy!
+                                    if( MyDebug.LOG ) {
+                                        Log.d(TAG, "max line index: " + address.getMaxAddressLineIndex());
                                     }
                                 }
-                                catch(Exception e) {
-                                    Log.e(TAG, "failed to read from geocoder");
-                                    e.printStackTrace();
-                                }
                             }
-                            else {
-                                if( MyDebug.LOG )
-                                    Log.d(TAG, "geocoder not present");
+                            catch(Exception e) {
+                                Log.e(TAG, "failed to read from geocoder");
+                                e.printStackTrace();
                             }
                         }
+                        else {
+                            if( MyDebug.LOG )
+                                Log.d(TAG, "geocoder not present");
+                        }
+                    }
 
-                        if( address != null ) {
-                            for(int i=0;i<=address.getMaxAddressLineIndex();i++) {
-                                // write in forward order
-                                String addressLine = address.getAddressLine(i);
-                                subtitles.append(addressLine).append("\n");
-                            }
+                    if( address != null ) {
+                        for(int i=0;i<=address.getMaxAddressLineIndex();i++) {
+                            // write in forward order
+                            String addressLine = address.getAddressLine(i);
+                            subtitles.append(addressLine).append("\n");
                         }
+                    }*/
 
-                        if( address == null || preference_stamp_geo_address.equals("preference_stamp_geo_address_both") ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "display gps coords");
+                    //if( address == null || preference_stamp_geo_address.equals("preference_stamp_geo_address_both") )
+                    {
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "display gps coords");
+                        subtitles.append(gps_stamp).append("\n");
+                    }
+                    /*else if( store_geo_direction ) {
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "not displaying gps coords, but need to display geo direction");
+                        gps_stamp = main_activity.getTextFormatter().getGPSString(preference_stamp_gpsformat, preference_units_distance, false, null, store_geo_direction && main_activity.getPreview().hasGeoDirection(), geo_direction);
+                        if( gps_stamp.length() > 0 ) {
+                            // don't log gps_stamp, in case of privacy!
                             subtitles.append(gps_stamp).append("\n");
                         }
-                        else if( store_geo_direction ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "not displaying gps coords, but need to display geo direction");
-                            gps_stamp = main_activity.getTextFormatter().getGPSString(preference_stamp_gpsformat, preference_units_distance, false, null, store_geo_direction && main_activity.getPreview().hasGeoDirection(), geo_direction);
-                            if( gps_stamp.length() > 0 ) {
-                                // don't log gps_stamp, in case of privacy!
-                                subtitles.append(gps_stamp).append("\n");
-                            }
-                        }
-                    }
+                    }*/
+                }
 
-                    if( subtitles.length() == 0 ) {
-                        return;
-                    }
-                    long video_time_from = video_time - offset_ms;
-                    long video_time_to = video_time_from + 999;
-                    // don't want to start from before 0; also need to keep track of min_video_time_from to avoid bug reported at
-                    // https://forum.xda-developers.com/showpost.php?p=74827802&postcount=345 for pause video where we ended up
-                    // with overlapping times when resuming
-                    if( video_time_from < min_video_time_from )
-                        video_time_from = min_video_time_from;
-                    min_video_time_from = video_time_to + 1;
-                    String subtitle_time_from = TextFormatter.formatTimeMS(video_time_from);
-                    String subtitle_time_to = TextFormatter.formatTimeMS(video_time_to);
-                    try {
-                        synchronized( this ) {
-                            if( writer == null ) {
-                                if( video_method == ApplicationInterface.VIDEOMETHOD_FILE ) {
-                                    String subtitle_filename = last_video_file.getAbsolutePath();
-                                    subtitle_filename = getSubtitleFilename(subtitle_filename);
-                                    writer = new FileWriter(subtitle_filename);
+                if( subtitles.length() == 0 ) {
+                    return;
+                }
+                long video_time_from = video_time - offset_ms;
+                long video_time_to = video_time_from + 999;
+                // don't want to start from before 0; also need to keep track of min_video_time_from to avoid bug reported at
+                // https://forum.xda-developers.com/showpost.php?p=74827802&postcount=345 for pause video where we ended up
+                // with overlapping times when resuming
+                if( video_time_from < min_video_time_from )
+                    video_time_from = min_video_time_from;
+                min_video_time_from = video_time_to + 1;
+                String subtitle_time_from = TextFormatter.formatTimeMS(video_time_from);
+                String subtitle_time_to = TextFormatter.formatTimeMS(video_time_to);
+                try {
+                    synchronized( this ) {
+                        if( writer == null ) {
+                            if( video_method == VideoMethod.FILE ) {
+                                String subtitle_filename = last_video_file.getAbsolutePath();
+                                subtitle_filename = getSubtitleFilename(subtitle_filename);
+                                writer = new FileWriter(subtitle_filename);
+                            }
+                            else if( video_method == VideoMethod.SAF || video_method == VideoMethod.MEDIASTORE ) {
+                                if( MyDebug.LOG )
+                                    Log.d(TAG, "last_video_file_uri: " + last_video_file_uri);
+                                String subtitle_filename = storageUtils.getFileName(last_video_file_uri);
+                                subtitle_filename = getSubtitleFilename(subtitle_filename);
+                                if( video_method == VideoMethod.SAF ) {
+                                    uri = storageUtils.createOutputFileSAF(subtitle_filename, ""); // don't set a mimetype, as we don't want it to append a new extension
                                 }
                                 else {
-                                    if( MyDebug.LOG )
-                                        Log.d(TAG, "last_video_file_saf: " + last_video_file_saf);
-                                    String subtitle_filename = storageUtils.getFileName(last_video_file_saf);
-                                    subtitle_filename = getSubtitleFilename(subtitle_filename);
-                                    Uri subtitle_uri = storageUtils.createOutputFileSAF(subtitle_filename, ""); // don't set a mimetype, as we don't want it to append a new extension
-                                    ParcelFileDescriptor pfd_saf = getContext().getContentResolver().openFileDescriptor(subtitle_uri, "w");
-                                    writer = new FileWriter(pfd_saf.getFileDescriptor());
+                                    Uri folder = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ?
+                                            MediaStore.Video.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY) :
+                                            MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+                                    ContentValues contentValues = new ContentValues();
+                                    contentValues.put(MediaStore.Video.Media.DISPLAY_NAME, subtitle_filename);
+                                    // set mime type - it's unclear if .SRT files have an official mime type, but (a) we must set a mime type otherwise
+                                    // resultant files are named "*.srt.mp4", and (b) the mime type must be video/*, otherwise we get exception:
+                                    // "java.lang.IllegalArgumentException: MIME type text/plain cannot be inserted into content://media/external_primary/video/media; expected MIME type under video/*"
+                                    // and we need the file to be saved in the same folder (in DCIM/ ) as the video
+                                    contentValues.put(MediaStore.Images.Media.MIME_TYPE, "video/x-srt");
+                                    if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
+                                        String relative_path = storageUtils.getSaveRelativeFolder();
+                                        if( MyDebug.LOG )
+                                            Log.d(TAG, "relative_path: " + relative_path);
+                                        contentValues.put(MediaStore.Video.Media.RELATIVE_PATH, relative_path);
+                                        contentValues.put(MediaStore.Video.Media.IS_PENDING, 1);
+                                    }
+
+                                    // Note, we catch exceptions specific to insert() here and rethrow as IOException,
+                                    // rather than catching below, to avoid catching things too broadly.
+                                    // Catching too broadly could mean we miss genuine problems that should be fixed.
+                                    try {
+                                        uri = main_activity.getContentResolver().insert(folder, contentValues);
+                                    }
+                                    catch(IllegalArgumentException e) {
+                                        // can happen for mediastore method if invalid ContentResolver.insert() call
+                                        if( MyDebug.LOG )
+                                            Log.e(TAG, "IllegalArgumentException from SubtitleVideoTimerTask inserting to mediastore: " + e.getMessage());
+                                        e.printStackTrace();
+                                        throw new IOException();
+                                    }
+                                    catch(IllegalStateException e) {
+                                        if( MyDebug.LOG )
+                                            Log.e(TAG, "IllegalStateException from SubtitleVideoTimerTask inserting to mediastore: " + e.getMessage());
+                                        e.printStackTrace();
+                                        throw new IOException();
+                                    }
+                                    if( uri == null ) {
+                                        throw new IOException();
+                                    }
                                 }
-                            }
-                            if( writer != null ) {
-                                writer.append(Integer.toString(count));
-                                writer.append('\n');
-                                writer.append(subtitle_time_from);
-                                writer.append(" --> ");
-                                writer.append(subtitle_time_to);
-                                writer.append('\n');
-                                writer.append(subtitles.toString()); // subtitles should include the '\n' at the end
-                                writer.append('\n'); // additional newline to indicate end of this subtitle
-                                writer.flush();
-                                // n.b., we flush rather than closing/reopening the writer each time, as appending doesn't seem to work with storage access framework
+                                if( MyDebug.LOG )
+                                    Log.d(TAG, "uri: " + uri);
+                                pfd_saf = getContext().getContentResolver().openFileDescriptor(uri, "w");
+                                writer = new FileWriter(pfd_saf.getFileDescriptor());
                             }
                         }
-                        count++;
-                    }
-                    catch(IOException e) {
-                        if( MyDebug.LOG )
-                            Log.e(TAG, "SubtitleVideoTimerTask failed to create or write");
-                        e.printStackTrace();
+                        if( writer != null ) {
+                            writer.append(Integer.toString(count));
+                            writer.append('\n');
+                            writer.append(subtitle_time_from);
+                            writer.append(" --> ");
+                            writer.append(subtitle_time_to);
+                            writer.append('\n');
+                            writer.append(subtitles.toString()); // subtitles should include the '\n' at the end
+                            writer.append('\n'); // additional newline to indicate end of this subtitle
+                            writer.flush();
+                            // n.b., we flush rather than closing/reopening the writer each time, as appending doesn't seem to work with storage access framework
+                        }
                     }
+                    count++;
+                }
+                catch(IOException e) {
                     if( MyDebug.LOG )
-                        Log.d(TAG, "SubtitleVideoTimerTask exit");
+                        Log.e(TAG, "SubtitleVideoTimerTask failed to create or write");
+                    e.printStackTrace();
                 }
+                if( MyDebug.LOG )
+                    Log.d(TAG, "SubtitleVideoTimerTask exit");
+            }
 
-                public boolean cancel() {
-                    if( MyDebug.LOG )
-                        Log.d(TAG, "SubtitleVideoTimerTask cancel");
-                    synchronized( this ) {
-                        if( writer != null ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "close writer");
-                            try {
-                                writer.close();
-                            }
-                            catch(IOException e) {
-                                e.printStackTrace();
-                            }
-                            writer = null;
+            public boolean cancel() {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "SubtitleVideoTimerTask cancel");
+                synchronized( this ) {
+                    if( writer != null ) {
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "close writer");
+                        try {
+                            writer.close();
+                        }
+                        catch(IOException e) {
+                            e.printStackTrace();
+                        }
+                        writer = null;
+                    }
+                    if( pfd_saf != null ) {
+                        try {
+                            pfd_saf.close();
+                        }
+                        catch(IOException e) {
+                            e.printStackTrace();
+                        }
+                        pfd_saf = null;
+                    }
+                    if( video_method == VideoMethod.MEDIASTORE ) {
+                        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
+                            ContentValues contentValues = new ContentValues();
+                            contentValues.put(MediaStore.Video.Media.IS_PENDING, 0);
+                            main_activity.getContentResolver().update(uri, contentValues, null, null);
                         }
                     }
-                    return super.cancel();
                 }
+                return super.cancel();
             }
-            subtitleVideoTimer.schedule(subtitleVideoTimerTask = new SubtitleVideoTimerTask(), 0, 1000);
         }
+        subtitleVideoTimer.schedule(subtitleVideoTimerTask = new SubtitleVideoTimerTask(), 0, 1000);
+    }
+
+    @Override
+    public void startedVideo() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "startedVideo()");
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
+            if( !( main_activity.getMainUI().inImmersiveMode() && main_activity.usingKitKatImmersiveModeEverything() ) ) {
+                View pauseVideoButton = main_activity.findViewById(R.id.pause_video);
+                pauseVideoButton.setVisibility(View.VISIBLE);
+            }
+            main_activity.getMainUI().setPauseVideoContentDescription();
+        }
+        if( main_activity.getPreview().supportsPhotoVideoRecording() && this.usePhotoVideoRecording() ) {
+            if( !( main_activity.getMainUI().inImmersiveMode() && main_activity.usingKitKatImmersiveModeEverything() ) ) {
+                View takePhotoVideoButton = main_activity.findViewById(R.id.take_photo_when_video_recording);
+                takePhotoVideoButton.setVisibility(View.VISIBLE);
+            }
+        }
+        if( main_activity.getMainUI().isExposureUIOpen() ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "need to update exposure UI for start video recording");
+            // need to update the exposure UI when starting/stopping video recording, to remove/add
+            // ability to switch between auto and manual
+            main_activity.getMainUI().setupExposureUI();
+        }
+        final VideoMethod video_method = this.createOutputVideoMethod();
+        boolean dategeo_subtitles = getVideoSubtitlePref(video_method).equals("preference_video_subtitle_yes");
+        if( dategeo_subtitles && video_method != ApplicationInterface.VideoMethod.URI ) {
+            startVideoSubtitlesTask(video_method);
+        }
+
+        ImageButton view = main_activity.findViewById(R.id.take_photo);
+        view.setImageResource(R.drawable.ic_camera_video_recording);
     }
 
     @Override
@@ -2112,7 +2354,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     }
 
     @Override
-    public void stoppedVideo(final int video_method, final Uri uri, final String filename) {
+    public void stoppedVideo(final VideoMethod video_method, final Uri uri, final String filename) {
         if( MyDebug.LOG ) {
             Log.d(TAG, "stoppedVideo");
             Log.d(TAG, "video_method " + video_method);
@@ -2137,13 +2379,13 @@ public class MyApplicationInterface extends BasicApplicationInterface {
             subtitleVideoTimerTask = null;
         }
 
+        completeVideo(video_method, uri);
         boolean done = broadcastVideo(video_method, uri, filename);
         if( MyDebug.LOG )
             Log.d(TAG, "done? " + done);
 
-        String action = main_activity.getIntent().getAction();
-        if( MediaStore.ACTION_VIDEO_CAPTURE.equals(action) ) {
-            if( done && video_method == VIDEOMETHOD_FILE ) {
+        if( isVideoCaptureIntent() ) {
+            if( done && video_method == VideoMethod.FILE ) {
                 // do nothing here - we end the activity from storageUtils.broadcastFile after the file has been scanned, as it seems caller apps seem to prefer the content:// Uri rather than one based on a File
             }
             else {
@@ -2152,9 +2394,9 @@ public class MyApplicationInterface extends BasicApplicationInterface {
                 Intent output = null;
                 if( done ) {
                     // may need to pass back the Uri we saved to, if the calling application didn't specify a Uri
-                    // set note above for VIDEOMETHOD_FILE
-                    // n.b., currently this code is not used, as we always switch to VIDEOMETHOD_FILE if the calling application didn't specify a Uri, but I've left this here for possible future behaviour
-                    if( video_method == VIDEOMETHOD_SAF ) {
+                    // set note above for VideoMethod.FILE
+                    // n.b., currently this code is not used, as we always switch to VideoMethod.FILE if the calling application didn't specify a Uri, but I've left this here for possible future behaviour
+                    if( video_method == VideoMethod.SAF || video_method == VideoMethod.MEDIASTORE ) {
                         output = new Intent();
                         output.setData(uri);
                         if( MyDebug.LOG )
@@ -2169,14 +2411,15 @@ public class MyApplicationInterface extends BasicApplicationInterface {
             // create thumbnail
             long debug_time = System.currentTimeMillis();
             Bitmap thumbnail = null;
+            ParcelFileDescriptor pfd_saf = null; // keep a reference to this as long as retriever, to avoid risk of pfd_saf being garbage collected
             MediaMetadataRetriever retriever = new MediaMetadataRetriever();
             try {
-                if( video_method == VIDEOMETHOD_FILE ) {
+                if( video_method == VideoMethod.FILE ) {
                     File file = new File(filename);
                     retriever.setDataSource(file.getPath());
                 }
                 else {
-                    ParcelFileDescriptor pfd_saf = getContext().getContentResolver().openFileDescriptor(uri, "r");
+                    pfd_saf = getContext().getContentResolver().openFileDescriptor(uri, "r");
                     retriever.setDataSource(pfd_saf.getFileDescriptor());
                 }
                 thumbnail = retriever.getFrameAtTime(-1);
@@ -2193,6 +2436,14 @@ public class MyApplicationInterface extends BasicApplicationInterface {
                 catch(RuntimeException ex) {
                     // ignore
                 }
+                try {
+                    if( pfd_saf != null ) {
+                        pfd_saf.close();
+                    }
+                }
+                catch(IOException e) {
+                    e.printStackTrace();
+                }
             }
             if( thumbnail != null ) {
                 CircleImageView galleryButton = main_activity.findViewById(R.id.gallery);
@@ -2226,17 +2477,43 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     }
 
     @Override
-    public void restartedVideo(final int video_method, final Uri uri, final String filename) {
+    public void restartedVideo(final VideoMethod video_method, final Uri uri, final String filename) {
         if( MyDebug.LOG ) {
             Log.d(TAG, "restartedVideo");
             Log.d(TAG, "video_method " + video_method);
             Log.d(TAG, "uri " + uri);
             Log.d(TAG, "filename " + filename);
         }
+        completeVideo(video_method, uri);
         broadcastVideo(video_method, uri, filename);
+
+        // also need to restart subtitles file
+        if( subtitleVideoTimerTask != null ) {
+            subtitleVideoTimerTask.cancel();
+            subtitleVideoTimerTask = null;
+
+            // No need to check if option for subtitles is set, if we were already saving subtitles.
+            // Assume that video_method is unchanged between old and new video file when restarting.
+            startVideoSubtitlesTask(video_method);
+        }
+    }
+
+    /** Called when we've finished recording to a video file, to do any necessary cleanup for the
+     *  file.
+     */
+    private void completeVideo(final VideoMethod video_method, final Uri uri) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "completeVideo");
+        if( video_method == VideoMethod.MEDIASTORE ) {
+            if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
+                ContentValues contentValues = new ContentValues();
+                contentValues.put(MediaStore.Video.Media.IS_PENDING, 0);
+                main_activity.getContentResolver().update(uri, contentValues, null, null);
+            }
+        }
     }
 
-    private boolean broadcastVideo(final int video_method, final Uri uri, final String filename) {
+    private boolean broadcastVideo(final VideoMethod video_method, final Uri uri, final String filename) {
         if( MyDebug.LOG ) {
             Log.d(TAG, "broadcastVideo");
             Log.d(TAG, "video_method " + video_method);
@@ -2244,7 +2521,24 @@ public class MyApplicationInterface extends BasicApplicationInterface {
             Log.d(TAG, "filename " + filename);
         }
         boolean done = false;
-        if( video_method == VIDEOMETHOD_FILE ) {
+        // clear just in case we're unable to update this - don't want an out of date cached uri
+        storageUtils.clearLastMediaScanned();
+        if( video_method == VideoMethod.MEDIASTORE ) {
+            // no need to broadcast when using mediastore
+
+            if( uri != null ) {
+                // in theory this is pointless, as announceUri no longer does anything on Android 7+,
+                // and mediastore method is only used on Android 10+, but keep this just in case
+                // announceUri does something in future
+                storageUtils.announceUri(uri, false, true);
+
+                // we also want to save the uri - we can use the media uri directly, rather than having to scan it
+                storageUtils.setLastMediaScanned(uri, false);
+
+                done = true;
+            }
+        }
+        else if( video_method == VideoMethod.FILE ) {
             if( filename != null ) {
                 File file = new File(filename);
                 storageUtils.broadcastFile(file, false, true, true);
@@ -2254,10 +2548,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         else {
             if( uri != null ) {
                 // see note in onPictureTaken() for where we call broadcastFile for SAF photos
-                File real_file = storageUtils.broadcastUri(uri, false, true, true);
-                if( real_file != null ) {
-                    main_activity.test_last_saved_image = real_file.getAbsolutePath();
-                }
+                storageUtils.broadcastUri(uri, false, true, true, false);
                 done = true;
             }
         }
@@ -2266,22 +2557,41 @@ public class MyApplicationInterface extends BasicApplicationInterface {
             if( MyDebug.LOG )
                 Log.d(TAG, "test_n_videos_scanned is now: " + test_n_videos_scanned);
         }
+
+        if( video_method == VideoMethod.MEDIASTORE && isVideoCaptureIntent() ) {
+            finishVideoIntent(uri);
+        }
         return done;
     }
 
+    /** For use when called from a video capture intent. This returns the supplied uri to the
+     *  caller, and finishes the activity.
+     */
+    void finishVideoIntent(Uri uri) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "finishVideoIntent:" + uri);
+        Intent output = new Intent();
+        output.setData(uri);
+        main_activity.setResult(Activity.RESULT_OK, output);
+        main_activity.finish();
+    }
+
     @Override
-    public void deleteUnusedVideo(final int video_method, final Uri uri, final String filename) {
+    public void deleteUnusedVideo(final VideoMethod video_method, final Uri uri, final String filename) {
         if( MyDebug.LOG ) {
             Log.d(TAG, "deleteUnusedVideo");
             Log.d(TAG, "video_method " + video_method);
             Log.d(TAG, "uri " + uri);
             Log.d(TAG, "filename " + filename);
         }
-        if( video_method == VIDEOMETHOD_FILE ) {
-            trashImage(false, uri, filename, false);
+        if( video_method == VideoMethod.FILE ) {
+            trashImage(LastImagesType.FILE, uri, filename, false);
         }
-        else if( video_method == VIDEOMETHOD_SAF ) {
-            trashImage(true, uri, filename, false);
+        else if( video_method == VideoMethod.SAF ) {
+            trashImage(LastImagesType.SAF, uri, filename, false);
+        }
+        else if( video_method == VideoMethod.MEDIASTORE ) {
+            trashImage(LastImagesType.MEDIASTORE, uri, filename, false);
         }
         // else can't delete Uri
     }
@@ -2357,10 +2667,6 @@ public class MyApplicationInterface extends BasicApplicationInterface {
             error_message = getContext().getResources().getString(R.string.failed_to_record_video);
         }
         main_activity.getPreview().showToast(null, error_message);
-        ImageButton view = main_activity.findViewById(R.id.take_photo);
-        view.setImageResource(R.drawable.take_video_selector);
-        view.setContentDescription( getContext().getResources().getString(R.string.start_video) );
-        view.setTag(R.drawable.take_video_selector); // for testing
     }
 
     @Override
@@ -2383,11 +2689,9 @@ public class MyApplicationInterface extends BasicApplicationInterface {
 
     @Override
     public void onFailedCreateVideoFileError() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "onFailedCreateVideoFileError");
         main_activity.getPreview().showToast(null, R.string.failed_to_save_video);
-        ImageButton view = main_activity.findViewById(R.id.take_photo);
-        view.setImageResource(R.drawable.take_video_selector);
-        view.setContentDescription( getContext().getResources().getString(R.string.start_video) );
-        view.setTag(R.drawable.take_video_selector); // for testing
     }
 
     @Override
@@ -2530,6 +2834,13 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         main_activity.getMainUI().setSeekbarZoom(new_zoom);
     }
 
+    @Override
+    public void requestTakePhoto() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "requestTakePhoto");
+        main_activity.takePicture(false);
+    }
+
     /** Switch to the first available camera that is front or back facing as desired.
      * @param front_facing Whether to switch to a front or back facing camera.
      */
@@ -2700,6 +3011,8 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     public boolean needsStoragePermission() {
         if( MyDebug.LOG )
             Log.d(TAG, "needsStoragePermission");
+        if( MainActivity.useScopedStorage() )
+            return false; // no longer need storage permission with scoped storage - and shouldn't request it either
         return true;
     }
 
@@ -2753,7 +3066,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
             // aperture is reset when switching camera, but not when application is paused or switching between photo/video etc
             this.aperture = aperture_default;
         }
-        this.zoom_factor = 0;
+        this.zoom_factor = -1;
     }
 
     @Override
@@ -2847,8 +3160,18 @@ public class MyApplicationInterface extends BasicApplicationInterface {
             paint.setAlpha(255);
         }
         paint.setColor(foreground);
+        if( shadow == Shadow.SHADOW_OUTLINE ) {
+            //noinspection PointlessArithmeticExpression
+            float shadow_radius = (1.0f * scale + 0.5f); // convert pt to pixels
+            shadow_radius = Math.max(shadow_radius, 1.0f);
+            paint.setShadowLayer(shadow_radius, 0.0f, 0.0f, background);
+        }
         canvas.drawText(text, location_x, location_y, paint);
         if( shadow == Shadow.SHADOW_OUTLINE ) {
+            paint.clearShadowLayer(); // set back to default
+        }
+        /*if( shadow == Shadow.SHADOW_OUTLINE ) {
+            // old method (instead of setting shadow layer) - doesn't work correctly on Android 12!
             paint.setColor(background);
             paint.setStyle(Paint.Style.STROKE);
             float current_stroke_width = paint.getStrokeWidth();
@@ -2856,7 +3179,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
             canvas.drawText(text, location_x, location_y, paint);
             paint.setStyle(Paint.Style.FILL); // set back to default
             paint.setStrokeWidth(current_stroke_width); // reset
-        }
+        }*/
         return text_bounds.bottom - text_bounds.top;
     }
 
@@ -2882,6 +3205,17 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         return image_capture_intent;
     }
 
+    boolean isVideoCaptureIntent() {
+        boolean video_capture_intent = false;
+        String action = main_activity.getIntent().getAction();
+        if( MediaStore.ACTION_VIDEO_CAPTURE.equals(action) ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "from video capture intent");
+            video_capture_intent = true;
+        }
+        return video_capture_intent;
+    }
+
     /** Whether the photos will be part of a burst, even if we're receiving via the non-burst callbacks.
      */
     private boolean forceSuffix(PhotoMode photo_mode) {
@@ -2921,6 +3255,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         }
 
         boolean using_camera2 = main_activity.getPreview().usingCamera2API();
+        boolean using_camera_extensions = isCameraExtensionPref();
         ImageSaver.Request.ImageFormat image_format = getImageFormatPref();
         boolean store_ypr = sharedPreferences.getBoolean(PreferenceKeys.AddYPRToComments, false) &&
                 main_activity.getPreview().hasLevelAngle() &&
@@ -2953,7 +3288,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
         String preference_stamp_dateformat = this.getStampDateFormatPref();
         String preference_stamp_timeformat = this.getStampTimeFormatPref();
         String preference_stamp_gpsformat = this.getStampGPSFormatPref();
-        String preference_stamp_geo_address = this.getStampGeoAddressPref();
+        //String preference_stamp_geo_address = this.getStampGeoAddressPref();
         String preference_units_distance = this.getUnitsDistancePref();
         boolean panorama_crop = sharedPreferences.getString(PreferenceKeys.PanoramaCropPreferenceKey, "preference_panorama_crop_on").equals("preference_panorama_crop_on");
         boolean store_location = getGeotaggingPref() && getLocation() != null;
@@ -3055,7 +3390,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
                         photo_mode == PhotoMode.NoiseReduction ? ImageSaver.Request.ProcessType.AVERAGE : ImageSaver.Request.ProcessType.PANORAMA,
                         save_base,
                         image_capture_intent, image_capture_intent_uri,
-                        using_camera2,
+                        using_camera2, using_camera_extensions,
                         image_format, image_quality,
                         do_auto_stabilise, level_angle, photo_mode == PhotoMode.Panorama,
                         is_front_facing,
@@ -3064,7 +3399,9 @@ public class MyApplicationInterface extends BasicApplicationInterface {
                         iso,
                         exposure_time,
                         zoom_factor,
-                        preference_stamp, preference_textstamp, font_size, color, pref_style, preference_stamp_dateformat, preference_stamp_timeformat, preference_stamp_gpsformat, preference_stamp_geo_address, preference_units_distance,
+                        preference_stamp, preference_textstamp, font_size, color, pref_style, preference_stamp_dateformat, preference_stamp_timeformat, preference_stamp_gpsformat,
+                        //preference_stamp_geo_address,
+                        preference_units_distance,
                         panorama_crop,
                         store_location, location, store_geo_direction, geo_direction,
                         pitch_angle, store_ypr,
@@ -3097,7 +3434,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
                     force_suffix ? (n_capture_images-1) : 0,
                     save_expo, images,
                     image_capture_intent, image_capture_intent_uri,
-                    using_camera2,
+                    using_camera2, using_camera_extensions,
                     image_format, image_quality,
                     do_auto_stabilise, level_angle,
                     is_front_facing,
@@ -3107,7 +3444,9 @@ public class MyApplicationInterface extends BasicApplicationInterface {
                     iso,
                     exposure_time,
                     zoom_factor,
-                    preference_stamp, preference_textstamp, font_size, color, pref_style, preference_stamp_dateformat, preference_stamp_timeformat, preference_stamp_gpsformat, preference_stamp_geo_address, preference_units_distance,
+                    preference_stamp, preference_textstamp, font_size, color, pref_style, preference_stamp_dateformat, preference_stamp_timeformat, preference_stamp_gpsformat,
+                    //preference_stamp_geo_address,
+                    preference_units_distance,
                     false, // panorama doesn't use this codepath
                     store_location, location, store_geo_direction, geo_direction,
                     pitch_angle, store_ypr,
@@ -3231,7 +3570,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
             Log.d(TAG, "addLastImage: " + file);
             Log.d(TAG, "share?: " + share);
         }
-        last_images_saf = false;
+        last_images_type = LastImagesType.FILE;
         LastImage last_image = new LastImage(file.getAbsolutePath(), share);
         last_images.add(last_image);
     }
@@ -3241,7 +3580,17 @@ public class MyApplicationInterface extends BasicApplicationInterface {
             Log.d(TAG, "addLastImageSAF: " + uri);
             Log.d(TAG, "share?: " + share);
         }
-        last_images_saf = true;
+        last_images_type = LastImagesType.SAF;
+        LastImage last_image = new LastImage(uri, share);
+        last_images.add(last_image);
+    }
+
+    void addLastImageMediaStore(Uri uri, boolean share) {
+        if( MyDebug.LOG ) {
+            Log.d(TAG, "addLastImageMediaStore: " + uri);
+            Log.d(TAG, "share?: " + share);
+        }
+        last_images_type = LastImagesType.MEDIASTORE;
         LastImage last_image = new LastImage(uri, share);
         last_images.add(last_image);
     }
@@ -3249,7 +3598,7 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     void clearLastImages() {
         if( MyDebug.LOG )
             Log.d(TAG, "clearLastImages");
-        last_images_saf = false;
+        last_images_type = LastImagesType.FILE;
         last_images.clear();
         drawPreview.clearLastImage();
     }
@@ -3292,13 +3641,13 @@ public class MyApplicationInterface extends BasicApplicationInterface {
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    private void trashImage(boolean image_saf, Uri image_uri, String image_name, boolean from_user) {
+    private void trashImage(LastImagesType image_type, Uri image_uri, String image_name, boolean from_user) {
         if( MyDebug.LOG )
             Log.d(TAG, "trashImage");
         Preview preview  = main_activity.getPreview();
-        if( image_saf && image_uri != null ) {
+        if( image_type == LastImagesType.SAF && image_uri != null ) {
             if( MyDebug.LOG )
-                Log.d(TAG, "Delete: " + image_uri);
+                Log.d(TAG, "Delete SAF: " + image_uri);
             File file = storageUtils.getFileFromDocumentUriSAF(image_uri, false); // need to get file before deleting it, as fileFromDocumentUriSAF may depend on the file still existing
             try {
                 if( !DocumentsContract.deleteDocument(main_activity.getContentResolver(), image_uri) ) {
@@ -3324,6 +3673,11 @@ public class MyApplicationInterface extends BasicApplicationInterface {
                 e.printStackTrace();
             }
         }
+        else if( image_type == LastImagesType.MEDIASTORE && image_uri != null ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "Delete MediaStore: " + image_uri);
+            main_activity.getContentResolver().delete(image_uri, null, null);
+        }
         else if( image_name != null ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "Delete: " + image_name);
@@ -3344,12 +3698,12 @@ public class MyApplicationInterface extends BasicApplicationInterface {
 
     void trashLastImage() {
         if( MyDebug.LOG )
-            Log.d(TAG, "trashImage");
+            Log.d(TAG, "trashLastImage");
         Preview preview  = main_activity.getPreview();
         if( preview.isPreviewPaused() ) {
             for(int i=0;i<last_images.size();i++) {
                 LastImage last_image = last_images.get(i);
-                trashImage(last_images_saf, last_image.uri, last_image.name, true);
+                trashImage(last_images_type, last_image.uri, last_image.name, true);
             }
             clearLastImages();
             drawPreview.clearGhostImage(); // doesn't make sense to show the last image as a ghost, if the user has trashed it!
diff --git a/app/src/main/java/net/sourceforge/opencamera/MyPreferenceFragment.java b/app/src/main/java/net/sourceforge/opencamera/MyPreferenceFragment.java
index aa236cdf9581d1b2d3682054102896a25bc0216d..a4ad149c6dd714f3416226063c5332796cd8758f 100644
--- a/app/src/main/java/net/sourceforge/opencamera/MyPreferenceFragment.java
+++ b/app/src/main/java/net/sourceforge/opencamera/MyPreferenceFragment.java
@@ -4,7 +4,9 @@ import net.sourceforge.opencamera.cameracontroller.CameraController;
 import net.sourceforge.opencamera.preview.Preview;
 import net.sourceforge.opencamera.ui.ArraySeekBarPreference;
 import net.sourceforge.opencamera.ui.FolderChooserDialog;
+import net.sourceforge.opencamera.ui.MyEditTextPreference;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
@@ -35,6 +37,7 @@ import android.preference.PreferenceGroup;
 import android.preference.PreferenceManager;
 import android.preference.TwoStatePreference;
 import androidx.annotation.Nullable;
+import android.text.Html;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
@@ -114,6 +117,13 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
         if( MyDebug.LOG )
             Log.d(TAG, "using_android_l: " + using_android_l);
 
+        final int camera_orientation = bundle.getInt("camera_orientation");
+        if( MyDebug.LOG )
+            Log.d(TAG, "camera_orientation: " + camera_orientation);
+
+        final float min_zoom_factor = bundle.getFloat("min_zoom_factor");
+        final float max_zoom_factor = bundle.getFloat("max_zoom_factor");
+
         final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this.getActivity());
 
         final boolean supports_auto_stabilise = bundle.getBoolean("supports_auto_stabilise");
@@ -290,9 +300,9 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
                 entries[i] = "" + (i+1) + "%";
                 values[i] = "" + (i+1);
             }
-            ListPreference lp = (ListPreference)findPreference("preference_quality");
-            lp.setEntries(entries);
-            lp.setEntryValues(values);
+            ArraySeekBarPreference sp = (ArraySeekBarPreference)findPreference("preference_quality");
+            sp.setEntries(entries);
+            sp.setEntryValues(values);
         }
 
         {
@@ -643,20 +653,8 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
             pg.removePreference(pref);
         }
 
-        if( Build.VERSION.SDK_INT < Build.VERSION_CODES.N ) {
-            // the required ExifInterface tags requires Android N or greater
-            Preference pref = findPreference("preference_category_exif_tags");
-            PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_screen_photo_settings");
-            pg.removePreference(pref);
-
-            pref = findPreference("preference_comment_ypr");
-            pg = (PreferenceGroup)this.findPreference("preference_screen_location_settings");
-            pg.removePreference(pref);
-        }
-        else {
-            setSummary("preference_exif_artist");
-            setSummary("preference_exif_copyright");
-        }
+        setSummary("preference_exif_artist");
+        setSummary("preference_exif_copyright");
 
         setSummary("preference_save_photo_prefix");
         setSummary("preference_save_video_prefix");
@@ -703,6 +701,10 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
             PreferenceGroup pg = (PreferenceGroup)this.findPreference("preference_category_photo_debugging");
             pg.removePreference(pref);
 
+            pref = findPreference("preference_camera2_dummy_capture_hack");
+            pg = (PreferenceGroup)this.findPreference("preference_category_photo_debugging");
+            pg.removePreference(pref);
+
             pref = findPreference("preference_camera2_fast_burst");
             pg = (PreferenceGroup)this.findPreference("preference_category_photo_debugging");
             pg.removePreference(pref);
@@ -864,6 +866,24 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
                         main_activity.openFolderChooserDialogSAF(true);
                         return true;
                     }
+                    else if( MainActivity.useScopedStorage() ) {
+                        // we can't use an EditTextPreference (or MyEditTextPreference) due to having to support non-scoped-storage, or when SAF is enabled...
+                        // anyhow, this means we can share code when called from gallery long-press anyway
+                        AlertDialog.Builder alertDialog = main_activity.createSaveFolderDialog();
+                        final AlertDialog alert = alertDialog.create();
+                        // AlertDialog.Builder.setOnDismissListener() requires API level 17, so do it this way instead
+                        alert.setOnDismissListener(new DialogInterface.OnDismissListener() {
+                            @Override
+                            public void onDismiss(DialogInterface arg0) {
+                                if( MyDebug.LOG )
+                                    Log.d(TAG, "save folder dialog dismissed");
+                                dialogs.remove(alert);
+                            }
+                        });
+                        alert.show();
+                        dialogs.add(alert);
+                        return true;
+                    }
                     else {
                         File start_folder = main_activity.getStorageUtils().getImageFolder();
 
@@ -1073,6 +1093,8 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
                         about_string.append(is_multi_cam);
                         about_string.append("\nCamera API: ");
                         about_string.append(camera_api);
+                        about_string.append("\nCamera orientation: ");
+                        about_string.append(camera_orientation);
                         about_string.append("\nPhoto mode: ");
                         about_string.append(photo_mode_string==null ? "UNKNOWN" : photo_mode_string);
                         {
@@ -1082,6 +1104,10 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
                                 about_string.append(last_video_error);
                             }
                         }
+                        about_string.append("\nMin zoom factor: ");
+                        about_string.append(min_zoom_factor);
+                        about_string.append("\nMax zoom factor: ");
+                        about_string.append(max_zoom_factor);
                         if( preview_widths != null && preview_heights != null ) {
                             about_string.append("\nPreview resolutions: ");
                             for(int i=0;i<preview_widths.length;i++) {
@@ -1330,17 +1356,14 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
 
                         // clickable text is only supported if we call setMovementMethod on the TextView - which means we need to create
                         // our own for the AlertDialog!
-                        final float scale = getActivity().getResources().getDisplayMetrics().density;
-                        TextView textView = new TextView(getActivity());
+                        @SuppressLint("InflateParams") // we add the view to the alert dialog in addTextViewForAlertDialog()
+                        final View dialog_view = LayoutInflater.from(getActivity()).inflate(R.layout.alertdialog_textview, null);
+                        final TextView textView = dialog_view.findViewById(R.id.text_view);
+
                         textView.setText(span);
                         textView.setMovementMethod(LinkMovementMethod.getInstance());
                         textView.setTextAppearance(getActivity(), android.R.style.TextAppearance_Medium);
-                        ScrollView scrollView = new ScrollView(getActivity());
-                        scrollView.addView(textView);
-                        // padding values from /sdk/platforms/android-18/data/res/layout/alert_dialog.xml
-                        textView.setPadding((int)(5*scale+0.5f), (int)(5*scale+0.5f), (int)(5*scale+0.5f), (int)(5*scale+0.5f));
-                        scrollView.setPadding((int)(14*scale+0.5f), (int)(2*scale+0.5f), (int)(10*scale+0.5f), (int)(12*scale+0.5f));
-                        alertDialog.setView(scrollView);
+                        addTextViewForAlertDialog(alertDialog, textView);
                         //alertDialog.setMessage(about_string);
 
                         alertDialog.setPositiveButton(android.R.string.ok, null);
@@ -1399,8 +1422,14 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
                         AlertDialog.Builder alertDialog = new AlertDialog.Builder(MyPreferenceFragment.this.getActivity());
                         alertDialog.setTitle(R.string.preference_save_settings_filename);
 
-                        final EditText editText = new EditText(getActivity());
-                        alertDialog.setView(editText);
+                        final View dialog_view = LayoutInflater.from(getActivity()).inflate(R.layout.alertdialog_edittext, null);
+                        final EditText editText = dialog_view.findViewById(R.id.edit_text);
+
+                        editText.setSingleLine();
+                        // set hint instead of content description for EditText, see https://support.google.com/accessibility/android/answer/6378120
+                        editText.setHint(getResources().getString(R.string.preference_save_settings_filename));
+
+                        alertDialog.setView(dialog_view);
 
                         final MainActivity main_activity = (MainActivity)MyPreferenceFragment.this.getActivity();
                         try {
@@ -1521,8 +1550,21 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
         return inflater.inflate(R.layout.custom_preference_list, container, false);
     }
 
+    /** Adds a TextView to an AlertDialog builder, placing it inside a scrollview and adding appropriate padding.
+     */
+    private void addTextViewForAlertDialog(AlertDialog.Builder alertDialog, TextView textView) {
+        final float scale = getActivity().getResources().getDisplayMetrics().density;
+        ScrollView scrollView = new ScrollView(getActivity());
+        scrollView.addView(textView);
+        // padding values from /sdk/platforms/android-18/data/res/layout/alert_dialog.xml
+        textView.setPadding((int)(5*scale+0.5f), (int)(5*scale+0.5f), (int)(5*scale+0.5f), (int)(5*scale+0.5f));
+        scrollView.setPadding((int)(14*scale+0.5f), (int)(2*scale+0.5f), (int)(10*scale+0.5f), (int)(12*scale+0.5f));
+        alertDialog.setView(scrollView);
+    }
+
     /** Programmatically set up dependencies for preference types (e.g., ListPreference) that don't
-     *  support this in xml (such as SwitchPreference and CheckBoxPreference).
+     *  support this in xml (such as SwitchPreference and CheckBoxPreference), or where this depends
+     *  on the device (e.g., Android version).
      */
     private void setupDependencies() {
         // set up dependency for preference_audio_noise_control_sensitivity on preference_audio_control
@@ -1552,6 +1594,14 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
             });
             setVideoProfileGammaDependency(pref.getValue()); // ensure dependency is enabled/disabled as required for initial value
         }
+
+        if( !MyApplicationInterface.mediastoreSupportsVideoSubtitles() ) {
+            // video subtitles only supported with SAF on Android 11+
+            pref = (ListPreference)findPreference("preference_video_subtitle");
+            if( pref != null ) {
+                pref.setDependency("preference_using_saf");
+            }
+        }
     }
 
     private void setAudioNoiseControlSensitivityDependency(String newValue) {
@@ -1722,7 +1772,15 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
      */
     public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
         if( MyDebug.LOG )
-            Log.d(TAG, "onSharedPreferenceChanged");
+            Log.d(TAG, "onSharedPreferenceChanged: " + key);
+
+        if( key == null ) {
+            // On Android 11+, when targetting Android 11+, this method is called with key==null
+            // if preferences are cleared. Unclear if this happens here in practice, but return
+            // just in case.
+            return;
+        }
+
         Preference pref = findPreference(key);
         if( pref instanceof TwoStatePreference ) {
             TwoStatePreference twoStatePref = (TwoStatePreference)pref;
@@ -1741,7 +1799,20 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
      */
     private void setSummary(String key) {
         Preference pref = findPreference(key);
+
+        //noinspection DuplicateCondition
         if( pref instanceof EditTextPreference ) {
+            /* We have a runtime check for using EditTextPreference - we don't want these due to importance of
+             * supporting the Google Play emoji policy (see comment in MyEditTextPreference.java) - and this
+             * helps guard against the risk of accidentally adding more EditTextPreferences in future.
+             * Once we've switched to using Android X Preference library, and hence safe to use EditTextPreference
+             * again, this code can be removed.
+             */
+            throw new RuntimeException("detected an EditTextPreference: " + key + " pref: " + pref);
+        }
+
+        //noinspection DuplicateCondition
+        if( pref instanceof EditTextPreference || pref instanceof MyEditTextPreference) {
             // %s only supported for ListPreference
             // we also display the usual summary if no preference value is set
             if( pref.getKey().equals("preference_exif_artist") ||
@@ -1755,8 +1826,18 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
                     default_value = "IMG_";
                 else if( pref.getKey().equals("preference_save_video_prefix") )
                     default_value = "VID_";
-                EditTextPreference editTextPref = (EditTextPreference)pref;
-                if( editTextPref.getText().equals(default_value) ) {
+
+                String current_value;
+                if( pref instanceof EditTextPreference ) {
+                    EditTextPreference editTextPref = (EditTextPreference)pref;
+                    current_value = editTextPref.getText();
+                }
+                else {
+                    MyEditTextPreference editTextPref = (MyEditTextPreference)pref;
+                    current_value = editTextPref.getText();
+                }
+
+                if( current_value.equals(default_value) ) {
                     switch (pref.getKey()) {
                         case "preference_exif_artist":
                             pref.setSummary(R.string.preference_exif_artist_summary);
@@ -1777,7 +1858,7 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
                 }
                 else {
                     // non-default value, so display the current value
-                    pref.setSummary(editTextPref.getText());
+                    pref.setSummary(current_value);
                 }
             }
         }
@@ -1806,6 +1887,10 @@ public class MyPreferenceFragment extends PreferenceFragment implements OnShared
                     fragment.setModeFolder(false);
                     fragment.setExtension(".xml");
                     fragment.setStartFolder(main_activity.getStorageUtils().getSettingsFolder());
+                    if( MainActivity.useScopedStorage() ) {
+                        // since we use File API to load, don't allow going outside of the application's folder, as we won't be able to read those files!
+                        fragment.setMaxParent(main_activity.getExternalFilesDir(null));
+                    }
                     fragment.show(getFragmentManager(), "FOLDER_FRAGMENT");
                 }
             }
diff --git a/app/src/main/java/net/sourceforge/opencamera/MyWidgetProvider.java b/app/src/main/java/net/sourceforge/opencamera/MyWidgetProvider.java
index d0e728f8ce38b7cce34e1d90f99aec84ea7e9b82..eeb9e59655174c241a4b1d9511230540eaed1ccf 100644
--- a/app/src/main/java/net/sourceforge/opencamera/MyWidgetProvider.java
+++ b/app/src/main/java/net/sourceforge/opencamera/MyWidgetProvider.java
@@ -9,6 +9,7 @@ import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.util.Log;
 import android.widget.RemoteViews;
 
@@ -45,7 +46,11 @@ public class MyWidgetProvider extends AppWidgetProvider {
                 /*if( MyDebug.LOG )
                     Log.d(TAG, "don't show above lock screen");*/
                 Intent intent = new Intent(context, MainActivity.class);
-                pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+
+                int flags = PendingIntent.FLAG_UPDATE_CURRENT;
+                if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M )
+                    flags = flags | PendingIntent.FLAG_IMMUTABLE; // needed for targetting Android 12+, but fine to set it all versions from Android 6 onwards
+                pendingIntent = PendingIntent.getActivity(context, 0, intent,  flags);
             }
 
             RemoteViews remote_views = new RemoteViews(context.getPackageName(), R.layout.widget_layout);
diff --git a/app/src/main/java/net/sourceforge/opencamera/MyWidgetProviderTakePhoto.java b/app/src/main/java/net/sourceforge/opencamera/MyWidgetProviderTakePhoto.java
index 76bfe385c2fea54fab72c4be19ab588f533729a8..cfea899b50a43b4243bc0537dafa4b33b9af5100 100644
--- a/app/src/main/java/net/sourceforge/opencamera/MyWidgetProviderTakePhoto.java
+++ b/app/src/main/java/net/sourceforge/opencamera/MyWidgetProviderTakePhoto.java
@@ -5,6 +5,7 @@ import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.util.Log;
 import android.widget.RemoteViews;
 
@@ -28,7 +29,11 @@ public class MyWidgetProviderTakePhoto extends AppWidgetProvider {
                 Log.d(TAG, "appWidgetId: " + appWidgetId);
 
             Intent intent = new Intent(context, TakePhoto.class);
-            PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
+
+            int flags = PendingIntent.FLAG_UPDATE_CURRENT;
+            if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M )
+                flags = flags | PendingIntent.FLAG_IMMUTABLE; // needed for targetting Android 12+, but fine to set it all versions from Android 6 onwards
+            PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, flags);
 
             RemoteViews remote_views = new RemoteViews(context.getPackageName(), R.layout.widget_layout_take_photo);
             remote_views.setOnClickPendingIntent(R.id.widget_take_photo, pendingIntent);
diff --git a/app/src/main/java/net/sourceforge/opencamera/PanoramaProcessor.java b/app/src/main/java/net/sourceforge/opencamera/PanoramaProcessor.java
index 378d977d60579d4aee4cf71a75132982136bbfe9..ed2f74045256ffb602a566a80636e2a8fbdde31f 100644
--- a/app/src/main/java/net/sourceforge/opencamera/PanoramaProcessor.java
+++ b/app/src/main/java/net/sourceforge/opencamera/PanoramaProcessor.java
@@ -218,7 +218,7 @@ public class PanoramaProcessor {
      *  RGBA_8888.
      */
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-    private List<Allocation> createLaplacianPyramid(ScriptC_pyramid_blending script, Bitmap bitmap, int n_levels, @SuppressWarnings("unused") String name) {
+    private List<Allocation> createLaplacianPyramid(ScriptC_pyramid_blending script, Bitmap bitmap, int n_levels, String name) {
         if( MyDebug.LOG )
             Log.d(TAG, "createLaplacianPyramid");
         long time_s = 0;
@@ -497,7 +497,6 @@ public class PanoramaProcessor {
         }
     }
 
-    @SuppressWarnings("unused")
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private void saveAllocation(String name, Allocation allocation) {
         Bitmap bitmap;
@@ -780,7 +779,7 @@ public class PanoramaProcessor {
         }
     }
 
-    private static void computeDistancesBetweenMatches(List<FeatureMatch> matches, int st_indx, int nd_indx, int feature_descriptor_radius, @SuppressWarnings("unused") List<Bitmap> bitmaps, int [] pixels0, int [] pixels1) {
+    private static void computeDistancesBetweenMatches(List<FeatureMatch> matches, int st_indx, int nd_indx, int feature_descriptor_radius, List<Bitmap> bitmaps, int [] pixels0, int [] pixels1) {
         final int wid = 2*feature_descriptor_radius+1;
         final int wid2 = wid*wid;
         for(int indx=st_indx;indx<nd_indx;indx++) {
@@ -1979,7 +1978,6 @@ public class PanoramaProcessor {
         return new AutoAlignmentByFeatureResult(offset_x, offset_y, rotation, y_scale);
     }
 
-    @SuppressWarnings("unused")
     private Bitmap blend_panorama_alpha(Bitmap lhs, Bitmap rhs) {
         int width = lhs.getWidth();
         int height = lhs.getHeight();
@@ -2486,7 +2484,6 @@ public class PanoramaProcessor {
         return ratio_brightnesses;
     }
 
-    @SuppressWarnings("unused")
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     private void adjustExposures(List<Bitmap> bitmaps, long time_s) {
         List<HDRProcessor.HistogramInfo> histogramInfos = new ArrayList<>();
@@ -3107,6 +3104,12 @@ public class PanoramaProcessor {
                 Log.d(TAG, "crop_y1: " + crop_y1);
                 Log.d(TAG, "panorama_height: " + panorama_height);
             }
+
+            if( panorama_height <= 0 ) {
+                // can happen if the transforms are such that we move off top or bottom of screen! Better to fail gracefully
+                Log.e(TAG, "crop caused panorama height to become -ve: " + panorama_height);
+                throw new PanoramaProcessorException(PanoramaProcessorException.FAILED_TO_CROP);
+            }
         }
 
         Bitmap panorama = Bitmap.createBitmap(panorama_width, panorama_height, Bitmap.Config.ARGB_8888);
diff --git a/app/src/main/java/net/sourceforge/opencamera/PanoramaProcessorException.java b/app/src/main/java/net/sourceforge/opencamera/PanoramaProcessorException.java
index c5dfc178a7b5207b36c0791f6e86bb58955401f6..b0787693a324e50ffab22f1524c1c5f52b6e79e4 100644
--- a/app/src/main/java/net/sourceforge/opencamera/PanoramaProcessorException.java
+++ b/app/src/main/java/net/sourceforge/opencamera/PanoramaProcessorException.java
@@ -6,6 +6,7 @@ package net.sourceforge.opencamera;
 public class PanoramaProcessorException extends Exception {
     final static public int INVALID_N_IMAGES = 0; // the supplied number of images is not supported
     final static public int UNEQUAL_SIZES = 1; // images not of the same resolution
+    final static public int FAILED_TO_CROP = 1; // failed to crop
 
     final private int code;
 
diff --git a/app/src/main/java/net/sourceforge/opencamera/PermissionHandler.java b/app/src/main/java/net/sourceforge/opencamera/PermissionHandler.java
index ef82c09881d5babbae5277beba29c113f21789a8..a7a1ee36255678c62326719ff9bf6ff3e43685e3 100644
--- a/app/src/main/java/net/sourceforge/opencamera/PermissionHandler.java
+++ b/app/src/main/java/net/sourceforge/opencamera/PermissionHandler.java
@@ -26,6 +26,26 @@ public class PermissionHandler {
     final private static int MY_PERMISSIONS_REQUEST_RECORD_AUDIO = 2;
     final private static int MY_PERMISSIONS_REQUEST_LOCATION = 3;
 
+    private boolean camera_denied; // whether the user requested to deny a camera permission
+    private long camera_denied_time_ms; // if denied, the time when this occurred
+    private boolean storage_denied; // whether the user requested to deny a camera permission
+    private long storage_denied_time_ms; // if denied, the time when this occurred
+    private boolean audio_denied; // whether the user requested to deny a camera permission
+    private long audio_denied_time_ms; // if denied, the time when this occurred
+    private boolean location_denied; // whether the user requested to deny a camera permission
+    private long location_denied_time_ms; // if denied, the time when this occurred
+    // In some cases there can be a problem if the user denies a permission, we then get an onResume()
+    // (since application goes into background when showing system UI to request permission) at which
+    // point we try to request permission again! This would happen for camera and storage permissions.
+    // Whilst that isn't necessarily wrong, there would also be a problem if the user says
+    // "Don't ask again", we get stuck in a loop repeatedly asking the OS for permission (and it
+    // repeatedly being automatically denied) causing the UI to become sluggish.
+    // So instead we only try asking again if not within deny_delay_ms of the user denying that
+    // permission.
+    // Time shouldn't be too long, as the user might restart and then not be asked again for camera
+    // or storage permission.
+    final private static long deny_delay_ms = 1000;
+
     PermissionHandler(MainActivity main_activity) {
         this.main_activity = main_activity;
     }
@@ -103,6 +123,11 @@ public class PermissionHandler {
                 Log.e(TAG, "shouldn't be requesting permissions for pre-Android M!");
             return;
         }
+        else if( camera_denied && System.currentTimeMillis() < camera_denied_time_ms + deny_delay_ms ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "too soon since user last denied permission");
+            return;
+        }
 
         if( ActivityCompat.shouldShowRequestPermissionRationale(main_activity, Manifest.permission.CAMERA) ) {
             // Show an explanation to the user *asynchronously* -- don't block
@@ -126,6 +151,16 @@ public class PermissionHandler {
                 Log.e(TAG, "shouldn't be requesting permissions for pre-Android M!");
             return;
         }
+        else if( MainActivity.useScopedStorage() ) {
+            if( MyDebug.LOG )
+                Log.e(TAG, "shouldn't be requesting permissions for scoped storage!");
+            return;
+        }
+        else if( storage_denied && System.currentTimeMillis() < storage_denied_time_ms + deny_delay_ms ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "too soon since user last denied permission");
+            return;
+        }
 
         if( ActivityCompat.shouldShowRequestPermissionRationale(main_activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) ) {
             // Show an explanation to the user *asynchronously* -- don't block
@@ -149,6 +184,11 @@ public class PermissionHandler {
                 Log.e(TAG, "shouldn't be requesting permissions for pre-Android M!");
             return;
         }
+        else if( audio_denied && System.currentTimeMillis() < audio_denied_time_ms + deny_delay_ms ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "too soon since user last denied permission");
+            return;
+        }
 
         if( ActivityCompat.shouldShowRequestPermissionRationale(main_activity, Manifest.permission.RECORD_AUDIO) ) {
             // Show an explanation to the user *asynchronously* -- don't block
@@ -172,6 +212,11 @@ public class PermissionHandler {
                 Log.e(TAG, "shouldn't be requesting permissions for pre-Android M!");
             return;
         }
+        else if( location_denied && System.currentTimeMillis() < location_denied_time_ms + deny_delay_ms ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "too soon since user last denied permission");
+            return;
+        }
 
         if( ActivityCompat.shouldShowRequestPermissionRationale(main_activity, Manifest.permission.ACCESS_FINE_LOCATION) ||
                 ActivityCompat.shouldShowRequestPermissionRationale(main_activity, Manifest.permission.ACCESS_COARSE_LOCATION) ) {
@@ -212,6 +257,8 @@ public class PermissionHandler {
                 else {
                     if( MyDebug.LOG )
                         Log.d(TAG, "camera permission denied");
+                    camera_denied = true;
+                    camera_denied_time_ms = System.currentTimeMillis();
                     // permission denied, boo! Disable the
                     // functionality that depends on this permission.
                     // Open Camera doesn't need to do anything: the camera will remain closed
@@ -232,6 +279,8 @@ public class PermissionHandler {
                 else {
                     if( MyDebug.LOG )
                         Log.d(TAG, "storage permission denied");
+                    storage_denied = true;
+                    storage_denied_time_ms = System.currentTimeMillis();
                     // permission denied, boo! Disable the
                     // functionality that depends on this permission.
                     // Open Camera doesn't need to do anything: the camera will remain closed
@@ -252,6 +301,8 @@ public class PermissionHandler {
                 else {
                     if( MyDebug.LOG )
                         Log.d(TAG, "record audio permission denied");
+                    audio_denied = true;
+                    audio_denied_time_ms = System.currentTimeMillis();
                     // permission denied, boo! Disable the
                     // functionality that depends on this permission.
                     // no need to do anything
@@ -262,17 +313,28 @@ public class PermissionHandler {
             case MY_PERMISSIONS_REQUEST_LOCATION:
             {
                 // If request is cancelled, the result arrays are empty.
-                if( grantResults.length > 0
+                if( grantResults.length == 2 && (grantResults[0] == PackageManager.PERMISSION_GRANTED || grantResults[1] == PackageManager.PERMISSION_GRANTED) ) {
+                    // On Android 12 users can choose to only grant approximation location. This means
+                    // one of the permissions will be denied, but as long as one location permission
+                    // is granted, we can still go ahead and use location.
+                    // Otherwise we have a problem that if user selects approximate location, we end
+                    // up turning the location option back off.
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "location permission granted [1]");
+                    main_activity.initLocation();
+                }
+                else if( grantResults.length > 0
                     && grantResults[0] == PackageManager.PERMISSION_GRANTED ) {
-                    // permission was granted, yay! Do the
-                    // contacts-related task you need to do.
+                    // in theory this code path is now redundant, but keep here just in case
                     if( MyDebug.LOG )
-                        Log.d(TAG, "location permission granted");
+                        Log.d(TAG, "location permission granted [2]");
                     main_activity.initLocation();
                 }
                 else {
                     if( MyDebug.LOG )
                         Log.d(TAG, "location permission denied");
+                    location_denied = true;
+                    location_denied_time_ms = System.currentTimeMillis();
                     // permission denied, boo! Disable the
                     // functionality that depends on this permission.
                     // for location, seems best to turn the option back off
diff --git a/app/src/main/java/net/sourceforge/opencamera/PreferenceKeys.java b/app/src/main/java/net/sourceforge/opencamera/PreferenceKeys.java
index bb590c8e59e4b44c4f9b4444261468afa7a8af67..ef56fce2a3f4d402f506def284cc03f6ee551b89 100644
--- a/app/src/main/java/net/sourceforge/opencamera/PreferenceKeys.java
+++ b/app/src/main/java/net/sourceforge/opencamera/PreferenceKeys.java
@@ -142,7 +142,7 @@ public class PreferenceKeys {
 
     public static final String StampGPSFormatPreferenceKey = "preference_stamp_gpsformat";
 
-    public static final String StampGeoAddressPreferenceKey = "preference_stamp_geo_address";
+    //public static final String StampGeoAddressPreferenceKey = "preference_stamp_geo_address";
 
     public static final String UnitsDistancePreferenceKey = "preference_units_distance";
 
@@ -170,6 +170,8 @@ public class PreferenceKeys {
 
     public static final String Camera2FakeFlashPreferenceKey = "preference_camera2_fake_flash";
 
+    public static final String Camera2DummyCaptureHackPreferenceKey = "preference_camera2_dummy_capture_hack";
+
     public static final String Camera2FastBurstPreferenceKey = "preference_camera2_fast_burst";
 
     public static final String Camera2PhotoVideoRecordingPreferenceKey = "preference_camera2_photo_video_recording";
@@ -204,6 +206,10 @@ public class PreferenceKeys {
 
     public static final String SaveLocationSAFPreferenceKey = "preference_save_location_saf";
 
+    public static final String SaveLocationHistoryBasePreferenceKey = "save_location_history";
+
+    public static final String SaveLocationHistorySAFBasePreferenceKey = "save_location_history_saf";
+
     public static final String SavePhotoPrefixPreferenceKey = "preference_save_photo_prefix";
 
     public static final String SaveVideoPrefixPreferenceKey = "preference_save_video_prefix";
@@ -350,5 +356,6 @@ public class PreferenceKeys {
 
     public static final String ShutterSoundPreferenceKey = "preference_shutter_sound";
 
+    public static final String ImmersiveModePreferenceKey = "preference_immersive_mode";
     public static final String AddYPRToComments="preference_comment_ypr";
 }
diff --git a/app/src/main/java/net/sourceforge/opencamera/SaveLocationHistory.java b/app/src/main/java/net/sourceforge/opencamera/SaveLocationHistory.java
index 56024ba969e23c4ccdbe42ed46113e2de72af7a4..0ce4172cfd1f0be01ee066b1c24ce421510ea98e 100644
--- a/app/src/main/java/net/sourceforge/opencamera/SaveLocationHistory.java
+++ b/app/src/main/java/net/sourceforge/opencamera/SaveLocationHistory.java
@@ -125,6 +125,21 @@ public class SaveLocationHistory {
         return save_location_history.get(index);
     }
 
+    /** Removes a save location entry.
+     * @param index The index to remove.
+     */
+    public void remove(int index) {
+        save_location_history.remove(index);
+    }
+
+    /** Sets a save location entry.
+     * @param index The index to set.
+     * @param element The new entry.
+     */
+    public void set(int index, String element) {
+        save_location_history.set(index, element);
+    }
+
     // for testing:
     /** Should be used for testing only.
      * @param value The value to search the location history for.
diff --git a/app/src/main/java/net/sourceforge/opencamera/SettingsManager.java b/app/src/main/java/net/sourceforge/opencamera/SettingsManager.java
index 22b10d5faad18a49bd018c81ddc2cd5affb097a7..dd6ff0ad5a4b6f27500b25c1325ae308f171c862 100644
--- a/app/src/main/java/net/sourceforge/opencamera/SettingsManager.java
+++ b/app/src/main/java/net/sourceforge/opencamera/SettingsManager.java
@@ -22,7 +22,6 @@ import java.io.OutputStream;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.util.Map;
-import java.util.Set;
 
 import foundation.e.camera.R;
 
@@ -218,10 +217,9 @@ public class SettingsManager {
             xmlSerializer.startTag(null, doc_tag);
 
             SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(main_activity);
-            Set set = sharedPreferences.getAll().entrySet();
-            for( Object aSet : set) {
-                Map.Entry entry = (Map.Entry) aSet;
-                String key = (String)entry.getKey();
+            Map<String, ?> map = sharedPreferences.getAll();
+            for( Map.Entry<String, ?> entry : map.entrySet()) {
+                String key = entry.getKey();
                 Object value = entry.getValue();
                 if( key != null ) {
                     String tag_type = null;
@@ -247,9 +245,7 @@ public class SettingsManager {
                     if( tag_type != null ) {
                         xmlSerializer.startTag(null, tag_type);
                         xmlSerializer.attribute(null, "key", key);
-                        if( value != null ) {
-                            xmlSerializer.attribute(null, "value", value.toString());
-                        }
+                        xmlSerializer.attribute(null, "value", value.toString());
                         xmlSerializer.endTag(null, tag_type);
                     }
                 }
diff --git a/app/src/main/java/net/sourceforge/opencamera/SpeechControl.java b/app/src/main/java/net/sourceforge/opencamera/SpeechControl.java
deleted file mode 100644
index adf0346af72812c9fcbb9ee46282def12eb3591d..0000000000000000000000000000000000000000
--- a/app/src/main/java/net/sourceforge/opencamera/SpeechControl.java
+++ /dev/null
@@ -1,295 +0,0 @@
-package net.sourceforge.opencamera;
-
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.speech.RecognitionListener;
-import android.speech.RecognizerIntent;
-import android.speech.SpeechRecognizer;
-import android.util.Log;
-import android.view.View;
-
-import java.util.ArrayList;
-import java.util.Locale;
-
-import foundation.e.camera.R;
-
-/** Manages speech recognition for remote control.
- */
-class SpeechControl {
-    private static final String TAG = "SpeechControl";
-
-    private final MainActivity main_activity;
-
-    private SpeechRecognizer speechRecognizer;
-    private boolean speechRecognizerIsStarted;
-
-    SpeechControl(final MainActivity main_activity) {
-        this.main_activity = main_activity;
-    }
-
-    void startSpeechRecognizerIntent() {
-        if( MyDebug.LOG )
-            Log.d(TAG, "startSpeechRecognizerIntent");
-        if( speechRecognizer != null ) {
-            Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
-            intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, "en_US"); // since we listen for "cheese", ensure this works even for devices with different language settings
-            speechRecognizer.startListening(intent);
-        }
-    }
-
-    void speechRecognizerStarted() {
-        if( MyDebug.LOG )
-            Log.d(TAG, "speechRecognizerStarted");
-        main_activity.getMainUI().audioControlStarted();
-        speechRecognizerIsStarted = true;
-    }
-
-    private void speechRecognizerStopped() {
-        if( MyDebug.LOG )
-            Log.d(TAG, "speechRecognizerStopped");
-        main_activity.getMainUI().audioControlStopped();
-        speechRecognizerIsStarted = false;
-    }
-
-    void initSpeechRecognizer() {
-        if( MyDebug.LOG )
-            Log.d(TAG, "initSpeechRecognizer");
-        // in theory we could create the speech recognizer always (hopefully it shouldn't use battery when not listening?), though to be safe, we only do this when the option is enabled (e.g., just in case this doesn't work on some devices!)
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(main_activity);
-        boolean want_speech_recognizer = sharedPreferences.getString(PreferenceKeys.AudioControlPreferenceKey, "none").equals("voice");
-        if( speechRecognizer == null && want_speech_recognizer ) {
-            if( MyDebug.LOG )
-                Log.d(TAG, "create new speechRecognizer");
-            speechRecognizer = SpeechRecognizer.createSpeechRecognizer(main_activity);
-            if( speechRecognizer != null ) {
-                speechRecognizerIsStarted = false;
-                speechRecognizer.setRecognitionListener(new RecognitionListener() {
-                    private void restart() {
-                        if( MyDebug.LOG )
-                            Log.d(TAG, "RecognitionListener: restart");
-                        Handler handler = new Handler();
-                        handler.postDelayed(new Runnable() {
-                            public void run() {
-                                startSpeechRecognizerIntent();
-                            }
-                        }, 250);
-
-						/*freeSpeechRecognizer();
-						Handler handler = new Handler();
-						handler.postDelayed(new Runnable() {
-							public void run() {
-								initSpeechRecognizer();
-								startSpeechRecognizerIntent();
-					        	speechRecognizerIsStarted = true;
-							}
-						}, 500);*/
-                    }
-
-                    @Override
-                    public void onBeginningOfSpeech() {
-                        if( MyDebug.LOG )
-                            Log.d(TAG, "RecognitionListener: onBeginningOfSpeech");
-                        if( !speechRecognizerIsStarted ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "...but speech recognition already stopped");
-                            //noinspection UnnecessaryReturnStatement
-                            return;
-                        }
-                    }
-
-                    @Override
-                    public void onBufferReceived(byte[] buffer) {
-                        if( MyDebug.LOG )
-                            Log.d(TAG, "RecognitionListener: onBufferReceived");
-                        if( !speechRecognizerIsStarted ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "...but speech recognition already stopped");
-                            //noinspection UnnecessaryReturnStatement
-                            return;
-                        }
-                    }
-
-                    @Override
-                    public void onEndOfSpeech() {
-                        if( MyDebug.LOG )
-                            Log.d(TAG, "RecognitionListener: onEndOfSpeech");
-                        if( !speechRecognizerIsStarted ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "...but speech recognition already stopped");
-                            return;
-                        }
-                        //speechRecognizerStopped();
-                        restart();
-                    }
-
-                    @Override
-                    public void onError(int error) {
-                        if( MyDebug.LOG )
-                            Log.d(TAG, "RecognitionListener: onError: " + error);
-                        if( !speechRecognizerIsStarted ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "...but speech recognition already stopped");
-                            return;
-                        }
-                        if( error != SpeechRecognizer.ERROR_NO_MATCH ) {
-                            // we sometime receive ERROR_NO_MATCH straight after listening starts
-                            // it seems that the end is signalled either by ERROR_SPEECH_TIMEOUT or onEndOfSpeech()
-                            //speechRecognizerStopped();
-							/*if( error == SpeechRecognizer.ERROR_RECOGNIZER_BUSY ) {
-								if( MyDebug.LOG )
-									Log.d(TAG, "RecognitionListener: ERROR_RECOGNIZER_BUSY");
-								freeSpeechRecognizer();
-
-								Handler handler = new Handler();
-								handler.postDelayed(new Runnable() {
-									public void run() {
-										initSpeechRecognizer();
-										startSpeechRecognizerIntent();
-							        	speechRecognizerIsStarted = true;
-									}
-								}, 500);
-							}
-							else*/ {
-                                restart();
-                            }
-                        }
-                    }
-
-                    @Override
-                    public void onEvent(int eventType, Bundle params) {
-                        if( MyDebug.LOG )
-                            Log.d(TAG, "RecognitionListener: onEvent");
-                        if( !speechRecognizerIsStarted ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "...but speech recognition already stopped");
-                            //noinspection UnnecessaryReturnStatement
-                            return;
-                        }
-                    }
-
-                    @Override
-                    public void onPartialResults(Bundle partialResults) {
-                        if( MyDebug.LOG )
-                            Log.d(TAG, "RecognitionListener: onPartialResults");
-                        if( !speechRecognizerIsStarted ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "...but speech recognition already stopped");
-                            //noinspection UnnecessaryReturnStatement
-                            return;
-                        }
-                    }
-
-                    @Override
-                    public void onReadyForSpeech(Bundle params) {
-                        if( MyDebug.LOG )
-                            Log.d(TAG, "RecognitionListener: onReadyForSpeech");
-                        if( !speechRecognizerIsStarted ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "...but speech recognition already stopped");
-                            //noinspection UnnecessaryReturnStatement
-                            return;
-                        }
-                    }
-
-                    public void onResults(Bundle results) {
-                        if( MyDebug.LOG )
-                            Log.d(TAG, "RecognitionListener: onResults");
-                        if( !speechRecognizerIsStarted ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "...but speech recognition already stopped");
-                            return;
-                        }
-                        ArrayList<String> list = results.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION);
-                        boolean found = false;
-                        final String trigger = "cheese";
-                        //String debug_toast = "";
-                        for(int i=0;list != null && i<list.size();i++) {
-                            String text = list.get(i);
-                            if( MyDebug.LOG ) {
-                                float [] scores = results.getFloatArray(SpeechRecognizer.CONFIDENCE_SCORES);
-                                if( scores != null )
-                                    Log.d(TAG, "text: " + text + " score: " + scores[i]);
-                            }
-							/*if( i > 0 )
-								debug_toast += "\n";
-							debug_toast += text + " : " + results.getFloatArray(SpeechRecognizer.CONFIDENCE_SCORES)[i];*/
-                            if( text.toLowerCase(Locale.US).contains(trigger) ) {
-                                found = true;
-                            }
-                        }
-                        //preview.showToast(null, debug_toast); // debug only!
-                        if( found ) {
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "audio trigger from speech recognition");
-                            main_activity.audioTrigger();
-                        }
-                        else if( list != null && list.size() > 0 ) {
-                            String toast = list.get(0) + "?";
-                            if( MyDebug.LOG )
-                                Log.d(TAG, "unrecognised: " + toast);
-                            main_activity.getPreview().showToast(main_activity.getAudioControlToast(), toast);
-                        }
-                    }
-
-                    @Override
-                    public void onRmsChanged(float rmsdB) {
-                    }
-                });
-
-                if( !main_activity.getMainUI().inImmersiveMode() ) {
-                    View speechRecognizerButton = main_activity.findViewById(R.id.audio_control);
-                    speechRecognizerButton.setVisibility(View.VISIBLE);
-                }
-            }
-        }
-        else if( speechRecognizer != null && !want_speech_recognizer ) {
-            if( MyDebug.LOG )
-                Log.d(TAG, "stop existing SpeechRecognizer");
-            stopSpeechRecognizer();
-        }
-    }
-
-    private void freeSpeechRecognizer() {
-        if( MyDebug.LOG )
-            Log.d(TAG, "freeSpeechRecognizer");
-        speechRecognizer.cancel();
-        try {
-            speechRecognizer.destroy();
-        }
-        catch(IllegalArgumentException e) {
-            // reported from Google Play - unclear why this happens, but might as well catch
-            Log.e(TAG, "exception destroying speechRecognizer");
-            e.printStackTrace();
-        }
-        speechRecognizer = null;
-    }
-
-    void stopSpeechRecognizer() {
-        if( MyDebug.LOG )
-            Log.d(TAG, "stopSpeechRecognizer");
-        if( speechRecognizer != null ) {
-            speechRecognizerStopped();
-            View speechRecognizerButton = main_activity.findViewById(R.id.audio_control);
-            speechRecognizerButton.setVisibility(View.GONE);
-            freeSpeechRecognizer();
-        }
-    }
-
-    boolean isStarted() {
-        return speechRecognizerIsStarted;
-    }
-
-    void stopListening() {
-        speechRecognizer.stopListening();
-        this.speechRecognizerStopped();
-    }
-
-    /** Whether the speech recognition has been set up (via initSpeechRecognizer()).
-     */
-    boolean hasSpeechRecognition() {
-        return speechRecognizer != null;
-    }
-}
diff --git a/app/src/main/java/net/sourceforge/opencamera/StorageUtils.java b/app/src/main/java/net/sourceforge/opencamera/StorageUtils.java
index 8abf1adbd38238b0c0df604fc8a6f39ac3742e27..64f8bf9563faa15776187bd25a6e90d9fe2a86fd 100644
--- a/app/src/main/java/net/sourceforge/opencamera/StorageUtils.java
+++ b/app/src/main/java/net/sourceforge/opencamera/StorageUtils.java
@@ -36,6 +36,7 @@ import android.provider.MediaStore.Video.VideoColumns;
 import android.provider.OpenableColumns;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
+
 import android.system.Os;
 import android.system.StructStatVfs;
 import android.util.Log;
@@ -54,8 +55,9 @@ public class StorageUtils {
     private final Context context;
     private final MyApplicationInterface applicationInterface;
     private Uri last_media_scanned;
+    private boolean last_media_scanned_is_raw;
 
-    private final static File base_folder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM);
+    private final static String RELATIVE_FOLDER_BASE = Environment.DIRECTORY_DCIM;
 
     // for testing:
     public volatile boolean failed_to_scan;
@@ -69,8 +71,24 @@ public class StorageUtils {
         return last_media_scanned;
     }
 
+    boolean getLastMediaScannedIsRaw() {
+        return last_media_scanned_is_raw;
+    }
+
     void clearLastMediaScanned() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "clearLastMediaScanned");
         last_media_scanned = null;
+        last_media_scanned_is_raw = false;
+    }
+
+    void setLastMediaScanned(Uri uri, boolean is_raw) {
+        last_media_scanned = uri;
+        last_media_scanned_is_raw = is_raw;
+        if( MyDebug.LOG ) {
+            Log.d(TAG, "set last_media_scanned to " + last_media_scanned);
+            Log.d(TAG, "    last_media_scanned_is_raw: " + last_media_scanned_is_raw);
+        }
     }
 
     /** Sends the intents to announce the new file to other Android applications. E.g., cloud storage applications like
@@ -97,6 +115,7 @@ public class StorageUtils {
 
             if( MyDebug.LOG ) // this code only used for debugging/logging
             {
+                @SuppressLint("InlinedApi") // complains this constant only available on API 29 (even though it was available on older versions, but looks like it was moved?)
                 String[] CONTENT_PROJECTION = { Images.Media.DATA, Images.Media.DISPLAY_NAME, Images.Media.MIME_TYPE, Images.Media.SIZE, Images.Media.DATE_TAKEN, Images.Media.DATE_ADDED };
                 Cursor c = context.getContentResolver().query(uri, CONTENT_PROJECTION, null, null, null);
                 if( c == null ) {
@@ -108,11 +127,12 @@ public class StorageUtils {
                         Log.e(TAG, "Couldn't resolve given uri [2]: " + uri);
                 }
                 else {
-                    String file_path = c.getString(c.getColumnIndex(Images.Media.DATA));
-                    String file_name = c.getString(c.getColumnIndex(Images.Media.DISPLAY_NAME));
-                    String mime_type = c.getString(c.getColumnIndex(Images.Media.MIME_TYPE));
-                    long date_taken = c.getLong(c.getColumnIndex(Images.Media.DATE_TAKEN));
-                    long date_added = c.getLong(c.getColumnIndex(Images.Media.DATE_ADDED));
+                    String file_path = c.getString(c.getColumnIndexOrThrow(Images.Media.DATA));
+                    String file_name = c.getString(c.getColumnIndexOrThrow(Images.Media.DISPLAY_NAME));
+                    String mime_type = c.getString(c.getColumnIndexOrThrow(Images.Media.MIME_TYPE));
+                    @SuppressLint("InlinedApi") // complains this constant only available on API 29 (even though it was available on older versions, but looks like it was moved?)
+                    long date_taken = c.getLong(c.getColumnIndexOrThrow(Images.Media.DATE_TAKEN));
+                    long date_added = c.getLong(c.getColumnIndexOrThrow(Images.Media.DATE_ADDED));
                     Log.d(TAG, "file_path: " + file_path);
                     Log.d(TAG, "file_name: " + file_name);
                     Log.d(TAG, "mime_type: " + mime_type);
@@ -239,10 +259,14 @@ public class StorageUtils {
                                 Log.d(TAG, "-> uri=" + uri);
                             }
                             if( set_last_scanned ) {
+                                boolean is_raw = filenameIsRaw(file.getName());
+                                setLastMediaScanned(uri, is_raw);
                                 last_media_scanned = uri;
                                 if (is_new_video) {
-                                    Media media = getLatestMedia(is_new_video);
-                                    last_media_scanned = (media != null) ? media.uri : uri;
+                                    Media media = getLatestMedia(UriType.MEDIASTORE_VIDEOS);
+                                    if (media != null) {
+                                        setLastMediaScanned(media.uri, is_raw);
+                                    }
                                 }
                                 if( MyDebug.LOG )
                                     Log.d(TAG, "set last_media_scanned to " + last_media_scanned);
@@ -250,17 +274,15 @@ public class StorageUtils {
                             announceUri(uri, is_new_picture, is_new_video);
                             applicationInterface.scannedFile(file, uri);
 
-                            // it seems caller apps seem to prefer the content:// Uri rather than one based on a File
+                            // If called from video intent, if not using scoped-storage, we'll have saved using File API (even if user preference is SAF), see
+                            // MyApplicationInterface.createOutputVideoMethod().
+                            // It seems caller apps seem to prefer the content:// Uri rather than one based on a File
                             // update for Android 7: seems that passing file uris is now restricted anyway, see https://code.google.com/p/android/issues/detail?id=203555
+                            // So we pass the uri back to the caller here.
                             Activity activity = (Activity)context;
                             String action = activity.getIntent().getAction();
-                            if( MediaStore.ACTION_VIDEO_CAPTURE.equals(action) ) {
-                                if( MyDebug.LOG )
-                                    Log.d(TAG, "from video capture intent");
-                                Intent output = new Intent();
-                                output.setData(uri);
-                                activity.setResult(Activity.RESULT_OK, output);
-                                activity.finish();
+                            if( !MainActivity.useScopedStorage() && MediaStore.ACTION_VIDEO_CAPTURE.equals(action) ) {
+                                applicationInterface.finishVideoIntent(uri);
                             }
                         }
                     }
@@ -270,9 +292,22 @@ public class StorageUtils {
 
     /** Wrapper for broadcastFile, when we only have a Uri (e.g., for SAF)
      */
-    public File broadcastUri(final Uri uri, final boolean is_new_picture, final boolean is_new_video, final boolean set_last_scanned) {
+    public void broadcastUri(final Uri uri, final boolean is_new_picture, final boolean is_new_video, final boolean set_last_scanned, final boolean image_capture_intent) {
         if( MyDebug.LOG )
             Log.d(TAG, "broadcastUri: " + uri);
+        /* We still need to broadcastFile for SAF for various reasons:
+            1. To call storageUtils.announceUri() to broadcast NEW_PICTURE etc.
+               Whilst in theory we could do this directly, it seems external apps that use such broadcasts typically
+               won't know what to do with a SAF based Uri (e.g, Owncloud crashes!) so better to broadcast the Uri
+               corresponding to the real file, if it exists.
+            2. Whilst the new file seems to be known by external apps such as Gallery without having to call media
+               scanner, I've had reports this doesn't happen when saving to external SD cards. So better to explicitly
+               scan.
+            3. If set_last_scanned==true, it means we get the media uri which can be used to set the thumbnail uri
+               (see setLastMediaScanned()). This is particularly important when using SAF with scoped storage, as
+               getting the latest media via SAF APIs is (if not cached) very slow! N.B., most gallery apps need a
+               mediastore uri, not the SAF uri.
+        */
         File real_file = getFileFromDocumentUriSAF(uri, false);
         if( MyDebug.LOG )
             Log.d(TAG, "real_file: " + real_file);
@@ -282,17 +317,16 @@ public class StorageUtils {
             //Uri media_uri = broadcastFileRaw(real_file, current_date, location);
             //announceUri(media_uri, is_new_picture, is_new_video);
             broadcastFile(real_file, is_new_picture, is_new_video, set_last_scanned);
-            return real_file;
         }
-        else {
+        else if( !image_capture_intent ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "announce SAF uri");
+            // shouldn't do this for an image capture intent - e.g., causes crash when calling from Google Keep
             announceUri(uri, is_new_picture, is_new_video);
         }
-        return null;
     }
 
-    boolean isUsingSAF() {
+    public boolean isUsingSAF() {
         // check Android version just to be safe
         if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ) {
             SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
@@ -316,7 +350,7 @@ public class StorageUtils {
     }
 
     // only valid if isUsingSAF()
-    private Uri getTreeUriSAF() {
+    public Uri getTreeUriSAF() {
         String folder_name = getSaveLocationSAF();
         return Uri.parse(folder_name);
     }
@@ -325,8 +359,23 @@ public class StorageUtils {
         return new File(context.getExternalFilesDir(null), "backups");
     }
 
-    // valid if whether or not isUsingSAF()
-    // but note that if isUsingSAF(), this may return null - it can't be assumed that there is a File corresponding to the SAF Uri
+    /** Valid whether or not isUsingSAF().
+     *  Returns the absolute path (in File format) of the image save folder.
+     *  Only use this for needing e.g. human-readable strings for UI.
+     *  This should not be used to create a File - instead, use getImageFolder().
+     *  Note that if isUsingSAF(), this may return null - it can't be assumed that there is a
+     *  File corresponding to the SAF Uri.
+     */
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public String getImageFolderPath() {
+        File file = getImageFolder();
+        return file == null ? null : file.getAbsolutePath();
+    }
+
+    /** Valid whether or not isUsingSAF().
+     *  But note that if isUsingSAF(), this may return null - it can't be assumed that there is a
+     *  File corresponding to the SAF Uri.
+     */
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     File getImageFolder() {
         File file;
@@ -343,10 +392,35 @@ public class StorageUtils {
         return file;
     }
 
+    // only valid if !isUsingSAF()
+    // returns a form for use with RELATIVE_PATH (scoped storage)
+    String getSaveRelativeFolder() {
+        String folder_name = getSaveLocation();
+        return getSaveRelativeFolder(folder_name);
+    }
+
+    // only valid if !isUsingSAF()
+    // returns a form for use with RELATIVE_PATH (scoped storage)
+    private static String getSaveRelativeFolder(String folder_name) {
+        if( folder_name.length() > 0 && folder_name.lastIndexOf('/') == folder_name.length()-1 ) {
+            // ignore final '/' character
+            folder_name = folder_name.substring(0, folder_name.length()-1);
+        }
+        return RELATIVE_FOLDER_BASE + File.separator + folder_name;
+    }
+
     public static File getBaseFolder() {
+        final File base_folder = Environment.getExternalStoragePublicDirectory(RELATIVE_FOLDER_BASE);
         return base_folder;
     }
 
+    /** Whether the save photo/video location is in a form that represents a full path, or a
+     *  sub-folder in DCIM/.
+     */
+    static boolean saveFolderIsFull(String folder_name) {
+        return folder_name.startsWith("/");
+    }
+
     // only valid if !isUsingSAF()
     private static File getImageFolder(String folder_name) {
         File file;
@@ -354,8 +428,7 @@ public class StorageUtils {
             // ignore final '/' character
             folder_name = folder_name.substring(0, folder_name.length()-1);
         }
-        //if( folder_name.contains("/") ) {
-        if( folder_name.startsWith("/") ) {
+        if( saveFolderIsFull(folder_name) ) {
             file = new File(folder_name);
         }
         else {
@@ -364,6 +437,17 @@ public class StorageUtils {
         return file;
     }
 
+    /** Only valid if isUsingSAF()
+     *  Returns the absolute path (in File format) of the SAF folder.
+     *  Only use this for needing e.g. human-readable strings for UI.
+     *  This should not be used to create a File - instead, use getFileFromDocumentUriSAF().
+     */
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public String getFilePathFromDocumentUriSAF(Uri uri, boolean is_folder) {
+        File file = getFileFromDocumentUriSAF(uri, is_folder);
+        return file == null ? null : file.getAbsolutePath();
+    }
+
     /** Only valid if isUsingSAF()
      *  This function should only be used as a last resort - we shouldn't generally assume that a Uri represents an actual File, or that
      *  the File can be obtained anyway.
@@ -371,6 +455,8 @@ public class StorageUtils {
      *  See:
             http://stackoverflow.com/questions/21605493/storage-access-framework-does-not-update-mediascanner-mtp
             http://stackoverflow.com/questions/20067508/get-real-path-from-uri-android-kitkat-new-storage-access-framework/
+        Note that when using Android Q's scoped storage, the returned File will be inaccessible. However we still sometimes call this,
+        e.g., to scan with mediascanner or get a human readable string for the path.
         Also note that this will return null for media store Uris with Android Q's scoped storage: https://developer.android.com/preview/privacy/scoped-storage
         "The DATA column is redacted for each file in the media store."
      */
@@ -492,7 +578,7 @@ public class StorageUtils {
     }
 
     private String getDataColumn(Uri uri, String selection, String [] selectionArgs) {
-        final String column = "_data";
+        final String column = MediaStore.Images.ImageColumns.DATA;
         final String[] projection = {
                 column
         };
@@ -524,7 +610,7 @@ public class StorageUtils {
      * See https://developer.android.com/guide/topics/providers/document-provider.html and
      * http://stackoverflow.com/questions/5568874/how-to-extract-the-file-name-from-uri-returned-from-intent-action-get-content .
      */
-    String getFileName(Uri uri) {
+    public String getFileName(Uri uri) {
         if( MyDebug.LOG ) {
             Log.d(TAG, "getFileName: " + uri);
             Log.d(TAG, "uri has path: " + uri.getPath());
@@ -565,7 +651,7 @@ public class StorageUtils {
         return result;
     }
 
-    private String createMediaFilename(int type, String suffix, int count, String extension, Date current_date) {
+    String createMediaFilename(int type, String suffix, int count, String extension, Date current_date) {
         String index = "";
         if( count > 0 ) {
             index = "_" + count; // try to find a unique filename
@@ -718,40 +804,56 @@ public class StorageUtils {
         }
     }
 
+    /** Return the mime type corresponding to the supplied extension. Supports images only, not video.
+     */
+    public String getImageMimeType(String extension) {
+        String mimeType;
+        switch (extension) {
+            case "dng":
+                mimeType = "image/dng";
+                //mimeType = "image/x-adobe-dng";
+                break;
+            case "webp":
+                mimeType = "image/webp";
+                break;
+            case "png":
+                mimeType = "image/png";
+                break;
+            default:
+                mimeType = "image/jpeg";
+                break;
+        }
+        return mimeType;
+    }
+
+    /** Return the mime type corresponding to the supplied extension. Supports video only, not images.
+     */
+    String getVideoMimeType(String extension) {
+        String mimeType;
+        switch( extension ) {
+            case "3gp":
+                mimeType = "video/3gpp";
+                break;
+            case "webm":
+                mimeType = "video/webm";
+                break;
+            default:
+                mimeType = "video/mp4";
+                break;
+        }
+        return mimeType;
+    }
+
     // only valid if isUsingSAF()
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     Uri createOutputMediaFileSAF(int type, String suffix, String extension, Date current_date) throws IOException {
         String mimeType;
         switch (type) {
             case MEDIA_TYPE_IMAGE:
-                switch (extension) {
-                    case "dng":
-                        mimeType = "image/dng";
-                        //mimeType = "image/x-adobe-dng";
-                        break;
-                    case "webp":
-                        mimeType = "image/webp";
-                        break;
-                    case "png":
-                        mimeType = "image/png";
-                        break;
-                    default:
-                        mimeType = "image/jpeg";
-                        break;
-                }
+                mimeType = getImageMimeType(extension);
                 break;
             case MEDIA_TYPE_VIDEO:
-                switch( extension ) {
-                    case "3gp":
-                        mimeType = "video/3gpp";
-                        break;
-                    case "webm":
-                        mimeType = "video/webm";
-                        break;
-                    default:
-                        mimeType = "video/mp4";
-                        break;
-                }
+                mimeType = getVideoMimeType(extension);
                 break;
             case MEDIA_TYPE_PREFS:
             case MEDIA_TYPE_GYRO_INFO:
@@ -769,14 +871,16 @@ public class StorageUtils {
     }
 
     static class Media {
-        final long id;
+        final boolean mediastore; // whether uri is from mediastore
+        final long id; // for mediastore==true only
         final boolean video;
         final Uri uri;
         final long date;
-        final int orientation;
+        final int orientation; // for mediastore==true, video==false only
         final String filename; // this should correspond to DISPLAY_NAME (so available with scoped storage) - so this includes file extension, but not full path
 
-        Media(long id, boolean video, Uri uri, long date, int orientation, String filename) {
+        Media(boolean mediastore, long id, boolean video, Uri uri, long date, int orientation, String filename) {
+            this.mediastore = mediastore;
             this.id = id;
             this.video = video;
             this.uri = uri;
@@ -784,14 +888,52 @@ public class StorageUtils {
             this.orientation = orientation;
             this.filename = filename;
         }
+
+        /** Returns a mediastore uri. If this Media object was not created by a mediastore uri, then
+         *  this will try to convert using MediaStore.getMediaUri(), but if this fails the function
+         *  will return null.
+         */
+        Uri getMediaStoreUri(Context context) {
+            if( this.mediastore )
+                return this.uri;
+            else {
+                try {
+                    // should only have allowed mediastore==null when using scoped storage
+                    if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
+                        return MediaStore.getMediaUri(context, this.uri);
+                    }
+                }
+                catch(Exception e) {
+                    e.printStackTrace();
+                }
+                return null;
+            }
+        }
+    }
+
+    static boolean filenameIsRaw(String filename) {
+        return filename.toLowerCase(Locale.US).endsWith(".dng");
+    }
+
+    private static String filenameWithoutExtension(String filename) {
+        String filename_without_ext = filename.toLowerCase(Locale.US);
+        if( filename_without_ext.indexOf(".") > 0 )
+            filename_without_ext = filename_without_ext.substring(0, filename_without_ext.lastIndexOf("."));
+        return filename_without_ext;
+    }
+
+    private enum UriType {
+        MEDIASTORE_IMAGES,
+        MEDIASTORE_VIDEOS
     }
 
-    private Media getLatestMediaCore(Uri baseUri, String bucket_id, boolean video) {
+    @SuppressLint("InlinedApi") // complains MediaColumns constants only available on API 29 (even though it was available on older versions, but looks like it was moved?); for some reason doesn't allow putting this at the actual comments?!
+    private Media getLatestMediaCore(Uri baseUri, String bucket_id, UriType uri_type) {
         if( MyDebug.LOG ) {
             Log.d(TAG, "getLatestMediaCore");
             Log.d(TAG, "baseUri: " + baseUri);
             Log.d(TAG, "bucket_id: " + bucket_id);
-            Log.d(TAG, "video: " + video);
+            Log.d(TAG, "uri_type: " + uri_type);
         }
         Media media = null;
 
@@ -801,32 +943,62 @@ public class StorageUtils {
         final int column_name_c = 3; // filename (without path), including extension
         final int column_orientation_c = 4; // for images only*/
         final int column_name_c = 2; // filename (without path), including extension
-        final int column_orientation_c = 3; // for images only
-        String [] projection = video ?
-                new String[] {VideoColumns._ID, VideoColumns.DATE_TAKEN, VideoColumns.DISPLAY_NAME} :
-                new String[] {ImageColumns._ID, ImageColumns.DATE_TAKEN, ImageColumns.DISPLAY_NAME, ImageColumns.ORIENTATION};
+        final int column_orientation_c = 3; // for mediastore images only
+        String [] projection;
+        switch( uri_type ) {
+            case MEDIASTORE_IMAGES:
+                projection = new String[] {ImageColumns._ID, ImageColumns.DATE_TAKEN, ImageColumns.DISPLAY_NAME, ImageColumns.ORIENTATION};
+                break;
+            case MEDIASTORE_VIDEOS:
+                projection = new String[] {VideoColumns._ID, VideoColumns.DATE_TAKEN, VideoColumns.DISPLAY_NAME};
+                break;
+            default:
+                throw new RuntimeException("unknown uri_type: " + uri_type);
+        }
         // for images, we need to search for JPEG/etc and RAW, to support RAW only mode (even if we're not currently in that mode, it may be that previously the user did take photos in RAW only mode)
+        // if updating this code for supported mime types, remember to also update getLatestMediaSAF()
         /*String selection = video ? "" : ImageColumns.MIME_TYPE + "='image/jpeg' OR " +
                 ImageColumns.MIME_TYPE + "='image/webp' OR " +
                 ImageColumns.MIME_TYPE + "='image/png' OR " +
                 ImageColumns.MIME_TYPE + "='image/x-adobe-dng'";*/
         String selection = "";
-        if( bucket_id != null )
-            selection = (video ? VideoColumns.BUCKET_ID : ImageColumns.BUCKET_ID) + " = " + bucket_id;
-        if( !video ) {
-            boolean and = selection.length() > 0;
-            if( and )
-                selection += " AND ( ";
-            selection += ImageColumns.MIME_TYPE + "='image/jpeg' OR " +
-                    ImageColumns.MIME_TYPE + "='image/webp' OR " +
-                    ImageColumns.MIME_TYPE + "='image/png' OR " +
-                    ImageColumns.MIME_TYPE + "='image/x-adobe-dng'";
-            if( and )
-                selection += " )";
+        switch( uri_type ) {
+            case MEDIASTORE_IMAGES:
+            {
+                if( bucket_id != null )
+                    selection = ImageColumns.BUCKET_ID + " = " + bucket_id;
+                boolean and = selection.length() > 0;
+                if( and )
+                    selection += " AND ( ";
+                selection += ImageColumns.MIME_TYPE + "='image/jpeg' OR " +
+                        ImageColumns.MIME_TYPE + "='image/webp' OR " +
+                        ImageColumns.MIME_TYPE + "='image/png' OR " +
+                        ImageColumns.MIME_TYPE + "='image/x-adobe-dng'";
+                if( and )
+                    selection += " )";
+                break;
+            }
+            case MEDIASTORE_VIDEOS:
+                if( bucket_id != null )
+                    selection = VideoColumns.BUCKET_ID + " = " + bucket_id;
+                break;
+            default:
+                throw new RuntimeException("unknown uri_type: " + uri_type);
         }
         if( MyDebug.LOG )
             Log.d(TAG, "selection: " + selection);
-        String order = video ? VideoColumns.DATE_TAKEN + " DESC," + VideoColumns._ID + " DESC" : ImageColumns.DATE_TAKEN + " DESC," + ImageColumns._ID + " DESC";
+        String order;
+        switch( uri_type ) {
+            case MEDIASTORE_IMAGES:
+                order = ImageColumns.DATE_TAKEN + " DESC," + ImageColumns._ID + " DESC";
+                break;
+            case MEDIASTORE_VIDEOS:
+                //noinspection DuplicateBranchesInSwitch
+                order = VideoColumns.DATE_TAKEN + " DESC," + VideoColumns._ID + " DESC";
+                break;
+            default:
+                throw new RuntimeException("unknown uri_type: " + uri_type);
+        }
         Cursor cursor = null;
 
         // we know we only want the most recent image - however we may need to scan forward if we find a RAW, to see if there's
@@ -890,14 +1062,12 @@ public class StorageUtils {
                         Log.d(TAG, "filename: " + filename);
                     }
                     // in theory now that we use DISPLAY_NAME instead of DATA (for path), this should always be non-null, but check just in case
-                    if( filename != null && filename.toLowerCase(Locale.US).endsWith(".dng") ) {
+                    if( filename != null && filenameIsRaw(filename) ) {
                         if( MyDebug.LOG )
                             Log.d(TAG, "try to find a non-RAW version of the DNG");
                         int dng_pos = cursor.getPosition();
                         boolean found_non_raw = false;
-                        String filename_without_ext = filename.toLowerCase(Locale.US);
-                        if( filename_without_ext.indexOf(".") > 0 )
-                            filename_without_ext = filename_without_ext.substring(0, filename_without_ext.lastIndexOf("."));
+                        String filename_without_ext = filenameWithoutExtension(filename);
                         if( MyDebug.LOG )
                             Log.d(TAG, "filename_without_ext: " + filename_without_ext);
                         while( cursor.moveToNext() ) {
@@ -909,9 +1079,7 @@ public class StorageUtils {
                                     Log.d(TAG, "done scanning, couldn't find filename");
                                 break;
                             }
-                            String next_filename_without_ext = next_filename.toLowerCase(Locale.US);
-                            if( next_filename_without_ext.indexOf(".") > 0 )
-                                next_filename_without_ext = next_filename_without_ext.substring(0, next_filename_without_ext.lastIndexOf("."));
+                            String next_filename_without_ext = filenameWithoutExtension(next_filename);
                             if( MyDebug.LOG )
                                 Log.d(TAG, "next_filename_without_ext: " + next_filename_without_ext);
                             if( !filename_without_ext.equals(next_filename_without_ext) ) {
@@ -921,21 +1089,16 @@ public class StorageUtils {
                                 break;
                             }
                             // so we've found another file with matching filename - is it a JPEG/etc?
-                            if( next_filename.toLowerCase(Locale.US).endsWith(".jpg") ) {
-                                if( MyDebug.LOG )
-                                    Log.d(TAG, "found equivalent jpeg");
-                                found_non_raw = true;
-                                break;
-                            }
-                            else if( next_filename.toLowerCase(Locale.US).endsWith(".webp") ) {
+                            // we've already restricted the query to the image types we're interested in, so
+                            // only need to check that it isn't another DNG (which would be strange, as it
+                            // would mean a duplicate filename, but check just in case!)
+                            if( filenameIsRaw(next_filename) ) {
                                 if( MyDebug.LOG )
-                                    Log.d(TAG, "found equivalent webp");
-                                found_non_raw = true;
-                                break;
+                                    Log.d(TAG, "found another dng!");
                             }
-                            else if( next_filename.toLowerCase(Locale.US).endsWith(".png") ) {
+                            else {
                                 if( MyDebug.LOG )
-                                    Log.d(TAG, "found equivalent png");
+                                    Log.d(TAG, "found equivalent non-dng");
                                 found_non_raw = true;
                                 break;
                             }
@@ -950,12 +1113,41 @@ public class StorageUtils {
 
                 long id = cursor.getLong(column_id_c);
                 long date = cursor.getLong(column_date_taken_c);
-                int orientation = video ? 0 : cursor.getInt(column_orientation_c);
+                int orientation = (uri_type == UriType.MEDIASTORE_IMAGES) ? cursor.getInt(column_orientation_c) : 0;
                 Uri uri = ContentUris.withAppendedId(baseUri, id);
                 String filename = cursor.getString(column_name_c);
                 if( MyDebug.LOG )
-                    Log.d(TAG, "found most recent uri for " + (video ? "video" : "images") + ": " + uri);
-                media = new Media(id, video, uri, date, orientation, filename);
+                    Log.d(TAG, "found most recent uri for " + uri_type + ": " + uri);
+
+                boolean video;
+                switch( uri_type ) {
+                    case MEDIASTORE_IMAGES:
+                        video = false;
+                        break;
+                    case MEDIASTORE_VIDEOS:
+                        video = true;
+                        break;
+                    default:
+                        throw new RuntimeException("unknown uri_type: " + uri_type);
+                }
+                if( MyDebug.LOG )
+                    Log.d(TAG, "video: " + video);
+
+                media = new Media(true, id, video, uri, date, orientation, filename);
+
+                if( MyDebug.LOG ) {
+                    // debug
+                    if( cursor.moveToFirst() ) {
+                        do {
+                            long this_id = cursor.getLong(column_id_c);
+                            long this_date = cursor.getLong(column_date_taken_c);
+                            Uri this_uri = ContentUris.withAppendedId(baseUri, this_id);
+                            String this_filename = cursor.getString(column_name_c);
+                            Log.d(TAG, "Date: " + this_date + " ID: " + this_id + " Name: " + this_filename + " Uri: " + this_uri);
+                        }
+                        while( cursor.moveToNext() );
+                    }
+                }
             }
             else {
                 if( MyDebug.LOG )
@@ -974,46 +1166,255 @@ public class StorageUtils {
             }
         }
 
+        if( MyDebug.LOG )
+            Log.d(TAG, "return latest media: " + media);
         return media;
     }
 
-    private Media getLatestMedia(boolean video) {
+    /** Used when using Storage Access Framework AND scoped storage.
+     *  This is because with scoped storage, we don't request READ_EXTERNAL_STORAGE (as
+     *  recommended). It's meant to be the case that applications should still be able to see files
+     *  that they own - but whilst this is true when images are saved using mediastore API, this is
+     *  NOT true when saving with Storage Access Framework - they don't show up in mediastore
+     *  queries (even though they've definitely been added to the mediastore). So instead we read
+     *  using the SAF uri, and if we need the media uri (e.g., to pass to Gallery application), use
+     *  Media.getMediaStoreUri(). What a mess!
+     */
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    private Media getLatestMediaSAF(Uri treeUri) {
+        if (MyDebug.LOG)
+            Log.d(TAG, "getLatestMediaSAF: " + treeUri);
+
+        Media media = null;
+
+        Uri baseUri;
+        try {
+            String parentDocUri = DocumentsContract.getTreeDocumentId(treeUri);
+            baseUri = DocumentsContract.buildChildDocumentsUriUsingTree(treeUri, parentDocUri);
+        }
+        catch(Exception e) {
+            // DocumentsContract.getTreeDocumentId throws IllegalArgumentException if the uri is
+            // invalid. Unclear if this can happen in practice - this happens in test
+            // testSaveFolderHistorySAF() but only because we test a dummy invalid SAF uri. But
+            // seems no harm catching it in case this can happen (e.g., especially if restoring
+            // backed up preferences from a different device?) Better to just show nothing in the
+            // thumbnail, rather than crashing!
+            // N.B., we catch Exception is otherwise compiler complains IllegalArgumentException
+            // isn't ever thrown - even though it is!?
+            Log.e(TAG, "Exception using treeUri: " + treeUri);
+            return media;
+        }
         if( MyDebug.LOG )
-            Log.d(TAG, "getLatestMedia: " + (video ? "video" : "images"));
-        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && ContextCompat.checkSelfPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ) {
+            Log.d(TAG, "baseUri: " + baseUri);
+
+        final int column_id_c = 0;
+        final int column_date_c = 1;
+        final int column_name_c = 2; // filename (without path), including extension
+        final int column_mime_c = 3;
+        String [] projection = new String[] {DocumentsContract.Document.COLUMN_DOCUMENT_ID, DocumentsContract.Document.COLUMN_LAST_MODIFIED, DocumentsContract.Document.COLUMN_DISPLAY_NAME, DocumentsContract.Document.COLUMN_MIME_TYPE};
+
+        // Note, it appears that when querying DocumentsContract, basic query functionality like selection, ordering, are ignored(!).
+        // See: https://stackoverflow.com/questions/52770188/how-to-filter-the-results-of-a-query-with-buildchilddocumentsuriusingtree
+        // https://stackoverflow.com/questions/56263620/contentresolver-query-on-documentcontract-lists-all-files-disregarding-selection
+        // So, we have to do it ourselves.
+
+        Cursor cursor = null;
+        try {
+            cursor = context.getContentResolver().query(baseUri, projection, null, null, null);
+            if( cursor != null && cursor.moveToFirst() ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "found: " + cursor.getCount());
+
+                Uri latest_uri = null;
+                long latest_date = 0;
+                String latest_filename = null;
+                boolean latest_is_video = false;
+
+                // as well as scanning for the most recent image, we also keep track of the most recent non-RAW image,
+                // in case we want to prefer that when the most recent
+                Uri nonraw_latest_uri = null;
+                long nonraw_latest_date = 0;
+                String nonraw_latest_filename = null;
+
+                do {
+                    long this_date = cursor.getLong(column_date_c);
+
+                    String doc_id = cursor.getString(column_id_c);
+                    Uri this_uri = DocumentsContract.buildDocumentUriUsingTree(treeUri, doc_id);
+                    String this_mime_type = cursor.getString(column_mime_c);
+
+                    // if updating this code for allowed mime types, also update corresponding code in getLatestMediaCore()
+                    boolean is_allowed;
+                    boolean this_is_video;
+                    switch( this_mime_type ) {
+                        case "image/jpeg":
+                        case "image/webp":
+                        case "image/png":
+                        case "image/x-adobe-dng":
+                            is_allowed = true;
+                            this_is_video = false;
+                            break;
+                        case "video/3gpp":
+                        case "video/webm":
+                        case "video/mp4":
+                            // n.b., perhaps we should just allow video/*, but we should still disallow .SRT files!
+                            is_allowed = true;
+                            this_is_video = true;
+                            break;
+                        default:
+                            // skip unwanted file format
+                            is_allowed = false;
+                            this_is_video = false;
+                            break;
+                    }
+                    if( !is_allowed ) {
+                        continue;
+                    }
+
+                    String this_filename = cursor.getString(column_name_c);
+                    /*if( MyDebug.LOG ) {
+                        Log.d(TAG, "Date: " + this_date + " doc_id: " + doc_id + " Name: " + this_filename + " Uri: " + this_uri);
+                    }*/
+
+                    if( latest_uri == null || this_date > latest_date ) {
+                        latest_uri = this_uri;
+                        latest_date = this_date;
+                        latest_filename = this_filename;
+                        latest_is_video = this_is_video;
+                    }
+                    if( !this_is_video && !filenameIsRaw(this_filename) ) {
+                        if( nonraw_latest_uri == null || this_date > nonraw_latest_date ) {
+                            nonraw_latest_uri = this_uri;
+                            nonraw_latest_date = this_date;
+                            nonraw_latest_filename = this_filename;
+                        }
+                    }
+                }
+                while( cursor.moveToNext() );
+
+                if( latest_uri == null ) {
+                    if( MyDebug.LOG )
+                        Log.e(TAG, "couldn't find latest uri");
+                }
+                else {
+                    if( MyDebug.LOG ) {
+                        Log.d(TAG, "latest_uri: " + latest_uri);
+                        Log.d(TAG, "nonraw_latest_uri: " + nonraw_latest_uri);
+                    }
+
+                    if( !latest_is_video && filenameIsRaw(latest_filename) && nonraw_latest_uri != null ) {
+                        // prefer non-RAW to RAW? check filenames without extensions match
+                        String filename_without_ext = filenameWithoutExtension(latest_filename);
+                        String next_filename_without_ext = filenameWithoutExtension(nonraw_latest_filename);
+                        if( MyDebug.LOG ) {
+                            Log.d(TAG, "filename_without_ext: " + filename_without_ext);
+                            Log.d(TAG, "next_filename_without_ext: " + next_filename_without_ext);
+                        }
+                        if( filename_without_ext.equals(next_filename_without_ext) ) {
+                            if( MyDebug.LOG )
+                                Log.d(TAG, "prefer non-RAW to RAW");
+                            latest_uri = nonraw_latest_uri;
+                            latest_date = nonraw_latest_date;
+                            latest_filename = nonraw_latest_filename;
+                            // video is unchanged
+                        }
+                    }
+
+                    media = new Media(false,0, latest_is_video, latest_uri, latest_date, 0, latest_filename);
+                }
+
+                /*if( MyDebug.LOG ) {
+                    // debug
+                    if( cursor.moveToFirst() ) {
+                        do {
+                            long this_id = cursor.getLong(column_id_c);
+                            long this_date = cursor.getLong(column_date_taken_c);
+                            Uri this_uri = ContentUris.withAppendedId(baseUri, this_id);
+                            String this_filename = cursor.getString(column_name_c);
+                            Log.d(TAG, "Date: " + this_date + " ID: " + this_id + " Name: " + this_filename + " Uri: " + this_uri);
+                        }
+                        while( cursor.moveToNext() );
+                    }
+                }*/
+            }
+            else {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "mediastore returned no media");
+            }
+        }
+        catch(Exception e) {
+            if( MyDebug.LOG )
+                Log.e(TAG, "Exception trying to find latest media");
+            e.printStackTrace();
+        }
+        finally {
+            if( cursor != null ) {
+                cursor.close();
+            }
+        }
+
+        if( MyDebug.LOG )
+            Log.d(TAG, "return latest media: " + media);
+        return media;
+    }
+
+    private Media getLatestMedia(UriType uri_type) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "getLatestMedia: " + uri_type);
+        if( !MainActivity.useScopedStorage() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && ContextCompat.checkSelfPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ) {
             // needed for Android 6, in case users deny storage permission, otherwise we get java.lang.SecurityException from ContentResolver.query()
             // see https://developer.android.com/training/permissions/requesting.html
             // we now request storage permission before opening the camera, but keep this here just in case
             // we restrict check to Android 6 or later just in case, see note in LocationSupplier.setupLocationListener()
+            // update for scoped storage: here we should no longer need READ_EXTERNAL_STORAGE (which we won't have), instead we'll only be able to see
+            // media created by Open Camera, which is fine
             if( MyDebug.LOG )
                 Log.e(TAG, "don't have READ_EXTERNAL_STORAGE permission");
             return null;
         }
 
-        File save_folder = getImageFolder(); // may be null if using SAF
+        String save_folder = getImageFolderPath(); // may be null if using SAF
         if( MyDebug.LOG )
             Log.d(TAG, "save_folder: " + save_folder);
         String bucket_id = null;
         if( save_folder != null ) {
-            bucket_id = String.valueOf(save_folder.getAbsolutePath().toLowerCase().hashCode());
+            bucket_id = String.valueOf(save_folder.toLowerCase().hashCode());
         }
         if( MyDebug.LOG )
             Log.d(TAG, "bucket_id: " + bucket_id);
 
-        Uri baseUri = video ? Video.Media.EXTERNAL_CONTENT_URI : MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-        Media media = getLatestMediaCore(baseUri, bucket_id, video);
+        Uri baseUri;
+        switch( uri_type ) {
+            case MEDIASTORE_IMAGES:
+                baseUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+                break;
+            case MEDIASTORE_VIDEOS:
+                baseUri = Video.Media.EXTERNAL_CONTENT_URI;
+                break;
+            default:
+                throw new RuntimeException("unknown uri_type: " + uri_type);
+        }
+
+        if( MyDebug.LOG )
+            Log.d(TAG, "baseUri: " + baseUri);
+        Media media = getLatestMediaCore(baseUri, bucket_id, uri_type);
         if( media == null && bucket_id != null ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "fall back to checking any folder");
-            media = getLatestMediaCore(baseUri, null, video);
+            media = getLatestMediaCore(baseUri, null, uri_type);
         }
 
         return media;
     }
 
     Media getLatestMedia() {
-        Media image_media = getLatestMedia(false);
-        Media video_media = getLatestMedia(true);
+        if( MainActivity.useScopedStorage() && this.isUsingSAF() ) {
+            Uri treeUri = this.getTreeUriSAF();
+            return getLatestMediaSAF(treeUri);
+        }
+
+        Media image_media = getLatestMedia(UriType.MEDIASTORE_IMAGES);
+        Media video_media = getLatestMedia(UriType.MEDIASTORE_VIDEOS);
         Media media = null;
         if( image_media != null && video_media == null ) {
             if( MyDebug.LOG )
@@ -1051,13 +1452,14 @@ public class StorageUtils {
     @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
     private long freeMemorySAF() {
         Uri treeUri = applicationInterface.getStorageUtils().getTreeUriSAF();
+        ParcelFileDescriptor pfd = null;
         if( MyDebug.LOG )
             Log.d(TAG, "treeUri: " + treeUri);
         try {
             Uri docUri = DocumentsContract.buildDocumentUriUsingTree(treeUri, DocumentsContract.getTreeDocumentId(treeUri));
             if( MyDebug.LOG )
                 Log.d(TAG, "docUri: " + docUri);
-            ParcelFileDescriptor pfd = context.getContentResolver().openFileDescriptor(docUri, "r");
+            pfd = context.getContentResolver().openFileDescriptor(docUri, "r");
             if( pfd == null ) { // just in case
                 Log.e(TAG, "pfd is null!");
                 throw new FileNotFoundException();
@@ -1083,6 +1485,15 @@ public class StorageUtils {
             // now.
             e.printStackTrace();
         }
+        finally {
+            try {
+                if( pfd != null )
+                    pfd.close();
+            }
+            catch(IOException e) {
+                e.printStackTrace();
+            }
+        }
         return -1;
     }
 
@@ -1095,6 +1506,7 @@ public class StorageUtils {
             // if we fail for SAF, don't fall back to the methods below, as this may be incorrect (especially for external SD card)
             return freeMemorySAF();
         }
+        // n.b., StatFs still seems to work with Android 10's scoped storage... (and there doesn't seem to be an official non-File based equivalent)
         try {
             File folder = getImageFolder();
             if( folder == null ) {
@@ -1122,7 +1534,7 @@ public class StorageUtils {
                 if( !isUsingSAF() ) {
                     // getSaveLocation() only valid if !isUsingSAF()
                     String folder_name = getSaveLocation();
-                    if( !folder_name.startsWith("/") ) {
+                    if( !saveFolderIsFull(folder_name) ) {
                         File folder = getBaseFolder();
                         StatFs statFs = new StatFs(folder.getAbsolutePath());
                         long blocks, size;
diff --git a/app/src/main/java/net/sourceforge/opencamera/TakePhoto.java b/app/src/main/java/net/sourceforge/opencamera/TakePhoto.java
index a80f5a1ad17a37212ac87cd8d360bc6833ce2628..982977ed5244765a408e7a7e314a30caf297ff43 100644
--- a/app/src/main/java/net/sourceforge/opencamera/TakePhoto.java
+++ b/app/src/main/java/net/sourceforge/opencamera/TakePhoto.java
@@ -1,15 +1,16 @@
 package net.sourceforge.opencamera;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 /** Entry Activity for the "take photo" widget (see MyWidgetProviderTakePhoto).
  *  This redirects to MainActivity, but uses an intent extra/bundle to pass the
  *  "take photo" request.
  */
-public class TakePhoto extends Activity {
+public class TakePhoto extends AppCompatActivity {
     private static final String TAG = "TakePhoto";
 
     // Usually passing data via intent is preferred to using statics - however here a static is better for security,
diff --git a/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController.java b/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController.java
index 49835b9b83db241f0a033ac754e3687eb588b92d..c8f6e12c746b2080985e9a3d2cea7092b23af364 100644
--- a/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController.java
+++ b/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController.java
@@ -15,6 +15,8 @@ import android.util.Log;
 import android.view.SurfaceHolder;
 import android.view.TextureView;
 
+import androidx.annotation.NonNull;
+
 /** CameraController is an abstract class that wraps up the access/control to
  *  the Android camera, so that the rest of the application doesn't have to
  *  deal directly with the Android camera API. It also allows us to support
@@ -38,12 +40,11 @@ public abstract class CameraController {
     public static final String ISO_DEFAULT = "auto";
     public static final long EXPOSURE_TIME_DEFAULT = 1000000000L/30; // note, responsibility of callers to check that this is within the valid min/max range
 
-    public static final int ISO_FOR_DARK = 1100;
     public static final int N_IMAGES_NR_DARK = 8;
     public static final int N_IMAGES_NR_DARK_LOW_LIGHT = 15;
 
     // for testing:
-    volatile int count_camera_parameters_exception;
+    public volatile int count_camera_parameters_exception;
     public volatile int count_precapture_timeout;
     public volatile boolean test_wait_capture_result; // whether to test delayed capture result in Camera2 API
     public volatile boolean test_release_during_photo; // for Camera2 API, will force takePictureAfterPrecapture() to call release() on UI thread
@@ -65,6 +66,7 @@ public abstract class CameraController {
         public List<CameraController.Size> video_sizes;
         public List<CameraController.Size> video_sizes_high_speed; // may be null if high speed not supported
         public List<CameraController.Size> preview_sizes;
+        public List<Integer> supported_extensions; // if non-null, list of supported camera vendor extensions, see https://developer.android.com/reference/android/hardware/camera2/CameraExtensionCharacteristics
         public List<String> supported_flash_values;
         public List<String> supported_focus_values;
         public float [] apertures; // may be null if not supported, else will have at least 2 values
@@ -136,7 +138,7 @@ public abstract class CameraController {
     }
 
     // Android docs and FindBugs recommend that Comparators also be Serializable
-    public static class RangeSorter implements Comparator<int[]>, Serializable {
+    static class RangeSorter implements Comparator<int[]>, Serializable {
         private static final long serialVersionUID = 5802214721073728212L;
         @Override
         public int compare(int[] o1, int[] o2) {
@@ -148,7 +150,7 @@ public abstract class CameraController {
     /* Sorts resolutions from highest to lowest, by area.
      * Android docs and FindBugs recommend that Comparators also be Serializable
      */
-    public static class SizeSorter implements Comparator<Size>, Serializable {
+    static class SizeSorter implements Comparator<Size>, Serializable {
         private static final long serialVersionUID = 5802214721073718212L;
 
         @Override
@@ -161,6 +163,7 @@ public abstract class CameraController {
         public final int width;
         public final int height;
         public boolean supports_burst; // for photo
+        public List<Integer> supported_extensions; // for photo and preview: if non-null, list of supported camera vendor extensions
         final List<int[]> fps_ranges; // for video
         public final boolean high_speed; // for video
 
@@ -174,7 +177,17 @@ public abstract class CameraController {
         }
 
         public Size(int width, int height) {
-            this(width, height, new ArrayList<int[]>(), false);
+            this(width, height, new ArrayList<>(), false);
+        }
+
+        /** Whether this size supports the requested burst and/or extension
+         */
+        public boolean supportsRequirements(boolean want_burst, boolean want_extension, int extension) {
+            return (!want_burst || this.supports_burst) && (!want_extension || this.supportsExtension(extension));
+        }
+
+        public boolean supportsExtension(int extension) {
+            return supported_extensions != null && supported_extensions.contains(extension);
         }
 
         boolean supportsFrameRate(double fps) {
@@ -203,6 +216,7 @@ public abstract class CameraController {
             return width*41 + height;
         }
 
+        @NonNull
         public String toString() {
             StringBuilder s = new StringBuilder();
             for (int[] f : this.fps_ranges) {
@@ -276,10 +290,13 @@ public abstract class CameraController {
 
     public static class Face {
         public final int score;
-        /* The has values from [-1000,-1000] (for top-left) to [1000,1000] (for bottom-right) for whatever is
+        /* The rect has values from [-1000,-1000] (for top-left) to [1000,1000] (for bottom-right) for whatever is
          * the current field of view (i.e., taking zoom into account).
          */
         public final Rect rect;
+        /** The temp rect is temporary storage that can be used by callers.
+         */
+        public final Rect temp = new Rect();
 
         Face(int score, Rect rect) {
             this.score = score;
@@ -369,6 +386,9 @@ public abstract class CameraController {
     public abstract CameraController.Size getPreviewSize();
     public abstract void setPreviewSize(int width, int height);
 
+    public abstract void setCameraExtension(boolean enabled, int extension);
+    public abstract boolean isCameraExtension();
+    public abstract int getCameraExtension();
     // whether to take a burst of images, and if so, what type
     public enum BurstType {
         BURSTTYPE_NONE, // no burst
@@ -400,6 +420,11 @@ public abstract class CameraController {
      */
     public abstract void setExpoBracketingStops(double stops);
     public abstract void setUseExpoFastBurst(boolean use_expo_fast_burst);
+    /** Whether to enable a workaround hack for some Galaxy devices - take an additional dummy photo
+     *  when taking an expo/HDR burst, to avoid problem where manual exposure is ignored for the
+     *  first image.
+     */
+    public abstract void setDummyCaptureHack(boolean dummy_capture_hack);
     public abstract boolean isBurstOrExpo();
     /** If true, then the camera controller is currently capturing a burst of images.
      */
@@ -478,6 +503,7 @@ public abstract class CameraController {
     public abstract void setJpegQuality(int quality);
     public abstract int getZoom();
     public abstract void setZoom(int value);
+    public abstract void resetZoom(); // resets to zoom 1x
     public abstract int getExposureCompensation();
     public abstract boolean setExposureCompensation(int new_exposure);
     public abstract void setPreviewFpsRange(int min, int max);
@@ -519,6 +545,7 @@ public abstract class CameraController {
     public abstract List<CameraController.Area> getFocusAreas();
     public abstract List<CameraController.Area> getMeteringAreas();
     public abstract boolean supportsAutoFocus();
+    public abstract boolean supportsMetering();
     public abstract boolean focusIsContinuous();
     public abstract boolean focusIsVideo();
     public abstract void reconnect() throws CameraControllerException;
diff --git a/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController1.java b/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController1.java
index 1310a17ef31369d9d45dc8dc344e058b5ecc2f95..379da2c2b1e741d510b25a56130d606069af5bbe 100644
--- a/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController1.java
+++ b/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController1.java
@@ -435,6 +435,7 @@ public class CameraController1 extends CameraController {
         catch(RuntimeException e) {
             Log.e(TAG, "exception from getParameters");
             e.printStackTrace();
+            count_camera_parameters_exception++;
             return null;
         }
         List<String> values = parameters.getSupportedSceneModes();
@@ -759,6 +760,21 @@ public class CameraController1 extends CameraController {
         setCameraParameters(parameters);
     }
 
+    @Override
+    public void setCameraExtension(boolean enabled, int extension) {
+        // not supported
+    }
+
+    @Override
+    public boolean isCameraExtension() {
+        return false;
+    }
+
+    @Override
+    public int getCameraExtension() {
+        return -1;
+    }
+
     @Override
     public void setBurstType(BurstType burst_type) {
         if( MyDebug.LOG )
@@ -835,6 +851,11 @@ public class CameraController1 extends CameraController {
         this.expo_bracketing_stops = stops;
     }
 
+    @Override
+    public void setDummyCaptureHack(boolean dummy_capture_hack) {
+        // not supported for CameraController1
+    }
+
     @Override
     public void setUseExpoFastBurst(boolean use_expo_fast_burst) {
         // not supported for CameraController1
@@ -890,8 +911,17 @@ public class CameraController1 extends CameraController {
     }
 
     public boolean getVideoStabilization() {
-        Camera.Parameters parameters = this.getParameters();
-        return parameters.getVideoStabilization();
+        try {
+            Camera.Parameters parameters = this.getParameters();
+            return parameters.getVideoStabilization();
+        }
+        catch(RuntimeException e) {
+            // have had crashes from Google Play for getParameters - assume video stabilization not enabled
+            Log.e(TAG, "failed to get parameters for video stabilization");
+            e.printStackTrace();
+            count_camera_parameters_exception++;
+            return false;
+        }
     }
 
     @Override
@@ -934,9 +964,15 @@ public class CameraController1 extends CameraController {
         catch(RuntimeException e) {
             Log.e(TAG, "failed to set parameters for zoom");
             e.printStackTrace();
+            count_camera_parameters_exception++;
         }
     }
 
+    @Override
+    public void resetZoom() {
+        setZoom(0);
+    }
+
     public int getExposureCompensation() {
 		/*Camera.Parameters parameters = this.getParameters();
 		return parameters.getExposureCompensation();*/
@@ -990,6 +1026,7 @@ public class CameraController1 extends CameraController {
             // but here it doesn't really matter if we fail to set the fps range
             Log.e(TAG, "setPreviewFpsRange failed to get parameters");
             e.printStackTrace();
+            count_camera_parameters_exception++;
         }
     }
 
@@ -1012,6 +1049,7 @@ public class CameraController1 extends CameraController {
 			  But that's a subclass of RuntimeException which we now catch anyway.
 			  */
             e.printStackTrace();
+            count_camera_parameters_exception++;
         }
         return null;
     }
@@ -1266,6 +1304,7 @@ public class CameraController1 extends CameraController {
             // but here it doesn't really matter if we fail to set the recording hint
             Log.e(TAG, "setRecordingHint failed to get parameters");
             e.printStackTrace();
+            count_camera_parameters_exception++;
         }
     }
 
@@ -1372,9 +1411,14 @@ public class CameraController1 extends CameraController {
 
                 setCameraParameters(parameters);
             }
+            else {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "metering areas not supported");
+            }
         }
         catch(RuntimeException e) {
             e.printStackTrace();
+            count_camera_parameters_exception++;
         }
         return false;
     }
@@ -1397,6 +1441,7 @@ public class CameraController1 extends CameraController {
         }
         catch(RuntimeException e) {
             e.printStackTrace();
+            count_camera_parameters_exception++;
         }
     }
 
@@ -1437,6 +1482,20 @@ public class CameraController1 extends CameraController {
         }
         catch(RuntimeException e) {
             e.printStackTrace();
+            count_camera_parameters_exception++;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean supportsMetering() {
+        try {
+            Camera.Parameters parameters = this.getParameters();
+            return parameters.getMaxNumMeteringAreas() > 0;
+        }
+        catch(RuntimeException e) {
+            e.printStackTrace();
+            count_camera_parameters_exception++;
         }
         return false;
     }
@@ -1454,6 +1513,7 @@ public class CameraController1 extends CameraController {
         }
         catch(RuntimeException e) {
             e.printStackTrace();
+            count_camera_parameters_exception++;
         }
         return false;
     }
@@ -1544,23 +1604,29 @@ public class CameraController1 extends CameraController {
         catch(RuntimeException e) {
             if( MyDebug.LOG )
                 Log.d(TAG, "face detection failed or already started");
+            count_camera_parameters_exception++;
             return false;
         }
         return true;
     }
 
     public void setFaceDetectionListener(final CameraController.FaceDetectionListener listener) {
-        class CameraFaceDetectionListener implements Camera.FaceDetectionListener {
-            @Override
-            public void onFaceDetection(Camera.Face[] camera_faces, Camera camera) {
-                Face [] faces = new Face[camera_faces.length];
-                for(int i=0;i<camera_faces.length;i++) {
-                    faces[i] = new Face(camera_faces[i].score, camera_faces[i].rect);
+        if( listener != null ) {
+            class CameraFaceDetectionListener implements Camera.FaceDetectionListener {
+                @Override
+                public void onFaceDetection(Camera.Face[] camera_faces, Camera camera) {
+                    Face [] faces = new Face[camera_faces.length];
+                    for(int i=0;i<camera_faces.length;i++) {
+                        faces[i] = new Face(camera_faces[i].score, camera_faces[i].rect);
+                    }
+                    listener.onFaceDetection(faces);
                 }
-                listener.onFaceDetection(faces);
             }
+            camera.setFaceDetectionListener(new CameraFaceDetectionListener());
+        }
+        else {
+            camera.setFaceDetectionListener(null);
         }
-        camera.setFaceDetectionListener(new CameraFaceDetectionListener());
     }
 
     @Override
diff --git a/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController2.java b/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController2.java
index de98372c7cca56d70f312dd2c2fbb19f0f7f5166..cc1cc7958cf0e8845e8d3fda26d6953eb9d35013 100644
--- a/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController2.java
+++ b/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController2.java
@@ -1,6 +1,7 @@
 package net.sourceforge.opencamera.cameracontroller;
 
 import net.sourceforge.opencamera.ContinuousBurstImageRunningAction;
+import net.sourceforge.opencamera.HDRProcessor;
 import net.sourceforge.opencamera.MyDebug;
 
 import java.nio.ByteBuffer;
@@ -11,6 +12,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Queue;
+import java.util.concurrent.Executor;
 
 import android.app.Activity;
 import android.content.Context;
@@ -23,6 +25,8 @@ import android.hardware.camera2.CameraCaptureSession;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraConstrainedHighSpeedCaptureSession;
 import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraExtensionCharacteristics;
+import android.hardware.camera2.CameraExtensionSession;
 import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.CameraMetadata;
 import android.hardware.camera2.CaptureFailure;
@@ -30,13 +34,16 @@ import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
 import android.hardware.camera2.DngCreator;
 import android.hardware.camera2.TotalCaptureResult;
+import android.hardware.camera2.params.Capability;
+import android.hardware.camera2.params.ExtensionSessionConfiguration;
 import android.hardware.camera2.params.MeteringRectangle;
+import android.hardware.camera2.params.OutputConfiguration;
 import android.hardware.camera2.params.RggbChannelVector;
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.hardware.camera2.params.TonemapCurve;
 import android.location.Location;
 import android.media.AudioManager;
-import android.media.ExifInterface;
+import androidx.exifinterface.media.ExifInterface;
 import android.media.Image;
 import android.media.ImageReader;
 import android.media.MediaActionSound;
@@ -66,23 +73,32 @@ public class CameraController2 extends CameraController {
 
     private final Context context;
     private CameraDevice camera;
-    private String cameraIdS;
+    private final String cameraIdS;
 
+    private final boolean is_oneplus;
     private final boolean is_samsung;
     private final boolean is_samsung_s7; // Galaxy S7 or Galaxy S7 Edge
+    private final boolean is_samsung_galaxy_s;
 
     private CameraCharacteristics characteristics;
+    private CameraExtensionCharacteristics extension_characteristics;
     // cached characteristics (use this for values that need to be frequently accessed, e.g., per frame, to improve performance);
     private int characteristics_sensor_orientation;
     private Facing characteristics_facing;
 
+    // camera features that we save (either to avoid repeatedly accessing, or we do our own modification)
     private List<Integer> zoom_ratios;
     private int current_zoom_value;
+    private int zoom_value_1x; // index into zoom_ratios list that is for zoom 1x
     private boolean supports_face_detect_mode_simple;
     private boolean supports_face_detect_mode_full;
     private boolean supports_optical_stabilization;
     private boolean supports_photo_video_recording;
     private boolean supports_white_balance_temperature;
+    private String initial_focus_mode; // if non-null, focus mode to use if not set by Preview (rather than relying on the Builder template's default, which can be one that isn't supported, at least on Android emulator with its LIMITED camera!)
+    private boolean supports_exposure_time;
+    private long min_exposure_time;
+    private long max_exposure_time;
 
     private final static int tonemap_log_max_curve_points_c = 64;
     private final static float [] jtvideo_values_base = new float[] {
@@ -149,7 +165,17 @@ public class CameraController2 extends CameraController {
 
     private final ErrorCallback preview_error_cb;
     private final ErrorCallback camera_error_cb;
-    private CameraCaptureSession captureSession;
+
+    private enum SessionType {
+        SESSIONTYPE_NORMAL, // standard use of Camera2 API, via CameraCaptureSession
+        SESSIONTYPE_EXTENSION, // use of vendor extension, via CameraExtensionSession
+    }
+    private SessionType sessionType = SessionType.SESSIONTYPE_NORMAL;
+    //private SessionType sessionType = SessionType.SESSIONTYPE_EXTENSION; // test
+    private CameraCaptureSession captureSession; // used if sessionType == SESSIONTYPE_NORMAL
+    private CameraExtensionSession extensionSession; // used if sessionType == SESSIONTYPE_EXTENSION
+    private int camera_extension = 0; // used if sessionType == SESSIONTYPE_EXTENSION
+
     private CaptureRequest.Builder previewBuilder;
     private boolean previewIsVideoMode;
     private AutoFocusCallback autofocus_cb;
@@ -181,12 +207,19 @@ public class CameraController2 extends CameraController {
     private boolean continuous_burst_in_progress; // whether we're currently taking a continuous burst
     private boolean continuous_burst_requested_last_capture; // whether we've requested the last capture
 
+    // Whether to enable a workaround hack for some Galaxy devices - take an additional dummy photo
+    // when taking an expo/HDR burst, to avoid problem where manual exposure is ignored for the
+    // first image.
+    private boolean dummy_capture_hack = false;
+    //private boolean dummy_capture_hack = true; // test
+
     private boolean optimise_ae_for_dro = false;
     private boolean want_raw;
     //private boolean want_raw = true;
     private int max_raw_images;
     private android.util.Size raw_size;
     private ImageReader imageReaderRaw;
+    private OnImageAvailableListener onImageAvailableListener;
     private OnRawImageAvailableListener onRawImageAvailableListener;
     private PictureCallback picture_cb;
     private boolean jpeg_todo; // whether we are still waiting for JPEG images
@@ -213,6 +246,7 @@ public class CameraController2 extends CameraController {
     private Surface surface_texture;
     private HandlerThread thread;
     private Handler handler;
+    private Executor executor;
     private Surface video_recorder_surface;
 
     private int preview_width;
@@ -265,8 +299,26 @@ public class CameraController2 extends CameraController {
     /*private boolean capture_result_has_focus_distance;
     private float capture_result_focus_distance_min;
     private float capture_result_focus_distance_max;*/
-    private final static long max_preview_exposure_time_c = 1000000000L/12;
-    
+    /** Even if using long exposure, we want to set a maximum for the preview to avoid very low
+     *  frame rates.
+     *  Originally this was 1/12s, but I think we can get away with 1/5s - for this range, having
+     *  a WYSIWYG preview is probably still better than the reduced framerate. Also as a side-benefit,
+     *  it reduces the impact of the Samsung Galaxy Android 11 bug where manual exposure is ignored if
+     *  different to the preview.
+     */
+    private final static long max_preview_exposure_time_c = 1000000000L/5;
+
+    private void resetCaptureResultInfo() {
+        capture_result_is_ae_scanning = false;
+        capture_result_ae = null;
+        is_flash_required = false;
+        capture_result_has_white_balance_rggb = false;
+        capture_result_has_iso = false;
+        capture_result_has_exposure_time = false;
+        capture_result_has_frame_duration = false;
+        capture_result_has_aperture = false;
+    }
+
     private enum RequestTagType {
         CAPTURE, // request is either for a regular non-burst capture, or the last of a burst capture sequence
         CAPTURE_BURST_IN_PROGRESS // request is for a burst capture, but isn't the last of the burst capture sequence
@@ -310,9 +362,11 @@ public class CameraController2 extends CameraController {
         private int antibanding = CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_AUTO;
         private boolean has_edge_mode;
         private int edge_mode = CameraMetadata.EDGE_MODE_FAST;
+        private boolean has_default_edge_mode;
         private Integer default_edge_mode;
         private boolean has_noise_reduction_mode;
         private int noise_reduction_mode = CameraMetadata.NOISE_REDUCTION_MODE_FAST;
+        private boolean has_default_noise_reduction_mode;
         private Integer default_noise_reduction_mode;
         private int white_balance_temperature = 5000; // used for white_balance == CONTROL_AWB_MODE_OFF
         private String flash_value = "flash_off";
@@ -323,7 +377,9 @@ public class CameraController2 extends CameraController {
         private long exposure_time = EXPOSURE_TIME_DEFAULT;
         private boolean has_aperture;
         private float aperture;
-        private Rect scalar_crop_region; // no need for has_scalar_crop_region, as we can set to null instead
+        private boolean has_control_zoom_ratio; // zoom for Android 11+
+        private float control_zoom_ratio; // zoom for Android 11+
+        private Rect scalar_crop_region; // zoom for older Android versions; no need for has_scalar_crop_region, as we can set to null instead
         private boolean has_ae_exposure_compensation;
         private int ae_exposure_compensation;
         private boolean has_af_mode;
@@ -332,8 +388,8 @@ public class CameraController2 extends CameraController {
         private float focus_distance_manual; // saved setting when in manual mode (so if user switches to infinity mode and back, we'll still remember the manual focus distance)
         private boolean ae_lock;
         private boolean wb_lock;
-        private MeteringRectangle [] af_regions; // no need for has_scalar_crop_region, as we can set to null instead
-        private MeteringRectangle [] ae_regions; // no need for has_scalar_crop_region, as we can set to null instead
+        private MeteringRectangle [] af_regions; // no need for has_af_regions, as we can set to null instead
+        private MeteringRectangle [] ae_regions; // no need for has_ae_regions, as we can set to null instead
         private boolean has_face_detect_mode;
         private int face_detect_mode = CaptureRequest.STATISTICS_FACE_DETECT_MODE_OFF;
         private Integer default_optical_stabilization;
@@ -384,13 +440,16 @@ public class CameraController2 extends CameraController {
             //builder.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
             //builder.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON_ALWAYS_FLASH);
 
-            builder.set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_IDLE);
+            if( sessionType != SessionType.SESSIONTYPE_EXTENSION ) {
+                builder.set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_IDLE);
+            }
 
             setSceneMode(builder);
             setColorEffect(builder);
             setWhiteBalance(builder);
             setAntiBanding(builder);
             setAEMode(builder, is_still);
+            setControlZoomRatio(builder);
             setCropRegion(builder);
             setExposureCompensation(builder);
             setFocusMode(builder);
@@ -405,7 +464,10 @@ public class CameraController2 extends CameraController {
             setTonemapProfile(builder);
 
             if( is_still ) {
-                if( location != null ) {
+                if( location != null && sessionType != SessionType.SESSIONTYPE_EXTENSION ) {
+                    // JPEG_GPS_LOCATION not supported for camera extensions, so instead this must
+                    // be set by the caller when receiving the image data (see ImageSaver.modifyExif(),
+                    // where we do this using ExifInterface.setGpsInfo()).
                     builder.set(CaptureRequest.JPEG_GPS_LOCATION, location);
                 }
                 builder.set(CaptureRequest.JPEG_ORIENTATION, rotation);
@@ -423,11 +485,11 @@ public class CameraController2 extends CameraController {
             /*builder.set(CaptureRequest.NOISE_REDUCTION_MODE, CaptureRequest.NOISE_REDUCTION_MODE_OFF);
             builder.set(CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE, CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE_OFF);
             builder.set(CaptureRequest.EDGE_MODE, CaptureRequest.EDGE_MODE_OFF);
-            if( Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M ) {
+            if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
                 builder.set(CaptureRequest.TONEMAP_MODE, CaptureRequest.TONEMAP_MODE_GAMMA_VALUE);
                 builder.set(CaptureRequest.TONEMAP_GAMMA, 5.0f);
             }*/
-            /*if( Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N ) {
+            /*if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
                 builder.set(CaptureRequest.CONTROL_POST_RAW_SENSITIVITY_BOOST, 0);
             }*/
             /*builder.set(CaptureRequest.CONTROL_EFFECT_MODE, CaptureRequest.CONTROL_EFFECT_MODE_OFF);
@@ -452,7 +514,7 @@ public class CameraController2 extends CameraController {
                     }
                 }
             }*/
-            /*if( Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M ) {
+            /*if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
                 builder.set(CaptureRequest.TONEMAP_MODE, CaptureRequest.TONEMAP_MODE_PRESET_CURVE);
                 builder.set(CaptureRequest.TONEMAP_PRESET_CURVE, CaptureRequest.TONEMAP_PRESET_CURVE_SRGB);
             }*/
@@ -465,7 +527,7 @@ public class CameraController2 extends CameraController {
                     Log.d(TAG, "edge_mode: " + (edge_mode==null ? "null" : edge_mode));
                     Integer cc_mode = builder.get(CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE);
                     Log.d(TAG, "cc_mode: " + (cc_mode==null ? "null" : cc_mode));
-                    /*if( Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N ) {
+                    /*if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
                         Integer raw_sensitivity_boost = builder.get(CaptureRequest.CONTROL_POST_RAW_SENSITIVITY_BOOST);
                         Log.d(TAG, "raw_sensitivity_boost: " + (raw_sensitivity_boost==null ? "null" : raw_sensitivity_boost));
                     }*/
@@ -480,6 +542,12 @@ public class CameraController2 extends CameraController {
                 Log.d(TAG, "setSceneMode");
                 Log.d(TAG, "builder: " + builder);
             }
+
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+                return false;
+            }
+
             Integer current_scene_mode = builder.get(CaptureRequest.CONTROL_SCENE_MODE);
             if( has_face_detect_mode ) {
                 // face detection mode overrides scene mode
@@ -507,10 +575,13 @@ public class CameraController2 extends CameraController {
         }
 
         private boolean setColorEffect(CaptureRequest.Builder builder) {
-            /*if( builder.get(CaptureRequest.CONTROL_EFFECT_MODE) == null && color_effect == CameraMetadata.CONTROL_EFFECT_MODE_OFF ) {
-                // can leave off
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
             }
-            else*/ if( builder.get(CaptureRequest.CONTROL_EFFECT_MODE) == null || builder.get(CaptureRequest.CONTROL_EFFECT_MODE) != color_effect ) {
+            /*else if( builder.get(CaptureRequest.CONTROL_EFFECT_MODE) == null && color_effect == CameraMetadata.CONTROL_EFFECT_MODE_OFF ) {
+                // can leave off
+            }*/
+            else if( builder.get(CaptureRequest.CONTROL_EFFECT_MODE) == null || builder.get(CaptureRequest.CONTROL_EFFECT_MODE) != color_effect ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "setting color effect: " + color_effect);
                 builder.set(CaptureRequest.CONTROL_EFFECT_MODE, color_effect);
@@ -521,10 +592,13 @@ public class CameraController2 extends CameraController {
 
         private boolean setWhiteBalance(CaptureRequest.Builder builder) {
             boolean changed = false;
-            /*if( builder.get(CaptureRequest.CONTROL_AWB_MODE) == null && white_balance == CameraMetadata.CONTROL_AWB_MODE_AUTO ) {
-                // can leave off
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
             }
-            else*/ if( builder.get(CaptureRequest.CONTROL_AWB_MODE) == null || builder.get(CaptureRequest.CONTROL_AWB_MODE) != white_balance ) {
+            /*else if( builder.get(CaptureRequest.CONTROL_AWB_MODE) == null && white_balance == CameraMetadata.CONTROL_AWB_MODE_AUTO ) {
+                // can leave off
+            }*/
+            else if( builder.get(CaptureRequest.CONTROL_AWB_MODE) == null || builder.get(CaptureRequest.CONTROL_AWB_MODE) != white_balance ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "setting white balance: " + white_balance);
                 builder.set(CaptureRequest.CONTROL_AWB_MODE, white_balance);
@@ -534,7 +608,7 @@ public class CameraController2 extends CameraController {
                 if( MyDebug.LOG )
                     Log.d(TAG, "setting white balance temperature: " + white_balance_temperature);
                 // manual white balance
-                RggbChannelVector rggbChannelVector = convertTemperatureToRggb(white_balance_temperature);
+                RggbChannelVector rggbChannelVector = convertTemperatureToRggbVector(white_balance_temperature);
                 builder.set(CaptureRequest.COLOR_CORRECTION_MODE, CameraMetadata.COLOR_CORRECTION_MODE_TRANSFORM_MATRIX);
                 builder.set(CaptureRequest.COLOR_CORRECTION_GAINS, rggbChannelVector);
                 changed = true;
@@ -544,7 +618,10 @@ public class CameraController2 extends CameraController {
 
         private boolean setAntiBanding(CaptureRequest.Builder builder) {
             boolean changed = false;
-            if( has_antibanding ) {
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else if( has_antibanding ) {
                 if( builder.get(CaptureRequest.CONTROL_AE_ANTIBANDING_MODE) == null || builder.get(CaptureRequest.CONTROL_AE_ANTIBANDING_MODE) != antibanding ) {
                     if( MyDebug.LOG )
                         Log.d(TAG, "setting antibanding: " + antibanding);
@@ -558,12 +635,17 @@ public class CameraController2 extends CameraController {
         private boolean setEdgeMode(CaptureRequest.Builder builder) {
             if( MyDebug.LOG ) {
                 Log.d(TAG, "setEdgeMode");
+                Log.d(TAG, "has_default_edge_mode: " + has_default_edge_mode);
                 Log.d(TAG, "default_edge_mode: " + default_edge_mode);
             }
             boolean changed = false;
-            if( has_edge_mode ) {
-                if( default_edge_mode == null ) {
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else if( has_edge_mode ) {
+                if( !has_default_edge_mode ) {
                     // save the default_edge_mode edge_mode
+                    has_default_edge_mode = true;
                     default_edge_mode = builder.get(CaptureRequest.EDGE_MODE);
                     if( MyDebug.LOG )
                         Log.d(TAG, "default_edge_mode: " + default_edge_mode);
@@ -587,7 +669,7 @@ public class CameraController2 extends CameraController {
                 // need EDGE_MODE_OFF to avoid a "glow" effect
                 builder.set(CaptureRequest.EDGE_MODE, CaptureRequest.EDGE_MODE_OFF);
             }
-            else if( default_edge_mode != null ) {
+            else if( has_default_edge_mode ) {
                 if( builder.get(CaptureRequest.EDGE_MODE) != null && !builder.get(CaptureRequest.EDGE_MODE).equals(default_edge_mode) ) {
                     builder.set(CaptureRequest.EDGE_MODE, default_edge_mode);
                     changed = true;
@@ -599,12 +681,17 @@ public class CameraController2 extends CameraController {
         private boolean setNoiseReductionMode(CaptureRequest.Builder builder) {
             if( MyDebug.LOG ) {
                 Log.d(TAG, "setNoiseReductionMode");
+                Log.d(TAG, "has_default_noise_reduction_mode: " + has_default_noise_reduction_mode);
                 Log.d(TAG, "default_noise_reduction_mode: " + default_noise_reduction_mode);
             }
             boolean changed = false;
-            if( has_noise_reduction_mode ) {
-                if( default_noise_reduction_mode == null ) {
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else if( has_noise_reduction_mode ) {
+                if( !has_default_noise_reduction_mode ) {
                     // save the default_noise_reduction_mode noise_reduction_mode
+                    has_default_noise_reduction_mode = true;
                     default_noise_reduction_mode = builder.get(CaptureRequest.NOISE_REDUCTION_MODE);
                     if( MyDebug.LOG )
                         Log.d(TAG, "default_noise_reduction_mode: " + default_noise_reduction_mode);
@@ -628,7 +715,7 @@ public class CameraController2 extends CameraController {
                 // need NOISE_REDUCTION_MODE_OFF to avoid excessive blurring
                 builder.set(CaptureRequest.NOISE_REDUCTION_MODE, CaptureRequest.NOISE_REDUCTION_MODE_OFF);
             }
-            else if( default_noise_reduction_mode != null ) {
+            else if( has_default_noise_reduction_mode ) {
                 if( builder.get(CaptureRequest.NOISE_REDUCTION_MODE) != null && !builder.get(CaptureRequest.NOISE_REDUCTION_MODE).equals(default_noise_reduction_mode)) {
                     builder.set(CaptureRequest.NOISE_REDUCTION_MODE, default_noise_reduction_mode);
                     changed = true;
@@ -640,13 +727,16 @@ public class CameraController2 extends CameraController {
         private boolean setAperture(CaptureRequest.Builder builder) {
             if( MyDebug.LOG )
                 Log.d(TAG, "setAperture");
-            // don't set at all if has_aperture==false
-            if( has_aperture ) {
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else if( has_aperture ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "    aperture: " + aperture);
                 builder.set(CaptureRequest.LENS_APERTURE, aperture);
                 return true;
             }
+            // don't set at all if has_aperture==false
             return false;
         }
 
@@ -654,6 +744,12 @@ public class CameraController2 extends CameraController {
         private boolean setAEMode(CaptureRequest.Builder builder, boolean is_still) {
             if( MyDebug.LOG )
                 Log.d(TAG, "setAEMode");
+
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+                return false;
+            }
+
             if( has_iso ) {
                 if( MyDebug.LOG ) {
                     Log.d(TAG, "manual mode");
@@ -741,8 +837,20 @@ public class CameraController2 extends CameraController {
             return true;
         }
 
+        private void setControlZoomRatio(CaptureRequest.Builder builder) {
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && has_control_zoom_ratio ) {
+                builder.set(CaptureRequest.CONTROL_ZOOM_RATIO, control_zoom_ratio);
+            }
+        }
+
         private void setCropRegion(CaptureRequest.Builder builder) {
-            if( scalar_crop_region != null ) {
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else if( scalar_crop_region != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.R ) {
                 builder.set(CaptureRequest.SCALER_CROP_REGION, scalar_crop_region);
             }
         }
@@ -755,6 +863,10 @@ public class CameraController2 extends CameraController {
                     Log.d(TAG, "don't set exposure compensation in manual iso mode");
                 return false;
             }
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+                return false;
+            }
             if( builder.get(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION) == null || ae_exposure_compensation != builder.get(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION) ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "change exposure to " + ae_exposure_compensation);
@@ -765,41 +877,73 @@ public class CameraController2 extends CameraController {
         }
 
         private void setFocusMode(CaptureRequest.Builder builder) {
-            if( has_af_mode ) {
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else if( has_af_mode ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "change af mode to " + af_mode);
                 builder.set(CaptureRequest.CONTROL_AF_MODE, af_mode);
             }
+            else {
+                if( MyDebug.LOG ) {
+                    Log.d(TAG, "af mode left at " + builder.get(CaptureRequest.CONTROL_AF_MODE));
+                }
+            }
         }
         
         private void setFocusDistance(CaptureRequest.Builder builder) {
             if( MyDebug.LOG )
                 Log.d(TAG, "change focus distance to " + focus_distance);
-            builder.set(CaptureRequest.LENS_FOCUS_DISTANCE, focus_distance);
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else {
+                builder.set(CaptureRequest.LENS_FOCUS_DISTANCE, focus_distance);
+            }
         }
 
         private void setAutoExposureLock(CaptureRequest.Builder builder) {
-            builder.set(CaptureRequest.CONTROL_AE_LOCK, ae_lock);
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else {
+                builder.set(CaptureRequest.CONTROL_AE_LOCK, ae_lock);
+            }
         }
 
         private void setAutoWhiteBalanceLock(CaptureRequest.Builder builder) {
-            builder.set(CaptureRequest.CONTROL_AWB_LOCK, wb_lock);
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else {
+                builder.set(CaptureRequest.CONTROL_AWB_LOCK, wb_lock);
+            }
         }
 
         private void setAFRegions(CaptureRequest.Builder builder) {
-            if( af_regions != null && characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF) > 0 ) {
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else if( af_regions != null && characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF) > 0 ) {
                 builder.set(CaptureRequest.CONTROL_AF_REGIONS, af_regions);
             }
         }
 
         private void setAERegions(CaptureRequest.Builder builder) {
-            if( ae_regions != null && characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AE) > 0 ) {
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else if( ae_regions != null && characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AE) > 0 ) {
                 builder.set(CaptureRequest.CONTROL_AE_REGIONS, ae_regions);
             }
         }
 
         private void setFaceDetectMode(CaptureRequest.Builder builder) {
-            if( has_face_detect_mode )
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else if( has_face_detect_mode )
                 builder.set(CaptureRequest.STATISTICS_FACE_DETECT_MODE, face_detect_mode);
             else
                 builder.set(CaptureRequest.STATISTICS_FACE_DETECT_MODE, CaptureRequest.STATISTICS_FACE_DETECT_MODE_OFF);
@@ -816,6 +960,12 @@ public class CameraController2 extends CameraController {
         private void setStabilization(CaptureRequest.Builder builder) {
             if( MyDebug.LOG )
                 Log.d(TAG, "setStabilization: " + video_stabilization);
+
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+                return;
+            }
+
             builder.set(CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE, video_stabilization ? CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE_ON : CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE_OFF);
             if( supports_optical_stabilization ) {
                 if( video_stabilization ) {
@@ -885,7 +1035,10 @@ public class CameraController2 extends CameraController {
             //if( test_new )
             //    have_tonemap_profile = false;
 
-            if( have_tonemap_profile ) {
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                // don't set for extensions
+            }
+            else if( have_tonemap_profile ) {
                 if( default_tonemap_mode == null ) {
                     // save the default tonemap_mode
                     default_tonemap_mode = builder.get(CaptureRequest.TONEMAP_MODE);
@@ -1125,9 +1278,26 @@ public class CameraController2 extends CameraController {
         // n.b., if we add more methods, remember to update setupBuilder() above!
     }
 
+    private boolean hasCaptureSession() {
+        if( sessionType == SessionType.SESSIONTYPE_EXTENSION )
+            return extensionSession != null;
+        return captureSession != null;
+    }
+
+    private void BLOCK_FOR_EXTENSIONS() {
+        if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+            throw new RuntimeException("not supported for extension session");
+        }
+    }
+
+    private static RggbChannelVector convertTemperatureToRggbVector(int temperature_kelvin) {
+        float [] rggb = convertTemperatureToRggb(temperature_kelvin);
+        return new RggbChannelVector(rggb[0], rggb[1], rggb[2], rggb[3]);
+    }
+
     /** Converts a white balance temperature to red, green even, green odd and blue components.
      */
-    private RggbChannelVector convertTemperatureToRggb(int temperature_kelvin) {
+    public static float [] convertTemperatureToRggb(int temperature_kelvin) {
         float temperature = temperature_kelvin / 100.0f;
         float red;
         float green;
@@ -1180,63 +1350,90 @@ public class CameraController2 extends CameraController {
             Log.d(TAG, "green: " + green);
             Log.d(TAG, "blue: " + blue);
         }
-        return new RggbChannelVector((red/255)*2,(green/255),(green/255),(blue/255)*2);
+
+        red = (red/255.0f);
+        green = (green/255.0f);
+        blue = (blue/255.0f);
+
+        red = RGBtoGain(red);
+        green = RGBtoGain(green);
+        blue = RGBtoGain(blue);
+        if( MyDebug.LOG ) {
+            Log.d(TAG, "red gain: " + red);
+            Log.d(TAG, "green gain: " + green);
+            Log.d(TAG, "blue gain: " + blue);
+        }
+
+        return new float[]{red,green/2,green/2,blue};
+    }
+
+    private static float RGBtoGain(float value) {
+        final float max_gain_c = 10.0f;
+        if( value < 1.0e-5f ) {
+            return max_gain_c;
+        }
+        value = 1.0f/value;
+        value = Math.min(max_gain_c, value);
+        return value;
+    }
+
+    public static int convertRggbVectorToTemperature(RggbChannelVector rggbChannelVector) {
+        return convertRggbToTemperature(new float[]{rggbChannelVector.getRed(), rggbChannelVector.getGreenEven(), rggbChannelVector.getGreenOdd(), rggbChannelVector.getBlue()});
     }
 
     /** Converts a red, green even, green odd and blue components to a white balance temperature.
      *  Note that this is not necessarily an inverse of convertTemperatureToRggb, since many rggb
      *  values can map to the same temperature.
      */
-    private int convertRggbToTemperature(RggbChannelVector rggbChannelVector) {
+    public static int convertRggbToTemperature(float [] rggb) {
         if( MyDebug.LOG ) {
             Log.d(TAG, "temperature:");
-            Log.d(TAG, "    red: " + rggbChannelVector.getRed());
-            Log.d(TAG, "    green even: " + rggbChannelVector.getGreenEven());
-            Log.d(TAG, "    green odd: " + rggbChannelVector.getGreenOdd());
-            Log.d(TAG, "    blue: " + rggbChannelVector.getBlue());
-        }
-        float red = rggbChannelVector.getRed();
-        float green_even = rggbChannelVector.getGreenEven();
-        float green_odd = rggbChannelVector.getGreenOdd();
-        float blue = rggbChannelVector.getBlue();
-        float green = 0.5f*(green_even + green_odd);
-
-        float max = Math.max(red, blue);
-        if( green > max )
-            green = max;
-
-        float scale = 255.0f/max;
-        red *= scale;
-        green *= scale;
-        blue *= scale;
-
-        int red_i = (int)red;
-        int green_i = (int)green;
-        int blue_i = (int)blue;
+            Log.d(TAG, "    red: " + rggb[0]);
+            Log.d(TAG, "    green even: " + rggb[1]);
+            Log.d(TAG, "    green odd: " + rggb[2]);
+            Log.d(TAG, "    blue: " + rggb[3]);
+        }
+        float red = rggb[0];
+        float green_even = rggb[1];
+        float green_odd = rggb[2];
+        float blue = rggb[3];
+        float green = (green_even + green_odd);
+
+        red = GaintoRGB(red);
+        green = GaintoRGB(green);
+        blue = GaintoRGB(blue);
+
+        red *= 255.0f;
+        green *= 255.0f;
+        blue *= 255.0f;
+
+        int red_i = (int)(red+0.5f);
+        int green_i = (int)(green+0.5f);
+        int blue_i = (int)(blue+0.5f);
         int temperature;
         if( red_i == blue_i ) {
             temperature = 6600;
         }
         else if( red_i > blue_i ) {
             // temperature <= 6600
-            int t_g = (int)( 100 * Math.exp((green_i + 161.1195681661) / 99.4708025861) );
+            float t_g = (float)( 100 * Math.exp((green + 161.1195681661) / 99.4708025861) );
             if( blue_i == 0 ) {
-                temperature = t_g;
+                temperature = (int)(t_g+0.5f);
             }
             else {
-                int t_b = (int)( 100 * (Math.exp((blue_i + 305.0447927307) / 138.5177312231) + 10) );
-                temperature = (t_g + t_b)/2;
+                float t_b = (float)( 100 * (Math.exp((blue + 305.0447927307) / 138.5177312231) + 10) );
+                temperature = (int)((t_g + t_b)/2+0.5f);
             }
         }
         else {
-            // temperature >= 6700
+            // temperature >= 6600
             if( red_i <= 1 || green_i <= 1 ) {
                 temperature = max_white_balance_temperature_c;
             }
             else {
-                int t_r = (int)(100 * (Math.pow(red_i / 329.698727446, 1.0 / -0.1332047592) + 60.0));
-                int t_g = (int)(100 * (Math.pow(green_i / 288.1221695283, 1.0 / -0.0755148492) + 60.0));
-                temperature = (t_r + t_g) / 2;
+                float t_r = (float)(100 * (Math.pow(red / 329.698727446, 1.0 / -0.1332047592) + 60.0));
+                float t_g = (float)(100 * (Math.pow(green / 288.1221695283, 1.0 / -0.0755148492) + 60.0));
+                temperature = (int)((t_r + t_g)/2+0.5f);
             }
         }
         temperature = Math.max(temperature, min_white_balance_temperature_c);
@@ -1247,7 +1444,17 @@ public class CameraController2 extends CameraController {
         return temperature;
     }
 
+    private static float GaintoRGB(float value) {
+        if( value <= 1.0f ) {
+            return 1.0f;
+        }
+        value = 1.0f/value;
+        return value;
+    }
+
     private class OnImageAvailableListener implements ImageReader.OnImageAvailableListener {
+        private boolean skip_next_image = false; // whether to ignore the next image (used for dummy_capture_hack)
+
         @Override
         public void onImageAvailable(ImageReader reader) {
             if( MyDebug.LOG )
@@ -1260,6 +1467,14 @@ public class CameraController2 extends CameraController {
                 image.close();
                 return;
             }
+            if( skip_next_image ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "skipping image");
+                skip_next_image = false;
+                Image image = reader.acquireNextImage();
+                image.close();
+                return;
+            }
 
             List<byte []> single_burst_complete_images = null;
             boolean call_takePhotoPartial = false;
@@ -1362,6 +1577,7 @@ public class CameraController2 extends CameraController {
         private void takePhotoPartial() {
             if( MyDebug.LOG )
                 Log.d(TAG, "takePhotoPartial");
+            BLOCK_FOR_EXTENSIONS(); // not supported for extension sessions
 
             ErrorCallback push_take_picture_error_cb = null;
 
@@ -1373,7 +1589,7 @@ public class CameraController2 extends CameraController {
                     }
                     if( burst_type != BurstType.BURSTTYPE_FOCUS ) {
                         try {
-                            if( camera != null && captureSession != null ) { // make sure camera wasn't released in the meantime
+                            if( camera != null && hasCaptureSession() ) { // make sure camera wasn't released in the meantime
                                 captureSession.capture(slow_burst_capture_requests.get(n_burst_taken), previewCaptureCallback, handler);
                             }
                         }
@@ -1456,7 +1672,7 @@ public class CameraController2 extends CameraController {
                             public void run(){
                                 if( MyDebug.LOG )
                                     Log.d(TAG, "take picture after delay for next focus bracket");
-                                if( camera != null && captureSession != null ) { // make sure camera wasn't released in the meantime
+                                if( camera != null && hasCaptureSession() ) { // make sure camera wasn't released in the meantime
                                     if( picture_cb.imageQueueWouldBlock(imageReaderRaw != null ? 1 : 0, 1) ) {
                                         if( MyDebug.LOG ) {
                                             Log.d(TAG, "...but wait for next focus bracket, as image queue would block");
@@ -1519,6 +1735,7 @@ public class CameraController2 extends CameraController {
     private class OnRawImageAvailableListener implements ImageReader.OnImageAvailableListener {
         private final Queue<CaptureResult> capture_results = new LinkedList<>();
         private final Queue<Image> images = new LinkedList<>();
+        private boolean skip_next_image = false; // whether to ignore the next image (used for dummy_capture_hack)
 
         void setCaptureResult(CaptureResult capture_result) {
             if( MyDebug.LOG )
@@ -1685,6 +1902,14 @@ public class CameraController2 extends CameraController {
                 this_image.close();
                 return;
             }
+            if( skip_next_image ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "skipping image");
+                skip_next_image = false;
+                Image image = reader.acquireNextImage();
+                image.close();
+                return;
+            }
             synchronized( background_camera_lock ) {
                 // see comment above in setCaptureResult() for why we synchronize
                 Image image = reader.acquireNextImage();
@@ -1745,25 +1970,42 @@ public class CameraController2 extends CameraController {
             Log.d(TAG, "this: " + this);
         }
 
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ) {
+            this.previewExtensionCaptureCallback = new MyExtensionCaptureCallback();
+        }
+        else {
+            this.previewExtensionCaptureCallback = null;
+        }
+
         this.context = context;
         this.preview_error_cb = preview_error_cb;
         this.camera_error_cb = camera_error_cb;
 
+        this.is_oneplus = Build.MANUFACTURER.toLowerCase(Locale.US).contains("oneplus");
         this.is_samsung = Build.MANUFACTURER.toLowerCase(Locale.US).contains("samsung");
         this.is_samsung_s7 = Build.MODEL.toLowerCase(Locale.US).contains("sm-g93");
+        this.is_samsung_galaxy_s = is_samsung && Build.MODEL.toLowerCase(Locale.US).contains("sm-g");
         if( MyDebug.LOG ) {
+            Log.d(TAG, "is_oneplus: " + is_oneplus);
             Log.d(TAG, "is_samsung: " + is_samsung);
             Log.d(TAG, "is_samsung_s7: " + is_samsung_s7);
+            Log.d(TAG, "is_samsung_galaxy_s: " + is_samsung_galaxy_s);
         }
 
         thread = new HandlerThread("CameraBackground"); 
         thread.start(); 
         handler = new Handler(thread.getLooper());
+        executor = new Executor() {
+            @Override
+            public void execute(Runnable command) {
+                handler.post(command);
+            }
+        };
 
         final CameraManager manager = (CameraManager)context.getSystemService(Context.CAMERA_SERVICE);
 
         class MyStateCallback extends CameraDevice.StateCallback {
-            boolean callback_done; // must sychronize on this and notifyAll when setting to true
+            boolean callback_done; // must synchronize on this and notifyAll when setting to true
             boolean first_callback = true; // Google Camera says we may get multiple callbacks, but only the first indicates the status of the camera opening operation
             @Override
             public void onOpened(@NonNull CameraDevice cam) {
@@ -1805,6 +2047,12 @@ public class CameraController2 extends CameraController {
                             Log.d(TAG, "characteristics_facing: " + characteristics_facing);
                         }
 
+                        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ) {
+                            extension_characteristics = manager.getCameraExtensionCharacteristics(cameraIdS);
+                            if( MyDebug.LOG )
+                                Log.d(TAG, "successfully obtained camera characteristics");
+                        }
+
                         CameraController2.this.camera = cam;
 
                         // note, this won't start the preview yet, but we create the previewBuilder in order to start setting camera parameters
@@ -2033,17 +2281,37 @@ public class CameraController2 extends CameraController {
         jtlog2_values = enforceMinTonemapCurvePoints(jtlog2_values_base);
     }
 
-    @Override
-    public void release() {
-        if( MyDebug.LOG )
-            Log.d(TAG, "release: " + this);
+    /** Closes the captureSession, if it exists.
+     */
+    private void closeCaptureSession() {
         synchronized( background_camera_lock ) {
             if( captureSession != null ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "close capture session");
                 captureSession.close();
                 captureSession = null;
-                //pending_request_when_ready = null;
+            }
+            if( extensionSession != null ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "close extension session");
+                if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ) {
+                    try {
+                        extensionSession.close();
+                    }
+                    catch(CameraAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+                extensionSession = null;
             }
         }
+    }
+
+    @Override
+    public void release() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "release: " + this);
+        closeCaptureSession();
         previewBuilder = null;
         previewIsVideoMode = false;
         if( camera != null ) {
@@ -2063,6 +2331,7 @@ public class CameraController2 extends CameraController {
                 thread.join();
                 thread = null;
                 handler = null;
+                executor = null;
             }
             catch(InterruptedException e) {
                 e.printStackTrace();
@@ -2145,6 +2414,7 @@ public class CameraController2 extends CameraController {
         if( imageReader != null ) {
             imageReader.close();
             imageReader = null;
+            onImageAvailableListener = null;
         }
         if( imageReaderRaw != null ) {
             imageReaderRaw.close();
@@ -2154,10 +2424,15 @@ public class CameraController2 extends CameraController {
     }
 
     private List<String> convertFocusModesToValues(int [] supported_focus_modes_arr, float minimum_focus_distance) {
-        if( MyDebug.LOG )
+        if( MyDebug.LOG ) {
             Log.d(TAG, "convertFocusModesToValues()");
-        if( supported_focus_modes_arr.length == 0 )
+            Log.d(TAG, "supported_focus_modes_arr: " + Arrays.toString(supported_focus_modes_arr));
+        }
+        if( supported_focus_modes_arr.length == 0 ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "no supported focus modes");
             return null;
+        }
         List<Integer> supported_focus_modes = new ArrayList<>();
         for(Integer supported_focus_mode : supported_focus_modes_arr)
             supported_focus_modes.add(supported_focus_mode);
@@ -2182,6 +2457,9 @@ public class CameraController2 extends CameraController {
         }
         if( supported_focus_modes.contains(CaptureRequest.CONTROL_AF_MODE_OFF) ) {
             output_modes.add("focus_mode_infinity");
+            if( MyDebug.LOG ) {
+                Log.d(TAG, " supports focus_mode_infinity");
+            }
             if( minimum_focus_distance > 0.0f ) {
                 output_modes.add("focus_mode_manual2");
                 if( MyDebug.LOG ) {
@@ -2247,33 +2525,127 @@ public class CameraController2 extends CameraController {
                 for(int i=0;i<nr_modes.length;i++) {
                     Log.d(TAG, "    " + i + ": " + nr_modes[i]);
                 }
+
+            }
+
+            if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.R ) {
+                Capability [] capabilities = characteristics.get(CameraCharacteristics.CONTROL_AVAILABLE_EXTENDED_SCENE_MODE_CAPABILITIES);
+                Log.d(TAG, "capabilities:");
+                if( capabilities == null ) {
+                    Log.d(TAG, "    none");
+                }
+                else {
+                    for(int i=0;i<capabilities.length;i++) {
+                        Log.d(TAG, "    " + i + ": " + capabilities[i].getMode());
+                    }
+                }
             }
         }
 
-        float max_zoom = characteristics.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM);
-        camera_features.is_zoom_supported = max_zoom > 0.0f;
-        if( MyDebug.LOG )
+        float min_zoom = 0.0f;
+        float max_zoom = 0.0f;
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.R ) {
+            // use CONTROL_ZOOM_RATIO_RANGE on Android 11+, to support multiple cameras with zoom ratios
+            // less than 1
+            Range<Float> zoom_ratio_range = characteristics.get(CameraCharacteristics.CONTROL_ZOOM_RATIO_RANGE);
+            if( zoom_ratio_range != null ) {
+                min_zoom = zoom_ratio_range.getLower();
+                max_zoom = zoom_ratio_range.getUpper();
+            }
+            else {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "zoom_ratio_range not supported");
+            }
+        }
+        else {
+            min_zoom = 1.0f;
+            max_zoom = characteristics.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM);
+        }
+        camera_features.is_zoom_supported = max_zoom > 0.0f && min_zoom > 0.0f;
+        if( MyDebug.LOG ) {
+            Log.d(TAG, "min_zoom: " + min_zoom);
             Log.d(TAG, "max_zoom: " + max_zoom);
+        }
         if( camera_features.is_zoom_supported ) {
+            float zoom_max_min_ratio = max_zoom / min_zoom;
             // set 20 steps per 2x factor
             final int steps_per_2x_factor = 20;
-            //final double scale_factor = Math.pow(2.0, 1.0/(double)steps_per_2x_factor);
-            int n_steps =(int)( (steps_per_2x_factor * Math.log(max_zoom + 1.0e-11)) / Math.log(2.0));
-            final double scale_factor = Math.pow(max_zoom, 1.0/(double)n_steps);
+            int n_steps = (int)( (steps_per_2x_factor * Math.log(zoom_max_min_ratio + 1.0e-11)) / Math.log(2.0));
             if( MyDebug.LOG ) {
                 Log.d(TAG, "n_steps: " + n_steps);
-                Log.d(TAG, "scale_factor: " + scale_factor);
             }
+
             camera_features.zoom_ratios = new ArrayList<>();
-            camera_features.zoom_ratios.add(100);
-            double zoom = 1.0;
-            for(int i=0;i<n_steps-1;i++) {
+
+            // add minimum zoom
+            camera_features.zoom_ratios.add((int)(min_zoom*100));
+            if( camera_features.zoom_ratios.get(0)/100.0f < min_zoom ) {
+                // fix for rounding down to less than the min_zoom
+                // e.g. if min_zoom = 0.666, we'd have stored a zoom ratio of 66 which then would
+                // convert back to 0.66
+                camera_features.zoom_ratios.set(0, camera_features.zoom_ratios.get(0) + 1);
+            }
+
+            if( camera_features.zoom_ratios.get(0) < 100 ) {
+                int n_steps_below_one = Math.max(1, n_steps/5);
+                // if the min zoom is < 1.0, we add multiple entries for 1x zoom, when using the zoom
+                // seekbar it's easy for the user to zoom to exactly 1x
+                int n_steps_one = Math.max(1, n_steps/20);
+                if( MyDebug.LOG ) {
+                    Log.d(TAG, "n_steps_below_one: " + n_steps_below_one);
+                    Log.d(TAG, "n_steps_one: " + n_steps_one);
+                }
+
+                // add rest of zoom values < 1.0f
+                double zoom = min_zoom;
+                final double scale_factor = Math.pow(1.0f / min_zoom, 1.0/(double)n_steps_below_one);
+                if( MyDebug.LOG ) {
+                    Log.d(TAG, "scale_factor for below 1.0x: " + scale_factor);
+                }
+                for(int i=0;i<n_steps_below_one-1;i++) {
+                    zoom *= scale_factor;
+                    int zoom_ratio = (int)(zoom*100);
+                    if( zoom_ratio > camera_features.zoom_ratios.get(0) ) {
+                        // on some devices (e.g., Pixel 6 Pro), the second entry would equal the first entry, due to the rounding fix above
+                        camera_features.zoom_ratios.add(zoom_ratio);
+                    }
+                }
+
+                // add values for 1.0f
+                zoom_value_1x = camera_features.zoom_ratios.size();
+                for(int i=0;i<n_steps_one;i++)
+                    camera_features.zoom_ratios.add(100);
+            }
+            else {
+                zoom_value_1x = 0;
+            }
+
+            final int n_steps_above_one = Math.max(1, n_steps - camera_features.zoom_ratios.size());
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "n_steps_above_one: " + n_steps_above_one);
+            }
+
+            // add zoom values > 1.0f
+            double zoom = 1.0f;
+            final double scale_factor = Math.pow(max_zoom, 1.0/(double)n_steps_above_one);
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "scale_factor for above 1.0x: " + scale_factor);
+            }
+            for(int i=0;i<n_steps_above_one-1;i++) {
                 zoom *= scale_factor;
-                camera_features.zoom_ratios.add((int)(zoom*100));
+                int zoom_ratio = (int)(zoom*100);
+                camera_features.zoom_ratios.add(zoom_ratio);
             }
-            camera_features.zoom_ratios.add((int)(max_zoom*100));
+
+            // add maximum zoom
+            int zoom_ratio = (int)(max_zoom*100);
+            camera_features.zoom_ratios.add(zoom_ratio);
+
             camera_features.max_zoom = camera_features.zoom_ratios.size()-1;
             this.zoom_ratios = camera_features.zoom_ratios;
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "zoom_ratios: " + zoom_ratios);
+            }
         }
         else {
             this.zoom_ratios = null;
@@ -2401,7 +2773,7 @@ public class CameraController2 extends CameraController {
 
         android.util.Size [] camera_picture_sizes = configs.getOutputSizes(ImageFormat.JPEG);
         camera_features.picture_sizes = new ArrayList<>();
-        if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M ) {
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
             android.util.Size [] camera_picture_sizes_hires = configs.getHighResolutionOutputSizes(ImageFormat.JPEG);
             if( camera_picture_sizes_hires != null ) {
                 for(android.util.Size camera_size : camera_picture_sizes_hires) {
@@ -2584,6 +2956,69 @@ public class CameraController2 extends CameraController {
             }
         }
 
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ) {
+            List<Integer> extensions = extension_characteristics.getSupportedExtensions();
+            if( extensions != null ) {
+                camera_features.supported_extensions = new ArrayList<>();
+                for(int extension : extensions) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "vendor extension: " + extension);
+
+                    // we assume that the allowed extension sizes are a subset of the full sizes - makes things easier to manage
+
+                    List<android.util.Size> extension_picture_sizes = extension_characteristics.getExtensionSupportedSizes(extension, ImageFormat.JPEG);
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "    extension_picture_sizes: " + extension_picture_sizes);
+                    boolean has_picture_resolution = false;
+                    for(CameraController.Size size : camera_features.picture_sizes) {
+                        if( extension_picture_sizes.contains(new android.util.Size(size.width, size.height)) ) {
+                            if( MyDebug.LOG ) {
+                                Log.d(TAG, "    picture size supports extension: " + size.width + " , " + size.height);
+                            }
+                            has_picture_resolution = true;
+                            if( size.supported_extensions == null ) {
+                                size.supported_extensions = new ArrayList<>();
+                            }
+                            size.supported_extensions.add(extension);
+                        }
+                        else {
+                            if( MyDebug.LOG ) {
+                                Log.d(TAG, "    picture size does NOT support extension: " + size.width + " , " + size.height);
+                            }
+                        }
+                    }
+
+                    List<android.util.Size> extension_preview_sizes = extension_characteristics.getExtensionSupportedSizes(extension, SurfaceTexture.class);
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "    extension_preview_sizes: " + extension_preview_sizes);
+                    boolean has_preview_resolution = false;
+                    for(CameraController.Size size : camera_features.preview_sizes) {
+                        if( extension_preview_sizes.contains(new android.util.Size(size.width, size.height)) ) {
+                            if( MyDebug.LOG ) {
+                                Log.d(TAG, "    preview size supports extension: " + size.width + " , " + size.height);
+                            }
+                            has_preview_resolution = true;
+                            if( size.supported_extensions == null ) {
+                                size.supported_extensions = new ArrayList<>();
+                            }
+                            size.supported_extensions.add(extension);
+                        }
+                        else {
+                            if( MyDebug.LOG ) {
+                                Log.d(TAG, "    preview size does NOT support extension: " + size.width + " , " + size.height);
+                            }
+                        }
+                    }
+
+                    if( has_picture_resolution && has_preview_resolution ) {
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "    extension is supported: " + extension);
+                        camera_features.supported_extensions.add(extension);
+                    }
+                }
+            }
+        }
+
         if( characteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE) ) {
             camera_features.supported_flash_values = new ArrayList<>();
             camera_features.supported_flash_values.add("flash_off");
@@ -2617,6 +3052,22 @@ public class CameraController2 extends CameraController {
         if( camera_features.supported_focus_values != null && camera_features.supported_focus_values.contains("focus_mode_manual2") ) {
             camera_features.supports_focus_bracketing = true;
         }
+        if( camera_features.supported_focus_values != null ) {
+            // prefer continuous focus mode
+            if( camera_features.supported_focus_values.contains("focus_mode_continuous_picture") ) {
+                initial_focus_mode = "focus_mode_continuous_picture";
+            }
+            else {
+                // just go with the first one
+                initial_focus_mode = camera_features.supported_focus_values.get(0);
+            }
+            if( MyDebug.LOG )
+                Log.d(TAG, "initial_focus_mode: " + initial_focus_mode);
+        }
+        else {
+            initial_focus_mode = null;
+        }
+
         camera_features.max_num_focus_areas = characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF);
 
         camera_features.is_exposure_lock_supported = true;
@@ -2686,9 +3137,22 @@ public class CameraController2 extends CameraController {
                     camera_features.max_expo_bracketing_n_images = max_expo_bracketing_n_images;
                     camera_features.min_exposure_time = exposure_time_range.getLower();
                     camera_features.max_exposure_time = exposure_time_range.getUpper();
+                    if( is_samsung_galaxy_s && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ) {
+                        // seems we can get away with longer exposure on some devices (e.g., Galaxy S10e claims only max of 0.1s, but works with 1/3s)
+                        // but Android 11 on Samsung devices also introduces a bug where manual exposure gets ignored if different to the preview,
+                        // and since the max preview rate is limited to 1/5s (see max_preview_exposure_time_c), there's no point
+                        // going above this!
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "boost max_exposure_time, was: " + max_exposure_time);
+                        camera_features.max_exposure_time = Math.max(camera_features.max_exposure_time, 1000000000L/5);
+                    }
                 }
             }
         }
+        // save to local fields:
+        this.supports_exposure_time = camera_features.supports_exposure_time;
+        this.min_exposure_time = camera_features.min_exposure_time;
+        this.max_exposure_time = camera_features.max_exposure_time;
 
         Range<Integer> exposure_range = characteristics.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE);
         camera_features.min_exposure = exposure_range.getLower();
@@ -3686,7 +4150,7 @@ public class CameraController2 extends CameraController {
                 Log.e(TAG, "no camera");
             return;
         }
-        if( captureSession != null ) {
+        if( hasCaptureSession() ) {
             // can only call this when captureSession not created - as the surface of the imageReader we create has to match the surface we pass to the captureSession
             if( MyDebug.LOG )
                 Log.e(TAG, "can't set picture size when captureSession running!");
@@ -3715,7 +4179,7 @@ public class CameraController2 extends CameraController {
                 Log.e(TAG, "can't set raw when raw not supported");
             return;
         }
-        if( captureSession != null ) {
+        if( hasCaptureSession() ) {
             // can only call this when captureSession not created - as it affects how we create the imageReader
             if( MyDebug.LOG )
                 Log.e(TAG, "can't set raw when captureSession running!");
@@ -3737,7 +4201,7 @@ public class CameraController2 extends CameraController {
         if( this.want_video_high_speed == want_video_high_speed ) {
             return;
         }
-        if( captureSession != null ) {
+        if( hasCaptureSession() ) {
             // can only call this when captureSession not created - as it affects how we create the session
             if( MyDebug.LOG )
                 Log.e(TAG, "can't set high speed when captureSession running!");
@@ -3747,6 +4211,62 @@ public class CameraController2 extends CameraController {
         this.is_video_high_speed = false; // reset just to be safe
     }
 
+    @Override
+    public void setCameraExtension(boolean enabled, int extension) {
+        if( MyDebug.LOG ) {
+            Log.d(TAG, "setCameraExtension?: " + enabled);
+            Log.d(TAG, "extension: " + extension);
+        }
+
+        if( camera == null ) {
+            if( MyDebug.LOG )
+                Log.e(TAG, "no camera");
+            return;
+        }
+        if( hasCaptureSession() ) {
+            // can only call this when captureSession not created - as it affects how we create the imageReader
+            if( MyDebug.LOG )
+                Log.e(TAG, "can't set extension when captureSession running!");
+            throw new RuntimeException(); // throw as RuntimeException, as this is a programming error
+        }
+
+        if( enabled != (sessionType == SessionType.SESSIONTYPE_EXTENSION) ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "turning extension session on or off");
+            // Ideally we'd probably only create the previewBuilder when starting the preview (so we
+            // start off with a "fresh" one), but for now at least ensure we start off with a fresh
+            // previewBuilder when enabling extensions (and might as well do so when disabling
+            // extensions too).
+            // This saves us having to set capture request parameters back to their defaults, and is
+            // also useful for modes like CONTROL_AE_ANTIBANDING_MODE where there isn't an obvious
+            // "default" to set (in theory extensions mode should just ignore such keys, but it'd be
+            // nicer to never set them).
+            previewBuilder = null;
+            createPreviewRequest();
+        }
+
+        if( enabled ) {
+            this.sessionType = SessionType.SESSIONTYPE_EXTENSION;
+            this.camera_extension = extension;
+        }
+        else {
+            this.sessionType = SessionType.SESSIONTYPE_NORMAL;
+            this.camera_extension = 0;
+        }
+    }
+
+    @Override
+    public boolean isCameraExtension() {
+        return this.sessionType == SessionType.SESSIONTYPE_EXTENSION;
+    }
+
+    @Override
+    public int getCameraExtension() {
+        if( isCameraExtension() )
+            return camera_extension;
+        return -1;
+    }
+
     @Override
     public void setBurstType(BurstType burst_type) {
         if( MyDebug.LOG )
@@ -3759,7 +4279,7 @@ public class CameraController2 extends CameraController {
         if( this.burst_type == burst_type ) {
             return;
         }
-        /*if( captureSession != null ) {
+        /*if( hasCaptureSession() ) {
             // can only call this when captureSession not created - as it affects how we create the imageReader
             if( MyDebug.LOG )
                 Log.e(TAG, "can't set burst type when captureSession running!");
@@ -3782,7 +4302,7 @@ public class CameraController2 extends CameraController {
         if( n_images <= 1 || (n_images % 2) == 0 ) {
             if( MyDebug.LOG )
                 Log.e(TAG, "n_images should be an odd number greater than 1");
-            throw new RuntimeException(); // throw as RuntimeException, as this is a programming error
+            throw new RuntimeException("n_images should be an odd number greater than 1"); // throw as RuntimeException, as this is a programming error
         }
         if( n_images > max_expo_bracketing_n_images ) {
             n_images = max_expo_bracketing_n_images;
@@ -3804,6 +4324,13 @@ public class CameraController2 extends CameraController {
         this.expo_bracketing_stops = stops;
     }
 
+    @Override
+    public void setDummyCaptureHack(boolean dummy_capture_hack) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "setDummyCaptureHack: " + dummy_capture_hack);
+        this.dummy_capture_hack = dummy_capture_hack;
+    }
+
     @Override
     public void setUseExpoFastBurst(boolean use_expo_fast_burst) {
         if( MyDebug.LOG )
@@ -3836,18 +4363,25 @@ public class CameraController2 extends CameraController {
             return 0; // total burst size is unknown
         return n_burst_total;
     }
+
     @Override
     public void setOptimiseAEForDRO(boolean optimise_ae_for_dro) {
         if( MyDebug.LOG )
             Log.d(TAG, "setOptimiseAEForDRO: " + optimise_ae_for_dro);
-        boolean is_oneplus = Build.MANUFACTURER.toLowerCase(Locale.US).contains("oneplus");
         if( is_oneplus ) {
-            // OnePlus 3T has preview corruption / camera freezing problems when using manual shutter speeds
-            // So best not to modify auto-exposure for DRO
+            // OnePlus 3T has preview corruption / camera freezing problems when using manual shutter speeds.
+            // So best not to modify auto-exposure for DRO.
             this.optimise_ae_for_dro = false;
             if( MyDebug.LOG )
                 Log.d(TAG, "don't modify ae for OnePlus");
         }
+        else if( is_samsung ) {
+            // At least some Samsung devices (e.g., Galaxy S10e on Android 11) give better results in auto mode
+            // than manual mode, so we're better off staying in auto mode.
+            this.optimise_ae_for_dro = false;
+            if( MyDebug.LOG )
+                Log.d(TAG, "don't modify ae for Samsung");
+        }
         else {
             this.optimise_ae_for_dro = optimise_ae_for_dro;
         }
@@ -3919,7 +4453,7 @@ public class CameraController2 extends CameraController {
     private void createPictureImageReader() {
         if( MyDebug.LOG )
             Log.d(TAG, "createPictureImageReader");
-        if( captureSession != null ) {
+        if( hasCaptureSession() ) {
             // can only call this when captureSession not created - as the surface of the imageReader we create has to match the surface we pass to the captureSession
             if( MyDebug.LOG )
                 Log.e(TAG, "can't create picture image reader when captureSession running!");
@@ -3935,19 +4469,19 @@ public class CameraController2 extends CameraController {
         imageReader = ImageReader.newInstance(picture_width, picture_height, ImageFormat.JPEG, 2);
         //imageReader = ImageReader.newInstance(picture_width, picture_height, ImageFormat.YUV_420_888, 2);
         if( MyDebug.LOG ) {
-            Log.d(TAG, "created new imageReader: " + imageReader.toString());
+            Log.d(TAG, "created new imageReader: " + imageReader);
             Log.d(TAG, "imageReader surface: " + imageReader.getSurface().toString());
         }
         // It's intentional that we pass a handler on null, so the OnImageAvailableListener runs on the UI thread.
         // If ever we want to change this on future, we should ensure that all image available listeners (JPEG+RAW) are
         // using the same handler/thread.
-        imageReader.setOnImageAvailableListener(new OnImageAvailableListener(), null);
+        imageReader.setOnImageAvailableListener(onImageAvailableListener = new OnImageAvailableListener(), null);
         if( want_raw && raw_size != null&& !previewIsVideoMode  ) {
             // unlike the JPEG imageReader, we can't read the data and close the image straight away, so we need to allow a larger
             // value for maxImages
             imageReaderRaw = ImageReader.newInstance(raw_size.getWidth(), raw_size.getHeight(), ImageFormat.RAW_SENSOR, max_raw_images);
             if( MyDebug.LOG ) {
-                Log.d(TAG, "created new imageReaderRaw: " + imageReaderRaw.toString());
+                Log.d(TAG, "created new imageReaderRaw: " + imageReaderRaw);
                 Log.d(TAG, "imageReaderRaw surface: " + imageReaderRaw.getSurface().toString());
             }
             // see note above for imageReader.setOnImageAvailableListener for why we use a null handler
@@ -3961,8 +4495,12 @@ public class CameraController2 extends CameraController {
         pending_burst_images.clear();
         pending_burst_images_raw.clear();
         pending_raw_image = null;
+        if( onImageAvailableListener != null ) {
+            onImageAvailableListener.skip_next_image = false;
+        }
         if( onRawImageAvailableListener != null ) {
             onRawImageAvailableListener.clear();
+            onRawImageAvailableListener.skip_next_image = false;
         }
         slow_burst_capture_requests = null;
         n_burst = 0;
@@ -4178,37 +4716,45 @@ public class CameraController2 extends CameraController {
             throw new RuntimeException(); // throw as RuntimeException, as this is a programming error
         }
         float zoom = zoom_ratios.get(value)/100.0f;
-        Rect sensor_rect = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
-        int left = sensor_rect.width()/2;
-        int right = left;
-        int top = sensor_rect.height()/2;
-        int bottom = top;
-        int hwidth = (int)(sensor_rect.width() / (2.0*zoom));
-        int hheight = (int)(sensor_rect.height() / (2.0*zoom));
-        left -= hwidth;
-        right += hwidth;
-        top -= hheight;
-        bottom += hheight;
-        if( MyDebug.LOG ) {
-            Log.d(TAG, "zoom: " + zoom);
-            Log.d(TAG, "hwidth: " + hwidth);
-            Log.d(TAG, "hheight: " + hheight);
-            Log.d(TAG, "sensor_rect left: " + sensor_rect.left);
-            Log.d(TAG, "sensor_rect top: " + sensor_rect.top);
-            Log.d(TAG, "sensor_rect right: " + sensor_rect.right);
-            Log.d(TAG, "sensor_rect bottom: " + sensor_rect.bottom);
-            Log.d(TAG, "left: " + left);
-            Log.d(TAG, "top: " + top);
-            Log.d(TAG, "right: " + right);
-            Log.d(TAG, "bottom: " + bottom);
+
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.R ) {
+            camera_settings.has_control_zoom_ratio = true;
+            camera_settings.control_zoom_ratio = zoom;
+            camera_settings.setControlZoomRatio(previewBuilder);
+        }
+        else {
+            Rect sensor_rect = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
+            int left = sensor_rect.width()/2;
+            int right = left;
+            int top = sensor_rect.height()/2;
+            int bottom = top;
+            int hwidth = (int)(sensor_rect.width() / (2.0*zoom));
+            int hheight = (int)(sensor_rect.height() / (2.0*zoom));
+            left -= hwidth;
+            right += hwidth;
+            top -= hheight;
+            bottom += hheight;
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "zoom: " + zoom);
+                Log.d(TAG, "hwidth: " + hwidth);
+                Log.d(TAG, "hheight: " + hheight);
+                Log.d(TAG, "sensor_rect left: " + sensor_rect.left);
+                Log.d(TAG, "sensor_rect top: " + sensor_rect.top);
+                Log.d(TAG, "sensor_rect right: " + sensor_rect.right);
+                Log.d(TAG, "sensor_rect bottom: " + sensor_rect.bottom);
+                Log.d(TAG, "left: " + left);
+                Log.d(TAG, "top: " + top);
+                Log.d(TAG, "right: " + right);
+                Log.d(TAG, "bottom: " + bottom);
             /*Rect current_rect = previewBuilder.get(CaptureRequest.SCALER_CROP_REGION);
             Log.d(TAG, "current_rect left: " + current_rect.left);
             Log.d(TAG, "current_rect top: " + current_rect.top);
             Log.d(TAG, "current_rect right: " + current_rect.right);
             Log.d(TAG, "current_rect bottom: " + current_rect.bottom);*/
+            }
+            camera_settings.scalar_crop_region = new Rect(left, top, right, bottom);
+            camera_settings.setCropRegion(previewBuilder);
         }
-        camera_settings.scalar_crop_region = new Rect(left, top, right, bottom);
-        camera_settings.setCropRegion(previewBuilder);
         this.current_zoom_value = value;
         try {
             setRepeatingRequest();
@@ -4222,7 +4768,12 @@ public class CameraController2 extends CameraController {
             e.printStackTrace();
         } 
     }
-    
+
+    @Override
+    public void resetZoom() {
+        setZoom(zoom_value_1x);
+    }
+
     @Override
     public int getExposureCompensation() {
         if( previewBuilder.get(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION) == null )
@@ -4325,6 +4876,7 @@ public class CameraController2 extends CameraController {
     public void setFocusValue(String focus_value) {
         if( MyDebug.LOG )
             Log.d(TAG, "setFocusValue: " + focus_value);
+        BLOCK_FOR_EXTENSIONS();
         int focus_mode;
         switch(focus_value) {
             case "focus_mode_auto":
@@ -4558,6 +5110,9 @@ public class CameraController2 extends CameraController {
 
     @Override
     public void setAutoExposureLock(boolean enabled) {
+        if( enabled ) {
+            BLOCK_FOR_EXTENSIONS();
+        }
         camera_settings.ae_lock = enabled;
         camera_settings.setAutoExposureLock(previewBuilder);
         try {
@@ -4582,6 +5137,9 @@ public class CameraController2 extends CameraController {
 
     @Override
     public void setAutoWhiteBalanceLock(boolean enabled) {
+        if( enabled ) {
+            BLOCK_FOR_EXTENSIONS();
+        }
         camera_settings.wb_lock = enabled;
         camera_settings.setAutoWhiteBalanceLock(previewBuilder);
         try {
@@ -4721,6 +5279,9 @@ public class CameraController2 extends CameraController {
 
     @Override
     public boolean setFocusAndMeteringArea(List<Area> areas) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "setFocusAndMeteringArea");
+        BLOCK_FOR_EXTENSIONS();
         Rect sensor_rect = getViewableRect();
         if( MyDebug.LOG )
             Log.d(TAG, "sensor_rect: " + sensor_rect.left + " , " + sensor_rect.top + " x " + sensor_rect.right + " , " + sensor_rect.bottom);
@@ -4766,6 +5327,9 @@ public class CameraController2 extends CameraController {
     
     @Override
     public void clearFocusAndMetering() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "clearFocusAndMetering");
+        BLOCK_FOR_EXTENSIONS();
         Rect sensor_rect = getViewableRect();
         boolean has_focus = false;
         boolean has_metering = false;
@@ -4805,17 +5369,24 @@ public class CameraController2 extends CameraController {
                 e.printStackTrace();
             } 
         }
+        if( MyDebug.LOG ) {
+            Log.d(TAG, "af_regions: " + Arrays.toString(camera_settings.af_regions));
+            Log.d(TAG, "ae_regions: " + Arrays.toString(camera_settings.ae_regions));
+        }
     }
 
     @Override
     public List<Area> getFocusAreas() {
         if( characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF) == 0 )
             return null;
+        if( camera_settings.af_regions == null ) {
+            // needed to fix failure on Android emulator in testTakePhotoContinuousNoTouch - can happen when CONTROL_MAX_REGIONS_AF > 0, but Camera only has 1 focus mode so Preview doesn't set focus areas
+            return null;
+        }
         MeteringRectangle [] metering_rectangles = previewBuilder.get(CaptureRequest.CONTROL_AF_REGIONS);
         if( metering_rectangles == null )
             return null;
         Rect sensor_rect = getViewableRect();
-        camera_settings.af_regions[0] = new MeteringRectangle(0, 0, sensor_rect.width()-1, sensor_rect.height()-1, 0);
         if( metering_rectangles.length == 1 && metering_rectangles[0].getRect().left == 0 && metering_rectangles[0].getRect().top == 0 && metering_rectangles[0].getRect().right == sensor_rect.width()-1 && metering_rectangles[0].getRect().bottom == sensor_rect.height()-1 ) {
             // for compatibility with CameraController1
             return null;
@@ -4831,6 +5402,10 @@ public class CameraController2 extends CameraController {
     public List<Area> getMeteringAreas() {
         if( characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AE) == 0 )
             return null;
+        if( camera_settings.ae_regions == null ) {
+            // needed to fix failure on Android emulator in testTakePhotoContinuousNoTouch - can happen when CONTROL_MAX_REGIONS_AF > 0, but Camera only has 1 focus mode so Preview doesn't set focus areas
+            return null;
+        }
         MeteringRectangle [] metering_rectangles = previewBuilder.get(CaptureRequest.CONTROL_AE_REGIONS);
         if( metering_rectangles == null )
             return null;
@@ -4850,6 +5425,8 @@ public class CameraController2 extends CameraController {
     public boolean supportsAutoFocus() {
         if( previewBuilder == null )
             return false;
+        if( sessionType == SessionType.SESSIONTYPE_EXTENSION )
+            return false;
         Integer focus_mode = previewBuilder.get(CaptureRequest.CONTROL_AF_MODE);
         if( focus_mode == null )
             return false;
@@ -4858,10 +5435,17 @@ public class CameraController2 extends CameraController {
         return false;
     }
 
+    @Override
+    public boolean supportsMetering() {
+        return characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AE) > 0;
+    }
+
     @Override
     public boolean focusIsContinuous() {
         if( previewBuilder == null )
             return false;
+        if( sessionType == SessionType.SESSIONTYPE_EXTENSION )
+            return false;
         Integer focus_mode = previewBuilder.get(CaptureRequest.CONTROL_AF_MODE);
         if( focus_mode == null )
             return false;
@@ -4874,6 +5458,8 @@ public class CameraController2 extends CameraController {
     public boolean focusIsVideo() {
         if( previewBuilder == null )
             return false;
+        if( sessionType == SessionType.SESSIONTYPE_EXTENSION )
+            return false;
         Integer focus_mode = previewBuilder.get(CaptureRequest.CONTROL_AF_MODE);
         if( focus_mode == null )
             return false;
@@ -4915,13 +5501,18 @@ public class CameraController2 extends CameraController {
         if( MyDebug.LOG )
             Log.d(TAG, "setRepeatingRequest");
         synchronized( background_camera_lock ) {
-            if( camera == null || captureSession == null ) {
+            if( camera == null || !hasCaptureSession() ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "no camera or capture session");
                 return;
             }
             try {
-                if( is_video_high_speed && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
+                if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                    if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ) {
+                        extensionSession.setRepeatingRequest(request, executor, previewExtensionCaptureCallback);
+                    }
+                }
+                else if( is_video_high_speed && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
                     CameraConstrainedHighSpeedCaptureSession captureSessionHighSpeed = (CameraConstrainedHighSpeedCaptureSession) captureSession;
                     List<CaptureRequest> mPreviewBuilderBurst = captureSessionHighSpeed.createHighSpeedRequestList(request);
                     captureSessionHighSpeed.setRepeatingBurst(mPreviewBuilderBurst, previewCaptureCallback, handler);
@@ -4945,15 +5536,19 @@ public class CameraController2 extends CameraController {
         capture(previewBuilder.build());
     }
 
+    /** Performs a "capture" - note that in practice this isn't used for taking photos, but for
+     *  one-off captures for the preview stream (e.g., to trigger focus).
+     */
     private void capture(CaptureRequest request) throws CameraAccessException {
         if( MyDebug.LOG )
             Log.d(TAG, "capture");
         synchronized( background_camera_lock ) {
-            if( camera == null || captureSession == null ) {
+            if( camera == null || !hasCaptureSession() ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "no camera or capture session");
                 return;
             }
+            BLOCK_FOR_EXTENSIONS(); // not yet supported for extension sessions
             captureSession.capture(request, previewCaptureCallback, handler);
         }
     }
@@ -4970,14 +5565,13 @@ public class CameraController2 extends CameraController {
             Log.d(TAG, "camera: " + camera);
         try {
             previewBuilder = camera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
-            previewIsVideoMode = false;
             previewBuilder.set(CaptureRequest.CONTROL_CAPTURE_INTENT, CaptureRequest.CONTROL_CAPTURE_INTENT_PREVIEW);
+            previewIsVideoMode = false;
             camera_settings.setupBuilder(previewBuilder, false);
             if( MyDebug.LOG )
                 Log.d(TAG, "successfully created preview request");
         }
         catch(CameraAccessException e) {
-            //captureSession = null;
             if( MyDebug.LOG ) {
                 Log.e(TAG, "failed to create capture request");
                 Log.e(TAG, "reason: " + e.getReason());
@@ -5026,13 +5620,42 @@ public class CameraController2 extends CameraController {
             return;
         }
 
-        synchronized( background_camera_lock ) {
-            if( captureSession != null ) {
-                if( MyDebug.LOG )
-                    Log.d(TAG, "close old capture session");
-                captureSession.close();
-                captureSession = null;
-                //pending_request_when_ready = null;
+        closeCaptureSession();
+
+        if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+            // check parameters are compatible with extension sessions
+            // we check here rather than when setting those parameters, to avoid problems with
+            // ordering (e.g., the caller sets those parameters, and then switches to an
+            // extension session)
+            if( want_video_high_speed ) {
+                throw new RuntimeException("want_video_high_speed not supported for extension session");
+            }
+            else if( burst_type != BurstType.BURSTTYPE_NONE ) {
+                throw new RuntimeException("burst_type not supported for extension session");
+            }
+            else if( want_raw ) {
+                throw new RuntimeException("want_raw not supported for extension session");
+            }
+            else if( camera_settings.has_iso ) {
+                throw new RuntimeException("has_iso not supported for extension session");
+            }
+            else if( camera_settings.ae_target_fps_range != null ) {
+                throw new RuntimeException("ae_target_fps_range not supported for extension session");
+            }
+            else if( camera_settings.sensor_frame_duration > 0 ) {
+                throw new RuntimeException("sensor_frame_duration not supported for extension session");
+            }
+            else if( camera_settings.ae_lock ) {
+                throw new RuntimeException("ae_lock not supported for extension session");
+            }
+            else if( camera_settings.wb_lock ) {
+                throw new RuntimeException("wb_lock not supported for extension session");
+            }
+            else if( camera_settings.has_face_detect_mode ) {
+                throw new RuntimeException("has_face_detect_mode not supported for extension session");
+            }
+            else if( face_detection_listener != null ) {
+                throw new RuntimeException("face_detection_listener not supported for extension session");
             }
         }
 
@@ -5094,13 +5717,9 @@ public class CameraController2 extends CameraController {
             }
 
             class MyStateCallback extends CameraCaptureSession.StateCallback {
-                private boolean callback_done; // must sychronize on this and notifyAll when setting to true
-                @Override
-                public void onConfigured(@NonNull CameraCaptureSession session) {
-                    if( MyDebug.LOG ) {
-                        Log.d(TAG, "onConfigured: " + session);
-                        Log.d(TAG, "captureSession was: " + captureSession);
-                    }
+                private boolean callback_done; // must synchronize on this and notifyAll when setting to true
+
+                void onConfigured(@NonNull CameraCaptureSession session, @NonNull CameraExtensionSession eSession) {
                     if( camera == null ) {
                         if( MyDebug.LOG ) {
                             Log.d(TAG, "camera is closed");
@@ -5113,11 +5732,8 @@ public class CameraController2 extends CameraController {
                     }
                     synchronized( background_camera_lock ) {
                         captureSession = session;
-                        Surface surface = getPreviewSurface();
-                        if( MyDebug.LOG ) {
-                            Log.d(TAG, "add surface to previewBuilder: " + surface);
-                        }
-                        previewBuilder.addTarget(surface);
+                        extensionSession = eSession;
+                        previewBuilder.addTarget(surface_texture);
                         if( video_recorder != null ) {
                             if( MyDebug.LOG ) {
                                 Log.d(TAG, "add video recorder surface to previewBuilder: " + video_recorder_surface);
@@ -5137,6 +5753,7 @@ public class CameraController2 extends CameraController {
                             // we indicate that we failed to start the preview by setting captureSession back to null
                             // this will cause a CameraControllerException to be thrown below
                             captureSession = null;
+                            extensionSession = null;
                         }
                     }
                     synchronized( background_camera_lock ) {
@@ -5146,11 +5763,14 @@ public class CameraController2 extends CameraController {
                 }
 
                 @Override
-                public void onConfigureFailed(@NonNull CameraCaptureSession session) {
+                public void onConfigured(@NonNull CameraCaptureSession session) {
                     if( MyDebug.LOG ) {
-                        Log.d(TAG, "onConfigureFailed: " + session);
-                        Log.d(TAG, "captureSession was: " + captureSession);
+                        Log.d(TAG, "onConfigured: " + session);
                     }
+                    onConfigured(session, null);
+                }
+
+                void onConfigureFailed() {
                     synchronized( background_camera_lock ) {
                         callback_done = true;
                         background_camera_lock.notifyAll();
@@ -5158,6 +5778,14 @@ public class CameraController2 extends CameraController {
                     // don't throw CameraControllerException here, as won't be caught - instead we throw CameraControllerException below
                 }
 
+                @Override
+                public void onConfigureFailed(@NonNull CameraCaptureSession session) {
+                    if( MyDebug.LOG ) {
+                        Log.d(TAG, "onConfigureFailed: " + session);
+                    }
+                    onConfigureFailed();
+                }
+
                 /*@Override
                 public void onReady(CameraCaptureSession session) {
                     if( MyDebug.LOG )
@@ -5216,6 +5844,7 @@ public class CameraController2 extends CameraController {
                 if( MyDebug.LOG ) {
                     Log.d(TAG, "texture: " + texture);
                     Log.d(TAG, "preview_surface: " + preview_surface);
+                    Log.d(TAG, "handler: " + handler);
                 }
             }
             if( MyDebug.LOG ) {
@@ -5234,7 +5863,49 @@ public class CameraController2 extends CameraController {
                     }
                 }
             }
-            if( video_recorder != null && want_video_high_speed && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ) {
+                    //int extension = CameraExtensionCharacteristics.EXTENSION_AUTOMATIC;
+                    //int extension = CameraExtensionCharacteristics.EXTENSION_BOKEH;
+                    int extension = camera_extension;
+                    List<OutputConfiguration> outputs = new ArrayList<>();
+                    for(Surface surface : surfaces) {
+                        outputs.add(new OutputConfiguration(surface));
+                    }
+                    ExtensionSessionConfiguration extensionConfiguration = new ExtensionSessionConfiguration(
+                            extension,
+                            outputs,
+                            executor,
+                            new CameraExtensionSession.StateCallback() {
+                                @Override
+                                public void onConfigured(@NonNull CameraExtensionSession session) {
+                                    if( MyDebug.LOG ) {
+                                        Log.d(TAG, "onConfigured: " + session);
+                                    }
+                                    myStateCallback.onConfigured(null, session);
+                                }
+
+                                @Override
+                                public void onConfigureFailed(@NonNull CameraExtensionSession session) {
+                                    if( MyDebug.LOG ) {
+                                        Log.d(TAG, "onConfigureFailed: " + session);
+                                    }
+                                    myStateCallback.onConfigureFailed();
+                                }
+
+                                @Override
+                                public void onClosed(@NonNull CameraExtensionSession session) {
+                                    if( MyDebug.LOG ) {
+                                        Log.d(TAG, "onClosed: " + session);
+                                    }
+                                }
+                            }
+                    );
+                    camera.createExtensionSession(extensionConfiguration);
+                }
+                is_video_high_speed = false;
+            }
+            else if( video_recorder != null && want_video_high_speed && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
             //if( want_video_high_speed && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ) {
                 camera.createConstrainedHighSpeedCaptureSession(surfaces,
                     myStateCallback,
@@ -5278,10 +5949,16 @@ public class CameraController2 extends CameraController {
                 }
             }
             if( MyDebug.LOG ) {
-                Log.d(TAG, "created captureSession: " + captureSession);
+                if( captureSession != null )
+                    Log.d(TAG, "created captureSession: " + captureSession);
+                if( extensionSession != null )
+                    Log.d(TAG, "created extensionSession: " + extensionSession);
+            }
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                resetCaptureResultInfo(); // important as extension modes don't receive capture result info
             }
             synchronized( background_camera_lock ) {
-                if( captureSession == null ) {
+                if( !hasCaptureSession() ) {
                     if( MyDebug.LOG )
                         Log.e(TAG, "failed to create capture session");
                     throw new CameraControllerException();
@@ -5313,8 +5990,22 @@ public class CameraController2 extends CameraController {
     public void startPreview() throws CameraControllerException {
         if( MyDebug.LOG )
             Log.d(TAG, "startPreview");
+
+        if( !camera_settings.has_af_mode && initial_focus_mode != null && sessionType != SessionType.SESSIONTYPE_EXTENSION ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "user didn't specify focus, so set to: " + initial_focus_mode);
+            // If the caller hasn't set a focus mode, but focus modes are supported, it's still better to explicitly set one rather than leaving to the
+            // builder's default - e.g., problem on Android emulator with LIMITED camera where it only supported infinity focus (CONTROL_AF_MODE_OFF), but
+            // the preview builder defaults to CONTROL_AF_MODE_CONTINUOUS_PICTURE! This meant we froze when trying to take a photo, because we thought
+            // we were in continuous picture mode and so waited in state STATE_WAITING_AUTOFOCUS, but the focus never occurred.
+            // Ideally the caller to CameraController2 (Preview) should always explicitly set a focus mode if at least 1 focus mode is supported. At the
+            // time of writing, Preview only sets a focus if at least 2 focus modes are supported. But even if we fix that in future, still good to have
+            // well defined behaviour at the CameraController level.
+            setFocusValue(initial_focus_mode);
+        }
+
         synchronized( background_camera_lock ) {
-            if( captureSession != null ) {
+            if( hasCaptureSession() ) {
                 try {
                     setRepeatingRequest();
                 }
@@ -5339,7 +6030,7 @@ public class CameraController2 extends CameraController {
         if( MyDebug.LOG )
             Log.d(TAG, "stopPreview: " + this);
         synchronized( background_camera_lock ) {
-            if( camera == null || captureSession == null ) {
+            if( camera == null || !hasCaptureSession() ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "no camera or capture session");
                 return;
@@ -5348,7 +6039,14 @@ public class CameraController2 extends CameraController {
                 //pending_request_when_ready = null;
 
                 try {
-                    captureSession.stopRepeating();
+                    if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ) {
+                            extensionSession.stopRepeating();
+                        }
+                    }
+                    else {
+                        captureSession.stopRepeating();
+                    }
                 }
                 catch(IllegalStateException e) {
                     if( MyDebug.LOG )
@@ -5358,10 +6056,7 @@ public class CameraController2 extends CameraController {
                     // we still call close() below, as it has no effect if captureSession is already closed
                 }
                 // although stopRepeating() alone will pause the preview, seems better to close captureSession altogether - this allows the app to make changes such as changing the picture size
-                if( MyDebug.LOG )
-                    Log.d(TAG, "close capture session");
-                captureSession.close();
-                captureSession = null;
+                closeCaptureSession();
             }
             catch(CameraAccessException e) {
                 if( MyDebug.LOG ) {
@@ -5386,6 +6081,7 @@ public class CameraController2 extends CameraController {
     public boolean startFaceDetection() {
         if( MyDebug.LOG )
             Log.d(TAG, "startFaceDetection");
+        BLOCK_FOR_EXTENSIONS();
         if( previewBuilder.get(CaptureRequest.STATISTICS_FACE_DETECT_MODE) != null && previewBuilder.get(CaptureRequest.STATISTICS_FACE_DETECT_MODE) != CaptureRequest.STATISTICS_FACE_DETECT_MODE_OFF ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "face detection already enabled");
@@ -5426,6 +6122,9 @@ public class CameraController2 extends CameraController {
     
     @Override
     public void setFaceDetectionListener(final FaceDetectionListener listener) {
+        if( listener != null ) {
+            BLOCK_FOR_EXTENSIONS();
+        }
         this.face_detection_listener = listener;
         this.last_faces_detected = -1;
     }
@@ -5435,17 +6134,19 @@ public class CameraController2 extends CameraController {
        If do_af_trigger_for_continuous is true, we set CONTROL_AF_TRIGGER_START, and wait for
        CONTROL_AF_STATE_FOCUSED_LOCKED or CONTROL_AF_STATE_NOT_FOCUSED_LOCKED, similar to other focus
        methods.
-       do_af_trigger_for_continuous==true has advantages:
+       do_af_trigger_for_continuous==true used to have advantages:
          - On Nexus 6 for flash auto, it means ae state is set to FLASH_REQUIRED if it is required
            when it comes to taking the photo. If do_af_trigger_for_continuous==false, sometimes
            it's set to CONTROL_AE_STATE_CONVERGED even for dark scenes, so we think we can skip
            the precapture, causing photos to come out dark (or we can force always doing precapture,
            but that makes things slower when flash isn't needed)
+           Update: this now seems hard to reproduce.
          - On OnePlus 3T, with do_af_trigger_for_continuous==false photos come out with blue tinge
            if the scene is not dark (but still dark enough that you'd want flash).
            do_af_trigger_for_continuous==true fixes this for cases where the flash fires for autofocus.
            Note that the problem is still not fixed for flash on where the scene is bright enough to
            not need flash (and so we don't fire flash for autofocus).
+           Update: now fixed by setting TEMPLATE_PREVIEW for the precaptureBuilder.
        do_af_trigger_for_continuous==true has disadvantage:
          - On both Nexus 6 and OnePlus 3T, taking photos with flash is longer, as we have flash firing
            for autofocus and precapture. Though note this is the case with autofocus mode anyway.
@@ -5453,8 +6154,7 @@ public class CameraController2 extends CameraController {
        af trigger for fake flash mode can sometimes mean flash fires for too long and we get a worse
        result).
      */
-    //private final static boolean do_af_trigger_for_continuous = false;
-    private final static boolean do_af_trigger_for_continuous = true;
+    private final static boolean do_af_trigger_for_continuous = false;
 
     @Override
     public void autoFocus(final AutoFocusCallback cb, boolean capture_follows_autofocus_hint) {
@@ -5465,7 +6165,7 @@ public class CameraController2 extends CameraController {
         AutoFocusCallback push_autofocus_cb = null;
         synchronized( background_camera_lock ) {
             fake_precapture_torch_focus_performed = false;
-            if( camera == null || captureSession == null ) {
+            if( camera == null || !hasCaptureSession() ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "no camera or capture session");
                 // should call the callback, so the application isn't left waiting (e.g., when we autofocus before trying to take a photo)
@@ -5473,6 +6173,8 @@ public class CameraController2 extends CameraController {
                 return;
             }
             Integer focus_mode = previewBuilder.get(CaptureRequest.CONTROL_AF_MODE);
+            if( MyDebug.LOG )
+                Log.d(TAG, "focus mode: " + (focus_mode == null ? "null" : focus_mode));
             if( focus_mode == null ) {
                 // we preserve the old Camera API where calling autoFocus() on a device without autofocus immediately calls the callback
                 // (unclear if Open Camera needs this, but just to be safe and consistent between camera APIs)
@@ -5481,6 +6183,12 @@ public class CameraController2 extends CameraController {
                 cb.onAutoFocus(true);
                 return;
             }
+            else if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "no auto focus for extensions");
+                cb.onAutoFocus(true);
+                return;
+            }
             else if( (!do_af_trigger_for_continuous || use_fake_precapture_mode) && focus_mode == CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE ) {
                 // See note above for do_af_trigger_for_continuous
                 if( MyDebug.LOG )
@@ -5599,6 +6307,7 @@ public class CameraController2 extends CameraController {
             Log.d(TAG, "setCaptureFollowAutofocusHint");
             Log.d(TAG, "capture_follows_autofocus_hint? " + capture_follows_autofocus_hint);
         }
+        BLOCK_FOR_EXTENSIONS();
         synchronized( background_camera_lock ) {
             this.capture_follows_autofocus_hint = capture_follows_autofocus_hint;
         }
@@ -5609,7 +6318,7 @@ public class CameraController2 extends CameraController {
         if( MyDebug.LOG )
             Log.d(TAG, "cancelAutoFocus");
         synchronized( background_camera_lock ) {
-            if( camera == null || captureSession == null ) {
+            if( camera == null || !hasCaptureSession() ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "no camera or capture session");
                 return;
@@ -5621,6 +6330,12 @@ public class CameraController2 extends CameraController {
                 return;
             }
 
+            if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "session type extension");
+                return;
+            }
+
             previewBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_CANCEL);
             // Camera2Basic does a capture then sets a repeating request - do the same here just to be safe
             try {
@@ -5657,6 +6372,9 @@ public class CameraController2 extends CameraController {
     public void setContinuousFocusMoveCallback(ContinuousFocusMoveCallback cb) {
         if( MyDebug.LOG )
             Log.d(TAG, "setContinuousFocusMoveCallback");
+        if( cb != null ) {
+            BLOCK_FOR_EXTENSIONS();
+        }
         this.continuous_focus_move_callback = cb;
     }
 
@@ -5679,14 +6397,11 @@ public class CameraController2 extends CameraController {
     /** Sets up a builder to have manual exposure time, if supported. The exposure time will be
      *  clamped to the allowed values, and manual ISO will also be set based on the current ISO value.
      */
-    private void setManualExposureTime(CaptureRequest.Builder stillBuilder, long exposure_time) {
+    private void setManualExposureTime(CaptureRequest.Builder stillBuilder, long exposure_time, boolean set_iso, int new_iso) {
         if( MyDebug.LOG )
             Log.d(TAG, "setManualExposureTime: " + exposure_time);
-        Range<Long> exposure_time_range = characteristics.get(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE); // may be null on some devices
         Range<Integer> iso_range = characteristics.get(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE); // may be null on some devices
-        if( exposure_time_range != null && iso_range != null ) {
-            long min_exposure_time = exposure_time_range.getLower();
-            long max_exposure_time = exposure_time_range.getUpper();
+        if( this.supports_exposure_time && iso_range != null ) {
             if( exposure_time < min_exposure_time )
                 exposure_time = min_exposure_time;
             if( exposure_time > max_exposure_time )
@@ -5698,12 +6413,17 @@ public class CameraController2 extends CameraController {
             {
                 // set ISO
                 int iso = 800;
-                if( capture_result_has_iso )
+                if( set_iso )
+                    iso = new_iso;
+                else if( capture_result_has_iso )
                     iso = capture_result_iso;
                 // see https://sourceforge.net/p/opencamera/tickets/321/ - some devices may have auto ISO that's
                 // outside of the allowed manual iso range!
                 iso = Math.max(iso, iso_range.getLower());
                 iso = Math.min(iso, iso_range.getUpper());
+                if( MyDebug.LOG ) {
+                    Log.d(TAG, "iso: " + iso);
+                }
                 stillBuilder.set(CaptureRequest.SENSOR_SENSITIVITY, iso );
             }
             if( capture_result_has_frame_duration  )
@@ -5745,7 +6465,7 @@ public class CameraController2 extends CameraController {
         ErrorCallback push_take_picture_error_cb = null;
 
         synchronized( background_camera_lock ) {
-            if( camera == null || captureSession == null ) {
+            if( camera == null || !hasCaptureSession() ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "no camera or capture session");
                 return;
@@ -5753,7 +6473,7 @@ public class CameraController2 extends CameraController {
             try {
                 if( MyDebug.LOG ) {
                     if( imageReaderRaw != null ) {
-                        Log.d(TAG, "imageReaderRaw: " + imageReaderRaw.toString());
+                        Log.d(TAG, "imageReaderRaw: " + imageReaderRaw);
                         Log.d(TAG, "imageReaderRaw surface: " + imageReaderRaw.getSurface().toString());
                     }
                     else {
@@ -5761,8 +6481,9 @@ public class CameraController2 extends CameraController {
                         Log.d(TAG, "imageReader surface: " + imageReader.getSurface().toString());
                     }
                 }
-                stillBuilder = camera.createCaptureRequest(previewIsVideoMode ? CameraDevice.TEMPLATE_VIDEO_SNAPSHOT : CameraDevice.TEMPLATE_STILL_CAPTURE);
-                stillBuilder.set(CaptureRequest.CONTROL_CAPTURE_INTENT, CaptureRequest.CONTROL_CAPTURE_INTENT_STILL_CAPTURE);
+                // important to use TEMPLATE_MANUAL for manual exposure: this fixes bug on Pixel 6 Pro where manual exposure is ignored when longer than the
+                // preview exposure time (oddly Galaxy S10e has the same bug since Android 11, but that isn't fixed with using TEMPLATE_MANUAL)
+                stillBuilder = camera.createCaptureRequest(previewIsVideoMode ? CameraDevice.TEMPLATE_VIDEO_SNAPSHOT : camera_settings.has_iso ? CameraDevice.TEMPLATE_MANUAL : CameraDevice.TEMPLATE_STILL_CAPTURE);
                 stillBuilder.setTag(new RequestTagObject(RequestTagType.CAPTURE));
                 camera_settings.setupBuilder(stillBuilder, true);
                 if( use_fake_precapture_mode && fake_precapture_torch_performed ) {
@@ -5786,14 +6507,15 @@ public class CameraController2 extends CameraController {
                             Log.d(TAG, "exposure_time_scale: " + exposure_time_scale);
                         }
                         modified_from_camera_settings = true;
-                        setManualExposureTime(stillBuilder, exposure_time);
+                        setManualExposureTime(stillBuilder, exposure_time, false, 0);
                     }
                 }
                 //stillBuilder.set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
                 //stillBuilder.set(CaptureRequest.CONTROL_AE_MODE, CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
-                if( Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O ) {
+                if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && sessionType != SessionType.SESSIONTYPE_EXTENSION ) {
                     // unclear why we wouldn't want to request ZSL
                     // this is also required to enable HDR+ on Google Pixel devices when using Camera2: https://opensource.google.com/projects/pixelvisualcorecamera
+                    // but don't set for extension sessions (in theory it should be ignored, but just in case)
                     stillBuilder.set(CaptureRequest.CONTROL_ENABLE_ZSL, true);
                     if( MyDebug.LOG ) {
                         Boolean zsl = stillBuilder.get(CaptureRequest.CONTROL_ENABLE_ZSL);
@@ -5815,7 +6537,8 @@ public class CameraController2 extends CameraController {
                     // need to stop preview before capture (as done in Camera2Basic; otherwise we get bugs such as flash remaining on after taking a photo with flash)
                     // but don't do this in video mode - if we're taking photo snapshots while video recording, we don't want to pause video!
                     // update: bug with flash may have been device specific (things are fine with Nokia 8)
-                    captureSession.stopRepeating();
+                    if( sessionType != SessionType.SESSIONTYPE_EXTENSION )
+                        captureSession.stopRepeating();
                 }
             }
             catch(CameraAccessException e) {
@@ -5853,7 +6576,7 @@ public class CameraController2 extends CameraController {
 
         if( ok ) {
             synchronized( background_camera_lock ) {
-                if( camera == null || captureSession == null ) {
+                if( camera == null || !hasCaptureSession() ) {
                     if( MyDebug.LOG )
                         Log.d(TAG, "no camera or capture session");
                     return;
@@ -5879,9 +6602,17 @@ public class CameraController2 extends CameraController {
                     if( MyDebug.LOG )
                         Log.d(TAG, "capture with stillBuilder");
                     //pending_request_when_ready = stillBuilder.build();
-                    captureSession.capture(stillBuilder.build(), previewCaptureCallback, handler);
-                    //captureSession.capture(stillBuilder.build(), new CameraCaptureSession.CaptureCallback() {
-                    //}, handler);
+
+                    if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ) {
+                            extensionSession.capture(stillBuilder.build(), executor, previewExtensionCaptureCallback);
+                        }
+                    }
+                    else {
+                        captureSession.capture(stillBuilder.build(), previewCaptureCallback, handler);
+                        //captureSession.capture(stillBuilder.build(), new CameraCaptureSession.CaptureCallback() {
+                        //}, handler);
+                    }
                     playSound(MediaActionSound.SHUTTER_CLICK); // play shutter sound asap, otherwise user has the illusion of being slow to take photos
                 }
                 catch(CameraAccessException e) {
@@ -5986,13 +6717,14 @@ public class CameraController2 extends CameraController {
         if( burst_type != BurstType.BURSTTYPE_EXPO && burst_type != BurstType.BURSTTYPE_FOCUS ) {
             Log.e(TAG, "takePictureBurstBracketing called but unexpected burst_type: " + burst_type);
         }
+        BLOCK_FOR_EXTENSIONS(); // not supported for extension sessions
 
         List<CaptureRequest> requests = new ArrayList<>();
         boolean ok = true;
         ErrorCallback push_take_picture_error_cb = null;
 
         synchronized( background_camera_lock ) {
-            if( camera == null || captureSession == null ) {
+            if( camera == null || !hasCaptureSession() ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "no camera or capture session");
                 return;
@@ -6002,11 +6734,19 @@ public class CameraController2 extends CameraController {
                     Log.d(TAG, "imageReader: " + imageReader.toString());
                     Log.d(TAG, "imageReader surface: " + imageReader.getSurface().toString());
                 }
+                int n_dummy_requests = 0;
 
-                CaptureRequest.Builder stillBuilder = camera.createCaptureRequest(previewIsVideoMode ? CameraDevice.TEMPLATE_VIDEO_SNAPSHOT : CameraDevice.TEMPLATE_STILL_CAPTURE);
-                stillBuilder.set(CaptureRequest.CONTROL_CAPTURE_INTENT, CaptureRequest.CONTROL_CAPTURE_INTENT_STILL_CAPTURE);
+                CaptureRequest.Builder stillBuilder = camera.createCaptureRequest(CameraDevice.TEMPLATE_MANUAL);
+                // Needs to be TEMPLATE_MANUAL! Otherwise first image in burst may come out incorrectly (on Pixel 6 Pro,
+                // the first image incorrectly had HDR+ applied, which we don't want here).
                 // n.b., don't set RequestTagType.CAPTURE here - we only do it for the last of the burst captures (see below)
                 camera_settings.setupBuilder(stillBuilder, true);
+
+                if( MyDebug.LOG && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O  ) {
+                    Boolean zsl = stillBuilder.get(CaptureRequest.CONTROL_ENABLE_ZSL);
+                    Log.d(TAG, "CONTROL_ENABLE_ZSL: " + (zsl==null ? "null" : zsl));
+                }
+
                 clearPending();
                 // shouldn't add preview surface as a target - see note in takePictureAfterPrecapture()
                 // but also, adding the preview surface causes the dark/light exposures to be visible, which we don't want
@@ -6070,14 +6810,7 @@ public class CameraController2 extends CameraController {
                     base_exposure_time = capture_result_exposure_time;
 
                 int n_half_images = expo_bracketing_n_images/2;
-                long min_exposure_time = base_exposure_time;
-                long max_exposure_time = base_exposure_time;
                 final double scale = Math.pow(2.0, expo_bracketing_stops/(double)n_half_images);
-                Range<Long> exposure_time_range = characteristics.get(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE); // may be null on some devices
-                if( exposure_time_range != null ) {
-                    min_exposure_time = exposure_time_range.getLower();
-                    max_exposure_time = exposure_time_range.getUpper();
-                }
 
                 if( MyDebug.LOG ) {
                     Log.d(TAG, "taking expo bracketing with n_images: " + expo_bracketing_n_images);
@@ -6088,10 +6821,25 @@ public class CameraController2 extends CameraController {
                     Log.d(TAG, "Max exposure time: " + max_exposure_time);
                 }
 
+                if( dummy_capture_hack && use_expo_fast_burst ) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "add dummy capture");
+                    // dummy_capture_hack only supported for use_expo_fast_burst==true -
+                    // supporting for use_expo_fast_burst==false would complicate the code, and
+                    // these are only special case hacks anyway
+                    stillBuilder.setTag(null);
+                    requests.add( stillBuilder.build() );
+                    n_dummy_requests++;
+                    if( onImageAvailableListener != null )
+                        onImageAvailableListener.skip_next_image = true;
+                    if( onRawImageAvailableListener != null )
+                        onRawImageAvailableListener.skip_next_image = true;
+                }
+
                 // darker images
                 for(int i=0;i<n_half_images;i++) {
                     long exposure_time = base_exposure_time;
-                    if( exposure_time_range != null ) {
+                    if( supports_exposure_time ) {
                         double this_scale = scale;
                         for(int j=i;j<n_half_images-1;j++)
                             this_scale *= scale;
@@ -6119,7 +6867,7 @@ public class CameraController2 extends CameraController {
                 // lighter images
                 for(int i=0;i<n_half_images;i++) {
                     long exposure_time = base_exposure_time;
-                    if( exposure_time_range != null ) {
+                    if( supports_exposure_time ) {
                         double this_scale = scale;
                         for(int j=0;j<i;j++)
                             this_scale *= scale;
@@ -6184,6 +6932,7 @@ public class CameraController2 extends CameraController {
                     }
                     for(int i=0;i<focus_distances.size();i++) {
                         stillBuilder.set(CaptureRequest.LENS_FOCUS_DISTANCE, focus_distances.get(i));
+                        //stillBuilder.set(CaptureRequest.LENS_FOCUS_DISTANCE, focus_distances.get(focus_distances.size()-1));
                         if( i == focus_distances.size()-1 ) {
                             stillBuilder.setTag(new RequestTagObject(RequestTagType.CAPTURE)); // set capture tag for last only
                         }
@@ -6219,7 +6968,7 @@ public class CameraController2 extends CameraController {
                 requests.add( stillBuilder.build() );
                 */
 
-                n_burst = requests.size();
+                n_burst = requests.size() - n_dummy_requests;
                 n_burst_total = n_burst;
                 n_burst_taken = 0;
                 n_burst_raw = raw_todo ? n_burst : 0;
@@ -6266,13 +7015,14 @@ public class CameraController2 extends CameraController {
 
         if( ok ) {
             synchronized( background_camera_lock ) {
-                if( camera == null || captureSession == null ) {
+                if( camera == null || !hasCaptureSession() ) {
                     if( MyDebug.LOG )
                         Log.d(TAG, "no camera or capture session");
                     return;
                 }
                 try {
                     modified_from_camera_settings = true;
+                    //setRepeatingRequest(requests.get(0));
                     if( use_expo_fast_burst && burst_type == BurstType.BURSTTYPE_EXPO ) { // alway use slow burst for focus bracketing
                         if( MyDebug.LOG )
                             Log.d(TAG, "using fast burst");
@@ -6330,6 +7080,7 @@ public class CameraController2 extends CameraController {
         if( burst_type != BurstType.BURSTTYPE_NORMAL && burst_type != BurstType.BURSTTYPE_CONTINUOUS ) {
             Log.e(TAG, "takePictureBurstBracketing called but unexpected burst_type: " + burst_type);
         }
+        BLOCK_FOR_EXTENSIONS(); // not supported for extension sessions
 
         boolean is_new_burst = true;
         CaptureRequest request = null;
@@ -6338,7 +7089,7 @@ public class CameraController2 extends CameraController {
         ErrorCallback push_take_picture_error_cb = null;
 
         synchronized( background_camera_lock ) {
-            if( camera == null || captureSession == null ) {
+            if( camera == null || !hasCaptureSession() ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "no camera or capture session");
                 return;
@@ -6412,24 +7163,34 @@ public class CameraController2 extends CameraController {
                     n_burst = 4;
                     n_burst_taken = 0;
 
-                    if( capture_result_has_iso ) {
-                        // For Nexus 6, max reported ISO is 1196, so the limit for dark scenes shouldn't be more than this
-                        // Nokia 8's max reported ISO is 1551
-                        // Note that OnePlus 3T has max reported ISO of 800, but this is a device bug
-                        if( capture_result_iso >= ISO_FOR_DARK ) {
+                    if( capture_result_has_iso && capture_result_has_exposure_time ) {
+                        if( HDRProcessor.sceneIsLowLight(capture_result_iso, capture_result_exposure_time) ) {
                             if( MyDebug.LOG )
                                 Log.d(TAG, "optimise for dark scene");
                             n_burst = noise_reduction_low_light ? N_IMAGES_NR_DARK_LOW_LIGHT : N_IMAGES_NR_DARK;
-                            boolean is_oneplus = Build.MANUFACTURER.toLowerCase(Locale.US).contains("oneplus");
                             // OnePlus 3T at least has bug where manual ISO can't be set to above 800, so dark images end up too dark -
                             // so no point enabling this code, which is meant to brighten the scene, not make it darker!
                             if( !camera_settings.has_iso && !is_oneplus ) {
                                 long exposure_time = noise_reduction_low_light ? 1000000000L/3 : 1000000000L/10;
-                                if( !capture_result_has_exposure_time || capture_result_exposure_time < exposure_time ) {
+                                if(  capture_result_exposure_time < exposure_time ) {
                                     if( MyDebug.LOG )
                                         Log.d(TAG, "also set long exposure time");
                                     modified_from_camera_settings = true;
-                                    setManualExposureTime(stillBuilder, exposure_time);
+
+                                    boolean set_new_iso = false;
+                                    int new_iso = 0;
+                                    {
+                                        // ISO*exposure should be a constant
+                                        set_new_iso = true;
+                                        new_iso = (int)((capture_result_iso * capture_result_exposure_time)/exposure_time);
+                                        // but don't make ISO too low
+                                        new_iso = Math.max(new_iso, capture_result_iso/2);
+                                        new_iso = Math.max(new_iso, 1100);
+                                        if( MyDebug.LOG )
+                                            Log.d(TAG, "... and set iso to " + new_iso);
+                                    }
+
+                                    setManualExposureTime(stillBuilder, exposure_time, set_new_iso, new_iso);
                                 }
                                 else {
                                     if( MyDebug.LOG )
@@ -6448,7 +7209,9 @@ public class CameraController2 extends CameraController {
                                     Log.d(TAG, "optimise for bright scene");
                                 //n_burst = 2;
                                 n_burst = 3;
-                                if( !camera_settings.has_iso ) {
+                                // At least some Samsung devices (e.g., Galaxy S10e on Android 11) give better results in auto mode
+                                // than manual mode, so we're better off staying in auto mode.
+                                if( !camera_settings.has_iso && !is_samsung ) {
                                     double exposure_time_scale = getScaleForExposureTime(exposure_time, fixed_exposure_time, scaled_exposure_time, full_exposure_time_scale);
                                     exposure_time *= exposure_time_scale;
                                     if( MyDebug.LOG ) {
@@ -6456,7 +7219,7 @@ public class CameraController2 extends CameraController {
                                         Log.d(TAG, "exposure_time_scale: " + exposure_time_scale);
                                     }
                                     modified_from_camera_settings = true;
-                                    setManualExposureTime(stillBuilder, exposure_time);
+                                    setManualExposureTime(stillBuilder, exposure_time, false, 0);
                                 }
                             }
                         }
@@ -6508,7 +7271,7 @@ public class CameraController2 extends CameraController {
 
         if( ok ) {
             synchronized( background_camera_lock ) {
-                if( camera == null || captureSession == null ) {
+                if( camera == null || !hasCaptureSession() ) {
                     if( MyDebug.LOG )
                         Log.d(TAG, "no camera or capture session");
                     return;
@@ -6593,7 +7356,7 @@ public class CameraController2 extends CameraController {
                                 ErrorCallback push_take_picture_error_cb = null;
 
                                 synchronized( background_camera_lock ) {
-                                    if( camera == null || captureSession == null ) {
+                                    if( camera == null || !hasCaptureSession() ) {
                                         if( MyDebug.LOG )
                                             Log.d(TAG, "no camera or capture session");
                                         return;
@@ -6659,6 +7422,9 @@ public class CameraController2 extends CameraController {
     private void runPrecapture() {
         if( MyDebug.LOG )
             Log.d(TAG, "runPrecapture");
+
+        BLOCK_FOR_EXTENSIONS(); // not supported for extension sessions
+
         long debug_time = 0;
         if( MyDebug.LOG ) {
             debug_time = System.currentTimeMillis();
@@ -6675,9 +7441,12 @@ public class CameraController2 extends CameraController {
                     Log.e(TAG, "shouldn't be doing precapture for burst - should be using fake precapture!");
             }
             try {
-                // use a separate builder for precapture - otherwise have problem that if we take photo with flash auto/on of dark scene, then point to a bright scene, the autoexposure isn't running until we autofocus again
-                final CaptureRequest.Builder precaptureBuilder = camera.createCaptureRequest(previewIsVideoMode ? CameraDevice.TEMPLATE_VIDEO_SNAPSHOT : CameraDevice.TEMPLATE_STILL_CAPTURE);
-                precaptureBuilder.set(CaptureRequest.CONTROL_CAPTURE_INTENT, CaptureRequest.CONTROL_CAPTURE_INTENT_STILL_CAPTURE);
+                // Use a separate builder for precapture - otherwise have problem that if we take photo with flash auto/on of dark scene, then point to a bright scene, the autoexposure isn't running until we autofocus again.
+                // Important that this is TEMPLATE_PREVIEW not TEMPLATE_STILL_CAPTURE, otherwise we have various problems with flash:
+                // * Flash won't fire on Galaxy devices.
+                // * End up with blue tinge on OnePlus 3T.
+                // * Flash auto produces blue tinge and leaves torch on for Pixel 6 Pro.
+                final CaptureRequest.Builder precaptureBuilder = camera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
 
                 camera_settings.setupBuilder(precaptureBuilder, false);
                 precaptureBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_IDLE);
@@ -6724,6 +7493,9 @@ public class CameraController2 extends CameraController {
     private void runFakePrecapture() {
         if( MyDebug.LOG )
             Log.d(TAG, "runFakePrecapture");
+
+        BLOCK_FOR_EXTENSIONS(); // not supported for extension sessions
+
         long debug_time = 0;
         if( MyDebug.LOG ) {
             debug_time = System.currentTimeMillis();
@@ -6877,7 +7649,7 @@ public class CameraController2 extends CameraController {
         boolean call_runPrecapture = false;
 
         synchronized( background_camera_lock ) {
-            if( camera == null || captureSession == null ) {
+            if( camera == null || !hasCaptureSession() ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "no camera or capture session");
                 error.onError();
@@ -6889,7 +7661,7 @@ public class CameraController2 extends CameraController {
             this.done_all_captures = false;
             this.take_picture_error_cb = error;
             this.fake_precapture_torch_performed = false; // just in case still on?
-            if( !ready_for_capture ) {
+            if( sessionType == SessionType.SESSIONTYPE_NORMAL && !ready_for_capture ) {
                 if( MyDebug.LOG )
                     Log.e(TAG, "takePicture: not ready for capture!");
                 //throw new RuntimeException(); // debugging
@@ -6900,8 +7672,12 @@ public class CameraController2 extends CameraController {
                     Log.d(TAG, "current flash value: " + camera_settings.flash_value);
                     Log.d(TAG, "use_fake_precapture_mode: " + use_fake_precapture_mode);
                 }
-                // Don't need precapture if flash off or torch
-                if( camera_settings.flash_value.equals("flash_off") || camera_settings.flash_value.equals("flash_torch") || camera_settings.flash_value.equals("flash_frontscreen_torch") ) {
+                if( sessionType == SessionType.SESSIONTYPE_EXTENSION ) {
+                    // precapture not supported for extensions
+                    call_takePictureAfterPrecapture = true;
+                }
+                else if( camera_settings.flash_value.equals("flash_off") || camera_settings.flash_value.equals("flash_torch") || camera_settings.flash_value.equals("flash_frontscreen_torch") ) {
+                    // Don't need precapture if flash off or torch
                     call_takePictureAfterPrecapture = true;
                 }
                 else if( use_fake_precapture_mode ) {
@@ -7016,6 +7792,7 @@ public class CameraController2 extends CameraController {
     @Override
     public void initVideoRecorderPrePrepare(MediaRecorder video_recorder) {
         // if we change where we play the START_VIDEO_RECORDING sound, make sure it can't be heard in resultant video
+        BLOCK_FOR_EXTENSIONS(); // not supported for extension sessions
         playSound(MediaActionSound.START_VIDEO_RECORDING);
     }
 
@@ -7027,6 +7804,7 @@ public class CameraController2 extends CameraController {
             Log.e(TAG, "no camera");
             throw new CameraControllerException();
         }
+        BLOCK_FOR_EXTENSIONS(); // not supported for extension sessions
         try {
             if( MyDebug.LOG )
                 Log.d(TAG, "obtain video_recorder surface");
@@ -7095,7 +7873,7 @@ public class CameraController2 extends CameraController {
     @Override
     public int captureResultWhiteBalanceTemperature() {
         // for performance reasons, we don't convert from rggb to temperature in every frame, rather only when requested
-        return convertRggbToTemperature(capture_result_white_balance_rggb);
+        return convertRggbVectorToTemperature(capture_result_white_balance_rggb);
     }
 
     @Override
@@ -7155,7 +7933,85 @@ public class CameraController2 extends CameraController {
     }
     */
 
-    private final CameraCaptureSession.CaptureCallback previewCaptureCallback = new CameraCaptureSession.CaptureCallback() {
+    private final CameraExtensionSession.ExtensionCaptureCallback previewExtensionCaptureCallback;
+
+    @RequiresApi(api = Build.VERSION_CODES.S)
+    private class MyExtensionCaptureCallback extends CameraExtensionSession.ExtensionCaptureCallback {
+
+        @Override
+        public void onCaptureStarted(@NonNull CameraExtensionSession session,
+                                     @NonNull CaptureRequest request, long timestamp) {
+            /*if( MyDebug.LOG )
+                Log.d(TAG, "onCaptureStarted");*/
+            if( MyDebug.LOG ) {
+                if( previewCaptureCallback.getRequestTagType(request) == RequestTagType.CAPTURE ) {
+                    Log.d(TAG, "onCaptureStarted: capture");
+                }
+                else if( previewCaptureCallback.getRequestTagType(request) == RequestTagType.CAPTURE_BURST_IN_PROGRESS ) {
+                    Log.d(TAG, "onCaptureStarted: capture burst in progress");
+                }
+            }
+
+            // for previewCaptureCallback, we set has_received_frame in onCaptureCompleted(), but
+            // that method doesn't exist for ExtensionCaptureCallback, and the other methods such as
+            // onCaptureSequenceCompleted aren't called for the preview captures
+            if( !has_received_frame ) {
+                has_received_frame = true;
+                if( MyDebug.LOG )
+                    Log.d(TAG, "has_received_frame now set to true");
+            }
+
+            super.onCaptureStarted(session, request, timestamp);
+        }
+
+        @Override
+        public void onCaptureProcessStarted(@NonNull CameraExtensionSession session,
+                                            @NonNull CaptureRequest request) {
+            super.onCaptureProcessStarted(session, request);
+        }
+
+        @Override
+        public void onCaptureFailed(@NonNull CameraExtensionSession session,
+                                    @NonNull CaptureRequest request) {
+            if( MyDebug.LOG ) {
+                Log.e(TAG, "onCaptureFailed");
+            }
+            super.onCaptureFailed(session, request);
+        }
+
+        @Override
+        public void onCaptureSequenceCompleted(@NonNull CameraExtensionSession session,
+                                               int sequenceId) {
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "onCaptureSequenceCompleted");
+                Log.d(TAG, "sequenceId: " + sequenceId);
+            }
+
+            // since we don't receive the request, we can't check for a request tag type of
+            // RequestTagType.CAPTURE - but this method should only be called for photo captures
+            // anyway
+            test_capture_results++;
+            modified_from_camera_settings = false;
+
+            previewCaptureCallback.callCheckImagesCompleted();
+
+            super.onCaptureSequenceCompleted(session, sequenceId);
+        }
+
+        @Override
+        public void onCaptureSequenceAborted(@NonNull CameraExtensionSession session,
+                                             int sequenceId) {
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "onCaptureSequenceAborted");
+                Log.d(TAG, "sequenceId: " + sequenceId);
+            }
+            super.onCaptureSequenceAborted(session, sequenceId);
+        }
+    }
+
+    private final MyCaptureCallback previewCaptureCallback = new MyCaptureCallback();
+
+    private class MyCaptureCallback extends CameraCaptureSession.CaptureCallback {
         private long last_process_frame_number = 0;
         private int last_af_state = -1;
 
@@ -7212,6 +8068,11 @@ public class CameraController2 extends CameraController {
                     Log.d(TAG, "frameNumber: " + frameNumber);
                     Log.d(TAG, "exposure time: " + request.get(CaptureRequest.SENSOR_EXPOSURE_TIME));
                 }
+                else if( getRequestTagType(request) == RequestTagType.CAPTURE_BURST_IN_PROGRESS ) {
+                    Log.d(TAG, "onCaptureStarted: capture burst in progress");
+                    Log.d(TAG, "frameNumber: " + frameNumber);
+                    Log.d(TAG, "exposure time: " + request.get(CaptureRequest.SENSOR_EXPOSURE_TIME));
+                }
             }
             // n.b., we don't play the shutter sound here for RequestTagType.CAPTURE, as it typically sounds "too late"
             // (if ever we changed this, would also need to fix for burst, where we only set the RequestTagType.CAPTURE for the last image)
@@ -7242,6 +8103,13 @@ public class CameraController2 extends CameraController {
                     Log.d(TAG, "exposure time: " + request.get(CaptureRequest.SENSOR_EXPOSURE_TIME));
                     Log.d(TAG, "frame duration: " + request.get(CaptureRequest.SENSOR_FRAME_DURATION));
                 }
+                else if( getRequestTagType(request) == RequestTagType.CAPTURE_BURST_IN_PROGRESS ) {
+                    Log.d(TAG, "onCaptureCompleted: capture burst in progress");
+                    Log.d(TAG, "sequenceId: " + result.getSequenceId());
+                    Log.d(TAG, "frameNumber: " + result.getFrameNumber());
+                    Log.d(TAG, "exposure time: " + request.get(CaptureRequest.SENSOR_EXPOSURE_TIME));
+                    Log.d(TAG, "frame duration: " + request.get(CaptureRequest.SENSOR_FRAME_DURATION));
+                }
             }
             process(request, result);
             processCompleted(request, result);
@@ -7740,7 +8608,11 @@ public class CameraController2 extends CameraController {
                 // (This affects the exposure time shown on on-screen preview - whilst showing the preview exposure time
                 // isn't necessarily wrong, it tended to confuse people, thinking that manual exposure time wasn't working
                 // when set above max_preview_exposure_time_c.)
-                if( camera_settings.has_iso && camera_settings.exposure_time > max_preview_exposure_time_c )
+                // Update: but on some devices (e.g., Galaxy S10e) the reported exposure time can become inaccurate when
+                // we set longer preview exposure times (fine at 1/15s, 1/10s, but wrong at 0.2s and 0.3s), possibly this is
+                // by design if the preview along supports certain rates(?), but best to fall back to the requested exposure
+                // time in manual mode if requested exposure is longer than 1/12s OR the max_preview_exposure_time_c.
+                if( camera_settings.has_iso && camera_settings.exposure_time > Math.min(max_preview_exposure_time_c, 1000000000L/12) )
                     capture_result_exposure_time = camera_settings.exposure_time;
 
                 if( capture_result_exposure_time <= 0 ) {
@@ -7811,7 +8683,7 @@ public class CameraController2 extends CameraController {
             /*if( MyDebug.LOG ) {
                 RggbChannelVector vector = result.get(CaptureResult.COLOR_CORRECTION_GAINS);
                 if( vector != null ) {
-                    convertRggbToTemperature(vector); // logging will occur in this function
+                    convertRggbVectorToTemperature(vector); // logging will occur in this function
                 }
             }*/
         }
@@ -7955,7 +8827,10 @@ public class CameraController2 extends CameraController {
                 }
             }
 
+            callCheckImagesCompleted();
+        }
 
+        private void callCheckImagesCompleted() {
             // Important that we only call the picture onCompleted callback after we've received the capture request, so
             // we need to check if we already received all the images.
             // Also needs to be run on UI thread.
@@ -8047,5 +8922,5 @@ public class CameraController2 extends CameraController {
                 handleCaptureBurstInProgress(result);
             }
         }
-    };
+    }
 }
diff --git a/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraControllerManager2.java b/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraControllerManager2.java
index 13b4a980970204a8a6cbfce02210d1351c246b42..f2d17cf7664b3810af09976fcebffdcf263a3b9c 100644
--- a/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraControllerManager2.java
+++ b/app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraControllerManager2.java
@@ -121,6 +121,15 @@ public class CameraControllerManager2 extends CameraControllerManager {
         SizeF physical_size = characteristics.get(CameraCharacteristics.SENSOR_INFO_PHYSICAL_SIZE);
         android.util.Size pixel_size = characteristics.get(CameraCharacteristics.SENSOR_INFO_PIXEL_ARRAY_SIZE);
         float [] focal_lengths = characteristics.get(CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS);
+        if( active_size == null || physical_size == null || pixel_size == null || focal_lengths == null || focal_lengths.length == 0 ) {
+            // in theory this should never happen according to the documentation, but I've had a report of physical_size (SENSOR_INFO_PHYSICAL_SIZE)
+            // being null on an EXTERNAL Camera2 device, see https://sourceforge.net/p/opencamera/tickets/754/
+            if( MyDebug.LOG ) {
+                Log.e(TAG, "can't get camera view angles");
+            }
+            // fall back to a default
+            return new SizeF(55.0f, 43.0f);
+        }
         //camera_features.view_angle_x = (float)Math.toDegrees(2.0 * Math.atan2(physical_size.getWidth(), (2.0 * focal_lengths[0])));
         //camera_features.view_angle_y = (float)Math.toDegrees(2.0 * Math.atan2(physical_size.getHeight(), (2.0 * focal_lengths[0])));
         float frac_x = ((float)active_size.width())/(float)pixel_size.getWidth();
diff --git a/app/src/main/java/net/sourceforge/opencamera/preview/ApplicationInterface.java b/app/src/main/java/net/sourceforge/opencamera/preview/ApplicationInterface.java
index d7a3f4ce8d42bf70f20c06e0fe76cfbbba58ba93..a367b441a9fe3f22cfb1cdd5f2a00c45b99c99f6 100644
--- a/app/src/main/java/net/sourceforge/opencamera/preview/ApplicationInterface.java
+++ b/app/src/main/java/net/sourceforge/opencamera/preview/ApplicationInterface.java
@@ -9,10 +9,13 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.location.Location;
 import android.net.Uri;
+import android.os.Build;
 import android.util.Log;
 import android.util.Pair;
 import android.view.MotionEvent;
 
+import androidx.annotation.RequiresApi;
+
 import net.sourceforge.opencamera.MyDebug;
 import net.sourceforge.opencamera.cameracontroller.CameraController;
 import net.sourceforge.opencamera.cameracontroller.RawImage;
@@ -31,18 +34,22 @@ public interface ApplicationInterface {
         public boolean auto_restart; // whether to automatically restart on hitting max filesize (this setting is still relevant for max_filesize==0, as typically there will still be a device max filesize)
     }
 
-    int VIDEOMETHOD_FILE = 0; // video will be saved to a file
-    int VIDEOMETHOD_SAF = 1; // video will be saved using Android 5's Storage Access Framework
-    int VIDEOMETHOD_URI = 2; // video will be written to the supplied Uri
+    enum VideoMethod {
+        FILE, // video will be saved to a file
+        SAF, // video will be saved using Android 5's Storage Access Framework
+        MEDIASTORE, // video will be saved to the supplied MediaStore Uri
+        URI // video will be written to the supplied Uri
+    }
 
     // methods that request information
     Context getContext(); // get the application context
     boolean useCamera2(); // should Android 5's Camera 2 API be used?
     Location getLocation(); // get current location - null if not available (or you don't care about geotagging)
-    int createOutputVideoMethod(); // return a VIDEOMETHOD_* value to specify how to create a video file
-    File createOutputVideoFile(String extension) throws IOException; // will be called if createOutputVideoUsingSAF() returns VIDEOMETHOD_FILE; extension is the recommended filename extension for the chosen video type
-    Uri createOutputVideoSAF(String extension) throws IOException; // will be called if createOutputVideoUsingSAF() returns VIDEOMETHOD_SAF; extension is the recommended filename extension for the chosen video type
-    Uri createOutputVideoUri(); // will be called if createOutputVideoUsingSAF() returns VIDEOMETHOD_URI
+    VideoMethod createOutputVideoMethod(); // return a VideoMethod value to specify how to create a video file
+    File createOutputVideoFile(String extension) throws IOException; // will be called if createOutputVideoUsingSAF() returns VideoMethod.FILE; extension is the recommended filename extension for the chosen video type
+    Uri createOutputVideoSAF(String extension) throws IOException; // will be called if createOutputVideoUsingSAF() returns VideoMethod.SAF; extension is the recommended filename extension for the chosen video type
+    Uri createOutputVideoMediaStore(String extension) throws IOException; // will be called if createOutputVideoUsingSAF() returns VideoMethod.MEDIASTORE; extension is the recommended filename extension for the chosen video type
+    Uri createOutputVideoUri(); // will be called if createOutputVideoUsingSAF() returns VideoMethod.URI
     // for all of the get*Pref() methods, you can use Preview methods to get the supported values (e.g., getSupportedSceneModes())
     // if you just want a default or don't really care, see the comments for each method for a default or possible options
     // if Preview doesn't support the requested setting, it will check this, and choose its own
@@ -117,7 +124,6 @@ public interface ApplicationInterface {
     boolean getVideoFlashPref(); // option to switch flash on/off while recording video (should be false in most cases!)
     boolean getVideoLowPowerCheckPref(); // whether to stop video automatically on critically low battery
     String getPreviewSizePref(); // "preference_preview_size_wysiwyg" is recommended (preview matches aspect ratio of photo resolution as close as possible), but can also be "preference_preview_size_display" to maximise the preview size
-    String getPreviewRotationPref(); // return "0" for default; use "180" to rotate the preview 180 degrees
     String getLockOrientationPref(); // return "none" for default; use "portrait" or "landscape" to lock photos/videos to that orientation
     boolean getTouchCapturePref(); // whether to enable touch to capture
     boolean getDoubleTapCapturePref(); // whether to enable double-tap to capture
@@ -133,10 +139,11 @@ public interface ApplicationInterface {
     boolean getRecordAudioPref(); // whether to record audio when recording video
     String getRecordAudioChannelsPref(); // either "audio_default", "audio_mono" or "audio_stereo"
     String getRecordAudioSourcePref(); // "audio_src_camcorder" is recommended, but other options are: "audio_src_mic", "audio_src_default", "audio_src_voice_communication", "audio_src_unprocessed" (unprocessed required Android 7+); see corresponding values in android.media.MediaRecorder.AudioSource
-    int getZoomPref(); // index into Preview.getSupportedZoomRatios() array (each entry is the zoom factor, scaled by 100; array is sorted from min to max zoom)
+    int getZoomPref(); // index into Preview.getSupportedZoomRatios() array (each entry is the zoom factor, scaled by 100; array is sorted from min to max zoom); return -1 for default 1x zoom
     double getCalibratedLevelAngle(); // set to non-zero to calibrate the accelerometer used for the level angles
     boolean canTakeNewPhoto(); // whether taking new photos is allowed (e.g., can return false if queue for processing images would become full)
     boolean imageQueueWouldBlock(int n_raw, int n_jpegs); // called during some burst operations, whether we can allow taking the supplied number of extra photos
+    int getDisplayRotation(); // same behaviour as Activity.getWindowManager().getDefaultDisplay().getRotation() (including returning a member of Surface.ROTATION_*), but allows application to modify e.g. for upside-down preview
     // Camera2 only modes:
     long getExposureTimePref(); // only called if getISOPref() is not "default"
     float getFocusDistancePref(boolean is_target_distance);
@@ -154,6 +161,9 @@ public interface ApplicationInterface {
         NRMODE_LOW_LIGHT
     }
     NRModePref getNRModePref(); // only relevant if getBurstForNoiseReduction() returns true; if this changes without reopening the preview's camera, call Preview.setupBurstMode()
+    boolean isCameraExtensionPref(); // whether to use camera vendor extension (see https://developer.android.com/reference/android/hardware/camera2/CameraExtensionCharacteristics )
+    @RequiresApi(api = Build.VERSION_CODES.S)
+    int getCameraExtensionPref(); // if isCameraExtensionPref() returns true, the camera extension mode to use
     float getAperturePref(); // get desired aperture (called if Preview.getSupportedApertures() returns non-null); return -1.0f for no preference
     boolean getOptimiseAEForDROPref(); // see CameraController doc for setOptimiseAEForDRO().
     enum RawPref {
@@ -162,10 +172,11 @@ public interface ApplicationInterface {
     }
     RawPref getRawPref(); // whether to enable RAW photos
     int getMaxRawImages(); // see documentation of CameraController.setRaw(), corresponds to max_raw_images
+    boolean useCamera2DummyCaptureHack(); // whether to enable CameraController.setDummyCaptureHack() for Camera2 API
     boolean useCamera2FakeFlash(); // whether to enable CameraController.setUseCamera2FakeFlash() for Camera2 API
     boolean useCamera2FastBurst(); // whether to enable Camera2's captureBurst() for faster taking of expo-bracketing photos (generally should be true, but some devices have problems with captureBurst())
     boolean usePhotoVideoRecording(); // whether to enable support for taking photos when recording video (if not supported, this won't be called)
-    boolean isPreviewInBackground(); // if true, then Preview can disable real-time effects (e.g., computing histogram)
+    boolean isPreviewInBackground(); // if true, then Preview can disable real-time effects (e.g., computing histogram); also it won't try to open the camera when in the background
     boolean allowZoom(); // if false, don't allow zoom functionality even if the device supports it - Preview.supportsZoom() will also return false; if true, allow zoom if the device supports it
 
     // for testing purposes:
@@ -177,9 +188,9 @@ public interface ApplicationInterface {
     void startingVideo(); // called just before video recording starts
     void startedVideo(); // called just after video recording starts
     void stoppingVideo(); // called just before video recording stops; note that if startingVideo() is called but then video recording fails to start, this method will still be called, but startedVideo() and stoppedVideo() won't be called
-    void stoppedVideo(final int video_method, final Uri uri, final String filename); // called after video recording stopped (uri/filename will be null if video is corrupt or not created); will be called iff startedVideo() was called
-    void restartedVideo(final int video_method, final Uri uri, final String filename); // called after a seamless restart (supported on Android 8+) has occurred - in this case stoppedVideo() is only called for the final video file; this method is instead called for all earlier video file segments
-    void deleteUnusedVideo(final int video_method, final Uri uri, final String filename); // application should delete the requested video (which will correspond to a video file previously returned via the createOutputVideo*() methods), either because it is corrupt or unused
+    void stoppedVideo(final VideoMethod video_method, final Uri uri, final String filename); // called after video recording stopped (uri/filename will be null if video is corrupt or not created); will be called iff startedVideo() was called
+    void restartedVideo(final VideoMethod video_method, final Uri uri, final String filename); // called after a seamless restart (supported on Android 8+) has occurred - in this case stoppedVideo() is only called for the final video file; this method is instead called for all earlier video file segments
+    void deleteUnusedVideo(final VideoMethod video_method, final Uri uri, final String filename); // application should delete the requested video (which will correspond to a video file previously returned via the createOutputVideo*() methods), either because it is corrupt or unused
     void onFailedStartPreview(); // called if failed to start camera preview
     void onCameraError(); // called if the camera closes due to serious error.
     void onPhotoError(); // callback for failing to take a photo
@@ -197,6 +208,7 @@ public interface ApplicationInterface {
 
     // methods that request actions
     void multitouchZoom(int new_zoom); // indicates that the zoom has changed due to multitouch gesture on preview
+    void requestTakePhoto(); // requesting taking a photo (due to single/double tap, if either getTouchCapturePref(), getDoubleTouchCapturePref() options are enabled)
     // the set/clear*Pref() methods are called if Preview decides to override the requested pref (because Camera device doesn't support requested pref) (clear*Pref() is called if the feature isn't supported at all)
     // the application can use this information to update its preferences
     void setCameraIdPref(int cameraId);
diff --git a/app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java b/app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java
index 58395005f0ba191aca7fd2730ec57092dc69d885..b12b7b144bf9088846448167efdaf058397728f7 100644
--- a/app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java
+++ b/app/src/main/java/net/sourceforge/opencamera/preview/BasicApplicationInterface.java
@@ -3,12 +3,16 @@ package net.sourceforge.opencamera.preview;
 import java.util.Date;
 import java.util.List;
 
+import android.app.Activity;
 import android.graphics.Canvas;
 import android.location.Location;
 import android.net.Uri;
+import android.os.Build;
 import android.util.Pair;
 import android.view.MotionEvent;
 
+import androidx.annotation.RequiresApi;
+
 import net.sourceforge.opencamera.cameracontroller.CameraController;
 import net.sourceforge.opencamera.cameracontroller.RawImage;
 
@@ -188,11 +192,6 @@ public abstract class BasicApplicationInterface implements ApplicationInterface
         return "preference_preview_size_wysiwyg";
     }
 
-    @Override
-    public String getPreviewRotationPref() {
-        return "0";
-    }
-
     @Override
     public String getLockOrientationPref() {
         return "none";
@@ -270,7 +269,7 @@ public abstract class BasicApplicationInterface implements ApplicationInterface
 
     @Override
     public int getZoomPref() {
-        return 0;
+        return -1;
     }
 
     @Override
@@ -288,6 +287,12 @@ public abstract class BasicApplicationInterface implements ApplicationInterface
         return false;
     }
 
+    @Override
+    public int getDisplayRotation() {
+        Activity activity = (Activity)this.getContext();
+        return activity.getWindowManager().getDefaultDisplay().getRotation();
+    }
+
     @Override
     public long getExposureTimePref() {
         return CameraController.EXPOSURE_TIME_DEFAULT;
@@ -348,6 +353,17 @@ public abstract class BasicApplicationInterface implements ApplicationInterface
         return NRModePref.NRMODE_NORMAL;
     }
 
+    @Override
+    public boolean isCameraExtensionPref() {
+        return false;
+    }
+
+    @Override
+    @RequiresApi(api = Build.VERSION_CODES.S)
+    public int getCameraExtensionPref() {
+        return 0;
+    }
+
     @Override
     public float getAperturePref() {
         return -1.0f;
@@ -368,6 +384,11 @@ public abstract class BasicApplicationInterface implements ApplicationInterface
         return 2;
     }
 
+    @Override
+    public boolean useCamera2DummyCaptureHack() {
+        return false;
+    }
+
     @Override
     public boolean useCamera2FakeFlash() {
         return false;
@@ -424,16 +445,16 @@ public abstract class BasicApplicationInterface implements ApplicationInterface
     }
 
     @Override
-    public void stoppedVideo(int video_method, Uri uri, String filename) {
+    public void stoppedVideo(VideoMethod video_method, Uri uri, String filename) {
 
     }
 
     @Override
-    public void restartedVideo(final int video_method, final Uri uri, final String filename) {
+    public void restartedVideo(final VideoMethod video_method, final Uri uri, final String filename) {
     }
 
     @Override
-    public void deleteUnusedVideo(final int video_method, final Uri uri, final String filename) {
+    public void deleteUnusedVideo(final VideoMethod video_method, final Uri uri, final String filename) {
     }
 
     @Override
@@ -511,6 +532,10 @@ public abstract class BasicApplicationInterface implements ApplicationInterface
 
     }
 
+    @Override
+    public void requestTakePhoto() {
+    }
+
     @Override
     public void setCameraIdPref(int cameraId) {
 
diff --git a/app/src/main/java/net/sourceforge/opencamera/preview/Preview.java b/app/src/main/java/net/sourceforge/opencamera/preview/Preview.java
index 04ef327e644d7bd2aa0d56ca9c0c2fc868e32719..f2e621d7913cae46014c32cd72220d96123ff003 100644
--- a/app/src/main/java/net/sourceforge/opencamera/preview/Preview.java
+++ b/app/src/main/java/net/sourceforge/opencamera/preview/Preview.java
@@ -53,14 +53,13 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
-import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.SurfaceTexture;
-import android.graphics.Typeface;
 import android.hardware.SensorEvent;
 import android.hardware.SensorManager;
+import android.hardware.camera2.CameraExtensionCharacteristics;
 import android.location.Location;
 import android.media.CamcorderProfile;
 import android.media.MediaRecorder;
@@ -79,10 +78,14 @@ import android.renderscript.RenderScript;
 import android.renderscript.Type;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.util.Pair;
 import android.view.Display;
 import android.view.GestureDetector;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.OrientationEventListener;
 import android.view.ScaleGestureDetector;
@@ -94,18 +97,39 @@ import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.view.WindowManager;
 import android.view.View.MeasureSpec;
-import android.view.accessibility.AccessibilityManager;
 import android.widget.FrameLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
-/**
- * This class was originally named due to encapsulating the camera preview,
- * but in practice it's grown to more than this, and includes most of the
- * operation of the camera. It exists at a higher level than CameraController
- * (i.e., this isn't merely a low level wrapper to the camera API, but
- * supports much of the Open Camera logic and functionality). Communication to
- * the rest of the application is available through ApplicationInterface.
- * We could probably do with decoupling this class into separate components!
+/** This class was originally named due to encapsulating the camera preview,
+ *  but in practice it's grown to more than this, and includes most of the
+ *  operation of the camera. It exists at a higher level than CameraController
+ *  (i.e., this isn't merely a low level wrapper to the camera API, but
+ *  supports much of the Open Camera logic and functionality). Communication to
+ *  the rest of the application is available through ApplicationInterface.
+ *  We could probably do with decoupling this class into separate components!
+ *
+ *  This class also keeps track of various camera parameters, obtained from the
+ *  CameraController class. One decision is when certain parameters depend on
+ *  others (e.g., some resolutions don't support burst; lots of things don't
+ *  support vendor camera extensions). In general we shouldn't do that restriction
+ *  at this level, as that can cause problems since at the Application level we
+ *  may need to know what features are possible in any mode. E.g., if we said
+ *  burst mode isn't supported because we're in a camera extension mode, the user
+ *  wouldn't be able to switch to Fast Burst mode because the application thinks
+ *  burst isn't available! And also for changing preferences in Settings, we
+ *  typically want to show all available settings (e.g., showing RAW if it's
+ *  available for the current camera, even if not available in the current mode).
+ *  There are some exceptions where we need to restrict at the Preview level, e.g.:
+ *    - Resolutions (for burst mode, camera extensions) - though the application
+ *      can choose to obtain the full list by calling getSupportedPictureSizes()
+ *      with check_supported==false.
+ *    - Flash modes (for manual ISO or camera extensions).
+ *    - Focus modes (for camera extensions).
+ *  Similarly we shouldn't restrict available features at the CameraController
+ *  class, except where this is unavoidable due to the Android camera API
+ *  behaviour (e.g., for scene modes, it may be that some camera features are
+ *  affected).
  */
 public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextureListener {
     private static final String TAG = "Preview";
@@ -158,7 +182,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
 
     //private boolean ui_placement_right = true;
 
-    private boolean app_is_paused = true;
+    private boolean app_is_paused = true; // whether activity is paused
+    private boolean is_paused = true; // whether Preview.onPause() is called - note this could include the application pausing the preview, even if app_is_paused==false
     private boolean has_surface;
     private boolean has_aspect_ratio;
     private double aspect_ratio;
@@ -179,32 +204,45 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     private boolean is_video;
     private volatile MediaRecorder video_recorder; // must be volatile for test project reading the state
     private volatile boolean video_start_time_set; // must be volatile for test project reading the state
-    private long video_start_time; // when the video recording was started, or last resumed if it's was paused
+    private long video_start_time; // system time when the video recording was started, or last resumed if it was paused
     private long video_accumulated_time; // this time should be added to (System.currentTimeMillis() - video_start_time) to find the true video duration, that takes into account pausing/resuming, as well as any auto-restarts from max filesize
+    private long video_time_last_maxfilesize_restart; // when the video last restarted due to maxfilesize (or otherwise 0) - note this is time in ms relative to the recorded video, and not system time
     private boolean video_recorder_is_paused; // whether video_recorder is running but has paused
     private boolean video_restart_on_max_filesize;
     private static final long min_safe_restart_video_time = 1000; // if the remaining max time after restart is less than this, don't restart
-
+    /** Stores the file (or similar) to record a video.
+     *  Important to call close() when the video recording is finished, to free up any resources
+     *  (e.g., supplied ParcelFileDescriptor).
+     */
     private static class VideoFileInfo {
-        // stores the file (or similar) to record a video
-        private final int video_method;
-        private final Uri video_uri; // for VIDEOMETHOD_SAF or VIDEOMETHOD_URI
-        private final String video_filename; // for VIDEOMETHOD_FILE
-        private final ParcelFileDescriptor video_pfd_saf; // for VIDEOMETHOD_SAF
+        private final ApplicationInterface.VideoMethod video_method;
+        private final Uri video_uri; // for VideoMethod.SAF, VideoMethod.URI or VideoMethod.MEDIASTORE
+        private final String video_filename; // for VideoMethod.FILE
+        private final ParcelFileDescriptor video_pfd_saf; // for VideoMethod.SAF, VideoMethod.URI or VideoMethod.MEDIASTORE
 
         VideoFileInfo() {
-            this.video_method = ApplicationInterface.VIDEOMETHOD_FILE;
+            this.video_method = ApplicationInterface.VideoMethod.FILE;
             this.video_uri = null;
             this.video_filename = null;
             this.video_pfd_saf = null;
         }
-
-        VideoFileInfo(int video_method, Uri video_uri, String video_filename, ParcelFileDescriptor video_pfd_saf) {
+        VideoFileInfo(ApplicationInterface.VideoMethod video_method, Uri video_uri, String video_filename, ParcelFileDescriptor video_pfd_saf) {
             this.video_method = video_method;
             this.video_uri = video_uri;
             this.video_filename = video_filename;
             this.video_pfd_saf = video_pfd_saf;
         }
+
+        void close() {
+            if( this.video_pfd_saf != null ) {
+                try {
+                    this.video_pfd_saf.close();
+                }
+                catch(IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
     }
 
     private VideoFileInfo videoFileInfo = new VideoFileInfo();
@@ -301,6 +339,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     private ApplicationInterface.CameraResolutionConstraints photo_size_constraints;
     private int current_size_index = -1; // this is an index into the sizes array, or -1 if sizes not yet set
 
+    public List<Integer> supported_extensions; // if non-null, list of supported camera vendor extensions, see https://developer.android.com/reference/android/hardware/camera2/CameraExtensionCharacteristics
+
     private boolean supports_video;
     private boolean has_capture_rate_factor; // whether we have a capture rate for faster (timelapse) or slow motion
     private float capture_rate_factor = 1.0f; // should be 1.0f if has_capture_rate_factor is false; set lower than 1 for slow motion, higher than 1 for timelapse
@@ -320,7 +360,6 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     private boolean using_face_detection;
     private CameraController.Face[] faces_detected;
     private final RectF face_rect = new RectF();
-    private final AccessibilityManager accessibility_manager;
     private boolean supports_optical_stabilization;
     private boolean supports_video_stabilization;
     private boolean supports_photo_video_recording;
@@ -329,8 +368,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     private boolean supports_tonemap_curve;
     private float[] supported_apertures;
     private boolean has_focus_area;
-    private int focus_screen_x;
-    private int focus_screen_y;
+    private float focus_camera_x;
+    private float focus_camera_y;
     private long focus_complete_time = -1;
     private long focus_started_time = -1;
     private int focus_success = FOCUS_DONE;
@@ -388,6 +427,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     public volatile int count_cameraContinuousFocusMoving;
     public volatile boolean test_fail_open_camera;
     public volatile boolean test_video_failure;
+    public volatile boolean test_video_ioexception;
+    public volatile boolean test_video_cameracontrollerexception;
     public volatile boolean test_ticker_called; // set from MySurfaceView or CanvasView
     public volatile boolean test_called_next_output_file;
     public volatile boolean test_started_next_output_file;
@@ -439,7 +480,6 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         gestureDetector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener());
         gestureDetector.setOnDoubleTapListener(new DoubleTapListener());
         scaleGestureDetector = new ScaleGestureDetector(getContext(), new ScaleListener());
-        accessibility_manager = (AccessibilityManager) activity.getSystemService(Activity.ACCESSIBILITY_SERVICE);
 
         parent.addView(cameraSurface.getView());
         if (canvasView != null) {
@@ -484,8 +524,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             boolean mirror = (camera_controller.getFacing() == CameraController.Facing.FACING_FRONT);
             camera_to_preview_matrix.setScale(mirror ? -1 : 1, 1);
             int display_orientation = camera_controller.getDisplayOrientation();
-            if (MyDebug.LOG) {
-                Log.d(TAG, "orientation of display relative to camera orientaton: " + display_orientation);
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "orientation of display relative to camera orientation: " + display_orientation);
             }
             camera_to_preview_matrix.postRotate(display_orientation);
         } else {
@@ -496,9 +536,9 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             camera_to_preview_matrix.setScale(1, mirror ? -1 : 1);
             int degrees = getDisplayRotationDegrees();
             int result = (camera_controller.getCameraOrientation() - degrees + 360) % 360;
-            if (MyDebug.LOG) {
-                Log.d(TAG, "orientation of display relative to natural orientaton: " + degrees);
-                Log.d(TAG, "orientation of display relative to camera orientaton: " + result);
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "orientation of display relative to natural orientation: " + degrees);
+                Log.d(TAG, "orientation of display relative to camera orientation: " + result);
             }
             camera_to_preview_matrix.postRotate(result);
         }
@@ -528,16 +568,12 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
 		return preview_to_camera_matrix;
 	}*/
 
-    private ArrayList<CameraController.Area> getAreas(float x, float y) {
-        float[] coords = {x, y};
-        calculatePreviewToCameraMatrix();
-        preview_to_camera_matrix.mapPoints(coords);
-        float focus_x = coords[0];
-        float focus_y = coords[1];
-
+    /** Return a focus area from supplied point. Supplied coordinates should be in camera
+     *  coordinates.
+     */
+    private ArrayList<CameraController.Area> getAreas(float focus_x, float focus_y) {
         int focus_size = 50;
-        if (MyDebug.LOG) {
-            Log.d(TAG, "x, y: " + x + ", " + y);
+        if( MyDebug.LOG ) {
             Log.d(TAG, "focus x, y: " + focus_x + ", " + focus_y);
         }
         Rect rect = new Rect();
@@ -614,10 +650,6 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         if (touch_was_multitouch) {
             return true;
         }
-        if (!this.is_video && this.isTakingPhotoOrOnTimer()) {
-            // if video, okay to refocus when recording
-            return true;
-        }
 
         // ignore swipes
         {
@@ -640,6 +672,24 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             }
         }
 
+        if( takePhotoOnDoubleTap() ) {
+            // need to wait until onSingleTapConfirmed() before calling handleSingleTouch(), e.g., don't
+            // want to do touch-to-focus if this is part of a double tap
+            return true;
+        }
+
+        return handleSingleTouch(event, was_paused);
+    }
+
+    private boolean handleSingleTouch(MotionEvent event, boolean was_paused) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "handleSingleTouch");
+
+        if( !this.is_video && this.isTakingPhotoOrOnTimer() ) {
+            // if video, okay to refocus when recording
+            return true;
+        }
+
         // note, we always try to force start the preview (in case is_preview_paused has become false)
         // except if recording video (firstly, the preview should be running; secondly, we don't want to reset the phase!)
         if (!this.is_video) {
@@ -647,29 +697,47 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         }
         cancelAutoFocus();
 
+        boolean touch_capture = applicationInterface.getTouchCapturePref();
+
         // don't set focus areas on touch if the user is touching to unpause!
-        if (camera_controller != null && !this.using_face_detection && !was_paused) {
+        // similarly if doing single touch to capture (we go straight to taking a photo)
+        // and not supported for camera extensions
+        if( camera_controller != null && !this.using_face_detection && !was_paused && !touch_capture && !camera_controller.isCameraExtension() ) {
             this.has_focus_area = false;
-            ArrayList<CameraController.Area> areas = getAreas(event.getX(), event.getY());
-            if (camera_controller.setFocusAndMeteringArea(areas)) {
-                if (MyDebug.LOG)
+
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "x, y: " + event.getX() + ", " + event.getY());
+            }
+            float [] coords = {event.getX(), event.getY()};
+            calculatePreviewToCameraMatrix();
+            preview_to_camera_matrix.mapPoints(coords);
+            float focus_x = coords[0];
+            float focus_y = coords[1];
+            ArrayList<CameraController.Area> areas = getAreas(focus_x, focus_y);
+
+            if( camera_controller.setFocusAndMeteringArea(areas) ) {
+                if( MyDebug.LOG )
                     Log.d(TAG, "set focus (and metering?) area");
                 this.has_focus_area = true;
-                this.focus_screen_x = (int) event.getX();
-                this.focus_screen_y = (int) event.getY();
-            } else {
-                if (MyDebug.LOG)
+                this.focus_camera_x = focus_x;
+                this.focus_camera_y = focus_y;
+            }
+            else {
+                if( MyDebug.LOG )
                     Log.d(TAG, "didn't set focus area in this mode, may have set metering");
                 // don't set has_focus_area in this mode
             }
         }
 
         // don't take a photo on touch if the user is touching to unpause!
-        if (!this.is_video && !was_paused && applicationInterface.getTouchCapturePref()) {
-            if (MyDebug.LOG)
+        if( !this.is_video && !was_paused && touch_capture ) {
+            if( MyDebug.LOG )
                 Log.d(TAG, "touch to capture");
-            // interpret as if user had clicked take photo/video button, except that we set the focus/metering areas
-            this.takePicturePressed(false, false);
+            // Interpret as if user had clicked take photo/video button, except that we set the focus/metering areas.
+            // We go via ApplicationInterface instead of going direct to Preview.takePicturePressed(), so that
+            // the application can handle same as if user had pressed shutter button (needed so that this works
+            // correctly in Panorama mode).
+            applicationInterface.requestTakePhoto();
             return true;
         }
 
@@ -682,10 +750,18 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
 
     //@SuppressLint("ClickableViewAccessibility") @Override
 
-    /**
-     * Handle multitouch zoom.
+    // When pinch zooming, we'd normally have the problem that zooming is too fast, because we can
+    // only zoom to the limited set of values in the zoom_ratios array. So when pinch zooming, we
+    // keep track of the fractional scaled zoom.
+    private boolean has_smooth_zoom = false;
+    private float smooth_zoom = 1.0f;
+
+    /** Handle multitouch zoom.
      */
     private class ScaleListener extends ScaleGestureDetector.SimpleOnScaleGestureListener {
+        private boolean has_multitouch_start_zoom_factor = false;
+        private int multitouch_start_zoom_factor = 0;
+
         @Override
         public boolean onScale(ScaleGestureDetector detector) {
             if (Preview.this.camera_controller != null && Preview.this.has_zoom) {
@@ -693,26 +769,106 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             }
             return true;
         }
+
+        @Override
+        public boolean onScaleBegin(ScaleGestureDetector detector) {
+            if( has_zoom && camera_controller != null ) {
+                has_multitouch_start_zoom_factor = true;
+                multitouch_start_zoom_factor = camera_controller.getZoom();
+                has_smooth_zoom = true;
+                smooth_zoom = zoom_ratios.get(multitouch_start_zoom_factor)/100.0f;
+            }
+             else {
+                has_multitouch_start_zoom_factor = false;
+                multitouch_start_zoom_factor = 0;
+                has_smooth_zoom = false;
+                smooth_zoom = 1.0f;
+            }
+            return true;
+        }
+
+        @Override
+        public void onScaleEnd(ScaleGestureDetector detector) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "onScaleEnd");
+            if( has_multitouch_start_zoom_factor && has_zoom && camera_controller != null && zoom_ratios.get(0) < 100 ) {
+                // when the minimum zoom is less than 1x, we should support snapping to 1x, so it's easy for the user to
+                // switch back to 1x zoom when using pinch zoom
+                int start_zoom = zoom_ratios.get(multitouch_start_zoom_factor);
+                final int end_zoom_factor = camera_controller.getZoom();
+                int end_zoom = zoom_ratios.get(end_zoom_factor);
+                if( MyDebug.LOG ) {
+                    Log.d(TAG, "start_zoom: " + start_zoom);
+                    Log.d(TAG, "end_zoom  : " + end_zoom);
+                }
+                if( end_zoom >= 90 && end_zoom <= 110 && start_zoom != 100 && end_zoom != 100 ) {
+                    int start_diff = start_zoom - 100;
+                    int end_diff = end_zoom - 100;
+                    if( Math.signum(start_diff) == Math.signum(end_diff) && Math.abs(end_diff) >= Math.abs(start_diff) ) {
+                        // we only want to snap when moving towards 1x, or have crossed over 1x
+                    }
+                    else {
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "snapped pinch zoom to 1x zoom");
+                        int snapped_zoom = find1xZoom();
+                        zoomTo(snapped_zoom);
+                    }
+                }
+            }
+            has_multitouch_start_zoom_factor = false;
+            multitouch_start_zoom_factor = 0;
+            has_smooth_zoom = false;
+            smooth_zoom = 1.0f;
+        }
+    }
+
+    /** Returns whether we will take a photo on a double tap.
+     */
+    private boolean takePhotoOnDoubleTap() {
+        return !is_video && applicationInterface.getDoubleTapCapturePref();
     }
 
     @SuppressWarnings("SameReturnValue")
     public boolean onDoubleTap() {
         if (MyDebug.LOG)
             Log.d(TAG, "onDoubleTap()");
-        if (!is_video && applicationInterface.getDoubleTapCapturePref()) {
-            if (MyDebug.LOG)
+        if( takePhotoOnDoubleTap() ) {
+            if( MyDebug.LOG )
                 Log.d(TAG, "double-tap to capture");
-            // interpret as if user had clicked take photo/video button (don't need to set focus/metering, as this was done in touchEvent() for the first touch of the double-tap)
-            takePicturePressed(false, false);
+            // Interpret as if user had clicked take photo/video button.
+            // We go via ApplicationInterface instead of going direct to Preview.takePicturePressed(), so that
+            // the application can handle same as if user had pressed shutter button (needed so that this works
+            // correctly in Panorama mode).
+            applicationInterface.requestTakePhoto();
         }
         return true;
     }
 
     private class DoubleTapListener extends GestureDetector.SimpleOnGestureListener {
+        @Override
+        public boolean onSingleTapConfirmed(MotionEvent e) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "onSingleTapConfirmed");
+            // If we're taking a photo on double tap, then for single taps we need to wait until these are confirmed
+            // otherwise we handle via Preview.touchEvent().
+            // Arguably we could handle everything via onSingleTapConfirmed(), but want to avoid
+            // unexpected changes of behaviour - plus it would mean a slight delay for touch to
+            // focus (since onSingleTapConfirmed obviously has to wait to be sure this isn't a
+            // double tap).
+            if( takePhotoOnDoubleTap() ) {
+                // now safe to handle the single touch
+                boolean was_paused = !is_preview_started;
+                if( MyDebug.LOG )
+                    Log.d(TAG, "was_paused: " + was_paused);
+                return handleSingleTouch(e, was_paused);
+            }
+            return false;
+        }
+
         @Override
         public boolean onDoubleTap(MotionEvent e) {
-            if (MyDebug.LOG)
-                Log.d(TAG, "onDoubleTap()");
+            if( MyDebug.LOG )
+                Log.d(TAG, "onDoubleTap");
             return Preview.this.onDoubleTap();
         }
     }
@@ -726,7 +882,10 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             return;
         }
         // don't cancelAutoFocus() here, otherwise we get sluggish zoom behaviour on Camera2 API
-        camera_controller.clearFocusAndMetering();
+        if( !camera_controller.isCameraExtension() ) {
+            // if using camera extensions, we could never have set focus and metering in the first place
+            camera_controller.clearFocusAndMetering();
+        }
         has_focus_area = false;
         focus_success = FOCUS_DONE;
         successfully_focused = false;
@@ -806,8 +965,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     }
 
     @Override
-    public void surfaceCreated(SurfaceHolder holder) {
-        if (MyDebug.LOG)
+    public void surfaceCreated(@NonNull SurfaceHolder holder) {
+        if( MyDebug.LOG )
             Log.d(TAG, "surfaceCreated()");
         // The Surface has been created, acquire the camera and tell it where
         // to draw.
@@ -816,8 +975,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     }
 
     @Override
-    public void surfaceDestroyed(SurfaceHolder holder) {
-        if (MyDebug.LOG)
+    public void surfaceDestroyed(@NonNull SurfaceHolder holder) {
+        if( MyDebug.LOG )
             Log.d(TAG, "surfaceDestroyed()");
         // Surface will be destroyed when we return, so stop the preview.
         // Because the CameraDevice object is not a shared resource, it's very
@@ -826,8 +985,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     }
 
     @Override
-    public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
-        if (MyDebug.LOG)
+    public void surfaceChanged(@NonNull SurfaceHolder holder, int format, int w, int h) {
+        if( MyDebug.LOG )
             Log.d(TAG, "surfaceChanged " + w + ", " + h);
         if (holder.getSurface() == null) {
             // preview surface does not exist
@@ -837,8 +996,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     }
 
     @Override
-    public void onSurfaceTextureAvailable(SurfaceTexture arg0, int width, int height) {
-        if (MyDebug.LOG)
+    public void onSurfaceTextureAvailable(@NonNull SurfaceTexture arg0, int width, int height) {
+        if( MyDebug.LOG )
             Log.d(TAG, "onSurfaceTextureAvailable()");
         this.set_textureview_size = true;
         this.textureview_w = width;
@@ -847,8 +1006,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     }
 
     @Override
-    public boolean onSurfaceTextureDestroyed(SurfaceTexture arg0) {
-        if (MyDebug.LOG)
+    public boolean onSurfaceTextureDestroyed(@NonNull SurfaceTexture arg0) {
+        if( MyDebug.LOG )
             Log.d(TAG, "onSurfaceTextureDestroyed()");
         this.set_textureview_size = false;
         this.textureview_w = 0;
@@ -858,8 +1017,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     }
 
     @Override
-    public void onSurfaceTextureSizeChanged(SurfaceTexture texture, int width, int height) {
-        if (MyDebug.LOG) {
+    public void onSurfaceTextureSizeChanged(@NonNull SurfaceTexture texture, int width, int height) {
+        if( MyDebug.LOG ) {
             Log.d(TAG, "onSurfaceTextureSizeChanged " + width + ", " + height);
             //Log.d(TAG, "surface texture is now: " + ((TextureView)cameraSurface).getSurfaceTexture());
         }
@@ -893,7 +1052,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     }
 
     @Override
-    public void onSurfaceTextureUpdated(SurfaceTexture arg0) {
+    public void onSurfaceTextureUpdated(@NonNull SurfaceTexture arg0) {
         refreshPreviewBitmap();
     }
 
@@ -907,13 +1066,13 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         }
         if (MyDebug.LOG)
             Log.d(TAG, "textureview size: " + textureview_w + ", " + textureview_h);
-        int rotation = getDisplayRotation();
+        int rotation = applicationInterface.getDisplayRotation();
         Matrix matrix = new Matrix();
         RectF viewRect = new RectF(0, 0, this.textureview_w, this.textureview_h);
         RectF bufferRect = new RectF(0, 0, this.preview_h, this.preview_w);
         float centerX = viewRect.centerX();
         float centerY = viewRect.centerY();
-        if (Surface.ROTATION_90 == rotation || Surface.ROTATION_270 == rotation) {
+        if( rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270  ) {
             bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY());
             matrix.setRectToRect(viewRect, bufferRect, Matrix.ScaleToFit.FILL);
             float scale = Math.max(
@@ -922,6 +1081,9 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             matrix.postScale(scale, scale, centerX, centerY);
             matrix.postRotate(90 * (rotation - 2), centerX, centerY);
         }
+        else if( rotation == Surface.ROTATION_180 ) {
+            matrix.postRotate(180, centerX, centerY);
+        }
         cameraSurface.setTransform(matrix);
     }
 
@@ -967,9 +1129,12 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                 // stop() can throw a RuntimeException if stop is called too soon after start - this indicates the video file is corrupt, and should be deleted
                 if (MyDebug.LOG)
                     Log.d(TAG, "runtime exception when stopping video");
+                videoFileInfo.close();
                 applicationInterface.deleteUnusedVideo(videoFileInfo.video_method, videoFileInfo.video_uri, videoFileInfo.video_filename);
 
                 videoFileInfo = new VideoFileInfo();
+                if( nextVideoFileInfo != null )
+                    nextVideoFileInfo.close();
                 nextVideoFileInfo = null;
                 // if video recording is stopped quickly after starting, it's normal that we might not have saved a valid file, so no need to display a message
                 if (!video_start_time_set || System.currentTimeMillis() - video_start_time > 2000) {
@@ -992,11 +1157,15 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         video_recorder_is_paused = false;
         applicationInterface.cameraInOperation(false, true);
         reconnectCamera(false); // n.b., if something went wrong with video, then we reopen the camera - which may fail (or simply not reopen, e.g., if app is now paused)
+        videoFileInfo.close();
         applicationInterface.stoppedVideo(videoFileInfo.video_method, videoFileInfo.video_uri, videoFileInfo.video_filename);
         if (nextVideoFileInfo != null) {
             // if nextVideoFileInfo is not-null, it means we received MEDIA_RECORDER_INFO_MAX_FILESIZE_APPROACHING but not
             // MEDIA_RECORDER_INFO_NEXT_OUTPUT_FILE_STARTED, so it is the application responsibility to create the zero-size
             // video file that will have been created
+            if( MyDebug.LOG )
+                Log.d(TAG, "delete ununused next video file");
+            nextVideoFileInfo.close();
             applicationInterface.deleteUnusedVideo(nextVideoFileInfo.video_method, nextVideoFileInfo.video_uri, nextVideoFileInfo.video_filename);
         }
         videoFileInfo = new VideoFileInfo();
@@ -1007,8 +1176,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         return applicationInterface.getContext();
     }
 
-    /**
-     * Restart video - either due to hitting maximum filesize, or maximum duration.
+    /** Restart video - either due to hitting maximum filesize (for pre-Android 8 when not able to restart seamlessly), or maximum duration.
      */
     private void restartVideo(boolean due_to_max_filesize) {
         if (MyDebug.LOG)
@@ -1159,6 +1327,12 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         }
     }
 
+    /** Closes the camera.
+     * @param async Whether to close the camera on a background thread.
+     * @param closeCameraCallback If async is true, closeCameraCallback.onClosed() will be called,
+     *                            from the UI thread, once the camera is closed. If async is false,
+     *                            this field is ignored.
+     */
     private void closeCamera(boolean async, final CloseCameraCallback closeCameraCallback) {
         long debug_time = 0;
         if (MyDebug.LOG) {
@@ -1329,8 +1503,15 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             Log.d(TAG, "openCamera()");
             debug_time = System.currentTimeMillis();
         }
-        if (camera_open_state == CameraOpenState.CAMERAOPENSTATE_OPENING) {
-            if (MyDebug.LOG)
+        if( applicationInterface.isPreviewInBackground() ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "don't open camera as preview in background");
+            // note, even if the application never tries to reopen the camera in the background, we still need this check to avoid the camera
+            // opening from mySurfaceCreated()
+            return;
+        }
+        else if( camera_open_state == CameraOpenState.CAMERAOPENSTATE_OPENING ) {
+            if( MyDebug.LOG )
                 Log.d(TAG, "already opening camera in background thread");
             return;
         } else if (camera_open_state == CameraOpenState.CAMERAOPENSTATE_CLOSING) {
@@ -1418,9 +1599,9 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             }
             return;
         }
-        if (this.app_is_paused) {
-            if (MyDebug.LOG) {
-                Log.d(TAG, "don't open camera as app is paused");
+        if( this.is_paused ) {
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "don't open camera as paused");
             }
             return;
         }
@@ -1800,6 +1981,47 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             this.switchVideo(true, false);
         }
 
+        // seems sensible to set extension mode (or not) first
+        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && this.supported_extensions != null && applicationInterface.isCameraExtensionPref() ) {
+            int extension = applicationInterface.getCameraExtensionPref();
+            if( this.supported_extensions.contains(extension) ) {
+                camera_controller.setCameraExtension(true, extension);
+
+                // also filter unsupported flash modes
+                if( supported_flash_values != null ) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "restrict flash modes for extension session");
+                    List<String> new_supported_flash_values = new ArrayList<>();
+                    for(String supported_flash_value : supported_flash_values) {
+                        switch( supported_flash_value ) {
+                            case "flash_off":
+                            case "flash_frontscreen_torch":
+                                new_supported_flash_values.add(supported_flash_value);
+                                break;
+                        }
+                    }
+                    supported_flash_values = new_supported_flash_values;
+                }
+
+                // also disallow focus modes
+                if( supported_focus_values != null ) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "restrict focus modes for extension session");
+                    supported_focus_values = null;
+                }
+
+                // and disable ae and awb lock (as normally we don't set this when stopping/starting preview)
+                camera_controller.setAutoExposureLock(false);
+                camera_controller.setAutoWhiteBalanceLock(false);
+            }
+            else {
+                camera_controller.setCameraExtension(false, 0);
+            }
+        }
+        else {
+            camera_controller.setCameraExtension(false, 0);
+        }
+
         setupCameraParameters();
 
         updateFlashForVideo();
@@ -1857,45 +2079,56 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
 
         setupBurstMode();
 
-        if (camera_controller.isBurstOrExpo()) {
-            if (MyDebug.LOG)
-                Log.d(TAG, "check photo resolution supports burst");
-            CameraController.Size current_size = getCurrentPictureSize();
-            if (MyDebug.LOG && current_size != null) {
-                Log.d(TAG, "current_size: " + current_size.width + " x " + current_size.height + " supports_burst? " + current_size.supports_burst);
-            }
-            if (current_size != null && !current_size.supports_burst) {
-                if (MyDebug.LOG)
-                    Log.d(TAG, "burst mode: current picture size doesn't support burst");
-                // set to next largest that supports burst
-                CameraController.Size new_size = null;
-                for (int i = 0; i < photo_sizes.size(); i++) {
-                    CameraController.Size size = photo_sizes.get(i);
-                    if (size.supports_burst && size.width * size.height <= current_size.width * current_size.height) {
-                        if (new_size == null || size.width * size.height > new_size.width * new_size.height) {
-                            current_size_index = i;
-                            new_size = size;
-                        }
-                    }
+        {
+            boolean is_burst = camera_controller.isBurstOrExpo();
+            boolean is_extension = camera_controller.isCameraExtension();
+            int extension = is_extension ? camera_controller.getCameraExtension() : -1;
+            if( is_burst || is_extension ) {
+                if( MyDebug.LOG ) {
+                    if( is_burst )
+                        Log.d(TAG, "check photo resolution supports burst");
+                    if( is_extension )
+                        Log.d(TAG, "check photo resolution supports extension: " + extension);
                 }
-                if (new_size == null) {
-                    Log.e(TAG, "can't find burst-supporting picture size smaller than the current picture size");
-                    // just find largest that supports burst
-                    for (int i = 0; i < photo_sizes.size(); i++) {
-                        CameraController.Size size = photo_sizes.get(i);
-                        if (size.supports_burst) {
-                            if (new_size == null || size.width * size.height > new_size.width * new_size.height) {
-                                current_size_index = i;
-                                new_size = size;
+                CameraController.Size current_size = getCurrentPictureSize();
+                if( current_size != null ) {
+                    if( MyDebug.LOG ) {
+                        Log.d(TAG, "current_size: " + current_size.width + " x " + current_size.height + " supports_burst? " + current_size.supports_burst);
+                    }
+                    if( !current_size.supportsRequirements(is_burst, is_extension, extension) ) {
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "burst mode: current picture size doesn't support required burst and/or extension");
+                        // set to next largest that supports what we need
+                        CameraController.Size new_size = null;
+                        for(int i=0;i<photo_sizes.size();i++) {
+                            CameraController.Size size = photo_sizes.get(i);
+                            if( size.supportsRequirements(is_burst, is_extension, extension) && size.width*size.height <= current_size.width*current_size.height ) {
+                                if( new_size == null || size.width*size.height > new_size.width*new_size.height ) {
+                                    current_size_index = i;
+                                    new_size = size;
+                                }
                             }
                         }
-                    }
-                    if (new_size == null) {
-                        Log.e(TAG, "can't find burst-supporting picture size");
+                        if( new_size == null ) {
+                            Log.e(TAG, "can't find supporting picture size smaller than the current picture size");
+                            // just find largest that supports requirements
+                            for(int i=0;i<photo_sizes.size();i++) {
+                                CameraController.Size size = photo_sizes.get(i);
+                                if( size.supportsRequirements(is_burst, is_extension, extension) ) {
+                                    if( new_size == null || size.width*size.height > new_size.width*new_size.height ) {
+                                        current_size_index = i;
+                                        new_size = size;
+                                    }
+                                }
+                            }
+                            if( new_size == null ) {
+                                Log.e(TAG, "can't find supporting picture size");
+                            }
+                        }
+                        // if we set a new size, we don't save this to applicationinterface (so that if user switches to a burst mode or extension mode and back
+                        // when the original resolution doesn't support burst/extension we revert to the original resolution)
                     }
                 }
-                // if we set a new size, we don't save this to applicationinterface (so that if user switches to a burst mode and back
-                // when the original resolution doesn't support burst we revert to the original resolution)
             }
         }
 
@@ -1903,6 +2136,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
 
         // Must set preview size before starting camera preview
         // and must do it after setting photo vs video mode
+        // and after setting what camera extension we're using (if any)
         setPreviewSize(); // need to call this when we switch cameras, not just when we run for the first time
         if (MyDebug.LOG) {
             Log.d(TAG, "setupCamera: time after setting preview size: " + (System.currentTimeMillis() - debug_time));
@@ -1915,9 +2149,13 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
 
         // must be done after setting parameters, as this function may set parameters
         // also needs to be done after starting preview for some devices (e.g., Nexus 7)
-        if (this.has_zoom && applicationInterface.getZoomPref() != 0) {
-            zoomTo(applicationInterface.getZoomPref());
-            if (MyDebug.LOG) {
+        if( this.has_zoom ) {
+            int zoom_pref = applicationInterface.getZoomPref();
+            if( zoom_pref == -1 ) {
+                zoom_pref = find1xZoom();
+            }
+            zoomTo(zoom_pref);
+            if( MyDebug.LOG ) {
                 Log.d(TAG, "setupCamera: total time after zoomTo: " + (System.currentTimeMillis() - debug_time));
             }
         } else if (camera_controller_supports_zoom && !has_zoom) {
@@ -1925,7 +2163,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                 Log.d(TAG, "camera supports zoom but application disabled zoom, so reset zoom to default");
             // if the application switches zoom off via ApplicationInterface.allowZoom(), we need to support
             // resetting the zoom (in case the application called setupCamera() rather than reopening the camera).
-            camera_controller.setZoom(0);
+            camera_controller.resetZoom();
         }
 
 	    /*if( take_photo ) {
@@ -1976,6 +2214,15 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         }
     }
 
+    private int find1xZoom() {
+        for(int i=0;i<zoom_ratios.size();i++) {
+            if( zoom_ratios.get(i) == 100 ) {
+                return i;
+            }
+        }
+        return 0; // shouldn't happen but just in case, choose smallest zoom value
+    }
+
     public void setupBurstMode() {
         if (MyDebug.LOG)
             Log.d(TAG, "setupBurstMode()");
@@ -2040,15 +2287,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             if (MyDebug.LOG)
                 Log.d(TAG, "grab info from parameters");
             CameraController.CameraFeatures camera_features = camera_controller.getCameraFeatures();
-            this.camera_controller_supports_zoom = camera_features.is_zoom_supported;
-            this.has_zoom = camera_features.is_zoom_supported && applicationInterface.allowZoom();
-            if (this.has_zoom) {
-                this.max_zoom_factor = camera_features.max_zoom;
-                this.zoom_ratios = camera_features.zoom_ratios;
-            } else {
-                this.max_zoom_factor = 0;
-                this.zoom_ratios = null;
-            }
+
             this.minimum_focus_distance = camera_features.minimum_focus_distance;
             this.supports_face_detection = camera_features.supports_face_detection;
             this.photo_sizes = camera_features.picture_sizes;
@@ -2099,6 +2338,22 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             this.video_quality_handler.setVideoSizes(camera_features.video_sizes);
             this.video_quality_handler.setVideoSizesHighSpeed(camera_features.video_sizes_high_speed);
             this.supported_preview_sizes = camera_features.preview_sizes;
+            this.supported_extensions = camera_features.supported_extensions;
+
+            // need to do zoom last, as applicationInterface.allowZoom() may depend on the supported
+            // camera features (e.g., zoom not supported with camera extensions, so we need to have first
+            // stored supported_extensions - otherwise starting up in an extension photo mode will still
+            // show zoom controls)
+            this.camera_controller_supports_zoom = camera_features.is_zoom_supported;
+            this.has_zoom = camera_features.is_zoom_supported && applicationInterface.allowZoom();
+            if( this.has_zoom ) {
+                this.max_zoom_factor = camera_features.max_zoom;
+                this.zoom_ratios = camera_features.zoom_ratios;
+            }
+            else {
+                this.max_zoom_factor = 0;
+                this.zoom_ratios = null;
+            }
         }
     }
 
@@ -2155,15 +2410,6 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                         Activity activity = (Activity) Preview.this.getContext();
                         activity.runOnUiThread(new Runnable() {
                             public void run() {
-                                // convert rects to preview screen space - also needs to be done on UI thread
-                                // (otherwise can have crashes if camera_controller becomes null in the meantime)
-                                final Matrix matrix = getCameraToPreviewMatrix();
-                                for (CameraController.Face face : faces) {
-                                    face_rect.set(face.rect);
-                                    matrix.mapRect(face_rect);
-                                    face_rect.round(face.rect);
-                                }
-
                                 reportFaces(faces);
 
                                 if (faces_detected == null || faces_detected.length != faces.length) {
@@ -2181,7 +2427,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                      */
                     private void reportFaces(CameraController.Face[] local_faces) {
                         // View.announceForAccessibility requires JELLY_BEAN
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && accessibility_manager.isEnabled() && accessibility_manager.isTouchExplorationEnabled()) {
+                        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN
+                            ) {
                             int n_faces = local_faces.length;
                             FaceLocation face_location = FaceLocation.FACELOCATION_UNKNOWN;
                             if (n_faces > 0) {
@@ -2189,13 +2436,20 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                                 float avg_x = 0, avg_y = 0;
                                 final float bdry_frac_c = 0.35f;
                                 boolean all_centre = true;
-                                for (CameraController.Face face : local_faces) {
-                                    float face_x = face.rect.centerX();
-                                    float face_y = face.rect.centerY();
-                                    face_x /= (float) cameraSurface.getView().getWidth();
-                                    face_y /= (float) cameraSurface.getView().getHeight();
-                                    if (all_centre) {
-                                        if (face_x < bdry_frac_c || face_x > 1.0f - bdry_frac_c || face_y < bdry_frac_c || face_y > 1.0f - bdry_frac_c)
+                                final Matrix matrix = getCameraToPreviewMatrix();
+                                for(CameraController.Face face : local_faces) {
+                                    //float face_x = face.rect.centerX();
+                                    //float face_y = face.rect.centerY();
+                                    // convert to screen space coordinates
+                                    face_rect.set(face.rect);
+                                    matrix.mapRect(face_rect);
+                                    float face_x = face_rect.centerX();
+                                    float face_y = face_rect.centerY();
+
+                                    face_x /= (float)cameraSurface.getView().getWidth();
+                                    face_y /= (float)cameraSurface.getView().getHeight();
+                                    if( all_centre ) {
+                                        if( face_x < bdry_frac_c || face_x > 1.0f-bdry_frac_c || face_y < bdry_frac_c || face_y > 1.0f-bdry_frac_c )
                                             all_centre = false;
                                     }
                                     avg_x += face_x;
@@ -2297,6 +2551,9 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                 }
                 camera_controller.setFaceDetectionListener(new MyFaceDetectionListener());
             }
+            else {
+                camera_controller.setFaceDetectionListener(null);
+            }
         }
         if (MyDebug.LOG) {
             Log.d(TAG, "setupCameraParameters: time after setting face detection: " + (System.currentTimeMillis() - debug_time));
@@ -2421,7 +2678,12 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         if (MyDebug.LOG)
             Log.d(TAG, "saved iso: " + value);
         boolean is_manual_iso = false;
-        if (supports_iso_range) {
+        boolean is_extension = camera_controller.isCameraExtension();
+        if( is_extension ) {
+            // manual ISO not supported for camera extensions
+            camera_controller.setManualISO(false, 0);
+        }
+        else if( supports_iso_range ) {
             // in this mode, we can set any ISO value from min to max
             this.isos = null; // if supports_iso_range==true, caller shouldn't be using getSupportedISOs()
 
@@ -2651,7 +2913,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             }
 
             // size set later in setPreviewSize()
-            // also note that we check for compatibility with burst (CameraController.Size.supports_burst) later on
+            // also note that we check for compatibility with burst (CameraController.Size.supports_burst) and extensions later on
         }
         if (MyDebug.LOG) {
             Log.d(TAG, "setupCameraParameters: time after picture sizes: " + (System.currentTimeMillis() - debug_time));
@@ -2813,7 +3075,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                         // if in manual ISO mode, we'll have restricted the available flash modes - so although we want to
                         // communicate this to the application, we don't want to save the new value we've chosen (otherwise
                         // if user goes to manual ISO and back, we might switch saved flash say from auto to off)
-                        updateFlash(0, !is_manual_iso);
+                        // similarly for camera extension modes
+                        updateFlash(0, !is_manual_iso && !is_extension );
                     }
                 } else {
                     if (MyDebug.LOG)
@@ -3516,8 +3779,16 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         for (CameraController.Size size : sizes) {
             if (MyDebug.LOG)
                 Log.d(TAG, "    supported preview size: " + size.width + ", " + size.height);
-            double ratio = (double) size.width / size.height;
-            if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE)
+            if( camera_controller.isCameraExtension() ) {
+                int extension = camera_controller.getCameraExtension();
+                if( !size.supportsExtension(extension) ) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "        not supported by current extension: " + extension);
+                    continue;
+                }
+            }
+            double ratio = (double)size.width / size.height;
+            if( Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE )
                 continue;
             if (Math.abs(size.height - targetHeight) < minDiff) {
                 optimalSize = size;
@@ -3625,46 +3896,12 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         return aspect_ratio;
     }
 
-    /**
-     * Returns the ROTATION_* enum of the display relative to the natural device orientation.
-     */
-    public int getDisplayRotation() {
-        // gets the display rotation (as a Surface.ROTATION_* constant), taking into account the getRotatePreviewPreferenceKey() setting
-        Activity activity = (Activity) this.getContext();
-        int rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
-
-        String rotate_preview = applicationInterface.getPreviewRotationPref();
-        if (MyDebug.LOG)
-            Log.d(TAG, "    rotate_preview = " + rotate_preview);
-        if (rotate_preview.equals("180")) {
-            switch (rotation) {
-                case Surface.ROTATION_0:
-                    rotation = Surface.ROTATION_180;
-                    break;
-                case Surface.ROTATION_90:
-                    rotation = Surface.ROTATION_270;
-                    break;
-                case Surface.ROTATION_180:
-                    rotation = Surface.ROTATION_0;
-                    break;
-                case Surface.ROTATION_270:
-                    rotation = Surface.ROTATION_90;
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        return rotation;
-    }
-
-    /**
-     * Returns the rotation in degrees of the display relative to the natural device orientation.
+    /** Returns the rotation in degrees of the display relative to the natural device orientation.
      */
     private int getDisplayRotationDegrees() {
         if (MyDebug.LOG)
             Log.d(TAG, "getDisplayRotationDegrees");
-        int rotation = getDisplayRotation();
+        int rotation = applicationInterface.getDisplayRotation();
         int degrees = 0;
         switch (rotation) {
             case Surface.ROTATION_0:
@@ -3805,9 +4042,9 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     public void draw(Canvas canvas) {
 		/*if( MyDebug.LOG )
 			Log.d(TAG, "draw()");*/
-        if (this.app_is_paused) {
+        if( this.is_paused ) {
     		/*if( MyDebug.LOG )
-    			Log.d(TAG, "draw(): app is paused");*/
+    			Log.d(TAG, "draw(): paused");*/
             return;
         }
 		/*if( true ) // test
@@ -3832,17 +4069,33 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             Log.d(TAG, "getScaledZoomFactor() " + scale_factor);
 
         int new_zoom_factor = 0;
-        if (this.camera_controller != null && this.has_zoom) {
-            int zoom_factor = camera_controller.getZoom();
-            float zoom_ratio = this.zoom_ratios.get(zoom_factor) / 100.0f;
+        if( this.camera_controller != null && this.has_zoom ) {
+            final int zoom_factor = camera_controller.getZoom();
+            float zoom_ratio;
+            if( has_smooth_zoom ) {
+                zoom_ratio = smooth_zoom;
+                if( MyDebug.LOG )
+                    Log.d(TAG, "    use smooth_zoom: " + smooth_zoom + " instead of: " + this.zoom_ratios.get(zoom_factor)/100.0f);
+            }
+            else {
+                zoom_ratio = this.zoom_ratios.get(zoom_factor)/100.0f;
+            }
             zoom_ratio *= scale_factor;
+            if( MyDebug.LOG )
+                Log.d(TAG, "    zoom_ratio: " + zoom_ratio);
 
             new_zoom_factor = zoom_factor;
-            if (zoom_ratio <= 1.0f) {
+            if( zoom_ratio <= zoom_ratios.get(0)/100.0f ) {
                 new_zoom_factor = 0;
-            } else if (zoom_ratio >= zoom_ratios.get(max_zoom_factor) / 100.0f) {
+                if( has_smooth_zoom )
+                    smooth_zoom = zoom_ratios.get(0)/100.0f;
+            }
+            else if( zoom_ratio >= zoom_ratios.get(max_zoom_factor)/100.0f ) {
                 new_zoom_factor = max_zoom_factor;
-            } else {
+                if( has_smooth_zoom )
+                    smooth_zoom = zoom_ratios.get(max_zoom_factor)/100.0f;
+            }
+            else {
                 // find the closest zoom level
                 if (scale_factor > 1.0f) {
                     // zooming in
@@ -3865,6 +4118,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                         }
                     }
                 }
+                if( has_smooth_zoom )
+                    smooth_zoom = zoom_ratio;
             }
             if (MyDebug.LOG) {
                 Log.d(TAG, "zoom_ratio is now " + zoom_ratio);
@@ -3886,6 +4141,9 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         }
     }
 
+    /** Zooms to the supplied index (within the zoom_ratios array).
+     * @param new_zoom_factor The index to zoom to.
+     */
     public void zoomTo(int new_zoom_factor) {
         if (MyDebug.LOG)
             Log.d(TAG, "ZoomTo(): " + new_zoom_factor);
@@ -4054,7 +4312,9 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     }
 
     public String getExposureTimeString(long exposure_time) {
-        double exposure_time_s = exposure_time / 1000000000.0;
+        /*if( MyDebug.LOG )
+            Log.d(TAG, "getExposureTimeString(): " + exposure_time);*/
+        double exposure_time_s = exposure_time/1000000000.0;
         String string;
         if (exposure_time > 100000000) {
             // show exposure times of more than 0.1s directly
@@ -4063,6 +4323,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             double exposure_time_r = 1.0 / exposure_time_s;
             string = " 1/" + (int) (exposure_time_r + 0.5) + getResources().getString(R.string.seconds_abbreviation);
         }
+        /*if( MyDebug.LOG )
+            Log.d(TAG, "getExposureTimeString() return: " + string);*/
         return string;
     }
 
@@ -4249,8 +4511,13 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                 Log.d(TAG, "fps_ranges not available");
             return;
         }
-        int[] selected_fps = null;
-        if (this.is_video) {
+        int [] selected_fps = null;
+        if( camera_controller.isCameraExtension() ) {
+            // don't set preview fps if using camera extension
+            // (important not to return here however - still want to call
+            // camera_controller.clearPreviewFpsRange() to clear a previously set fps)
+        }
+        else if( this.is_video ) {
             // For Nexus 5 and Nexus 6, we need to set the preview fps using matchPreviewFpsToVideo to avoid problem of dark preview in low light, as described above.
             // When the video recording starts, the preview automatically adjusts, but still good to avoid too-dark preview before the user starts recording.
             // However I'm wary of changing the behaviour for all devices at the moment, since some devices can be
@@ -4354,16 +4621,19 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                 updateFlashForVideo();
             }
 
-            if (!during_startup) {
-                String focus_value = current_focus_index != -1 ? supported_focus_values.get(current_focus_index) : null;
-                if (MyDebug.LOG)
+            if( !during_startup ) {
+                if( MyDebug.LOG ) {
+                    String focus_value = current_focus_index != -1 ? supported_focus_values.get(current_focus_index) : null;
                     Log.d(TAG, "focus_value is " + focus_value);
+                }
                 // Although in theory we only need to stop and start preview, which should be faster, reopening the camera allows that to
                 // run on the background thread, thus not freezing the UI
                 // Also workaround for bug on Nexus 6 at least where switching to video and back to photo mode causes continuous picture mode to stop -
                 // at the least, we need to reopen camera when: ( !is_video && focus_value != null && focus_value.equals("focus_mode_continuous_picture") ).
                 // Lastly, note that it's important to still call setupCamera() when switching between photo and video modes (see comment for setupCamera()).
                 // So if we ever allow stopping/starting the preview again, we still need to call setupCamera() again.
+                // Update: and even if we want to go back to just stopping/starting the preview, it's likely still a good idea to reopen the camera when
+                // switching from/to vendor camera extensions, otherwise risk of hangs/crashes on at least some devices (see note in MainActivity.updateForSettings)
                 this.reopenCamera();
             }
 
@@ -4413,7 +4683,11 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                 Log.d(TAG, "found no existing focus_value");
             // here we set the default values for focus mode
             // note if updating default focus value for photo mode, also update MainActivityTest.setToDefault()
-            updateFocus(is_video ? "focus_mode_continuous_video" : "focus_mode_continuous_picture", true, true, auto_focus);
+            if( !updateFocus(is_video ? "focus_mode_continuous_video" : "focus_mode_continuous_picture", true, true, auto_focus) ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "continuous focus not supported, so fall back to first");
+                updateFocus(0, true, true, auto_focus);
+            }
         }
     }
 
@@ -4951,8 +5225,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             Log.d(TAG, "takePicturePressed exit");
     }
 
-    private void takePictureOnTimer(final long timer_delay, @SuppressWarnings("unused") boolean repeated) {
-        if (MyDebug.LOG) {
+    private void takePictureOnTimer(final long timer_delay, boolean repeated) {
+        if( MyDebug.LOG ) {
             Log.d(TAG, "takePictureOnTimer");
             Log.d(TAG, "timer_delay: " + timer_delay);
         }
@@ -5079,7 +5353,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                         try {
                             //if( true )
                             //	throw new IOException(); // test
-                            if (info.video_method == ApplicationInterface.VIDEOMETHOD_FILE) {
+                            if( info.video_method == ApplicationInterface.VideoMethod.FILE ) {
                                 video_recorder.setNextOutputFile(new File(info.video_filename));
                             } else {
                                 video_recorder.setNextOutputFile(info.video_pfd_saf.getFileDescriptor());
@@ -5091,6 +5365,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                         } catch (IOException e) {
                             Log.e(TAG, "failed to setNextOutputFile");
                             e.printStackTrace();
+                            info.close();
                         }
                     }
                 }
@@ -5102,7 +5377,10 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                 Log.d(TAG, "seamless restart with setNextOutputFile has now occurred");
             if (nextVideoFileInfo == null) {
                 Log.e(TAG, "received MEDIA_RECORDER_INFO_NEXT_OUTPUT_FILE_STARTED but nextVideoFileInfo is null");
-            } else {
+            }
+            else {
+                videoFileInfo.close();
+                video_time_last_maxfilesize_restart = getVideoTime(false);
                 applicationInterface.restartedVideo(videoFileInfo.video_method, videoFileInfo.video_uri, videoFileInfo.video_filename);
                 videoFileInfo = nextVideoFileInfo;
                 nextVideoFileInfo = null;
@@ -5232,14 +5510,15 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     private VideoFileInfo createVideoFile(String extension) {
         if (MyDebug.LOG)
             Log.d(TAG, "createVideoFile");
+        VideoFileInfo video_file_info = null;
+        ParcelFileDescriptor video_pfd_saf = null;
         try {
-            int method = applicationInterface.createOutputVideoMethod();
+            ApplicationInterface.VideoMethod method = applicationInterface.createOutputVideoMethod();
             Uri video_uri = null;
             String video_filename = null;
-            ParcelFileDescriptor video_pfd_saf = null;
-            if (MyDebug.LOG)
+            if( MyDebug.LOG )
                 Log.d(TAG, "method? " + method);
-            if (method == ApplicationInterface.VIDEOMETHOD_FILE) {
+            if( method == ApplicationInterface.VideoMethod.FILE ) {
     			/*if( true )
     				throw new IOException(); // test*/
                 File videoFile = applicationInterface.createOutputVideoFile(extension);
@@ -5248,9 +5527,13 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                     Log.d(TAG, "save to: " + video_filename);
             } else {
                 Uri uri;
-                if (method == ApplicationInterface.VIDEOMETHOD_SAF) {
+                if( method == ApplicationInterface.VideoMethod.SAF ) {
                     uri = applicationInterface.createOutputVideoSAF(extension);
-                } else {
+                }
+                else if( method == ApplicationInterface.VideoMethod.MEDIASTORE ) {
+                    uri = applicationInterface.createOutputVideoMediaStore(extension);
+                }
+                else {
                     uri = applicationInterface.createOutputVideoUri();
                 }
                 if (MyDebug.LOG)
@@ -5259,13 +5542,26 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                 video_uri = uri;
             }
 
-            return new VideoFileInfo(method, video_uri, video_filename, video_pfd_saf);
-        } catch (IOException e) {
-            if (MyDebug.LOG)
+            video_file_info = new VideoFileInfo(method, video_uri, video_filename, video_pfd_saf);
+        }
+        catch(IOException e) {
+            if( MyDebug.LOG )
                 Log.e(TAG, "Couldn't create media video file; check storage permissions?");
             e.printStackTrace();
         }
-        return null;
+        finally {
+            if( video_file_info == null && video_pfd_saf != null ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "failed, so clean up video_pfd_saf");
+                try {
+                    video_pfd_saf.close();
+                }
+                catch(IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return video_file_info;
     }
 
     /**
@@ -5392,7 +5688,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                     Log.d(TAG, "actual video_max_duration: " + video_max_duration);
                 local_video_recorder.setMaxDuration((int) video_max_duration);
 
-                if (videoFileInfo.video_method == ApplicationInterface.VIDEOMETHOD_FILE) {
+                if( videoFileInfo.video_method == ApplicationInterface.VideoMethod.FILE ) {
                     local_video_recorder.setOutputFile(videoFileInfo.video_filename);
                 } else {
                     local_video_recorder.setOutputFile(videoFileInfo.video_pfd_saf.getFileDescriptor());
@@ -5407,14 +5703,33 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                 local_video_recorder.setOrientationHint(getImageVideoRotation());
                 if (MyDebug.LOG)
                     Log.d(TAG, "about to prepare video recorder");
+
                 local_video_recorder.prepare();
+                if( test_video_ioexception ) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "test_video_ioexception is true");
+                    throw new IOException();
+                }
+
                 boolean want_photo_video_recording = supportsPhotoVideoRecording() && applicationInterface.usePhotoVideoRecording();
+
                 camera_controller.initVideoRecorderPostPrepare(local_video_recorder, want_photo_video_recording);
-                if (MyDebug.LOG)
+                if( test_video_cameracontrollerexception ) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "test_video_cameracontrollerexception is true");
+                    throw new CameraControllerException();
+                }
+
+                if( MyDebug.LOG )
                     Log.d(TAG, "about to start video recorder");
 
                 try {
                     local_video_recorder.start();
+                    if( test_video_failure ) {
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "test_video_failure is true");
+                        throw new RuntimeException();
+                    }
                     this.video_recorder = local_video_recorder;
                     videoRecordingStarted(max_filesize_restart);
                 } catch (RuntimeException e) {
@@ -5478,6 +5793,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                 video_recorder.release();
                 video_recorder = null;
                 video_recorder_is_paused = false;
+                applicationInterface.deleteUnusedVideo(videoFileInfo.video_method, videoFileInfo.video_uri, videoFileInfo.video_filename);
+                videoFileInfo = new VideoFileInfo();
                 applicationInterface.cameraInOperation(false, true);
                 this.reconnectCamera(true);
             } catch (CameraControllerException e) {
@@ -5501,6 +5818,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                 video_recorder.release();
                 video_recorder = null;
                 video_recorder_is_paused = false;
+                applicationInterface.deleteUnusedVideo(videoFileInfo.video_method, videoFileInfo.video_uri, videoFileInfo.video_filename);
+                videoFileInfo = new VideoFileInfo();
                 applicationInterface.cameraInOperation(false, true);
                 this.reconnectCamera(true);
                 this.showToast(null, R.string.video_no_free_space);
@@ -5521,13 +5840,9 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             faces_detected = null;
         }
 
-        if (test_video_failure) {
-            if (MyDebug.LOG)
-                Log.d(TAG, "test_video_failure is true");
-            throw new RuntimeException();
-        }
         video_start_time = System.currentTimeMillis();
         video_start_time_set = true;
+        video_time_last_maxfilesize_restart = max_filesize_restart ? video_accumulated_time : 0;
         applicationInterface.startedVideo();
         // Don't send intent for ACTION_MEDIA_SCANNER_SCAN_FILE yet - wait until finished, so we get completed file.
         // Don't do any further calls after applicationInterface.startedVideo() that might throw an error - instead video error
@@ -5621,6 +5936,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         video_recorder.release();
         video_recorder = null;
         video_recorder_is_paused = false;
+        applicationInterface.deleteUnusedVideo(videoFileInfo.video_method, videoFileInfo.video_uri, videoFileInfo.video_filename);
+        videoFileInfo = new VideoFileInfo();
         applicationInterface.cameraInOperation(false, true);
         this.reconnectCamera(true);
     }
@@ -6014,7 +6331,12 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             if (MyDebug.LOG)
                 Log.d(TAG, "enable_sound? " + enable_sound);
             camera_controller.enableShutterSound(enable_sound);
-            if (using_android_l) {
+            if( using_android_l ) {
+                boolean camera2_dummy_capture_hack = applicationInterface.useCamera2DummyCaptureHack();
+                if( MyDebug.LOG )
+                    Log.d(TAG, "camera2_dummy_capture_hack? " + camera2_dummy_capture_hack);
+                camera_controller.setDummyCaptureHack( camera2_dummy_capture_hack );
+
                 boolean use_camera2_fast_burst = applicationInterface.useCamera2FastBurst();
                 if (MyDebug.LOG)
                     Log.d(TAG, "use_camera2_fast_burst? " + use_camera2_fast_burst);
@@ -6195,6 +6517,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             String current_ui_focus_value = getCurrentFocusValue();
             if (current_ui_focus_value != null && !camera_controller.getFocusValue().equals(current_ui_focus_value) && camera_controller.getFocusValue().equals("focus_mode_auto")) {
                 camera_controller.cancelAutoFocus();
+                if( MyDebug.LOG )
+                    Log.d(TAG, "switch back to: " + current_ui_focus_value);
                 camera_controller.setFocusValue(current_ui_focus_value);
             } else {
                 if (MyDebug.LOG)
@@ -6823,6 +7147,18 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         return this.supports_burst;
     }
 
+    /** Whether the Camera vendor extension is supported (see
+     * https://developer.android.com/reference/android/hardware/camera2/CameraExtensionCharacteristics ).
+     */
+    public boolean supportsCameraExtension(int extension) {
+        if( extension == CameraExtensionCharacteristics.EXTENSION_HDR ) {
+            // blocked for now, as have yet to be able to test this (seems to have no effect on Galaxy S10e;
+            // not available on Pixel 6 Pro)
+            return false;
+        }
+        return this.supported_extensions != null && this.supported_extensions.contains(extension);
+    }
+
     public boolean supportsRaw() {
         return this.supports_raw;
     }
@@ -6920,24 +7256,27 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     }
 
     /**
-     * @param check_supported If true, and a burst mode is in use (fast burst, expo, HDR), and/or
-     *                        a constraint was set via getCameraResolutionPref(), then the returned
-     *                        list will be filtered to remove sizes that don't support burst and/or
-     *                        these constraints.
+     * @param check_supported If true, and a burst mode is in use (fast burst, expo, HDR), or
+     *                        a camera vendor extension mode, and/o a constraint was set via
+     *                        getCameraResolutionPref(), then the returned list will be filtered to
+     *                        remove sizes that don't support burst and/or these constraints.
      */
     public List<CameraController.Size> getSupportedPictureSizes(boolean check_supported) {
         if (MyDebug.LOG)
             Log.d(TAG, "getSupportedPictureSizes");
-        boolean is_burst = (camera_controller != null && camera_controller.isBurstOrExpo());
+        boolean is_burst = ( camera_controller != null && camera_controller.isBurstOrExpo() );
+        boolean is_extension = ( camera_controller != null && camera_controller.isCameraExtension() );
+        int extension = is_extension ? camera_controller.getCameraExtension() : -1;
         boolean has_constraints = photo_size_constraints != null && photo_size_constraints.hasConstraints();
-        if (check_supported && (is_burst || has_constraints)) {
-            if (MyDebug.LOG)
-                Log.d(TAG, "need to filter picture sizes for burst mode and/or constraints");
+        if( check_supported && ( is_burst || is_extension || has_constraints ) ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "need to filter picture sizes for burst mode and/or extension mode and/or constraints");
             List<CameraController.Size> filtered_sizes = new ArrayList<>();
-            for (CameraController.Size size : photo_sizes) {
-                if (is_burst && !size.supports_burst) {
-                    // burst mode not supported
-                } else if (!photo_size_constraints.satisfies(size)) {
+            for(CameraController.Size size : photo_sizes) {
+                if( !size.supportsRequirements(is_burst, is_extension, extension) ) {
+                    // burst or extension mode not supported
+                }
+                else if( !photo_size_constraints.satisfies(size) ) {
                     // doesn't satisfy imposed constraints
                 } else {
                     filtered_sizes.add(size);
@@ -7073,11 +7412,14 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         return camera_controller.getAPI();
     }
 
+    /** Call when activity is resumed.
+     */
     public void onResume() {
         if (MyDebug.LOG)
             Log.d(TAG, "onResume");
         recreatePreviewBitmap();
         this.app_is_paused = false;
+        this.is_paused = false;
         cameraSurface.onResume();
         if (canvasView != null)
             canvasView.onResume();
@@ -7097,12 +7439,25 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         }
     }
 
+    /** Call when activity is paused.
+     */
     public void onPause() {
-        if (MyDebug.LOG)
+        onPause(true);
+    }
+
+    /** Call when activity is paused, or the application wants to put the Preview into a paused
+     *  state (closing the camera etc).
+     * @param activity_is_pausing Set to true if this is called because the activity is being paused;
+     *                            set to false if the activity is not pausing.
+     */
+    public void onPause(boolean activity_is_pausing) {
+        if( MyDebug.LOG )
             Log.d(TAG, "onPause");
-        this.app_is_paused = true;
-        if (camera_open_state == CameraOpenState.CAMERAOPENSTATE_OPENING) {
-            if (MyDebug.LOG)
+        this.is_paused = true;
+        if( activity_is_pausing )
+            this.app_is_paused = true; // note, if activity_is_paused==false, we don't change app_is_paused, in case app was paused indicated via a separate call to onPause
+        if( camera_open_state == CameraOpenState.CAMERAOPENSTATE_OPENING ) {
+            if( MyDebug.LOG )
                 Log.d(TAG, "cancel open_camera_task");
             if (open_camera_task != null) { // just to be safe
                 this.open_camera_task.cancel(true);
@@ -7178,115 +7533,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             Log.d(TAG, "onSaveInstanceState");
     }
 
-    private class RotatedTextView extends View {
-        private String[] lines;
-        private int offset_y;
-        private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        private final Rect bounds = new Rect();
-        private final Rect sub_bounds = new Rect();
-        private final RectF rect = new RectF();
-        private final boolean style_outline; // if true, display text with outline rather than background
-
-        RotatedTextView(String text, int offset_y, boolean style_outline, Context context) {
-            super(context);
-
-            this.lines = text.split("\n");
-            this.offset_y = offset_y;
-            this.style_outline = style_outline;
-
-            if (style_outline) {
-                // outline style looks clearer when using bold text
-                this.paint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
-            }
-        }
-
-        void setText(String text) {
-            this.lines = text.split("\n");
-        }
-
-        void setOffsetY(int offset_y) {
-            this.offset_y = offset_y;
-        }
-
-        @SuppressLint("CanvasSize")
-        @Override
-        protected void onDraw(Canvas canvas) {
-            final float scale = Preview.this.getResources().getDisplayMetrics().density;
-            paint.setTextSize(14 * scale + 0.5f); // convert dps to pixels
-            if (!style_outline) {
-                paint.setShadowLayer(1, 0, 1, Color.BLACK);
-            }
-            //paint.getTextBounds(text, 0, text.length(), bounds);
-            boolean first_line = true;
-            for (String line : lines) {
-                paint.getTextBounds(line, 0, line.length(), sub_bounds);
-					/*if( MyDebug.LOG ) {
-						Log.d(TAG, "line: " + line + " sub_bounds: " + sub_bounds);
-					}*/
-                if (first_line) {
-                    bounds.set(sub_bounds);
-                    first_line = false;
-                } else {
-                    bounds.top = Math.min(sub_bounds.top, bounds.top);
-                    bounds.bottom = Math.max(sub_bounds.bottom, bounds.bottom);
-                    bounds.left = Math.min(sub_bounds.left, bounds.left);
-                    bounds.right = Math.max(sub_bounds.right, bounds.right);
-                }
-            }
-            // above we've worked out the maximum bounds of each line - this is useful for left/right, but for the top/bottom
-            // we would rather use a consistent height no matter what the text is (otherwise we have the problem of varying
-            // gap between lines, depending on what the characters are).
-            final String reference_text = "Ap";
-            paint.getTextBounds(reference_text, 0, reference_text.length(), sub_bounds);
-            bounds.top = sub_bounds.top;
-            bounds.bottom = sub_bounds.bottom;
-				/*if( MyDebug.LOG ) {
-					Log.d(TAG, "bounds: " + bounds);
-				}*/
-            int height = bounds.bottom - bounds.top; // height of each line
-            bounds.bottom += ((lines.length - 1) * height) / 2;
-            bounds.top -= ((lines.length - 1) * height) / 2;
-            final int padding = (int) (14 * scale + 0.5f); // padding for the shaded rectangle; convert dps to pixels
-            canvas.save();
-            canvas.rotate(ui_rotation, canvas.getWidth() / 2.0f, canvas.getHeight() / 2.0f);
-            float margin = 32.0f;
-
-            rect.left = canvas.getWidth() / 2.0f - bounds.width() / 2.0f + bounds.left - padding + margin;
-            rect.top = canvas.getHeight() / 2.0f + bounds.top - padding + offset_y;
-            rect.right = canvas.getWidth() / 2.0f - bounds.width() / 2.0f + bounds.right + padding + margin;
-            rect.bottom = canvas.getHeight() / 2.0f + bounds.bottom + padding + offset_y;
-
-            paint.setStyle(Paint.Style.FILL);
-            if (!style_outline) {
-                paint.setColor(Preview.this.getResources().getColor(R.color.color_toast_bg));
-                final float radius = (24 * scale + 0.5f); // convert dps to pixels
-                canvas.drawRoundRect(rect, radius, radius, paint);
-            }
-
-            paint.setColor(Color.WHITE);
-            int ypos = canvas.getHeight() / 2 + offset_y - ((lines.length - 1) * height) / 2;
-            for (String line : lines) {
-                canvas.drawText(line, canvas.getWidth() / 2.0f - bounds.width() / 2.0f + margin, ypos, paint);
-
-                if (style_outline) {
-                    // draw outline
-                    int current_color = paint.getColor();
-                    paint.setColor(Color.BLACK);
-                    paint.setStyle(Paint.Style.STROKE);
-                    paint.setStrokeWidth(1);
-                    canvas.drawText(line, canvas.getWidth() / 2.0f - bounds.width() / 2.0f + margin, ypos, paint);
-                    paint.setStyle(Paint.Style.FILL);
-                    paint.setColor(current_color);
-                }
-
-                ypos += height;
-            }
-            canvas.restore();
-        }
-    }
-
     private final Handler fake_toast_handler = new Handler();
-    private RotatedTextView active_fake_toast = null;
+    private TextView active_fake_toast = null;
 
     public void clearActiveFakeToast() {
         clearActiveFakeToast(false);
@@ -7391,6 +7639,10 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
 
                 final float scale = Preview.this.getResources().getDisplayMetrics().density;
                 final int offset_y = (int) (offset_y_dp * scale + 0.5f); // convert dps to pixels
+                float shadow_radius = (2.0f * scale + 0.5f); // convert pt to pixels
+                shadow_radius = Math.max(shadow_radius, 1.0f);
+                if( MyDebug.LOG )
+                    Log.d(TAG, "shadow_radius: " + shadow_radius);
 
                 if (use_fake_toast) {
                     if (active_fake_toast != null) {
@@ -7398,13 +7650,19 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                         if (MyDebug.LOG)
                             Log.d(TAG, "re-use fake toast: " + active_fake_toast);
                         active_fake_toast.setText(message);
-                        active_fake_toast.setOffsetY(offset_y);
+                        active_fake_toast.setPadding(0, offset_y, 0, 0);
                         active_fake_toast.invalidate(); // make sure the view is redrawn
-                    } else {
-                        active_fake_toast = new RotatedTextView(message, offset_y, true, activity);
-                        if (MyDebug.LOG)
-                            Log.d(TAG, "create new fake toast: " + active_fake_toast);
+                    }
+                    else {
                         Activity activity = (Activity) Preview.this.getContext();
+                        @SuppressLint("InflateParams") // we add the view a few lines below
+                        final View view = LayoutInflater.from(activity).inflate(R.layout.toast_textview, null);
+                        active_fake_toast = view.findViewById(R.id.text_view);
+                        active_fake_toast.setShadowLayer(shadow_radius, 0.0f, 0.0f, Color.BLACK);
+                        active_fake_toast.setPadding(0, offset_y, 0, 0);
+                        active_fake_toast.setText(message);
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "create new fake toast: " + active_fake_toast);
                         final FrameLayout rootLayout = activity.findViewById(android.R.id.content);
                         rootLayout.addView(active_fake_toast);
                     }
@@ -7449,9 +7707,9 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                         Log.d(TAG, "reuse last toast: " + last_toast);
                     toast = clear_toast.toast;
                     // for performance, important to reuse the same view, instead of creating a new one (otherwise we get jerky preview update e.g. for changing manual focus slider)
-                    RotatedTextView view = (RotatedTextView) toast.getView();
+                    TextView view = (TextView)toast.getView();
                     view.setText(message);
-                    view.setOffsetY(offset_y);
+                    view.setPadding(0, offset_y, 0, 0);
                     view.invalidate(); // make sure the toast is redrawn
                     toast.setView(view);
                 } else {
@@ -7465,8 +7723,14 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                         Log.d(TAG, "created new toast: " + toast);
                     if (clear_toast != null)
                         clear_toast.toast = toast;
-                    View text = new RotatedTextView(message, offset_y, false, activity);
+                    @SuppressLint("InflateParams") // we add the view to the toast
+                    final View view = LayoutInflater.from(activity).inflate(R.layout.toast_textview, null);
+                    TextView text = view.findViewById(R.id.text_view);
+                    text.setShadowLayer(shadow_radius, 0.0f, 0.0f, Color.BLACK);
+                    text.setText(message);
+                    view.setPadding(0, offset_y, 0, 0);
                     toast.setView(text);
+                    toast.setGravity(Gravity.CENTER, 0, 0);
                     last_toast_time_ms = time_now;
                 }
                 toast.setDuration(Toast.LENGTH_SHORT);
@@ -7483,8 +7747,8 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     }
 
     public void setUIRotation(int ui_rotation) {
-        if (MyDebug.LOG)
-            Log.d(TAG, "setUIRotation");
+        if( MyDebug.LOG )
+            Log.d(TAG, "setUIRotation: " + ui_rotation);
         this.ui_rotation = ui_rotation;
     }
 
@@ -7591,8 +7855,11 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     }
 
     private void recreatePreviewBitmap() {
-        if (MyDebug.LOG)
+        if( MyDebug.LOG ) {
             Log.d(TAG, "recreatePreviewBitmap");
+            Log.d(TAG, "textureview_w: " + textureview_w);
+            Log.d(TAG, "textureview_h: " + textureview_h);
+        }
         freePreviewBitmap();
 
         if (want_preview_bitmap) {
@@ -7966,7 +8233,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
                     // of the device
                     int rotation_degrees = preview.getDisplayRotationDegrees();
 					/*if( MyDebug.LOG ) {
-						Log.d(TAG, "orientation of display relative to natural orientaton: " + rotation_degrees);
+						Log.d(TAG, "orientation of display relative to natural orientation: " + rotation_degrees);
 					}*/
                     if (MyDebug.LOG)
                         Log.d(TAG, "time before creating new_zebra_stripes_bitmap: " + (System.currentTimeMillis() - debug_time));
@@ -8111,10 +8378,10 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         final int refresh_histogram_rate_ms = 200;
         final long refresh_time = (want_zebra_stripes || want_focus_peaking) ? 40 : refresh_histogram_rate_ms;
         long time_now = System.currentTimeMillis();
-        if (want_preview_bitmap && preview_bitmap != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
-                !app_is_paused && !applicationInterface.isPreviewInBackground() &&
-                !refreshPreviewBitmapTaskIsRunning() && time_now > last_preview_bitmap_time_ms + refresh_time) {
-            if (MyDebug.LOG)
+        if( want_preview_bitmap && preview_bitmap != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
+                !is_paused && !applicationInterface.isPreviewInBackground() &&
+                !refreshPreviewBitmapTaskIsRunning() && time_now > last_preview_bitmap_time_ms + refresh_time ) {
+            if( MyDebug.LOG )
                 Log.d(TAG, "refreshPreviewBitmap");
             // even if we're running the background task at a faster rate (due to zebra stripes etc), we still update the histogram
             // at the standard rate
@@ -8158,12 +8425,17 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         return isVideoRecording() && video_recorder_is_paused;
     }
 
-    public long getVideoTime() {
-        if (this.isVideoRecordingPaused()) {
-            return video_accumulated_time;
+    /** Returns the time of the current video.
+     *  In case of restarting due to max filesize (whether on Android 8+ or not), this includes the
+     *  total time of all the previous video files too, unless this_file_only==true;
+     */
+    public long getVideoTime(boolean this_file_only) {
+        long offset = this_file_only ? video_time_last_maxfilesize_restart : 0;
+        if( this.isVideoRecordingPaused() ) {
+            return video_accumulated_time - offset;
         }
         long time_now = System.currentTimeMillis();
-        return time_now - video_start_time + video_accumulated_time;
+        return time_now - video_start_time + video_accumulated_time - offset;
     }
 
     public long getVideoAccumulatedTime() {
@@ -8251,7 +8523,12 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
     }
 
     public Pair<Integer, Integer> getFocusPos() {
-        return new Pair<>(focus_screen_x, focus_screen_y);
+        // note, we don't store the screen coordinates, as they may become out of date in the
+        // screen orientation changes (if MainActivity.lock_to_landscape==false)
+        float [] coords = {focus_camera_x, focus_camera_y};
+        final Matrix matrix = getCameraToPreviewMatrix();
+        matrix.mapPoints(coords);
+        return new Pair<>((int)coords[0], (int)coords[1]);
     }
 
     public int getMaxNumFocusAreas() {
@@ -8303,7 +8580,20 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         return this.successfully_focused && System.currentTimeMillis() < this.successfully_focused_time + 5000;
     }
 
-    public CameraController.Face[] getFacesDetected() {
+    /** If non-null, this returned array will stored the currently detected faces (if face recognition
+     *  is enabled). The face.temp rect will store the face rectangle in screen coordinates.
+     */
+    public CameraController.Face [] getFacesDetected() {
+        if( faces_detected != null && faces_detected.length > 0 ) {
+            // note, we don't store the screen coordinates, as they may become out of date in the
+            // screen orientation changes (if MainActivity.lock_to_landscape==false)
+            final Matrix matrix = getCameraToPreviewMatrix();
+            for(CameraController.Face face : faces_detected) {
+                face_rect.set(face.rect);
+                matrix.mapRect(face_rect);
+                face_rect.round(face.temp);
+            }
+        }
         // FindBugs warns about returning the array directly, but in fact we need to return direct access rather than copying, so that the on-screen display of faces rectangles updates
         return this.faces_detected;
     }
@@ -8317,4 +8607,22 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         int zoom_factor = camera_controller.getZoom();
         return this.zoom_ratios.get(zoom_factor) / 100.0f;
     }
+
+    public float getZoomRatio(int index) {
+        if( zoom_ratios == null )
+            return 1.0f;
+        return this.zoom_ratios.get(index)/100.0f;
+    }
+
+    public float getMinZoomRatio() {
+        if( zoom_ratios == null )
+            return 1.0f;
+        return this.zoom_ratios.get(0)/100.0f;
+    }
+
+    public float getMaxZoomRatio() {
+        if( zoom_ratios == null )
+            return 1.0f;
+        return this.zoom_ratios.get(max_zoom_factor)/100.0f;
+    }
 }
diff --git a/app/src/main/java/net/sourceforge/opencamera/preview/VideoProfile.java b/app/src/main/java/net/sourceforge/opencamera/preview/VideoProfile.java
index 8ebe7c1cb5b84d7fd01ee4e8735bdbd820de6ea9..8de628050e4e6fb40eb016ef1763e7c17a33046c 100644
--- a/app/src/main/java/net/sourceforge/opencamera/preview/VideoProfile.java
+++ b/app/src/main/java/net/sourceforge/opencamera/preview/VideoProfile.java
@@ -4,6 +4,8 @@ import android.media.CamcorderProfile;
 import android.media.MediaRecorder;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import net.sourceforge.opencamera.MyDebug;
 
 /** This is essentially similar to CamcorderProfile in that it encapsulates a set of video settings
@@ -54,6 +56,7 @@ public class VideoProfile {
         this.videoFrameWidth = camcorderProfile.videoFrameWidth;
     }
 
+    @NonNull
     public String toString() {
         return ("\nAudioSource:        " + this.audioSource +
                 "\nVideoSource:        " + this.videoSource +
diff --git a/app/src/main/java/net/sourceforge/opencamera/remotecontrol/BluetoothLeService.java b/app/src/main/java/net/sourceforge/opencamera/remotecontrol/BluetoothLeService.java
index 6cacf161bcbc778a8b2b62075b3c25a3da6ce76c..daaa6b2937e3e8301f89c7a5b9f18ba4ae58c5ff 100644
--- a/app/src/main/java/net/sourceforge/opencamera/remotecontrol/BluetoothLeService.java
+++ b/app/src/main/java/net/sourceforge/opencamera/remotecontrol/BluetoothLeService.java
@@ -2,6 +2,7 @@ package net.sourceforge.opencamera.remotecontrol;
 
 import net.sourceforge.opencamera.MyDebug;
 
+import android.Manifest;
 import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -14,11 +15,14 @@ import android.bluetooth.BluetoothManager;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
+
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -33,6 +37,7 @@ import java.util.UUID;
 public class BluetoothLeService extends Service {
     private final static String TAG = "BluetoothLeService";
 
+    private boolean is_bound; // whether service is bound
     private BluetoothManager bluetoothManager;
     private BluetoothAdapter bluetoothAdapter;
     private String device_address;
@@ -79,10 +84,37 @@ public class BluetoothLeService extends Service {
      * Android BLE stack and API (just knowing the MAC is not enough on
      * many phones).*/
     private void triggerScan() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "triggerScan");
+
+        if( !is_bound ) {
+            // Don't allow calls to startLeScan() (which requires location permission) when service
+            // not bound, as application may be in background!
+            // In theory this shouldn't be needed here, as we also check is_bound in connect(), but
+            // have it here too just to be safe.
+            Log.e(TAG, "triggerScan shouldn't be called when service not bound");
+            return;
+        }
+
+        // Check for Android 12 Bluetooth permission just in case (and for Android lint error)
+        if( DeviceScanner.useAndroid12BluetoothPermissions() ) {
+            if( ContextCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED ) {
+                Log.e(TAG, "bluetooth scan permission not granted!");
+                return;
+            }
+        }
+
         // Stops scanning after a pre-defined scan period.
         bluetoothHandler.postDelayed(new Runnable() {
             @Override
             public void run() {
+                // Check for Android 12 Bluetooth permission just in case (and for Android lint error)
+                if( DeviceScanner.useAndroid12BluetoothPermissions() ) {
+                    if( ContextCompat.checkSelfPermission(BluetoothLeService.this, Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED ) {
+                        Log.e(TAG, "bluetooth scan permission not granted!");
+                        return;
+                    }
+                }
                 bluetoothAdapter.stopLeScan(null);
             }
         }, 10000);
@@ -105,7 +137,20 @@ public class BluetoothLeService extends Service {
                 if( MyDebug.LOG ) {
                     Log.d(TAG, "Connected to GATT server, call discoverServices()");
                 }
-                bluetoothGatt.discoverServices();
+
+                // Check for Android 12 Bluetooth permission just in case (and for Android lint error)
+                boolean has_bluetooth_permission = true;
+                if( DeviceScanner.useAndroid12BluetoothPermissions() ) {
+                    if( ContextCompat.checkSelfPermission(BluetoothLeService.this, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) {
+                        Log.e(TAG, "bluetooth scan permission not granted!");
+                        has_bluetooth_permission = false;
+                    }
+                }
+
+                if( has_bluetooth_permission ) {
+                    bluetoothGatt.discoverServices();
+                }
+
                 currentDepth = -1;
                 currentTemp = -1;
 
@@ -120,6 +165,13 @@ public class BluetoothLeService extends Service {
         }
 
         void attemptReconnect() {
+            if( !is_bound ) {
+                // We check is_bound in connect() itself, but seems pointless to even try if we
+                // know the service is unbound (and if it's later bound again, we'll try connecting
+                // again anyway without needing this).
+                Log.e(TAG, "don't attempt to reconnect when service not bound");
+            }
+
             Timer timer = new Timer();
             timer.schedule(new TimerTask() {
                 public void run() {
@@ -299,18 +351,30 @@ public class BluetoothLeService extends Service {
     @Override
     public IBinder onBind(Intent intent) {
         if( MyDebug.LOG )
-            Log.d(TAG, "Starting OpenCamera Bluetooth Service");
+            Log.d(TAG, "onBind");
         return mBinder;
     }
 
     @Override
     public boolean onUnbind(Intent intent) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "onUnbind");
+        this.is_bound = false;
         close();
         return super.onUnbind(intent);
     }
 
-
+    /** Only call this after service is bound (from ServiceConnection.onServiceConnected())!
+     */
     public boolean initialize() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "initialize");
+
+        // in theory we'd put this in onBind(), to be more symmetric with onUnbind() where we
+        // set to false - but unclear whether onBind() is always called before
+        // ServiceConnection.onServiceConnected().
+        this.is_bound = true;
+
         if( bluetoothManager == null ) {
             bluetoothManager = (BluetoothManager) getSystemService(Context.BLUETOOTH_SERVICE);
             if( bluetoothManager == null ) {
@@ -341,6 +405,43 @@ public class BluetoothLeService extends Service {
                 Log.d(TAG, "address is null");
             return false;
         }
+        else if( !is_bound ) {
+            // Don't allow calls to startLeScan() via triggerScan() (which requires location
+            // permission) when service not bound, as application may be in background!
+            // And it doesn't seem sensible to even allow connecting if service not bound.
+            // Under normal operation this isn't needed, but there are calls to connect() that can
+            // happen from postDelayed() or TimerTask in this class, so a risk that they call
+            // connect() after the service is unbound!
+            Log.e(TAG, "connect shouldn't be called when service not bound");
+            return false;
+        }
+
+        // Check for Android 12 Bluetooth permission just in case (and for Android lint error)
+        if( DeviceScanner.useAndroid12BluetoothPermissions() ) {
+            if( ContextCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) {
+                Log.e(TAG, "bluetooth scan permission not granted!");
+                return false;
+            }
+        }
+
+        // test code for infinite looping, seeing if this runs in background:
+        /*if( address.equals("undefined") ) {
+            Handler handler = new Handler();
+            handler.postDelayed(new Runnable() {
+                public void run() {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "trying connect again from postdelayed");
+                    connect(address);
+                }
+            }, 1000);
+        }
+
+        if( address.equals("undefined") ) {
+            // test - only needed if we've hacked BluetoothRemoteControl.remoteEnabled() to not check for being undefined
+            if( MyDebug.LOG )
+                Log.d(TAG, "address is undefined");
+            return false;
+        }*/
 
         if( address.equals(device_address) && bluetoothGatt != null ) {
             bluetoothGatt.disconnect();
@@ -378,6 +479,15 @@ public class BluetoothLeService extends Service {
         if( bluetoothGatt == null ) {
             return;
         }
+
+        // Check for Android 12 Bluetooth permission just in case (and for Android lint error)
+        if( DeviceScanner.useAndroid12BluetoothPermissions() ) {
+            if( ContextCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) {
+                Log.e(TAG, "bluetooth scan permission not granted!");
+                return;
+            }
+        }
+
         bluetoothGatt.close();
         bluetoothGatt = null;
     }
@@ -394,6 +504,14 @@ public class BluetoothLeService extends Service {
             return;
         }
 
+        // Check for Android 12 Bluetooth permission just in case (and for Android lint error)
+        if( DeviceScanner.useAndroid12BluetoothPermissions() ) {
+            if( ContextCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) {
+                Log.e(TAG, "bluetooth scan permission not granted!");
+                return;
+            }
+        }
+
         String uuid = characteristic.getUuid().toString();
         bluetoothGatt.setCharacteristicNotification(characteristic, enabled);
         if( enabled ) {
diff --git a/app/src/main/java/net/sourceforge/opencamera/remotecontrol/BluetoothRemoteControl.java b/app/src/main/java/net/sourceforge/opencamera/remotecontrol/BluetoothRemoteControl.java
index eb25c2fabcaf11c8059cef75027978c8dd2daf35..e6d4a0261a01ec2f7d195767e918fc250cea351d 100644
--- a/app/src/main/java/net/sourceforge/opencamera/remotecontrol/BluetoothRemoteControl.java
+++ b/app/src/main/java/net/sourceforge/opencamera/remotecontrol/BluetoothRemoteControl.java
@@ -41,10 +41,23 @@ public class BluetoothRemoteControl {
 
         @Override
         public void onServiceConnected(ComponentName componentName, IBinder service) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "onServiceConnected");
             if( Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2 ) {
                 // BluetoothLeService requires Android 4.3+
                 return;
             }
+            if( main_activity.isAppPaused() ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "but app is now paused");
+                // Unclear if this could happen - possibly if app pauses immediately after starting
+                // the service, but before we connect? In theory we should then unbind the service,
+                // but seems safer not to try to call initialize or connect.
+                // This will mean the BluetoothLeService still thinks it's unbound (is_bound will
+                // be left false), but find, that just means we'll enforce not trying to connect at
+                // a later stage).
+                return;
+            }
             bluetoothLeService = ((BluetoothLeService.LocalBinder) service).getService();
             if( !bluetoothLeService.initialize() ) {
                 Log.e(TAG, "Unable to initialize Bluetooth");
@@ -54,8 +67,17 @@ public class BluetoothRemoteControl {
             bluetoothLeService.connect(remoteDeviceAddress);
         }
 
+        /** Called when a connection to the Service has been lost. This typically happens when the
+         * process hosting the service has crashed or been killed.
+         * So in particular, note this isn't the inverse to onServiceConnected() - whilst
+         * onServiceConnected is always called (after the service receives onBind()), upon normal
+         * disconnection (after we call unbindService()), the service receives onUnbind(), but
+         * onServiceDisconnected is not called under normal operation.
+         */
         @Override
         public void onServiceDisconnected(ComponentName componentName) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "onServiceDisconnected");
             Handler handler = new Handler();
             handler.postDelayed(new Runnable() {
                 public void run() {
@@ -232,7 +254,10 @@ public class BluetoothRemoteControl {
             return;
         }
         Intent gattServiceIntent = new Intent(main_activity, BluetoothLeService.class);
-        if( remoteEnabled()) {
+        // Check isAppPaused() just to be safe - in theory shouldn't be needed, but don't want to
+        // start up the service if we're in background! (And we might as well then try to stop the
+        // service instead.)
+        if( !main_activity.isAppPaused() && remoteEnabled() ) {
             if( MyDebug.LOG )
                 Log.d(TAG, "Remote enabled, starting service");
             main_activity.bindService(gattServiceIntent, mServiceConnection, Context.BIND_AUTO_CREATE);
@@ -287,6 +312,7 @@ public class BluetoothRemoteControl {
         boolean remote_enabled = sharedPreferences.getBoolean(PreferenceKeys.EnableRemote, false);
         remoteDeviceType = sharedPreferences.getString(PreferenceKeys.RemoteType, "undefined");
         remoteDeviceAddress = sharedPreferences.getString(PreferenceKeys.RemoteName, "undefined");
+        //return remote_enabled; // test - if using this, also need to enable test code in BluetoothLeService.connect()
         return remote_enabled && !remoteDeviceAddress.equals("undefined");
     }
 }
diff --git a/app/src/main/java/net/sourceforge/opencamera/remotecontrol/DeviceScanner.java b/app/src/main/java/net/sourceforge/opencamera/remotecontrol/DeviceScanner.java
index ecb2a268458da94bb4bcd781ae2a68bb60f100e5..54aba108549c8da0b8717ee01f24991fb5316661 100644
--- a/app/src/main/java/net/sourceforge/opencamera/remotecontrol/DeviceScanner.java
+++ b/app/src/main/java/net/sourceforge/opencamera/remotecontrol/DeviceScanner.java
@@ -3,7 +3,7 @@ package net.sourceforge.opencamera.remotecontrol;
 import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.ListActivity;
+//import android.app.ListActivity;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothManager;
@@ -18,12 +18,14 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.ListView;
@@ -37,7 +39,9 @@ import foundation.e.camera.R;
 import java.util.ArrayList;
 
 @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
-public class DeviceScanner extends ListActivity {
+//public class DeviceScanner extends ListActivity {
+//public class DeviceScanner extends Activity {
+public class DeviceScanner extends AppCompatActivity {
     private static final String TAG = "OC-BLEScanner";
     private LeDeviceListAdapter leDeviceListAdapter;
     private BluetoothAdapter bluetoothAdapter;
@@ -47,6 +51,7 @@ public class DeviceScanner extends ListActivity {
 
     private static final int REQUEST_ENABLE_BT = 1;
     private static final int REQUEST_LOCATION_PERMISSIONS = 2;
+    private static final int REQUEST_BLUETOOTHSCANCONNECT_PERMISSIONS = 3;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -83,42 +88,109 @@ public class DeviceScanner extends ListActivity {
 
         TextView currentRemote = findViewById(R.id.currentRemote);
         currentRemote.setText(getResources().getString(R.string.bluetooth_current_remote) + " " + remote_name);
+    }
+
+    @Override
+    public void onContentChanged() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "onContentChanged");
 
+        super.onContentChanged();
+
+        ListView list = findViewById(R.id.list);
+        list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+                onListItemClick((ListView)parent, v, position, id);
+            }
+        });
     }
 
-    private void startScanning() {
+    /** Returns whether we can use the new Android 12 permissions for bluetooth (BLUETOOTH_SCAN,
+     *  BLUETOOTH_CONNECT) - if so, we should use these and NOT location permissions.
+     *  See https://developer.android.com/guide/topics/connectivity/bluetooth/permissions .
+     */
+    static boolean useAndroid12BluetoothPermissions() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S;
+    }
 
+    private void checkBluetoothEnabled() {
         if( MyDebug.LOG )
-            Log.d(TAG, "Start scanning");
-
+            Log.d(TAG, "checkBluetoothEnabled");
+        // BLUETOOTH_CONNECT permission is needed for BluetoothAdapter.ACTION_REQUEST_ENABLE.
+        // Callers should have already checked for bluetooth permission, but we have this check
+        // just in case - and also to avoid the Android lint error that we'd get.
+        if( useAndroid12BluetoothPermissions() ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "check for bluetooth connect permission");
+            if( ContextCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) {
+                Log.e(TAG, "bluetooth connect permission not granted!");
+                return;
+            }
+        }
         if( !bluetoothAdapter.isEnabled() ) {
             // fire an intent to display a dialog asking the user to grant permission to enable Bluetooth
+            // n.b., on Android 12 need BLUETOOTH_CONNECT permission for this
+            if( MyDebug.LOG )
+                Log.d(TAG, "request to enable bluetooth");
             Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
             startActivityForResult(enableBtIntent, REQUEST_ENABLE_BT);
         }
+    }
 
-        leDeviceListAdapter = new LeDeviceListAdapter();
-        setListAdapter(leDeviceListAdapter);
+    private void startScanning() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "Start scanning");
 
         // In real life most of bluetooth LE devices associated with location, so without this
         // permission the sample shows nothing in most cases
         // Also see https://stackoverflow.com/questions/33045581/location-needs-to-be-enabled-for-bluetooth-low-energy-scanning-on-android-6-0
-        int permissionCoarse = Build.VERSION.SDK_INT >= 23 ?
-                ContextCompat
-                        .checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) :
-                PackageManager.PERMISSION_GRANTED;
+        // Update: on Android 10+, ACCESS_FINE_LOCATION is needed: https://developer.android.com/about/versions/10/privacy/changes#location-telephony-bluetooth-wifi
+        // Update: on Android 12+, we use the new bluetooth permissions instead of location permissions.
+        boolean has_permission = false;
+        if( useAndroid12BluetoothPermissions() ) {
+            if( ContextCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED
+                    &&
+                    ContextCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED
+            ) {
+                has_permission = true;
+            }
+        }
+        else {
+            String permission_needed = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ? Manifest.permission.ACCESS_FINE_LOCATION : Manifest.permission.ACCESS_COARSE_LOCATION;
 
-        if( permissionCoarse == PackageManager.PERMISSION_GRANTED ) {
+            int permissionCoarse = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ?
+                    ContextCompat
+                            .checkSelfPermission(this, permission_needed) :
+                    PackageManager.PERMISSION_GRANTED;
+
+            if( permissionCoarse == PackageManager.PERMISSION_GRANTED ) {
+                has_permission = true;
+            }
+        }
+
+        if( has_permission ) {
+            checkBluetoothEnabled();
+        }
+
+        leDeviceListAdapter = new LeDeviceListAdapter();
+        //setListAdapter(leDeviceListAdapter);
+        ListView list = findViewById(R.id.list);
+        list.setAdapter(leDeviceListAdapter);
+
+        if( has_permission ) {
             scanLeDevice(true);
         }
         else {
-            askForLocationPermission();
+            askForDeviceScannerPermission();
         }
     }
 
-    private void askForLocationPermission() {
+    /** Request permissions needed for bluetooth (BLUETOOTH_SCAN and BLUETOOTH_CONNECT on Android
+     *  12+, else location permission).
+     */
+    private void askForDeviceScannerPermission() {
         if( MyDebug.LOG )
-            Log.d(TAG, "askForLocationPermission");
+            Log.d(TAG, "askForDeviceScannerPermission");
         // n.b., we only need ACCESS_COARSE_LOCATION, but it's simpler to request both to be consistent with Open Camera's
         // location permission requests in PermissionHandler. If we only request ACCESS_COARSE_LOCATION here, and later the
         // user enables something that needs ACCESS_FINE_LOCATION, Android ends up showing the "rationale" dialog - and once
@@ -127,23 +199,71 @@ public class DeviceScanner extends ListActivity {
         // Also note that if we did want to only request ACCESS_COARSE_LOCATION here, we'd need to declare that permission
         // explicitly in the AndroidManifest.xml, otherwise the dialog to request permission is never shown (and the permission
         // is denied automatically).
-        if( ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.ACCESS_FINE_LOCATION) ||
-                ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.ACCESS_COARSE_LOCATION) ) {
-            // Show an explanation to the user *asynchronously* -- don't block
-            // this thread waiting for the user's response! After the user
-            // sees the explanation, try again to request the permission.
-            showRequestLocationPermissionRationale();
+        // Update: on Android 10+, ACCESS_FINE_LOCATION is needed anyway: https://developer.android.com/about/versions/10/privacy/changes#location-telephony-bluetooth-wifi
+        // Update: on Android 12+, we use the new bluetooth permissions instead of location permissions.
+        if( useAndroid12BluetoothPermissions() ) {
+            if( ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.BLUETOOTH_SCAN) ||
+                    ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.BLUETOOTH_CONNECT) ) {
+                // Show an explanation to the user *asynchronously* -- don't block
+                // this thread waiting for the user's response! After the user
+                // sees the explanation, try again to request the permission.
+                showRequestBluetoothScanConnectPermissionRationale();
+            }
+            else {
+                // Can go ahead and request the permission
+                if( MyDebug.LOG )
+                    Log.d(TAG, "requesting bluetooth scan/connect permissions...");
+                ActivityCompat.requestPermissions(this,
+                        new String[]{Manifest.permission.BLUETOOTH_SCAN, Manifest.permission.BLUETOOTH_CONNECT},
+                        REQUEST_BLUETOOTHSCANCONNECT_PERMISSIONS);
+            }
         }
         else {
-            // Can go ahead and request the permission
-            if( MyDebug.LOG )
-                Log.d(TAG, "requesting location permissions...");
-            ActivityCompat.requestPermissions(this,
-                    new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION},
-                    REQUEST_LOCATION_PERMISSIONS);
+            if( ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.ACCESS_FINE_LOCATION) ||
+                    ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.ACCESS_COARSE_LOCATION) ) {
+                // Show an explanation to the user *asynchronously* -- don't block
+                // this thread waiting for the user's response! After the user
+                // sees the explanation, try again to request the permission.
+                showRequestLocationPermissionRationale();
+            }
+            else {
+                // Can go ahead and request the permission
+                if( MyDebug.LOG )
+                    Log.d(TAG, "requesting location permissions...");
+                ActivityCompat.requestPermissions(this,
+                        new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION},
+                        REQUEST_LOCATION_PERMISSIONS);
+            }
         }
     }
 
+    private void showRequestBluetoothScanConnectPermissionRationale() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "showRequestBluetoothScanConnectPermissionRationale");
+        if( !useAndroid12BluetoothPermissions() ) {
+            // just in case!
+            Log.e(TAG, "shouldn't be requesting bluetooth scan/connect permissions!");
+            return;
+        }
+
+        String [] permissions = new String[]{Manifest.permission.BLUETOOTH_SCAN, Manifest.permission.BLUETOOTH_CONNECT};
+        int message_id = R.string.permission_rationale_bluetooth_scan_connect;
+
+        final String [] permissions_f = permissions;
+        new AlertDialog.Builder(this)
+                .setTitle(R.string.permission_rationale_title)
+                .setMessage(message_id)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setPositiveButton(android.R.string.ok, null)
+                .setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    public void onDismiss(DialogInterface dialog) {
+                        if( MyDebug.LOG )
+                            Log.d(TAG, "requesting permission...");
+                        ActivityCompat.requestPermissions(DeviceScanner.this, permissions_f, REQUEST_BLUETOOTHSCANCONNECT_PERMISSIONS);
+                    }
+                }).show();
+    }
+
     private void showRequestLocationPermissionRationale() {
         if( MyDebug.LOG )
             Log.d(TAG, "showRequestLocationPermissionRationale");
@@ -176,18 +296,37 @@ public class DeviceScanner extends ListActivity {
                                            @NonNull int[] grantResults) {
         if( MyDebug.LOG )
             Log.d(TAG, "onRequestPermissionsResult: requestCode " + requestCode);
-        //noinspection SwitchStatementWithTooFewBranches
+
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
         switch (requestCode) {
             case REQUEST_LOCATION_PERMISSIONS: {
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                     if( MyDebug.LOG )
                         Log.d(TAG, "location permission granted");
+                    checkBluetoothEnabled();
                     scanLeDevice(true);
                 }
                 else {
                     if( MyDebug.LOG )
                         Log.d(TAG, "location permission denied");
                 }
+
+                break;
+            }
+            case REQUEST_BLUETOOTHSCANCONNECT_PERMISSIONS: {
+                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "bluetooth scan/connect permission granted");
+                    checkBluetoothEnabled();
+                    scanLeDevice(true);
+                }
+                else {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "bluetooth scan/connect permission denied");
+                }
+
+                break;
             }
         }
     }
@@ -207,7 +346,7 @@ public class DeviceScanner extends ListActivity {
     @Override
     protected void onPause() {
         if( MyDebug.LOG )
-            Log.d(TAG, "pause...");
+            Log.d(TAG, "onPause");
         super.onPause();
         if( is_scanning ) {
             scanLeDevice(false);
@@ -216,6 +355,33 @@ public class DeviceScanner extends ListActivity {
     }
 
     @Override
+    protected void onStop() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "onStop");
+        super.onStop();
+
+        // we do this in onPause, but done here again just to be certain!
+        if( is_scanning ) {
+            scanLeDevice(false);
+            leDeviceListAdapter.clear();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        if( MyDebug.LOG )
+            Log.d(TAG, "onDestroy");
+
+        // we do this in onPause, but done here again just to be certain!
+        if( is_scanning ) {
+            scanLeDevice(false);
+            leDeviceListAdapter.clear();
+        }
+
+        super.onDestroy();
+    }
+
+    //@Override
     protected void onListItemClick(ListView l, View v, int position, long id) {
         final BluetoothDevice device = leDeviceListAdapter.getDevice(position);
         if( device == null )
@@ -235,14 +401,31 @@ public class DeviceScanner extends ListActivity {
     private void scanLeDevice(final boolean enable) {
         if( MyDebug.LOG )
             Log.d(TAG, "scanLeDevice: " + enable);
+
+        // BLUETOOTH_SCAN permission is needed for bluetoothAdapter.startLeScan and
+        // bluetoothAdapter.stopLeScan. Callers should have already checked for bluetooth
+        // permission, but we have this check just in case - and also to avoid the Android lint
+        // error that we'd get.
+        if( useAndroid12BluetoothPermissions() ) {
+            if( MyDebug.LOG )
+                Log.d(TAG, "check for bluetooth scan permission");
+            if( ContextCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED ) {
+                Log.e(TAG, "bluetooth scan permission not granted!");
+                return;
+            }
+        }
+
         if( enable ) {
             // stop scanning after certain time
             bluetoothHandler.postDelayed(new Runnable() {
                 @Override
                 public void run() {
-                    is_scanning = false;
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "stop scanning after delay");
+                    /*is_scanning = false;
                     bluetoothAdapter.stopLeScan(mLeScanCallback);
-                    invalidateOptionsMenu();
+                    invalidateOptionsMenu();*/
+                    scanLeDevice(false);
                 }
             }, 10000);
 
@@ -309,12 +492,32 @@ public class DeviceScanner extends ListActivity {
                 viewHolder = (ViewHolder) view.getTag();
             }
 
+            // BLUETOOTH_CONNECT permission is needed for device.getName. In theory we shouldn't
+            // have added to this list if bluetooth permission not available, but we have this
+            // check just in case - and also to avoid the Android lint error that we'd get.
+            boolean has_bluetooth_scan_permission = true;
+            if( useAndroid12BluetoothPermissions() ) {
+                if( MyDebug.LOG )
+                    Log.d(TAG, "check for bluetooth connect permission");
+                if( ContextCompat.checkSelfPermission(DeviceScanner.this, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) {
+                    has_bluetooth_scan_permission = false;
+                }
+            }
+
             BluetoothDevice device = mLeDevices.get(i);
-            final String deviceName = device.getName();
-            if( deviceName != null && deviceName.length() > 0 )
-                viewHolder.deviceName.setText(deviceName);
-            else
-                viewHolder.deviceName.setText(R.string.unknown_device);
+
+            if( !has_bluetooth_scan_permission ) {
+                Log.e(TAG, "bluetooth connect permission not granted!");
+                viewHolder.deviceName.setText(R.string.unknown_device_no_permission);
+            }
+            else {
+                final String deviceName = device.getName();
+                if( deviceName != null && deviceName.length() > 0 )
+                    viewHolder.deviceName.setText(deviceName);
+                else
+                    viewHolder.deviceName.setText(R.string.unknown_device);
+            }
+
             viewHolder.deviceAddress.setText(device.getAddress());
 
             return view;
diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java b/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
index 717d5111af09abf1226c347dae4859bde0af9178..41df473781080b5eaa3a3f1e9604c0cc5c0f4c51 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/DrawPreview.java
@@ -1,6 +1,5 @@
 package net.sourceforge.opencamera.ui;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.DateFormat;
@@ -42,10 +41,8 @@ import android.graphics.RectF;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.location.Location;
-import android.media.ExifInterface;
 import android.net.Uri;
 import android.os.BatteryManager;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.util.Pair;
@@ -62,6 +59,8 @@ public class DrawPreview {
     private final MainActivity main_activity;
     private final MyApplicationInterface applicationInterface;
 
+    private boolean cover_preview; // whether to cover the preview for Camera2 API
+
     // store to avoid calling PreferenceManager.getDefaultSharedPreferences() repeatedly
     private final SharedPreferences sharedPreferences;
 
@@ -169,9 +168,13 @@ public class DrawPreview {
     private Bitmap hdr_bitmap;
     private Bitmap panorama_bitmap;
     private Bitmap expo_bitmap;
-    private Bitmap focus_bracket_bitmap;
+    //private Bitmap focus_bracket_bitmap;
+        // no longer bother with a focus bracketing icon - hard to come up with a clear icon, and should be obvious from the two on-screen seekbars
     private Bitmap burst_bitmap;
     private Bitmap nr_bitmap;
+    private Bitmap x_night_bitmap;
+    private Bitmap x_bokeh_bitmap;
+    private Bitmap x_beauty_bitmap;
     private Bitmap photostamp_bitmap;
     private Drawable flash_drawable;
     private Drawable face_detection_drawable;
@@ -189,6 +192,7 @@ public class DrawPreview {
     private Bitmap last_thumbnail; // thumbnail of last picture taken
     private volatile boolean thumbnail_anim; // whether we are displaying the thumbnail animation; must be volatile for test project reading the state
     private long thumbnail_anim_start_ms = -1; // time that the thumbnail animation started
+    public volatile int test_thumbnail_anim_count;
     private final RectF thumbnail_anim_src_rect = new RectF();
     private final RectF thumbnail_anim_dst_rect = new RectF();
     private final Matrix thumbnail_anim_matrix = new Matrix();
@@ -221,7 +225,7 @@ public class DrawPreview {
     private float view_angle_y_preview;
     private long last_view_angles_time;
 
-    private int take_photo_top; // coordinate (in canvas x coordinates) of top of the take photo icon
+    private int take_photo_top; // coordinate (in canvas x coordinates, or y coords if system_orientation_portrait==true) of top of the take photo icon
     private long last_take_photo_top_time;
 
     private int top_icon_shift; // shift that may be needed for on-screen text to avoid clashing with icons (when arranged "along top")
@@ -249,6 +253,7 @@ public class DrawPreview {
         p.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
         p.setStrokeCap(Paint.Cap.ROUND);
         scale = getContext().getResources().getDisplayMetrics().density;
+        //noinspection PointlessArithmeticExpression
         this.stroke_width = (1.0f * scale + 0.5f); // convert dps to pixels
         p.setStrokeWidth(this.stroke_width);
 
@@ -261,9 +266,12 @@ public class DrawPreview {
         hdr_bitmap = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.ic_hdr_on_white_48dp);
         panorama_bitmap = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.baseline_panorama_horizontal_white_48);
         expo_bitmap = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.expo_icon);
-        focus_bracket_bitmap = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.focus_bracket_icon);
+        //focus_bracket_bitmap = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.focus_bracket_icon);
         burst_bitmap = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.ic_burst_mode_white_48dp);
         nr_bitmap = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.nr_icon);
+        x_night_bitmap = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.baseline_bedtime_white_48);
+        x_bokeh_bitmap = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.baseline_portrait_white_48);
+        x_beauty_bitmap = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.baseline_face_retouching_natural_white_48);
         photostamp_bitmap = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.ic_text_format_white_48dp);
         flash_drawable = getContext().getResources().getDrawable(R.drawable.ic_camera_flash_on);
         face_detection_drawable = getContext().getResources().getDrawable(R.drawable.ic_face);
@@ -316,10 +324,10 @@ public class DrawPreview {
             expo_bitmap.recycle();
             expo_bitmap = null;
         }
-        if( focus_bracket_bitmap != null ) {
+        /*if( focus_bracket_bitmap != null ) {
             focus_bracket_bitmap.recycle();
             focus_bracket_bitmap = null;
-        }
+        }*/
         if( burst_bitmap != null ) {
             burst_bitmap.recycle();
             burst_bitmap = null;
@@ -328,6 +336,18 @@ public class DrawPreview {
             nr_bitmap.recycle();
             nr_bitmap = null;
         }
+        if( x_night_bitmap != null ) {
+            x_night_bitmap.recycle();
+            x_night_bitmap = null;
+        }
+        if( x_bokeh_bitmap != null ) {
+            x_bokeh_bitmap.recycle();
+            x_bokeh_bitmap = null;
+        }
+        if( x_beauty_bitmap != null ) {
+            x_beauty_bitmap.recycle();
+            x_beauty_bitmap = null;
+        }
         if( photostamp_bitmap != null ) {
             photostamp_bitmap.recycle();
             photostamp_bitmap = null;
@@ -377,18 +397,34 @@ public class DrawPreview {
      *  *after* applying the rotation, when we want the top left of the icon as shown on screen.
      *  This should not be called every frame but instead should be cached, due to cost of calling
      *  view.getLocationOnScreen().
+     *  Update: For supporting landscape and portrait (if MainActivity.lock_to_landscape==false),
+     *  instead this returns the top side if in portrait. Note though we still need to take rotation
+     *  into account, as we still apply rotation to the icons when changing orienations (e.g., this
+     *  is needed when rotating from reverse landscape to portrait, for on-screen text like level
+     *  angle to be offset correctly above the shutter button (see take_photo_top) when the preview
+     *  has a wide aspect ratio.
      */
     private int getViewOnScreenX(View view) {
         view.getLocationOnScreen(gui_location);
-        int xpos = gui_location[0];
+
+        MainActivity.SystemOrientation system_orientation = main_activity.getSystemOrientation();
+        boolean system_orientation_portrait = system_orientation == MainActivity.SystemOrientation.PORTRAIT;
+        int xpos = gui_location[system_orientation_portrait ? 1 : 0];
         int rotation = Math.round(view.getRotation());
         // rotation can be outside [0, 359] if the user repeatedly rotates in same direction!
         rotation = (rotation % 360 + 360) % 360; // version of (rotation % 360) that work if rotation is -ve
         /*if( MyDebug.LOG )
             Log.d(TAG, "    mod rotation: " + rotation);*/
-        if( rotation == 180 || rotation == 90 ) {
-            // annoying behaviour that getLocationOnScreen takes the rotation into account
-            xpos -= view.getWidth();
+        // undo annoying behaviour that getLocationOnScreen takes the rotation into account
+        if( system_orientation_portrait ) {
+            if( rotation == 180 || rotation == 270 ) {
+                xpos -= view.getHeight();
+            }
+        }
+        else {
+            if( rotation == 90 || rotation == 180 ) {
+                xpos -= view.getWidth();
+            }
         }
         return xpos;
     }
@@ -404,6 +440,9 @@ public class DrawPreview {
                 Log.d(TAG, "thumbnail_anim started");
             thumbnail_anim = true;
             thumbnail_anim_start_ms = System.currentTimeMillis();
+            test_thumbnail_anim_count++;
+            if( MyDebug.LOG )
+                Log.d(TAG, "test_thumbnail_anim_count is now: " + test_thumbnail_anim_count);
         }
         Bitmap old_thumbnail = this.last_thumbnail;
         this.last_thumbnail = thumbnail;
@@ -586,8 +625,7 @@ public class DrawPreview {
                 }
                 Uri uri = Uri.parse(ghost_selected_image_pref);
                 try {
-                    File file = main_activity.getStorageUtils().getFileFromDocumentUriSAF(uri, false);
-                    ghost_selected_image_bitmap = loadBitmap(uri, file);
+                    ghost_selected_image_bitmap = loadBitmap(uri);
                 }
                 catch(IOException e) {
                     Log.e(TAG, "failed to load ghost_selected_image uri: " + uri);
@@ -656,7 +694,7 @@ public class DrawPreview {
         last_take_photo_top_time = 0;  // force take_photo_top to be recomputed
         last_top_icon_shift_time = 0; // for top_icon_shift to be recomputed
 
-        focus_seekbars_margin_left = -1; // just in case??
+        focus_seekbars_margin_left = -1; // needed as the focus seekbars can only be updated when visible
 
         has_settings = true;
     }
@@ -675,11 +713,10 @@ public class DrawPreview {
         }
     }
 
-    /** Loads the bitmap from the uri. File is optional, and is used on pre-Android 7 devices to
-     *  read the exif orientation.
+    /** Loads the bitmap from the uri.
      *  The image will be downscaled if required to be comparable to the preview width.
      */
-    private Bitmap loadBitmap(Uri uri, File file) throws IOException {
+    private Bitmap loadBitmap(Uri uri) throws IOException {
         if( MyDebug.LOG )
             Log.d(TAG, "loadBitmap: " + uri);
         Bitmap bitmap;
@@ -748,59 +785,7 @@ public class DrawPreview {
 
         // now need to take exif orientation into account, as some devices or camera apps store the orientation in the exif tag,
         // which getBitmap() doesn't account for
-        ExifInterface exif = null;
-        if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
-            // better to use the Uri from Android 7, so this works when images are shared to Vibrance
-            try( InputStream inputStream = main_activity.getContentResolver().openInputStream(uri) ) {
-                exif = new ExifInterface(inputStream);
-            }
-        }
-        else {
-            if( file != null ) {
-                exif = new ExifInterface(file.getAbsolutePath());
-            }
-        }
-        if( exif != null ) {
-            int exif_orientation_s = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED);
-            boolean needs_tf = false;
-            int exif_orientation = 0;
-            // see http://jpegclub.org/exif_orientation.html
-            // and http://stackoverflow.com/questions/20478765/how-to-get-the-correct-orientation-of-the-image-selected-from-the-default-image
-            if( exif_orientation_s == ExifInterface.ORIENTATION_UNDEFINED || exif_orientation_s == ExifInterface.ORIENTATION_NORMAL ) {
-                // leave unchanged
-            }
-            else if( exif_orientation_s == ExifInterface.ORIENTATION_ROTATE_180 ) {
-                needs_tf = true;
-                exif_orientation = 180;
-            }
-            else if( exif_orientation_s == ExifInterface.ORIENTATION_ROTATE_90 ) {
-                needs_tf = true;
-                exif_orientation = 90;
-            }
-            else if( exif_orientation_s == ExifInterface.ORIENTATION_ROTATE_270 ) {
-                needs_tf = true;
-                exif_orientation = 270;
-            }
-            else {
-                // just leave unchanged for now
-                if( MyDebug.LOG )
-                    Log.e(TAG, "    unsupported exif orientation: " + exif_orientation_s);
-            }
-            if( MyDebug.LOG )
-                Log.d(TAG, "    exif orientation: " + exif_orientation);
-
-            if( needs_tf ) {
-                if( MyDebug.LOG )
-                    Log.d(TAG, "    need to rotate bitmap due to exif orientation tag");
-                Matrix m = new Matrix();
-                m.setRotate(exif_orientation, bitmap.getWidth() * 0.5f, bitmap.getHeight() * 0.5f);
-                Bitmap rotated_bitmap = Bitmap.createBitmap(bitmap, 0, 0,bitmap.getWidth(), bitmap.getHeight(), m, true);
-                if( rotated_bitmap != bitmap ) {
-                    bitmap.recycle();
-                    bitmap = rotated_bitmap;
-                }
-            }
-        }
+        bitmap = main_activity.rotateForExif(bitmap, uri);
 
         return bitmap;
     }
@@ -984,10 +969,9 @@ public class DrawPreview {
                 canvas.drawLine(0.0f, 0.0f, canvas.getHeight() - 1.0f, canvas.getHeight() - 1.0f, p);
                 canvas.drawLine(canvas.getHeight() - 1.0f, 0.0f, 0.0f, canvas.getHeight() - 1.0f, p);
                 int diff = canvas.getWidth() - canvas.getHeight();
-                if (diff > 0) {
-                    canvas.drawLine(diff, 0.0f, diff + canvas.getHeight() - 1.0f, canvas.getHeight() - 1.0f, p);
-                    canvas.drawLine(diff + canvas.getHeight() - 1.0f, 0.0f, diff, canvas.getHeight() - 1.0f, p);
-                }
+                // n.b., diff is -ve in portrait orientation
+                canvas.drawLine(diff, 0.0f, diff + canvas.getHeight() - 1.0f, canvas.getHeight() - 1.0f, p);
+                canvas.drawLine(diff + canvas.getHeight() - 1.0f, 0.0f, diff, canvas.getHeight() - 1.0f, p);
                 break;
         }
     }
@@ -1037,37 +1021,47 @@ public class DrawPreview {
                         crop_ratio = 2.4;
                         break;
                 }
-                // we should compare to getCurrentPreviewAspectRatio() not getCurrentPreviewAspectRatio(), as the actual preview
-                // aspect ratio may differ to the requested photo/video resolution's aspect ratio, in which case it's still useful
-                // to display the crop guide
-                if( crop_ratio > 0.0 && Math.abs(preview.getCurrentPreviewAspectRatio() - crop_ratio) > 1.0e-5 ) {
-		    		/*if( MyDebug.LOG ) {
-		    			Log.d(TAG, "crop_ratio: " + crop_ratio);
-		    			Log.d(TAG, "preview_targetRatio: " + preview_targetRatio);
-		    			Log.d(TAG, "canvas width: " + canvas.getWidth());
-		    			Log.d(TAG, "canvas height: " + canvas.getHeight());
-		    		}*/
-                    int left = 1, top = 1, right = canvas.getWidth()-1, bottom = canvas.getHeight()-1;
-                    if( crop_ratio > preview.getTargetRatio() ) {
-                        // crop ratio is wider, so we have to crop top/bottom
-                        double new_hheight = ((double)canvas.getWidth()) / (2.0f*crop_ratio);
-                        top = (canvas.getHeight()/2 - (int)new_hheight);
-                        bottom = (canvas.getHeight()/2 + (int)new_hheight);
+                if( crop_ratio > 0.0 ) {
+                    // we should compare to getCurrentPreviewAspectRatio() not getTargetRatio(), as the actual preview
+                    // aspect ratio may differ to the requested photo/video resolution's aspect ratio, in which case it's still useful
+                    // to display the crop guide
+                    double preview_aspect_ratio = preview.getCurrentPreviewAspectRatio();
+                    MainActivity.SystemOrientation system_orientation = main_activity.getSystemOrientation();
+                    boolean system_orientation_portrait = system_orientation == MainActivity.SystemOrientation.PORTRAIT;
+                    if( system_orientation_portrait ) {
+                        // crop ratios are always drawn as if in landscape
+                        crop_ratio = 1.0/crop_ratio;
+                        preview_aspect_ratio = 1.0/preview_aspect_ratio;
                     }
-                    else {
-                        // crop ratio is taller, so we have to crop left/right
-                        double new_hwidth = (((double)canvas.getHeight()) * crop_ratio) / 2.0f;
-                        left = (canvas.getWidth()/2 - (int)new_hwidth);
-                        right = (canvas.getWidth()/2 + (int)new_hwidth);
+                    if( Math.abs(preview_aspect_ratio - crop_ratio) > 1.0e-5 ) {
+                        /*if( MyDebug.LOG ) {
+                            Log.d(TAG, "crop_ratio: " + crop_ratio);
+                            Log.d(TAG, "preview_aspect_ratio: " + preview_aspect_ratio);
+                            Log.d(TAG, "canvas width: " + canvas.getWidth());
+                            Log.d(TAG, "canvas height: " + canvas.getHeight());
+                        }*/
+                        int left = 1, top = 1, right = canvas.getWidth()-1, bottom = canvas.getHeight()-1;
+                        if( crop_ratio > preview_aspect_ratio ) {
+                            // crop ratio is wider, so we have to crop top/bottom
+                            double new_hheight = ((double)canvas.getWidth()) / (2.0f*crop_ratio);
+                            top = (canvas.getHeight()/2 - (int)new_hheight);
+                            bottom = (canvas.getHeight()/2 + (int)new_hheight);
+                        }
+                        else {
+                            // crop ratio is taller, so we have to crop left/right
+                            double new_hwidth = (((double)canvas.getHeight()) * crop_ratio) / 2.0f;
+                            left = (canvas.getWidth()/2 - (int)new_hwidth);
+                            right = (canvas.getWidth()/2 + (int)new_hwidth);
+                        }
+                        canvas.drawRect(left, top, right, bottom, p);
                     }
-                    canvas.drawRect(left, top, right, bottom, p);
                 }
                 p.setStyle(Paint.Style.FILL); // reset
             }
         }
     }
 
-    private void onDrawInfoLines(Canvas canvas, final int top_x, final int top_y, final int bottom_y, long time_ms) {
+    private void onDrawInfoLines(Canvas canvas, final int top_x, final int top_y, final int bottom_y, final int device_ui_rotation, long time_ms) {
         Preview preview = main_activity.getPreview();
         CameraController camera_controller = preview.getCameraController();
         int ui_rotation = preview.getUIRotation();
@@ -1081,15 +1075,16 @@ public class DrawPreview {
         final int gap_y = (int) (0 * scale + 0.5f); // convert dps to pixels
         final int icon_gap_y = (int) (2 * scale + 0.5f); // convert dps to pixels
         if( ui_rotation == 90 || ui_rotation == 270 ) {
+            // n.b., this is only for when lock_to_landscape==true, so we don't look at device_ui_rotation
             int diff = canvas.getWidth() - canvas.getHeight();
             location_x += diff/2;
             location_y -= diff/2;
         }
-        if( ui_rotation == 90 ) {
+        if( device_ui_rotation == 90 ) {
             location_y = canvas.getHeight() - location_y - (int) (20 * scale + 0.5f);
         }
         boolean align_right = false;
-        if( ui_rotation == 180 ) {
+        if( device_ui_rotation == 180 ) {
             location_x = canvas.getWidth() - location_x;
             p.setTextAlign(Paint.Align.RIGHT);
             align_right = true;
@@ -1155,7 +1150,7 @@ public class DrawPreview {
             first_line_height = Math.max(first_line_height, height);
         }
         // update location_y for first line (time and camera id)
-        if( ui_rotation == 90 ) {
+        if( device_ui_rotation == 90 ) {
             // upside-down portrait
             location_y -= first_line_height;
         }
@@ -1190,7 +1185,7 @@ public class DrawPreview {
                 }
                 int height = applicationInterface.drawTextWithBackground(canvas, p, free_memory_gb_string, Color.WHITE, Color.BLACK, location_x, location_y, MyApplicationInterface.Alignment.ALIGNMENT_TOP, null, MyApplicationInterface.Shadow.SHADOW_OUTLINE, text_bounds_free_memory);
                 height += gap_y;
-                if( ui_rotation == 90 ) {
+                if( device_ui_rotation == 90 ) {
                     location_y -= height;
                 }
                 else {
@@ -1274,7 +1269,7 @@ public class DrawPreview {
                 height += gap_y;
                 // only move location_y if we actually print something (because on old camera API, even if the ISO option has
                 // been enabled, we'll never be able to display the on-screen ISO)
-                if( ui_rotation == 90 ) {
+                if( device_ui_rotation == 90 ) {
                     location_y -= height;
                 }
                 else {
@@ -1291,7 +1286,7 @@ public class DrawPreview {
 
             int location_x2 = location_x - flash_padding;
             final int icon_size = (int) (16 * scale + 0.5f); // convert dps to pixels
-            if( ui_rotation == 180 ) {
+            if( device_ui_rotation == 180 ) {
                 location_x2 = location_x - icon_size + flash_padding;
             }
 
@@ -1318,7 +1313,7 @@ public class DrawPreview {
                     canvas.drawBitmap(location_off_bitmap, null, icon_dest, p);
                 }
 
-                if( ui_rotation == 180 ) {
+                if( device_ui_rotation == 180 ) {
                     location_x2 -= icon_size + flash_padding;
                 }
                 else {
@@ -1340,7 +1335,7 @@ public class DrawPreview {
                 p.setAlpha(255);
                 canvas.drawBitmap(is_raw_only_pref ? raw_only_bitmap : raw_jpeg_bitmap, null, icon_dest, p);
 
-                if( ui_rotation == 180 ) {
+                if( device_ui_rotation == 180 ) {
                     location_x2 -= icon_size + flash_padding;
                 }
                 else {
@@ -1357,7 +1352,7 @@ public class DrawPreview {
                 p.setAlpha(255);
                 face_detection_drawable.draw(canvas);
 
-                if( ui_rotation == 180 ) {
+                if( device_ui_rotation == 180 ) {
                     location_x2 -= icon_size + flash_padding;
                 }
                 else {
@@ -1374,7 +1369,7 @@ public class DrawPreview {
                 p.setAlpha(255);
                 auto_stabilise_drawable.draw(canvas);
 
-                if( ui_rotation == 180 ) {
+                if( device_ui_rotation == 180 ) {
                     location_x2 -= icon_size + flash_padding;
                 }
                 else {
@@ -1387,9 +1382,12 @@ public class DrawPreview {
                             photoMode == MyApplicationInterface.PhotoMode.HDR ||
                             photoMode == MyApplicationInterface.PhotoMode.Panorama ||
                             photoMode == MyApplicationInterface.PhotoMode.ExpoBracketing ||
-                            photoMode == MyApplicationInterface.PhotoMode.FocusBracketing ||
+                            //photoMode == MyApplicationInterface.PhotoMode.FocusBracketing ||
                             photoMode == MyApplicationInterface.PhotoMode.FastBurst ||
-                            photoMode == MyApplicationInterface.PhotoMode.NoiseReduction
+                            photoMode == MyApplicationInterface.PhotoMode.NoiseReduction ||
+                            photoMode == MyApplicationInterface.PhotoMode.X_Night ||
+                            photoMode == MyApplicationInterface.PhotoMode.X_Bokeh ||
+                            photoMode == MyApplicationInterface.PhotoMode.X_Beauty
             ) &&
                     !applicationInterface.isVideoPref() ) { // these photo modes not supported for video mode
                 icon_dest.set(location_x2, location_y, location_x2 + icon_size, location_y + icon_size);
@@ -1402,9 +1400,12 @@ public class DrawPreview {
                         photoMode == MyApplicationInterface.PhotoMode.HDR ? hdr_bitmap :
                                 photoMode == MyApplicationInterface.PhotoMode.Panorama ? panorama_bitmap :
                                     photoMode == MyApplicationInterface.PhotoMode.ExpoBracketing ? expo_bitmap :
-                                            photoMode == MyApplicationInterface.PhotoMode.FocusBracketing ? focus_bracket_bitmap :
+                                            //photoMode == MyApplicationInterface.PhotoMode.FocusBracketing ? focus_bracket_bitmap :
                                                     photoMode == MyApplicationInterface.PhotoMode.FastBurst ? burst_bitmap :
                                                             photoMode == MyApplicationInterface.PhotoMode.NoiseReduction ? nr_bitmap :
+                                                                    photoMode == MyApplicationInterface.PhotoMode.X_Night ? x_night_bitmap :
+                                                                        photoMode == MyApplicationInterface.PhotoMode.X_Bokeh ? x_bokeh_bitmap :
+                                                                                photoMode == MyApplicationInterface.PhotoMode.X_Beauty ? x_beauty_bitmap :
                                                                     null;
                 if( bitmap != null ) {
                     if( photoMode == MyApplicationInterface.PhotoMode.NoiseReduction && applicationInterface.getNRModePref() == ApplicationInterface.NRModePref.NRMODE_LOW_LIGHT ) {
@@ -1413,7 +1414,7 @@ public class DrawPreview {
                     canvas.drawBitmap(bitmap, null, icon_dest, p);
                     p.setColorFilter(null);
 
-                    if( ui_rotation == 180 ) {
+                    if( device_ui_rotation == 180 ) {
                         location_x2 -= icon_size + flash_padding;
                     }
                     else {
@@ -1422,6 +1423,7 @@ public class DrawPreview {
                 }
             }
 
+
             // photo-stamp is supported for photos taken in video mode
             // but it isn't supported in RAW-only mode
             if( has_stamp_pref && !( is_raw_only_pref && preview.supportsRaw() ) ) {
@@ -1433,7 +1435,7 @@ public class DrawPreview {
                 p.setAlpha(255);
                 canvas.drawBitmap(photostamp_bitmap, null, icon_dest, p);
 
-                if( ui_rotation == 180 ) {
+                if( device_ui_rotation == 180 ) {
                     location_x2 -= icon_size + flash_padding;
                 }
                 else {
@@ -1450,7 +1452,7 @@ public class DrawPreview {
                 p.setAlpha(255);
                 canvas.drawBitmap(audio_disabled_bitmap, null, icon_dest, p);
 
-                if( ui_rotation == 180 ) {
+                if( device_ui_rotation == 180 ) {
                     location_x2 -= icon_size + flash_padding;
                 }
                 else {
@@ -1468,7 +1470,7 @@ public class DrawPreview {
                 p.setAlpha(255);
                 canvas.drawBitmap(capture_rate_factor < 1.0f ? slow_motion_bitmap : time_lapse_bitmap, null, icon_dest, p);
 
-                if( ui_rotation == 180 ) {
+                if( device_ui_rotation == 180 ) {
                     location_x2 -= icon_size + flash_padding;
                 }
                 else {
@@ -1484,7 +1486,7 @@ public class DrawPreview {
                 p.setAlpha(255);
                 canvas.drawBitmap(high_speed_fps_bitmap, null, icon_dest, p);
 
-                if( ui_rotation == 180 ) {
+                if( device_ui_rotation == 180 ) {
                     location_x2 -= icon_size + flash_padding;
                 }
                 else {
@@ -1532,7 +1534,7 @@ public class DrawPreview {
                 needs_flash_time = -1;
             }
 
-            if( ui_rotation == 90 ) {
+            if( device_ui_rotation == 90 ) {
                 location_y -= icon_gap_y;
             }
             else {
@@ -1552,11 +1554,11 @@ public class DrawPreview {
                     // n.b., if changing the histogram_height, remember to update focus_seekbar and
                     // focus_bracketing_target_seekbar margins in activity_main.xml
                     int location_x2 = location_x - flash_padding;
-                    if( ui_rotation == 180 ) {
+                    if( device_ui_rotation == 180 ) {
                         location_x2 = location_x - histogram_width + flash_padding;
                     }
                     icon_dest.set(location_x2 - flash_padding, location_y, location_x2 - flash_padding + histogram_width, location_y + histogram_height);
-                    if( ui_rotation == 90 ) {
+                    if( device_ui_rotation == 90 ) {
                         icon_dest.top -= histogram_height;
                         icon_dest.bottom -= histogram_height;
                     }
@@ -1672,7 +1674,7 @@ public class DrawPreview {
     /** This includes drawing of the UI that requires the canvas to be rotated according to the preview's
      *  current UI rotation.
      */
-    private void drawUI(Canvas canvas, long time_ms) {
+    private void drawUI(Canvas canvas, int device_ui_rotation, long time_ms) {
         Preview preview = main_activity.getPreview();
         CameraController camera_controller = preview.getCameraController();
         int ui_rotation = preview.getUIRotation();
@@ -1681,6 +1683,8 @@ public class DrawPreview {
         double level_angle = preview.getLevelAngle();
         boolean has_geo_direction = preview.hasGeoDirection();
         double geo_direction = preview.getGeoDirection();
+        MainActivity.SystemOrientation system_orientation = main_activity.getSystemOrientation();
+        boolean system_orientation_portrait = system_orientation == MainActivity.SystemOrientation.PORTRAIT;
         int text_base_y = 0;
 
         canvas.save();
@@ -1689,23 +1693,24 @@ public class DrawPreview {
         if( camera_controller != null && !preview.isPreviewPaused() ) {
 			/*canvas.drawText("PREVIEW", canvas.getWidth() / 2,
 					canvas.getHeight() / 2, p);*/
+
             int gap_y = (int) (20 * scale + 0.5f); // convert dps to pixels
             int text_y = (int) (16 * scale + 0.5f); // convert dps to pixels
             boolean avoid_ui = false;
             // fine tuning to adjust placement of text with respect to the GUI, depending on orientation
-            if( ui_placement == MainUI.UIPlacement.UIPLACEMENT_TOP && ( ui_rotation == 0 || ui_rotation == 180 ) ) {
+            if( ui_placement == MainUI.UIPlacement.UIPLACEMENT_TOP && ( device_ui_rotation == 0 || device_ui_rotation == 180 ) ) {
                 text_base_y = canvas.getHeight() - (int)(0.1*gap_y);
                 avoid_ui = true;
             }
-            else if( ui_rotation == ( ui_placement == MainUI.UIPlacement.UIPLACEMENT_RIGHT ? 0 : 180 ) ) {
+            else if( device_ui_rotation == ( ui_placement == MainUI.UIPlacement.UIPLACEMENT_RIGHT ? 0 : 180 ) ) {
                 text_base_y = canvas.getHeight() - (int)(0.1*gap_y);
                 avoid_ui = true;
             }
-            else if( ui_rotation == ( ui_placement == MainUI.UIPlacement.UIPLACEMENT_RIGHT ? 180 : 0 ) ) {
+            else if( device_ui_rotation == ( ui_placement == MainUI.UIPlacement.UIPLACEMENT_RIGHT ? 180 : 0 ) ) {
                 text_base_y = canvas.getHeight() - (int)(2.5*gap_y); // leave room for GUI icons
             }
-            else if( ui_rotation == 90 || ui_rotation == 270 ) {
-                // ui_rotation 90 is upside down portrait
+            else if( device_ui_rotation == 90 || device_ui_rotation == 270 ) {
+                // 90 is upside down portrait
                 // 270 is portrait
 
                 if( last_take_photo_top_time == 0 || time_ms > last_take_photo_top_time + 1000 ) {
@@ -1716,11 +1721,12 @@ public class DrawPreview {
                     // align with "top" of the take_photo button, but remember to take the rotation into account!
                     int view_left = getViewOnScreenX(view);
                     preview.getView().getLocationOnScreen(gui_location);
-                    int this_left = gui_location[0];
+                    int this_left = gui_location[system_orientation_portrait ? 1 : 0];
                     take_photo_top = view_left - this_left;
 
                     last_take_photo_top_time = time_ms;
                     /*if( MyDebug.LOG ) {
+                        Log.d(TAG, "device_ui_rotation: " + device_ui_rotation);
                         Log.d(TAG, "view_left: " + view_left);
                         Log.d(TAG, "this_left: " + this_left);
                         Log.d(TAG, "take_photo_top: " + take_photo_top);
@@ -1728,7 +1734,9 @@ public class DrawPreview {
                 }
 
 				// diff_x is the difference from the centre of the canvas to the position we want
-                int diff_x = take_photo_top - canvas.getWidth()/2;
+                int max_x = system_orientation_portrait ? canvas.getHeight() : canvas.getWidth();
+                int mid_x = max_x/2;
+                int diff_x = take_photo_top - mid_x;
 
 				/*if( MyDebug.LOG ) {
 					Log.d(TAG, "view left: " + view_left);
@@ -1747,8 +1755,7 @@ public class DrawPreview {
                 int diff_x = preview.getView().getRootView().getRight()/2 - offset_x;
                 */
 
-                int max_x = canvas.getWidth();
-                if( ui_rotation == 90 ) {
+                if( device_ui_rotation == 90 ) {
                     // so we don't interfere with the top bar info (datetime, free memory, ISO) when upside down
                     max_x -= (int)(2.5*gap_y);
                 }
@@ -1758,9 +1765,9 @@ public class DrawPreview {
 					Log.d(TAG, "canvas.getWidth()/2 + diff_x: " + (canvas.getWidth()/2+diff_x));
 					Log.d(TAG, "max_x: " + max_x);
 				}*/
-                if( canvas.getWidth()/2 + diff_x > max_x ) {
+                if( mid_x + diff_x > max_x ) {
                     // in case goes off the size of the canvas, for "black bar" cases (when preview aspect ratio < screen aspect ratio)
-                    diff_x = max_x - canvas.getWidth()/2;
+                    diff_x = max_x - mid_x;
                 }
                 text_base_y = canvas.getHeight()/2 + diff_x - (int)(0.5*gap_y);
             }
@@ -1870,7 +1877,7 @@ public class DrawPreview {
                 }
             }
             else if( preview.isVideoRecording() ) {
-                long video_time = preview.getVideoTime();
+                long video_time = preview.getVideoTime(false);
                 String time_s = getTimeStringFromSeconds(video_time/1000);
             	/*if( MyDebug.LOG )
 					Log.d(TAG, "video_time: " + video_time + " " + time_s);*/
@@ -1951,7 +1958,7 @@ public class DrawPreview {
                     p.setTextSize(14 * scale + 0.5f); // convert dps to pixels
                     p.setTextAlign(Paint.Align.CENTER);
                     int pixels_offset_y = 2*text_y; // avoid overwriting the zoom
-                    if( ui_rotation == 0 && applicationInterface.getPhotoMode() == MyApplicationInterface.PhotoMode.FocusBracketing ) {
+                    if( device_ui_rotation == 0 && applicationInterface.getPhotoMode() == MyApplicationInterface.PhotoMode.FocusBracketing ) {
                         // avoid clashing with the target focus bracketing seekbar in landscape orientation
                         pixels_offset_y = 5*gap_y;
                     }
@@ -1988,8 +1995,8 @@ public class DrawPreview {
 
             if( preview.supportsZoom() && show_zoom_pref ) {
                 float zoom_ratio = preview.getZoomRatio();
-                // only show when actually zoomed in
-                if( zoom_ratio > 1.0f + 1.0e-5f ) {
+                // only show when actually zoomed in - or out!
+                if( zoom_ratio < 1.0f - 1.0e-5f || zoom_ratio > 1.0f + 1.0e-5f ) {
                     // Convert the dps to pixels, based on density scale
                     p.setTextSize(14 * scale + 0.5f); // convert dps to pixels
                     p.setTextAlign(Paint.Align.CENTER);
@@ -2032,22 +2039,31 @@ public class DrawPreview {
                 // avoid computing every time, due to cost of calling View.getLocationOnScreen()
                 /*if( MyDebug.LOG )
                     Log.d(TAG, "update cached top_icon_shift");*/
-                int top_margin = getViewOnScreenX(top_icon) + top_icon.getWidth();
+                int top_margin = getViewOnScreenX(top_icon);
+                if( system_orientation == MainActivity.SystemOrientation.LANDSCAPE )
+                    top_margin += top_icon.getWidth();
+                else if( system_orientation == MainActivity.SystemOrientation.PORTRAIT )
+                    top_margin += top_icon.getHeight();
+                // n.b., don't adjust top_margin for icon width/height for an reverse orientation
                 preview.getView().getLocationOnScreen(gui_location);
-                int preview_left = gui_location[0];
+                int preview_left = gui_location[system_orientation_portrait ? 1 : 0];
+                if( system_orientation == MainActivity.SystemOrientation.REVERSE_LANDSCAPE )
+                    preview_left += preview.getView().getWidth(); // actually want preview-right for reverse landscape
                 this.top_icon_shift = top_margin - preview_left;
-                if( MyDebug.LOG ) {
+                if( system_orientation == MainActivity.SystemOrientation.REVERSE_LANDSCAPE )
+                    this.top_icon_shift = -this.top_icon_shift;
+                /*if( MyDebug.LOG ) {
                     Log.d(TAG, "top_icon.getRotation(): " + top_icon.getRotation());
                     Log.d(TAG, "preview_left: " + preview_left);
                     Log.d(TAG, "top_margin: " + top_margin);
                     Log.d(TAG, "top_icon_shift: " + top_icon_shift);
-                }
+                }*/
 
                 last_top_icon_shift_time = time_ms;
             }
 
             if( this.top_icon_shift > 0 ) {
-                if( ui_rotation == 90 || ui_rotation == 270 ) {
+                if( device_ui_rotation == 90 || device_ui_rotation == 270 ) {
                     // portrait
                     top_y += top_icon_shift;
                 }
@@ -2077,15 +2093,51 @@ public class DrawPreview {
                 if( MyDebug.LOG )
                     Log.d(TAG, "set focus_seekbars_margin_left to " + focus_seekbars_margin_left);
 
+                // "left" and "right" here are written assuming we're in landscape system orientation
+
                 View view = main_activity.findViewById(R.id.focus_seekbar);
                 RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams)view.getLayoutParams();
-                layoutParams.setMargins(focus_seekbars_margin_left, 0, 0, 0);
+                preview.getView().getLocationOnScreen(gui_location);
+                int preview_left = gui_location[system_orientation_portrait ? 1 : 0];
+                if( system_orientation == MainActivity.SystemOrientation.REVERSE_LANDSCAPE )
+                    preview_left += preview.getView().getWidth(); // actually want preview-right for reverse landscape
+
+                view.getLocationOnScreen(gui_location);
+                int seekbar_right = gui_location[system_orientation_portrait ? 1 : 0];
+                if( system_orientation == MainActivity.SystemOrientation.LANDSCAPE || system_orientation == MainActivity.SystemOrientation.PORTRAIT ) {
+                    // n.b., we read view.getWidth() even if system_orientation is portrait, because the seekbar is rotated in portrait orientation
+                    seekbar_right += view.getWidth();
+                }
+                else {
+                    // and for reversed landscape, the seekbar is rotated 180 degrees, and getLocationOnScreen() returns the location after the rotation
+                    seekbar_right -= view.getWidth();
+                }
+
+                int min_seekbar_width = (int) (150 * scale + 0.5f); // convert dps to pixels
+                int new_seekbar_width;
+                if( system_orientation == MainActivity.SystemOrientation.LANDSCAPE || system_orientation == MainActivity.SystemOrientation.PORTRAIT ) {
+                    new_seekbar_width = seekbar_right - (preview_left+focus_seekbars_margin_left);
+                }
+                else {
+                    // reversed landscape
+                    new_seekbar_width = preview_left - focus_seekbars_margin_left - seekbar_right;
+                }
+                new_seekbar_width = Math.max(new_seekbar_width, min_seekbar_width);
+                /*if( MyDebug.LOG ) {
+                    Log.d(TAG, "preview_left: " + preview_left);
+                    Log.d(TAG, "seekbar_right: " + seekbar_right);
+                    Log.d(TAG, "new_seekbar_width: " + new_seekbar_width);
+                }*/
+                layoutParams.width = new_seekbar_width;
                 view.setLayoutParams(layoutParams);
 
                 view = main_activity.findViewById(R.id.focus_bracketing_target_seekbar);
                 layoutParams = (RelativeLayout.LayoutParams)view.getLayoutParams();
-                layoutParams.setMargins(focus_seekbars_margin_left, 0, 0, 0);
+                layoutParams.width = new_seekbar_width;
                 view.setLayoutParams(layoutParams);
+
+                // need to update due to changing width of focus seekbars
+                main_activity.getMainUI().setFocusSeekbarsRotation();
             }
         }
 
@@ -2094,14 +2146,15 @@ public class DrawPreview {
         int battery_width = (int) (5 * scale + 0.5f); // convert dps to pixels
         int battery_height = 4*battery_width;
         if( ui_rotation == 90 || ui_rotation == 270 ) {
+            // n.b., this is only for when lock_to_landscape==true, so we don't look at device_ui_rotation
             int diff = canvas.getWidth() - canvas.getHeight();
             battery_x += diff/2;
             battery_y -= diff/2;
         }
-        if( ui_rotation == 90 ) {
+        if( device_ui_rotation == 90 ) {
             battery_y = canvas.getHeight() - battery_y - battery_height;
         }
-        if( ui_rotation == 180 ) {
+        if( device_ui_rotation == 180 ) {
             battery_x = canvas.getWidth() - battery_x - battery_width;
         }
         if( show_battery_pref ) {
@@ -2137,7 +2190,7 @@ public class DrawPreview {
             top_x += (int) (10 * scale + 0.5f); // convert dps to pixels
         }
 
-        onDrawInfoLines(canvas, top_x, top_y, text_base_y, time_ms);
+        onDrawInfoLines(canvas, top_x, top_y, text_base_y, device_ui_rotation, time_ms);
 
         canvas.restore();
     }
@@ -2147,9 +2200,11 @@ public class DrawPreview {
         return "·    " + zoom_ratio + "X" + "    ·";
     }
 
-    private void drawAngleLines(Canvas canvas, long time_ms) {
+    private void drawAngleLines(Canvas canvas, int device_ui_rotation, long time_ms) {
         Preview preview = main_activity.getPreview();
         CameraController camera_controller = preview.getCameraController();
+        MainActivity.SystemOrientation system_orientation = main_activity.getSystemOrientation();
+        boolean system_orientation_portrait = system_orientation == MainActivity.SystemOrientation.PORTRAIT;
         boolean has_level_angle = preview.hasLevelAngle();
         boolean actual_show_angle_line_pref;
         if( photoMode == MyApplicationInterface.PhotoMode.Panorama ) {
@@ -2162,28 +2217,36 @@ public class DrawPreview {
         boolean allow_angle_lines = camera_controller != null && !preview.isPreviewPaused();
 
         if( allow_angle_lines && has_level_angle && ( actual_show_angle_line_pref || show_pitch_lines_pref || show_geo_direction_lines_pref ) ) {
-            int ui_rotation = preview.getUIRotation();
             double level_angle = preview.getLevelAngle();
             boolean has_pitch_angle = preview.hasPitchAngle();
             double pitch_angle = preview.getPitchAngle();
             boolean has_geo_direction = preview.hasGeoDirection();
             double geo_direction = preview.getGeoDirection();
             // n.b., must draw this without the standard canvas rotation
-            int radius_dps = (ui_rotation == 90 || ui_rotation == 270) ? 60 : 80;
+            // lines should be shorter in portrait
+            int radius_dps = (device_ui_rotation == 90 || device_ui_rotation == 270) ? 60 : 80;
             int radius = (int) (radius_dps * scale + 0.5f); // convert dps to pixels
             double angle = - preview.getOrigLevelAngle();
             // see http://android-developers.blogspot.co.uk/2010/09/one-screen-turn-deserves-another.html
-            int rotation = main_activity.getWindowManager().getDefaultDisplay().getRotation();
+            int rotation = main_activity.getDisplayRotation();
             switch (rotation) {
                 case Surface.ROTATION_90:
-                case Surface.ROTATION_270:
                     angle -= 90.0;
                     break;
-                case Surface.ROTATION_0:
+                case Surface.ROTATION_270:
+                    angle += 90.0;
+                    break;
                 case Surface.ROTATION_180:
+                    angle += 180.0;
+                    break;
+                case Surface.ROTATION_0:
                 default:
                     break;
             }
+			/*if( MyDebug.LOG ) {
+                Log.d(TAG, "system_orientation: " + system_orientation);
+                Log.d(TAG, "rotation: " + rotation);
+            }*/
 			/*if( MyDebug.LOG ) {
 				Log.d(TAG, "orig_level_angle: " + preview.getOrigLevelAngle());
 				Log.d(TAG, "angle: " + angle);
@@ -2247,8 +2310,15 @@ public class DrawPreview {
                 }
             }
             updateCachedViewAngles(time_ms); // ensure view_angle_x_preview, view_angle_y_preview are computed and up to date
-            float camera_angle_x = this.view_angle_x_preview;
-            float camera_angle_y = this.view_angle_y_preview;
+            float camera_angle_x, camera_angle_y;
+            if( system_orientation_portrait ) {
+                camera_angle_x = this.view_angle_y_preview;
+                camera_angle_y = this.view_angle_x_preview;
+            }
+            else {
+                camera_angle_x = this.view_angle_x_preview;
+                camera_angle_y = this.view_angle_y_preview;
+            }
             float angle_scale_x = (float)( canvas.getWidth() / (2.0 * Math.tan( Math.toRadians((camera_angle_x/2.0)) )) );
             float angle_scale_y = (float)( canvas.getHeight() / (2.0 * Math.tan( Math.toRadians((camera_angle_y/2.0)) )) );
 			/*if( MyDebug.LOG ) {
@@ -2266,7 +2336,8 @@ public class DrawPreview {
             float angle_scale = (float)Math.sqrt( angle_scale_x*angle_scale_x + angle_scale_y*angle_scale_y );
             angle_scale *= preview.getZoomRatio();
             if( has_pitch_angle && show_pitch_lines_pref ) {
-                int pitch_radius_dps = (ui_rotation == 90 || ui_rotation == 270) ? 100 : 80;
+                // lines should be shorter in portrait
+                int pitch_radius_dps = (device_ui_rotation == 90 || device_ui_rotation == 270) ? 80 : 100;
                 int pitch_radius = (int) (pitch_radius_dps * scale + 0.5f); // convert dps to pixels
                 int angle_step = 10;
                 if( preview.getZoomRatio() >= 2.0f )
@@ -2308,7 +2379,9 @@ public class DrawPreview {
                 }
             }
             if( has_geo_direction && has_pitch_angle && show_geo_direction_lines_pref ) {
-                int geo_radius_dps = (ui_rotation == 90 || ui_rotation == 270) ? 80 : 100;
+                // lines should be longer in portrait - n.b., this is opposite to behaviour of pitch lines, as
+                // geo lines are drawn perpendicularly
+                int geo_radius_dps = (device_ui_rotation == 90 || device_ui_rotation == 270) ? 100 : 80;
                 int geo_radius = (int) (geo_radius_dps * scale + 0.5f); // convert dps to pixels
                 float geo_angle = (float)Math.toDegrees(geo_direction);
                 int angle_step = 10;
@@ -2552,6 +2625,12 @@ public class DrawPreview {
         }
     }
 
+    public void setCoverPreview(boolean cover_preview) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "setCoverPreview: " + cover_preview);
+        this.cover_preview = cover_preview;
+    }
+
     public void onDrawPreview(Canvas canvas) {
 		/*if( MyDebug.LOG )
 			Log.d(TAG, "onDrawPreview");*/
@@ -2592,10 +2671,26 @@ public class DrawPreview {
                 preview.disableFocusPeaking();
         }
 
-        // see documentation for CameraController.shouldCoverPreview()
-        if( preview.usingCamera2API() && ( camera_controller == null || camera_controller.shouldCoverPreview() ) ) {
-            p.setColor(Color.BLACK);
-            canvas.drawRect(0.0f, 0.0f, canvas.getWidth(), canvas.getHeight(), p);
+        // See documentation for CameraController.shouldCoverPreview().
+        // Note, originally we checked camera_controller.shouldCoverPreview() every frame, but this
+        // has the problem that we blank whenever the camera is being reopened, e.g., when switching
+        // cameras or changing photo modes that require a reopen. The intent however is to only
+        // cover up the camera when the application is pausing, and to keep it covered up until
+        // after we've resumed, and the camera has been reopened and we've received frames.
+        if( preview.usingCamera2API() ) {
+            if( cover_preview ) {
+                // see if we have received a frame yet
+                if( camera_controller != null && !camera_controller.shouldCoverPreview() ) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "no longer need to cover preview");
+                    cover_preview = false;
+                }
+            }
+            if( cover_preview ) {
+                p.setColor(Color.BLACK);
+                //p.setColor(Color.RED); // test
+                canvas.drawRect(0.0f, 0.0f, canvas.getWidth(), canvas.getHeight(), p);
+            }
         }
 
         if( camera_controller!= null && front_screen_flash ) {
@@ -2609,6 +2704,19 @@ public class DrawPreview {
             p.setAlpha(255);
         }
 
+        // If MainActivity.lock_to_landscape==true, then the ui_rotation represents the orientation of the
+        // device; if MainActivity.lock_to_landscape==false then ui_rotation is always 0 as we don't need to
+        // apply any orientation ourselves. However, we're we do want to know the true rotation of the
+        // device, as it affects how certain elements of the UI are layed out.
+        int device_ui_rotation;
+        if( MainActivity.lock_to_landscape ) {
+            device_ui_rotation = ui_rotation;
+        }
+        else {
+            MainActivity.SystemOrientation system_orientation = main_activity.getSystemOrientation();
+            device_ui_rotation = MainActivity.getRotationFromSystemOrientation(system_orientation);
+        }
+
         if( camera_controller != null && taking_picture && !front_screen_flash && take_photo_border_pref ) {
             p.setColor(Color.WHITE);
             p.setStyle(Paint.Style.STROKE);
@@ -2677,9 +2785,9 @@ public class DrawPreview {
 
         doThumbnailAnimation(canvas, time_ms);
 
-        drawUI(canvas, time_ms);
+        drawUI(canvas, device_ui_rotation, time_ms);
 
-        drawAngleLines(canvas, time_ms);
+        drawAngleLines(canvas, device_ui_rotation, time_ms);
 
         doFocusAnimation(canvas, time_ms);
 
@@ -2691,7 +2799,7 @@ public class DrawPreview {
             for(CameraController.Face face : faces_detected) {
                 // Android doc recommends filtering out faces with score less than 50 (same for both Camera and Camera2 APIs)
                 if( face.score >= 50 ) {
-                    canvas.drawRect(face.rect, p);
+                    canvas.drawRect(face.temp, p);
                 }
             }
             p.setStyle(Paint.Style.FILL); // reset
@@ -2700,17 +2808,33 @@ public class DrawPreview {
         if( enable_gyro_target_spot && camera_controller != null ) {
             GyroSensor gyroSensor = main_activity.getApplicationInterface().getGyroSensor();
             if( gyroSensor.isRecording() ) {
+                MainActivity.SystemOrientation system_orientation = main_activity.getSystemOrientation();
+                boolean system_orientation_portrait = system_orientation == MainActivity.SystemOrientation.PORTRAIT;
                 for(float [] gyro_direction : gyro_directions) {
                     gyroSensor.getRelativeInverseVector(transformed_gyro_direction, gyro_direction);
                     gyroSensor.getRelativeInverseVector(transformed_gyro_direction_up, gyro_direction_up);
                     // note that although X of gyro_direction represents left to right on the device, because we're in landscape mode,
                     // this is y coordinates on the screen
-                    float angle_x = - (float)Math.asin(transformed_gyro_direction[1]);
-                    float angle_y = - (float)Math.asin(transformed_gyro_direction[0]);
+                    float angle_x, angle_y;
+                    if( system_orientation_portrait ) {
+                        angle_x = (float)Math.asin(transformed_gyro_direction[0]);
+                        angle_y = - (float)Math.asin(transformed_gyro_direction[1]);
+                    }
+                    else {
+                        angle_x = - (float)Math.asin(transformed_gyro_direction[1]);
+                        angle_y = - (float)Math.asin(transformed_gyro_direction[0]);
+                    }
                     if( Math.abs(angle_x) < 0.5f*Math.PI && Math.abs(angle_y) < 0.5f*Math.PI ) {
                         updateCachedViewAngles(time_ms); // ensure view_angle_x_preview, view_angle_y_preview are computed and up to date
-                        float camera_angle_x = this.view_angle_x_preview;
-                        float camera_angle_y = this.view_angle_y_preview;
+                        float camera_angle_x, camera_angle_y;
+                        if( system_orientation_portrait ) {
+                            camera_angle_x = this.view_angle_y_preview;
+                            camera_angle_y = this.view_angle_x_preview;
+                        }
+                        else {
+                            camera_angle_x = this.view_angle_x_preview;
+                            camera_angle_y = this.view_angle_y_preview;
+                        }
                         float angle_scale_x = (float) (canvas.getWidth() / (2.0 * Math.tan(Math.toRadians((camera_angle_x / 2.0)))));
                         float angle_scale_y = (float) (canvas.getHeight() / (2.0 * Math.tan(Math.toRadians((camera_angle_y / 2.0)))));
                         angle_scale_x *= preview.getZoomRatio();
@@ -2794,7 +2918,7 @@ public class DrawPreview {
         }
     }
 
-    private void drawGyroSpot(Canvas canvas, float distance_x, float distance_y, @SuppressWarnings("unused") float dir_x, @SuppressWarnings("unused") float dir_y, int radius_dp, boolean outline) {
+    private void drawGyroSpot(Canvas canvas, float distance_x, float distance_y, float dir_x, float dir_y, int radius_dp, boolean outline) {
         if( outline ) {
             p.setStyle(Paint.Style.STROKE);
             p.setStrokeWidth(stroke_width);
diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/FolderChooserDialog.java b/app/src/main/java/net/sourceforge/opencamera/ui/FolderChooserDialog.java
index 6d97475f6f02e22dd7a272e22d32718896082435..299d30943d7e2ed847fd99592f0e8e3e94883365 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/FolderChooserDialog.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/FolderChooserDialog.java
@@ -21,6 +21,7 @@ import android.text.InputFilter;
 import android.text.Spanned;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -43,6 +44,7 @@ public class FolderChooserDialog extends DialogFragment {
 
     private File start_folder = new File("");
     private File current_folder;
+    private File max_parent; // if non-null, don't show the Parent option if viewing this folder (so the user can't go above that folder)
     private AlertDialog folder_dialog;
     private ListView list;
     private String chosen_folder;
@@ -59,6 +61,7 @@ public class FolderChooserDialog extends DialogFragment {
             this.sort_order = sort_order;
         }
 
+        @NonNull
         @Override
         public String toString() {
             if( override_name != null )
@@ -184,12 +187,17 @@ public class FolderChooserDialog extends DialogFragment {
             // see testFolderChooserInvalid()
             if( MyDebug.LOG )
                 Log.d(TAG, "failed to read folder");
-            // note that we reset to DCIM rather than DCIM/OpenCamera, just to increase likelihood of getting back to a valid state
-            refreshList(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM));
-            if( current_folder == null ) {
+
+            if( show_dcim_shortcut ) {
                 if( MyDebug.LOG )
-                    Log.d(TAG, "can't even read DCIM?!");
-                refreshList(new File("/"));
+                    Log.d(TAG, "fall back to DCIM");
+                // note that we reset to DCIM rather than DCIM/OpenCamera, just to increase likelihood of getting back to a valid state
+                refreshList(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM));
+                if( current_folder == null ) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "can't even read DCIM?!");
+                    refreshList(new File("/"));
+                }
             }
         }
         return folder_dialog;
@@ -199,6 +207,12 @@ public class FolderChooserDialog extends DialogFragment {
         this.start_folder = start_folder;
     }
 
+    public void setMaxParent(File max_parent) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "setMaxParent: " + max_parent);
+        this.max_parent = max_parent;
+    }
+
     public void setShowNewFolderButton(boolean show_new_folder_button) {
         this.show_new_folder_button = show_new_folder_button;
     }
@@ -236,8 +250,14 @@ public class FolderChooserDialog extends DialogFragment {
         // n.b., files may be null if no files could be found in the folder (or we can't read) - but should still allow the user
         // to view this folder (so the user can go to parent folders which might be readable again)
         List<FileWrapper> listed_files = new ArrayList<>();
-        if( new_folder.getParentFile() != null )
-            listed_files.add(new FileWrapper(new_folder.getParentFile(), getResources().getString(R.string.parent_folder), 0));
+        if( new_folder.getParentFile() != null ) {
+            if( max_parent != null && max_parent.equals(new_folder) ) {
+                // don't show parent option
+            }
+            else {
+                listed_files.add(new FileWrapper(new_folder.getParentFile(), getResources().getString(R.string.parent_folder), 0));
+            }
+        }
         if( show_dcim_shortcut ) {
             File default_folder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM);
             if( !default_folder.equals(new_folder) && !default_folder.equals(new_folder.getParentFile()) )
@@ -296,12 +316,14 @@ public class FolderChooserDialog extends DialogFragment {
         if( current_folder == null )
             return false;
         if( canWrite() ) {
-            File base_folder = StorageUtils.getBaseFolder();
             String new_save_location = current_folder.getAbsolutePath();
-            if( current_folder.getParentFile() != null && current_folder.getParentFile().equals(base_folder) ) {
-                if( MyDebug.LOG )
-                    Log.d(TAG, "parent folder is base folder");
-                new_save_location = current_folder.getName();
+            if( this.show_dcim_shortcut ) {
+                File base_folder = StorageUtils.getBaseFolder();
+                if( current_folder.getParentFile() != null && current_folder.getParentFile().equals(base_folder) ) {
+                    if( MyDebug.LOG )
+                        Log.d(TAG, "parent folder is base folder");
+                    new_save_location = current_folder.getName();
+                }
             }
             if( MyDebug.LOG )
                 Log.d(TAG, "new_save_location: " + new_save_location);
@@ -349,17 +371,21 @@ public class FolderChooserDialog extends DialogFragment {
         if( current_folder == null )
             return;
         if( canWrite() ) {
-            final EditText edit_text = new EditText(getActivity());
+            final View dialog_view = LayoutInflater.from(getActivity()).inflate(R.layout.alertdialog_edittext, null);
+            final EditText edit_text = dialog_view.findViewById(R.id.edit_text);
+
             edit_text.setSingleLine();
             edit_text.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 20.0f);
-            edit_text.setContentDescription(getResources().getString(R.string.enter_new_folder));
+            // set hint instead of content description for EditText, see https://support.google.com/accessibility/android/answer/6378120
+            //edit_text.setContentDescription(getResources().getString(R.string.enter_new_folder));
+            edit_text.setHint(getResources().getString(R.string.enter_new_folder));
             InputFilter filter = new NewFolderInputFilter();
             edit_text.setFilters(new InputFilter[]{filter});
 
             Dialog dialog = new AlertDialog.Builder(getActivity())
                     //.setIcon(R.drawable.alert_dialog_icon)
                     .setTitle(R.string.enter_new_folder)
-                    .setView(edit_text)
+                    .setView(dialog_view)
                     .setPositiveButton(android.R.string.ok, new Dialog.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
index 043fcade5a7065ebac4b9f10cf1963a75eac0a22..bbe2fa97d6c619bf5d797a517cb53009026db2e0 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java
@@ -31,6 +31,8 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 
+import androidx.constraintlayout.widget.ConstraintLayout;
+
 import net.sourceforge.opencamera.MainActivity;
 import net.sourceforge.opencamera.MyApplicationInterface;
 import net.sourceforge.opencamera.MyDebug;
@@ -71,7 +73,9 @@ public class MainUI {
     private UIPlacement ui_placement = UIPlacement.UIPLACEMENT_RIGHT;
     private View top_icon = null;
     private boolean view_rotate_animation;
+    private float view_rotate_animation_start; // for MainActivity.lock_to_landscape==false
     private final static int view_rotate_animation_duration = 100; // duration in ms of the icon rotation animation
+    public final static int privacy_indicator_gap_dp = 24;
 
     private boolean immersive_mode;
     private boolean show_gui_photo = true; // result of call to showGUI() - false means a "reduced" GUI is displayed, whilst taking photo or video
@@ -153,6 +157,12 @@ public class MainUI {
         if (!view_rotate_animation) {
             view.setRotation(ui_rotation);
         }
+        if( !MainActivity.lock_to_landscape ) {
+            float start_rotation = view_rotate_animation_start + ui_rotation;
+            if( start_rotation >= 360.0f )
+                start_rotation -= 360.0f;
+            view.setRotation(start_rotation);
+        }
         float rotate_by = ui_rotation - view.getRotation();
         if (rotate_by > 181.0f)
             rotate_by -= 360.0f;
@@ -160,13 +170,31 @@ public class MainUI {
             rotate_by += 360.0f;
         // view.animate() modifies the view's rotation attribute, so it ends up equivalent to view.setRotation()
         // we use rotationBy() instead of rotation(), so we get the minimal rotation for clockwise vs anti-clockwise
-        view.animate().rotationBy(rotate_by).setDuration(view_rotate_animation_duration).setInterpolator(new AccelerateDecelerateInterpolator()).start();
+        if( main_activity.is_test && Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2 ) {
+            // We randomly get a java.lang.ArrayIndexOutOfBoundsException crash when running MainTests suite
+            // on Android emulator with Android 4.3, from deep below ViewPropertyAnimator.start().
+            // Unclear why this is - I haven't seen this on real devices and can't find out info about it.
+            view.setRotation(ui_rotation);
+        }
+        else {
+            view.animate().rotationBy(rotate_by).setDuration(view_rotate_animation_duration).setInterpolator(new AccelerateDecelerateInterpolator()).start();
+        }
     }
 
     public void layoutUI() {
         layoutUI(false);
     }
 
+    public void layoutUIWithRotation(float view_rotate_animation_start) {
+        if( MyDebug.LOG )
+            Log.d(TAG, "layoutUIWithRotation: " + view_rotate_animation_start);
+        this.view_rotate_animation = true;
+        this.view_rotate_animation_start = view_rotate_animation_start;
+        layoutUI();
+        view_rotate_animation = false;
+        this.view_rotate_animation_start = 0.0f;
+    }
+
     private UIPlacement computeUIPlacement() {
         return UIPlacement.UIPLACEMENT_TOP;
     }
@@ -178,82 +206,136 @@ public class MainUI {
             debug_time = System.currentTimeMillis();
         }
 
+        MainActivity.SystemOrientation system_orientation = main_activity.getSystemOrientation();
+        boolean system_orientation_portrait = system_orientation == MainActivity.SystemOrientation.PORTRAIT;
+        boolean system_orientation_reversed_landscape = system_orientation == MainActivity.SystemOrientation.REVERSE_LANDSCAPE;
+        if( MyDebug.LOG ) {
+            Log.d(TAG, "    system_orientation = " + system_orientation);
+            Log.d(TAG, "    system_orientation_portrait? " + system_orientation_portrait);
+        }
+
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(main_activity);
         // we cache the preference_ui_placement to save having to check it in the draw() method
         this.ui_placement = computeUIPlacement();
         if (MyDebug.LOG)
             Log.d(TAG, "ui_placement: " + ui_placement);
-        // new code for orientation fixed to landscape
-        // the display orientation should be locked to landscape, but how many degrees is that?
-        int rotation = main_activity.getWindowManager().getDefaultDisplay().getRotation();
-        int degrees = 0;
-        switch (rotation) {
-            case Surface.ROTATION_0:
-                degrees = 0;
-                break;
-            case Surface.ROTATION_90:
-                degrees = 90;
-                break;
-            case Surface.ROTATION_180:
-                degrees = 180;
-                break;
-            case Surface.ROTATION_270:
-                degrees = 270;
-                break;
-            default:
-                break;
+        int relative_orientation;
+        if( MainActivity.lock_to_landscape ) {
+            // new code for orientation fixed to landscape
+            // the display orientation should be locked to landscape, but how many degrees is that?
+            int rotation = main_activity.getWindowManager().getDefaultDisplay().getRotation();
+            int degrees = 0;
+            switch (rotation) {
+                case Surface.ROTATION_0: degrees = 0; break;
+                case Surface.ROTATION_90: degrees = 90; break;
+                case Surface.ROTATION_180: degrees = 180; break;
+                case Surface.ROTATION_270: degrees = 270; break;
+                default:
+                    break;
+            }
+            // getRotation is anti-clockwise, but current_orientation is clockwise, so we add rather than subtract
+            // relative_orientation is clockwise from landscape-left
+            //int relative_orientation = (current_orientation + 360 - degrees) % 360;
+            relative_orientation = (current_orientation + degrees) % 360;
+            if( MyDebug.LOG ) {
+                Log.d(TAG, "    current_orientation = " + current_orientation);
+                Log.d(TAG, "    degrees = " + degrees);
+                Log.d(TAG, "    relative_orientation = " + relative_orientation);
+            }
         }
-        // getRotation is anti-clockwise, but current_orientation is clockwise, so we add rather than subtract
-        // relative_orientation is clockwise from landscape-left
-        //int relative_orientation = (current_orientation + 360 - degrees) % 360;
-        int relative_orientation = (current_orientation + degrees) % 360;
-        if (MyDebug.LOG) {
-            Log.d(TAG, "    current_orientation = " + current_orientation);
-            Log.d(TAG, "    degrees = " + degrees);
-            Log.d(TAG, "    relative_orientation = " + relative_orientation);
+        else {
+            relative_orientation = 0;
         }
         final int ui_rotation = (360 - relative_orientation) % 360;
         main_activity.getPreview().setUIRotation(ui_rotation);
-        int align_left = RelativeLayout.ALIGN_LEFT;
-        int align_right = RelativeLayout.ALIGN_RIGHT;
-        //int align_top = RelativeLayout.ALIGN_TOP;
-        //int align_bottom = RelativeLayout.ALIGN_BOTTOM;
-        int left_of = RelativeLayout.LEFT_OF;
-        int right_of = RelativeLayout.RIGHT_OF;
+        // naming convention for variables is for system_orientation==LANDSCAPE, right-handed UI
+        int align_left = system_orientation_portrait ? RelativeLayout.ALIGN_TOP : RelativeLayout.ALIGN_LEFT;
+        int align_right = system_orientation_portrait ? RelativeLayout.ALIGN_BOTTOM : RelativeLayout.ALIGN_RIGHT;
+        int align_top = system_orientation_portrait ? RelativeLayout.ALIGN_RIGHT : RelativeLayout.ALIGN_TOP;
+        int align_bottom = system_orientation_portrait ? RelativeLayout.ALIGN_LEFT : RelativeLayout.ALIGN_BOTTOM;
+        int left_of = system_orientation_portrait ? RelativeLayout.ABOVE : RelativeLayout.LEFT_OF;
+        int right_of = system_orientation_portrait ? RelativeLayout.BELOW : RelativeLayout.RIGHT_OF;
+        int above = system_orientation_portrait ? RelativeLayout.RIGHT_OF : RelativeLayout.ABOVE;
+        int below = system_orientation_portrait ? RelativeLayout.LEFT_OF : RelativeLayout.BELOW;
+        int ui_independent_left_of = left_of;
+        int ui_independent_right_of = right_of;
+        int ui_independent_above = above;
+        int ui_independent_below = below;
+        int align_parent_left = system_orientation_portrait ? RelativeLayout.ALIGN_PARENT_TOP : RelativeLayout.ALIGN_PARENT_LEFT;
+        int align_parent_right = system_orientation_portrait ? RelativeLayout.ALIGN_PARENT_BOTTOM : RelativeLayout.ALIGN_PARENT_RIGHT;
+        int align_parent_top = system_orientation_portrait ? RelativeLayout.ALIGN_PARENT_RIGHT : RelativeLayout.ALIGN_PARENT_TOP;
+        int align_parent_bottom = system_orientation_portrait ? RelativeLayout.ALIGN_PARENT_LEFT : RelativeLayout.ALIGN_PARENT_BOTTOM;
+        int center_horizontal = system_orientation_portrait ? RelativeLayout.CENTER_VERTICAL : RelativeLayout.CENTER_HORIZONTAL;
+        int center_vertical = system_orientation_portrait ? RelativeLayout.CENTER_HORIZONTAL : RelativeLayout.CENTER_VERTICAL;
+
         int iconpanel_left_of = left_of;
         int iconpanel_right_of = right_of;
-        int above = RelativeLayout.ABOVE;
-        int below = RelativeLayout.BELOW;
         int iconpanel_above = above;
         int iconpanel_below = below;
-        int align_parent_left = RelativeLayout.ALIGN_PARENT_LEFT;
-        int align_parent_right = RelativeLayout.ALIGN_PARENT_RIGHT;
         int iconpanel_align_parent_left = align_parent_left;
         int iconpanel_align_parent_right = align_parent_right;
-        int align_parent_top = RelativeLayout.ALIGN_PARENT_TOP;
-        int align_parent_bottom = RelativeLayout.ALIGN_PARENT_BOTTOM;
         int iconpanel_align_parent_top = align_parent_top;
         int iconpanel_align_parent_bottom = align_parent_bottom;
-        if (ui_placement == UIPlacement.UIPLACEMENT_LEFT) {
-            above = RelativeLayout.BELOW;
-            below = RelativeLayout.ABOVE;
-            align_parent_top = RelativeLayout.ALIGN_PARENT_BOTTOM;
-            align_parent_bottom = RelativeLayout.ALIGN_PARENT_TOP;
+
+        if( system_orientation_reversed_landscape ) {
+            int temp = align_left;
+            align_left = align_right;
+            align_right = temp;
+            temp  = align_top;
+            align_top = align_bottom;
+            align_bottom = temp;
+            temp = left_of;
+            left_of = right_of;
+            right_of = temp;
+            temp = above;
+            above = below;
+            below = temp;
+
+            ui_independent_left_of = left_of;
+            ui_independent_right_of = right_of;
+            ui_independent_above = above;
+            ui_independent_below = below;
+
+            temp = align_parent_left;
+            align_parent_left = align_parent_right;
+            align_parent_right = temp;
+            temp = align_parent_top;
+            align_parent_top = align_parent_bottom;
+            align_parent_bottom = temp;
+
+            iconpanel_left_of = left_of;
+            iconpanel_right_of = right_of;
+            iconpanel_above = above;
+            iconpanel_below = below;
+            iconpanel_align_parent_left = align_parent_left;
+            iconpanel_align_parent_right = align_parent_right;
             iconpanel_align_parent_top = align_parent_top;
             iconpanel_align_parent_bottom = align_parent_bottom;
-        } else if (ui_placement == UIPlacement.UIPLACEMENT_TOP) {
-            iconpanel_left_of = RelativeLayout.BELOW;
-            iconpanel_right_of = RelativeLayout.ABOVE;
-            iconpanel_above = RelativeLayout.LEFT_OF;
-            iconpanel_below = RelativeLayout.RIGHT_OF;
+        }
+
+        if( ui_placement == UIPlacement.UIPLACEMENT_LEFT ) {
+            int temp = above;
+            above = below;
+            below = temp;
+            temp = align_parent_top;
+            align_parent_top = align_parent_bottom;
+            align_parent_bottom = temp;
+            iconpanel_align_parent_top = align_parent_top;
+            iconpanel_align_parent_bottom = align_parent_bottom;
+        }
+        else if( ui_placement == UIPlacement.UIPLACEMENT_TOP ) {
+            iconpanel_left_of = below;
+            iconpanel_right_of = above;
+            iconpanel_above = left_of;
+            iconpanel_below = right_of;
             //noinspection SuspiciousNameCombination
-            iconpanel_align_parent_left = RelativeLayout.ALIGN_PARENT_BOTTOM;
+            iconpanel_align_parent_left = align_parent_bottom;
             //noinspection SuspiciousNameCombination
-            iconpanel_align_parent_right = RelativeLayout.ALIGN_PARENT_TOP;
+            iconpanel_align_parent_right = align_parent_top;
             //noinspection SuspiciousNameCombination
-            iconpanel_align_parent_top = RelativeLayout.ALIGN_PARENT_LEFT;
+            iconpanel_align_parent_top = align_parent_left;
             //noinspection SuspiciousNameCombination
-            iconpanel_align_parent_bottom = RelativeLayout.ALIGN_PARENT_RIGHT;
+            iconpanel_align_parent_bottom = align_parent_right;
         }
 
         Point display_size = new Point();
@@ -261,6 +343,10 @@ public class MainUI {
         display.getSize(display_size);
         final int display_height = Math.min(display_size.x, display_size.y);
 
+        final float scale = main_activity.getResources().getDisplayMetrics().density;
+        if( MyDebug.LOG )
+            Log.d(TAG, "scale: " + scale);
+
         /*int navigation_gap = 0;
 		if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 ) {
             final int display_width = Math.max(display_size.x, display_size.y);
@@ -275,9 +361,34 @@ public class MainUI {
             }
         }*/
         int navigation_gap = main_activity.getNavigationGap();
+        int gallery_navigation_gap = navigation_gap;
+
+        int gallery_top_gap = 0;
+        {
+            // Leave space for the Android 12+ camera privacy indicator, as gallery icon would
+            // otherwise overlap when in landscape orientation.
+            // In theory we should use WindowInsets.getPrivacyIndicatorBounds() for this, but it seems
+            // to give a much larger value when required (leaving to a much larger gap), as well as
+            // obviously changing depending on orientation - but whilst this is only an issue for
+            // landscape orientation, it looks better to keep the position consistent for any
+            // orientation (otherwise the icons jump about when changing orientation, which looks
+            // especially bad for UIPLACEMENT_RIGHT.
+            // Not needed for UIPLACEMENT_LEFT - although still adjust the right hand side margin
+            // for consistency.
+            // We do for all Android versions for consistency (avoids testing overhead due to
+            // different behaviour on different Android versions).
+            if( ui_placement != UIPlacement.UIPLACEMENT_LEFT ) {
+                // if we did want to do this for UIPLACEMENT_LEFT for consistency, it'd be the
+                // "bottom" margin we need to change.
+                gallery_top_gap = (int) (privacy_indicator_gap_dp * scale + 0.5f); // convert dps to pixels
+            }
+            int privacy_indicator_gap = (int) (privacy_indicator_gap_dp * scale + 0.5f); // convert dps to pixels
+            gallery_navigation_gap += privacy_indicator_gap;
+        }
         test_navigation_gap = navigation_gap;
         if (MyDebug.LOG) {
             Log.d(TAG, "navigation_gap: " + navigation_gap);
+            Log.d(TAG, "gallery_navigation_gap: " + gallery_navigation_gap);
         }
 
         if (!popup_container_only) {
@@ -408,7 +519,9 @@ public class MainUI {
                             // is displayed (when taking a photo) if it is still shown left-most, rather than centred; also
                             // needed for "pause preview" trash/icons to be shown properly (test by rotating the phone to update
                             // the layout)
-                            layoutParams.setMargins(0, this_view == first_visible_view ? topMargin : margin / 2, 0, this_view == last_visible_view ? topMargin : margin / 2);
+                            int margin_first = this_view==first_visible_view ? topMargin : margin/2;
+                            int margin_last = this_view==last_visible_view ? topMargin : margin/2;
+                            setMarginsForSystemUI(layoutParams, 0, margin_first, 0, margin_last);
                             layoutParams.width = button_size;
                             layoutParams.height = button_size;
                             this_view.setLayoutParams(layoutParams);
@@ -423,12 +536,20 @@ public class MainUI {
                 }
             } else {
                 // need to reset size/margins to their default
-                for (View this_view : buttons_permanent) {
-                    layoutParams = (RelativeLayout.LayoutParams) this_view.getLayoutParams();
-                    layoutParams.setMargins(0, 0, 0, 0);
-                    layoutParams.width = button_size;
-                    layoutParams.height = button_size;
-                    this_view.setLayoutParams(layoutParams);
+                // except for gallery, which still needs its margins set for navigation gap! (and we
+                // shouldn't change it's size, which isn't necessarily button_size)
+                view = main_activity.findViewById(R.id.gallery);
+                layoutParams = (RelativeLayout.LayoutParams) view.getLayoutParams();
+                setMarginsForSystemUI(layoutParams, 0, gallery_top_gap, gallery_navigation_gap, 0);
+                view.setLayoutParams(layoutParams);
+                for(View this_view : buttons_permanent) {
+                    if( this_view != view ) {
+                        layoutParams = (RelativeLayout.LayoutParams)this_view.getLayoutParams();
+                        layoutParams.setMargins(0, 0, 0, 0);
+                        layoutParams.width = button_size;
+                        layoutParams.height = button_size;
+                        this_view.setLayoutParams(layoutParams);
+                    }
                 }
             }
 
@@ -481,8 +602,12 @@ public class MainUI {
             layoutParams.addRule(align_right, 0);
             // layoutParams.addRule(left_of, R.id.zoom_seekbar);
             layoutParams.addRule(right_of, 0);
+            layoutParams.addRule(above, 0);
+            layoutParams.addRule(below, 0);
             layoutParams.addRule(align_parent_top, 0);
             layoutParams.addRule(align_parent_bottom, RelativeLayout.TRUE);
+            layoutParams.addRule(align_parent_left, 0);
+            layoutParams.addRule(align_parent_right, 0);
             view.setLayoutParams(layoutParams);
 
             view = main_activity.findViewById(R.id.focus_bracketing_target_seekbar);
@@ -494,12 +619,14 @@ public class MainUI {
             layoutParams.addRule(above, R.id.focus_seekbar);
             layoutParams.addRule(below, 0);
             view.setLayoutParams(layoutParams);
+
+            setFocusSeekbarsRotation();
         }
 
         if (!popup_container_only) {
             // set seekbar info
             int width_dp;
-            if (ui_rotation == 0 || ui_rotation == 180) {
+            if( !system_orientation_portrait && (ui_rotation == 0 || ui_rotation == 180) ) {
                 // landscape
                 width_dp = 350;
             } else {
@@ -513,7 +640,6 @@ public class MainUI {
             if (MyDebug.LOG)
                 Log.d(TAG, "width_dp: " + width_dp);
             int height_dp = 50;
-            final float scale = main_activity.getResources().getDisplayMetrics().density;
             int width_pixels = (int) (width_dp * scale + 0.5f); // convert dps to pixels
             int height_pixels = (int) (height_dp * scale + 0.5f); // convert dps to pixels
 
@@ -522,10 +648,14 @@ public class MainUI {
             view.setTranslationX(0.0f);
             view.setTranslationY(0.0f);
 
-            if (ui_rotation == 90 || ui_rotation == 270) {
+            if( system_orientation_portrait || ui_rotation == 90 || ui_rotation == 270 ) {
                 // portrait
-                view.setTranslationX(2 * height_pixels);
-            } else if (ui_rotation == 0) {
+                if( system_orientation_portrait )
+                    view.setTranslationY(2*height_pixels);
+                else
+                    view.setTranslationX(2*height_pixels);
+            }
+            else if( ui_rotation == 0 ) {
                 // landscape
                 view.setTranslationY(height_pixels);
             } else {
@@ -536,9 +666,12 @@ public class MainUI {
             /*
             // align sliders_container
             RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams)view.getLayoutParams();
-            if( ui_rotation == 90 || ui_rotation == 270 ) {
+            if( system_orientation_portrait || ui_rotation == 90 || ui_rotation == 270 ) {
                 // portrait
-                view.setTranslationX(2*height_pixels);
+                if( system_orientation_portrait )
+                    view.setTranslationY(2*height_pixels);
+                else
+                    view.setTranslationX(2*height_pixels);
                 lp.addRule(left_of, 0);
                 lp.addRule(right_of, 0);
                 lp.addRule(above, 0);
@@ -615,20 +748,35 @@ public class MainUI {
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) view.getLayoutParams();
             if (ui_placement == UIPlacement.UIPLACEMENT_TOP) {
                 layoutParams.addRule(align_right, 0);
+                layoutParams.addRule(align_bottom, 0);
+                layoutParams.addRule(align_left, 0);
+                layoutParams.addRule(align_top, 0);
                 layoutParams.addRule(above, 0);
                 layoutParams.addRule(below, 0);
                 layoutParams.addRule(left_of, 0);
                 layoutParams.addRule(right_of, R.id.top_bg);
-                layoutParams.addRule(align_parent_top, RelativeLayout.TRUE);
-                layoutParams.addRule(align_parent_bottom, RelativeLayout.TRUE);
-            } else {
+                layoutParams.addRule(align_parent_top, system_orientation_portrait ? 0 : RelativeLayout.TRUE);
+                layoutParams.addRule(align_parent_bottom, system_orientation_portrait ? 0 : RelativeLayout.TRUE);
+                layoutParams.addRule(align_parent_left, 0);
+                layoutParams.addRule(align_parent_right, 0);
+            }
+            else {
                 layoutParams.addRule(align_right, R.id.top_bg);
+                layoutParams.addRule(align_bottom, 0);
+                layoutParams.addRule(align_left, 0);
+                layoutParams.addRule(align_top, 0);
                 layoutParams.addRule(above, 0);
                 layoutParams.addRule(below, R.id.top_bg);
                 layoutParams.addRule(left_of, 0);
                 layoutParams.addRule(right_of, 0);
                 layoutParams.addRule(align_parent_top, 0);
-                layoutParams.addRule(align_parent_bottom, RelativeLayout.TRUE);
+                layoutParams.addRule(align_parent_bottom, system_orientation_portrait ? 0 : RelativeLayout.TRUE);
+                layoutParams.addRule(align_parent_left, 0);
+                layoutParams.addRule(align_parent_right, 0);
+            }
+            if( system_orientation_portrait ) {
+                // limit height so doesn't take up full height of screen
+                layoutParams.height = display_height;
             }
             view.setLayoutParams(layoutParams);
 
@@ -668,6 +816,57 @@ public class MainUI {
         }
     }
 
+    /** Wrapper for layoutParams.setMargins, but where the margins are supplied for landscape orientation,
+     *  and if in portrait these are automatically rotated.
+     */
+    void setMarginsForSystemUI(RelativeLayout.LayoutParams layoutParams, int left, int top, int right, int bottom) {
+        MainActivity.SystemOrientation system_orientation = main_activity.getSystemOrientation();
+        if( system_orientation == MainActivity.SystemOrientation.PORTRAIT ) {
+            layoutParams.setMargins(bottom, left, top, right);
+        }
+        else if( system_orientation == MainActivity.SystemOrientation.REVERSE_LANDSCAPE ) {
+            layoutParams.setMargins(right, bottom, left, top);
+        }
+        else {
+            layoutParams.setMargins(left, top, right, bottom);
+        }
+    }
+
+    /** Some views (e.g. seekbars and zoom controls) are ones where we want to have a fixed
+     *  orientation as if in landscape mode, even if the system UI is portrait. So this method
+     *  sets a rotation so that the view appears as if in landscape orentation, and also sets
+     *  margins.
+     *  Note that Android has poor support for a rotated seekbar - we use view.setRotation(), but
+     *  this doesn't affect the bounds of the view! So as a hack, we modify the margins so the
+     *  view is positioned correctly. For this to work, the view must have a specified width
+     *  (which can be computed programmatically), rather than having both left and right sides being
+     *  aligned to another view.
+     *  The left/top/right/bottom margins should be supply for landscape orientation - these will
+     *  be automatically rotated if we're actually in portrait orientation.
+     */
+    private void setFixedRotation(View view, int left, int top, int right, int bottom) {
+        MainActivity.SystemOrientation system_orientation = main_activity.getSystemOrientation();
+        int rotation = (360 - MainActivity.getRotationFromSystemOrientation(system_orientation)) % 360;
+        view.setRotation(rotation);
+        // set margins due to rotation
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams)view.getLayoutParams();
+        if( system_orientation == MainActivity.SystemOrientation.PORTRAIT ) {
+            int diff = (layoutParams.width-layoutParams.height)/2;
+            if( MyDebug.LOG )
+                Log.d(TAG, "diff: " + diff);
+            setMarginsForSystemUI(layoutParams, +diff+left, -diff+top, +diff+right, -diff+bottom);
+        }
+        else {
+            setMarginsForSystemUI(layoutParams, left, top, right, bottom);
+        }
+        view.setLayoutParams(layoutParams);
+    }
+
+    void setFocusSeekbarsRotation() {
+        setFixedRotation(main_activity.findViewById(R.id.focus_seekbar), 0, 0, 0, 0);
+        setFixedRotation(main_activity.findViewById(R.id.focus_bracketing_target_seekbar), 0, 0, 0, 0);
+    }
+
     private void setPopupViewRotation(int ui_rotation, int display_height) {
         if (MyDebug.LOG)
             Log.d(TAG, "setPopupViewRotation");
@@ -871,13 +1070,19 @@ public class MainUI {
 
     }
 
-    public void onOrientationChanged(int orientation) {
+    // ParameterCanBeLocal warning suppressed as it's incorrect here! (Or
+    // possibly it's due to effect of MainActivity.lock_to_landscape always
+    // being false.)
+    public void onOrientationChanged(@SuppressWarnings("ParameterCanBeLocal") int orientation) {
 		/*if( MyDebug.LOG ) {
 			Log.d(TAG, "onOrientationChanged()");
 			Log.d(TAG, "orientation: " + orientation);
 			Log.d(TAG, "current_orientation: " + current_orientation);
 		}*/
-        if (orientation == OrientationEventListener.ORIENTATION_UNKNOWN)
+        if( !MainActivity.lock_to_landscape )
+            return;
+        // if locked to landscape, we need to handle the orientation change ourselves
+        if( orientation == OrientationEventListener.ORIENTATION_UNKNOWN )
             return;
         int diff = Math.abs(orientation - current_orientation);
         if (diff > 180)
@@ -924,6 +1129,10 @@ public class MainUI {
     public boolean showExposureLockIcon() {
         if (!main_activity.getPreview().supportsExposureLock())
             return false;
+        if( main_activity.getApplicationInterface().isCameraExtensionPref() ) {
+            // not supported for camera extensions
+            return false;
+        }
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(main_activity);
         return sharedPreferences.getBoolean(PreferenceKeys.ShowExposureLockPreferenceKey, true);
     }
@@ -931,6 +1140,10 @@ public class MainUI {
     public boolean showWhiteBalanceLockIcon() {
         if (!main_activity.getPreview().supportsWhiteBalanceLock())
             return false;
+        if( main_activity.getApplicationInterface().isCameraExtensionPref() ) {
+            // not supported for camera extensions
+            return false;
+        }
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(main_activity);
         return sharedPreferences.getBoolean(PreferenceKeys.ShowWhiteBalanceLockPreferenceKey, false);
     }
@@ -1014,8 +1227,10 @@ public class MainUI {
                 View settingsButton = main_activity.findViewById(R.id.settings);
                 View zoomControls = main_activity.findViewById(R.id.zoom);
                 View zoomSeekBar = main_activity.findViewById(R.id.zoom_seekbar);
+                View focusSeekBar = main_activity.findViewById(R.id.focus_seekbar);
+                View focusBracketingTargetSeekBar = main_activity.findViewById(R.id.focus_bracketing_target_seekbar);
                 View zoomSeekbarIcon = main_activity.findViewById(R.id.zoom_seekbar_icon);
-                if (main_activity.getPreview().getCameraControllerManager().getNumberOfCameras() > 1)
+                if( main_activity.getPreview().getCameraControllerManager().getNumberOfCameras() > 1 )
                     switchCameraButton.setVisibility(visibility);
                 if (main_activity.showSwitchMultiCamIcon())
                     switchMultiCameraButton.setVisibility(visibility);
@@ -1055,6 +1270,29 @@ public class MainUI {
                     zoomSeekBar.setVisibility(visibility);
                     zoomSeekbarIcon.setVisibility(visibility);
                 }
+                if( main_activity.showManualFocusSeekbar(false) )
+                    focusSeekBar.setVisibility(visibility);
+                if( main_activity.showManualFocusSeekbar(true) )
+                    focusBracketingTargetSeekBar.setVisibility(visibility);
+                String pref_immersive_mode = sharedPreferences.getString(PreferenceKeys.ImmersiveModePreferenceKey, "immersive_mode_low_profile");
+                if( pref_immersive_mode.equals("immersive_mode_everything") ) {
+                    if( sharedPreferences.getBoolean(PreferenceKeys.ShowTakePhotoPreferenceKey, true) ) {
+                        View takePhotoButton = main_activity.findViewById(R.id.take_photo);
+                        takePhotoButton.setVisibility(visibility);
+                    }
+                    if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && main_activity.getPreview().isVideoRecording() ) {
+                        View pauseVideoButton = main_activity.findViewById(R.id.pause_video);
+                        pauseVideoButton.setVisibility(visibility);
+                    }
+                    if( main_activity.getPreview().supportsPhotoVideoRecording() && main_activity.getApplicationInterface().usePhotoVideoRecording() && main_activity.getPreview().isVideoRecording() ) {
+                        View takePhotoVideoButton = main_activity.findViewById(R.id.take_photo_when_video_recording);
+                        takePhotoVideoButton.setVisibility(visibility);
+                    }
+                    if( main_activity.getApplicationInterface().getGyroSensor().isRecording() ) {
+                        View cancelPanoramaButton = main_activity.findViewById(R.id.cancel_panorama);
+                        cancelPanoramaButton.setVisibility(visibility);
+                    }
+                }
                 if (!immersive_mode) {
                     // make sure the GUI is set up as expected
                     showGUI();
@@ -1309,7 +1547,8 @@ public class MainUI {
         mSelectingExposureUIElement = false;
         if (isExposureUIOpen()) {
             closeExposureUI();
-        } else if (main_activity.getPreview().getCameraController() != null) {
+        }
+        else if( main_activity.getPreview().getCameraController() != null && main_activity.supportsExposureButton() ) {
             setupExposureUI();
             if (main_activity.getBluetoothRemoteControl().remoteEnabled()) {
                 initRemoteControlForExposureUI();
@@ -1496,23 +1735,23 @@ public class MainUI {
         int count = iso_buttons.size();
         int step = previous ? -1 : 1;
         boolean found = false;
-        for (int i = 0; i < count; i++) {
-            Button button = (Button) iso_buttons.get(i);
+        for(int i = 0; i < count; i++) {
+            Button button = (Button)iso_buttons.get(i);
             String button_text = "" + button.getText();
-            if (button_text.contains(current_iso)) {
+            if( ISOTextEquals(button_text, current_iso) ) {
                 found = true;
                 // Select next one, unless it's "Manual", which we skip since
                 // it's not practical in remote mode.
                 Button nextButton = (Button) iso_buttons.get((i + count + step) % count);
                 String nextButton_text = "" + nextButton.getText();
-                if (nextButton_text.contains("m")) {
-                    nextButton = (Button) iso_buttons.get((i + count + 2 * step) % count);
+                if( nextButton_text.contains("m") ) {
+                    nextButton = (Button) iso_buttons.get((i+count+ 2*step)%count);
                 }
                 nextButton.callOnClick();
                 break;
             }
         }
-        if (!found) {
+        if( !found ) {
             // For instance, we are in ISO manual mode and "M" is selected. default
             // back to "Auto" to avoid being stuck since we're with a remote control
             iso_buttons.get(0).callOnClick();
@@ -1530,11 +1769,11 @@ public class MainUI {
     private void selectExposureUILine() {
         if (MyDebug.LOG)
             Log.d(TAG, "selectExposureUILine");
-        if (!isExposureUIOpen()) { // Safety check
+        if( !isExposureUIOpen() ) { // Safety check
             return;
         }
 
-        if (mExposureLine == 0) { // ISO presets
+        if( mExposureLine == 0 ) { // ISO presets
             ViewGroup iso_buttons_container = main_activity.findViewById(R.id.iso_buttons);
             iso_buttons_container.setBackgroundColor(highlightColorExposureUIElement);
             //iso_buttons_container.setAlpha(1f);
@@ -1546,45 +1785,50 @@ public class MainUI {
             for (View view : iso_buttons) {
                 Button button = (Button) view;
                 String button_text = "" + button.getText();
-                if (button_text.contains(current_iso)) {
+                if( ISOTextEquals(button_text, current_iso) ) {
                     PopupView.setButtonSelected(button, true);
                     //button.setBackgroundColor(highlightColorExposureUIElement);
                     //button.setAlpha(0.3f);
                     found = true;
-                } else {
-                    if (button_text.contains("m")) {
+                }
+                else {
+                    if( button_text.contains("m") ) {
                         manualButton = button;
                     }
                     PopupView.setButtonSelected(button, false);
                     button.setBackgroundColor(Color.TRANSPARENT);
                 }
             }
-            if (!found && manualButton != null) {
+            if( !found && manualButton != null ) {
                 // We are in manual ISO, highlight the "M" button
                 PopupView.setButtonSelected(manualButton, true);
                 manualButton.setBackgroundColor(highlightColorExposureUIElement);
                 //manualButton.setAlpha(0.3f);
             }
             mSelectingExposureUIElement = true;
-        } else if (mExposureLine == 1) {
+        }
+        else if( mExposureLine == 1 ) {
             // ISO seek bar - change color
             View seek_bar = main_activity.findViewById(R.id.iso_seekbar);
             //seek_bar.setAlpha(0.1f);
             seek_bar.setBackgroundColor(highlightColorExposureUIElement);
             mSelectingExposureUIElement = true;
-        } else if (mExposureLine == 2) {
+        }
+        else if( mExposureLine == 2 ) {
             // ISO seek bar - change color
             View seek_bar = main_activity.findViewById(R.id.exposure_time_seekbar);
             //seek_bar.setAlpha(0.1f);
             seek_bar.setBackgroundColor(highlightColorExposureUIElement);
             mSelectingExposureUIElement = true;
-        } else if (mExposureLine == 3) {
+        }
+        else if ( mExposureLine == 3 ) {
             // Exposure compensation
             View container = main_activity.findViewById(R.id.exposure_container);
             //container.setAlpha(0.1f);
             container.setBackgroundColor(highlightColorExposureUIElement);
             mSelectingExposureUIElement = true;
-        } else if (mExposureLine == 4) {
+        }
+        else if( mExposureLine == 4 ) {
             // Manual white balance
             View container = main_activity.findViewById(R.id.white_balance_seekbar);
             //container.setAlpha(0.1f);
@@ -1713,14 +1957,14 @@ public class MainUI {
             values.add(CameraController.ISO_DEFAULT);
             values.add(manual_iso_value);
             iso_button_manual_index = 1; // must match where we place the manual button!
-            int[] iso_values = {50, 100, 200, 400, 800, 1600, 3200, 6400};
-            values.add("" + min_iso);
-            for (int iso_value : iso_values) {
-                if (iso_value > min_iso && iso_value < max_iso) {
-                    values.add("" + iso_value);
+            int [] iso_values = {50, 100, 200, 400, 800, 1600, 3200, 6400};
+            values.add(ISOToButtonText(min_iso));
+            for(int iso_value : iso_values) {
+                if( iso_value > min_iso && iso_value < max_iso ) {
+                    values.add(ISOToButtonText(iso_value));
                 }
             }
-            values.add("" + max_iso);
+            values.add(ISOToButtonText(max_iso));
             supported_isos = values;
         } else {
             supported_isos = preview.getSupportedISOs();
@@ -1760,9 +2004,10 @@ public class MainUI {
                         editor.putLong(PreferenceKeys.ExposureTimePreferenceKey, CameraController.EXPOSURE_TIME_DEFAULT);
                         editor.apply();
                         preview.showToast("ISO: " + toast_option, 0, true); // supply offset_y_dp to be consistent with preview.setExposure(), preview.setISO()
-                        main_activity.updateForSettings(""); // already showed the toast, so block from showing again
-                    } else if (old_iso.equals(CameraController.ISO_DEFAULT)) {
-                        if (MyDebug.LOG)
+                        main_activity.updateForSettings(true, ""); // already showed the toast, so block from showing again
+                    }
+                    else if( old_iso.equals(CameraController.ISO_DEFAULT) ) {
+                        if( MyDebug.LOG )
                             Log.d(TAG, "switched from auto to manual iso");
                         if (option.equals("m")) {
                             // if we used the generic "manual", then instead try to preserve the current iso if it exists
@@ -1795,9 +2040,10 @@ public class MainUI {
 
                         editor.apply();
                         preview.showToast("ISO: " + toast_option, 0, true); // supply offset_y_dp to be consistent with preview.setExposure(), preview.setISO()
-                        main_activity.updateForSettings(""); // already showed the toast, so block from showing again
-                    } else {
-                        if (MyDebug.LOG)
+                        main_activity.updateForSettings(true, ""); // already showed the toast, so block from showing again
+                    }
+                    else {
+                        if( MyDebug.LOG )
                             Log.d(TAG, "changed manual iso");
                         if (option.equals("m")) {
                             // if user selected the generic "manual", then just keep the previous non-ISO option
@@ -1876,9 +2122,30 @@ public class MainUI {
         //layoutUI(); // needed to update alignment of exposure UI
     }
 
-    /**
-     * If the exposure panel is open, updates the selected ISO button to match the current ISO value,
-     * if a continuous range of ISO values are supported by the camera.
+    /** Returns whether the ISO button with the supplied text is a match for the supplied iso.
+     *  Should only be used for Preview.supportsISORange()==true (i.e., full manual ISO).
+     */
+    public static boolean ISOTextEquals(String button_text, String iso) {
+        // Can't use equals(), due to the \n that Popupview.getButtonOptionString() inserts, and
+        // also good to make this general in case in future we support other text formats.
+        // We really want to check that iso is the last word in button_text.
+        if( button_text.endsWith(iso) ) {
+            return button_text.length()==iso.length() || Character.isWhitespace( button_text.charAt(button_text.length()-iso.length()-1) );
+        }
+        return false;
+    }
+
+    /** Returns the ISO button text for the supplied iso.
+     *  Should only be used for Preview.supportsISORange()==true (i.e., full manual ISO).
+     */
+    public static String ISOToButtonText(int iso) {
+        // n.b., if we change how the ISO is converted to a string for the button, will also need
+        // to update updateSelectedISOButton()
+        return "" + iso;
+    }
+
+    /** If the exposure panel is open, updates the selected ISO button to match the current ISO value,
+     *  if a continuous range of ISO values are supported by the camera.
      */
     public void updateSelectedISOButton() {
         if (MyDebug.LOG)
@@ -1896,7 +2163,7 @@ public class MainUI {
                 if (MyDebug.LOG)
                     Log.d(TAG, "button: " + button.getText());
                 String button_text = "" + button.getText();
-                if (button_text.contains(current_iso)) {
+                if( ISOTextEquals(button_text, current_iso) ) {
                     PopupView.setButtonSelected(button, true);
                     found = true;
                 } else {
@@ -2259,25 +2526,52 @@ public class MainUI {
                         }
 
                         UIPlacement ui_placement = computeUIPlacement();
+                        MainActivity.SystemOrientation system_orientation = main_activity.getSystemOrientation();
                         float pivot_x;
                         float pivot_y;
                         switch (ui_placement) {
                             case UIPLACEMENT_TOP:
-                                if (main_activity.getPreview().getUIRotation() == 270) {
+                                if( main_activity.getPreview().getUIRotation() == 270 ) {
+                                    // portrait (when not locked)
                                     pivot_x = 0.0f;
                                     pivot_y = 1.0f;
-                                } else {
+                                }
+                                else if( system_orientation == MainActivity.SystemOrientation.REVERSE_LANDSCAPE ) {
+                                    pivot_x = 1.0f;
+                                    pivot_y = 1.0f;
+                                }
+                                else {
                                     pivot_x = 0.0f;
                                     pivot_y = 0.0f;
                                 }
                                 break;
                             case UIPLACEMENT_LEFT:
-                                pivot_x = 1.0f;
-                                pivot_y = 1.0f;
+                                if( system_orientation == MainActivity.SystemOrientation.PORTRAIT ) {
+                                    pivot_x = 0.0f;
+                                    pivot_y = 1.0f;
+                                }
+                                else if( system_orientation == MainActivity.SystemOrientation.REVERSE_LANDSCAPE ) {
+                                    pivot_x = 0.0f;
+                                    pivot_y = 0.0f;
+                                }
+                                else {
+                                    pivot_x = 1.0f;
+                                    pivot_y = 1.0f;
+                                }
                                 break;
                             default:
-                                pivot_x = 1.0f;
-                                pivot_y = 0.0f;
+                                if( system_orientation == MainActivity.SystemOrientation.PORTRAIT ) {
+                                    pivot_x = 1.0f;
+                                    pivot_y = 1.0f;
+                                }
+                                else if( system_orientation == MainActivity.SystemOrientation.REVERSE_LANDSCAPE ) {
+                                    pivot_x = 0.0f;
+                                    pivot_y = 1.0f;
+                                }
+                                else {
+                                    pivot_x = 1.0f;
+                                    pivot_y = 0.0f;
+                                }
                                 break;
                         }
                         ScaleAnimation animation = new ScaleAnimation(0.0f, 1.0f, 0.0f, 1.0f, Animation.RELATIVE_TO_SELF, pivot_x, Animation.RELATIVE_TO_SELF, pivot_y);
@@ -2403,17 +2697,18 @@ public class MainUI {
                         if (main_activity.getPreview().getCameraController() != null) {
                             String value = sharedPreferences.getString(PreferenceKeys.ISOPreferenceKey, CameraController.ISO_DEFAULT);
                             boolean manual_iso = !value.equals(CameraController.ISO_DEFAULT);
-                            if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
-                                if (manual_iso) {
-                                    if (main_activity.getPreview().supportsISORange())
-                                        main_activity.changeISO(1);
-                                } else
+                            if(keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
+                                if(manual_iso) {
+                                    main_activity.changeISO(1);
+                                }
+                                else
                                     main_activity.changeExposure(1);
-                            } else {
-                                if (manual_iso) {
-                                    if (main_activity.getPreview().supportsISORange())
-                                        main_activity.changeISO(-1);
-                                } else
+                            }
+                            else {
+                                if(manual_iso) {
+                                    main_activity.changeISO(-1);
+                                }
+                                else
                                     main_activity.changeExposure(-1);
                             }
                         }
diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/ManualSeekbars.java b/app/src/main/java/net/sourceforge/opencamera/ui/ManualSeekbars.java
index 148a296d361bd67413a128bc8ef121f3da0609ff..9a48bcab3ea0ea5b43cf1bcd75b81b145e1d8a72 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/ManualSeekbars.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/ManualSeekbars.java
@@ -177,21 +177,21 @@ public class ManualSeekbars {
 
         // 1/10,000 to 1/1,000
         for(int i=10;i>=1;i--) {
-            long exposure = 1000000000L/(i*1000);
+            long exposure = 1000000000L/(i* 1000L);
             if( exposure > min_exposure_time && exposure < max_exposure_time )
                 seekbar_values.add(exposure);
         }
 
         // 1/900 to 1/100
         for(int i=9;i>=1;i--) {
-            long exposure = 1000000000L/(i*100);
+            long exposure = 1000000000L/(i* 100L);
             if( exposure > min_exposure_time && exposure < max_exposure_time )
                 seekbar_values.add(exposure);
         }
 
         // 1/90 to 1/60 (steps of 10)
         for(int i=9;i>=6;i--) {
-            long exposure = 1000000000L/(i*10);
+            long exposure = 1000000000L/(i* 10L);
             if( exposure > min_exposure_time && exposure < max_exposure_time )
                 seekbar_values.add(exposure);
         }
diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/MyEditTextPreference.java b/app/src/main/java/net/sourceforge/opencamera/ui/MyEditTextPreference.java
new file mode 100644
index 0000000000000000000000000000000000000000..8a27d3c5e91ddf5d486ae70fb997b8b016b298fd
--- /dev/null
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/MyEditTextPreference.java
@@ -0,0 +1,158 @@
+package net.sourceforge.opencamera.ui;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.preference.DialogPreference;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import foundation.e.camera.R;
+
+
+/** This contains a custom preference for an EditTextPreference. We do all this to fix the problem
+ *  that Android's EditTextPreference doesn't satisfy Google's own emoji policy, due to the
+ *  programmatically allocated EditText (which means AppCompat can't update it to support emoji
+ *  properly). This is fixed with AndroidX (androidx.preference.*), but switching to that is a major
+ *  change.
+ *  Once we have switched to AndroidX's preference libraries, we can switch back to
+ *  EditTextPreference (but check that the emoji strings still work on Android 10 or earlier!)
+ */
+public class MyEditTextPreference extends DialogPreference {
+    //private static final String TAG = "MyEditTextPreference";
+
+    private EditText edittext;
+
+    private String dialogMessage = "";
+    private final int inputType;
+
+    private String value; // current saved value of this preference (note that this is intentionally not updated when the seekbar changes, as we don't save until the user clicks ok)
+    private boolean value_set;
+
+    public MyEditTextPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        String namespace = "http://schemas.android.com/apk/res/android";
+
+        // can't get both strings and resources to work - only support resources
+        int id = attrs.getAttributeResourceValue(namespace, "dialogMessage", 0);
+        if( id > 0 )
+            this.dialogMessage = context.getString(id);
+
+        this.inputType = attrs.getAttributeIntValue(namespace, "inputType", EditorInfo.TYPE_NULL);
+
+        setDialogLayoutResource(R.layout.myedittextpreference);
+    }
+
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+
+        this.edittext = view.findViewById(R.id.myedittextpreference_edittext);
+        this.edittext.setInputType(inputType);
+
+        TextView textView = view.findViewById(R.id.myedittextpreference_summary);
+        textView.setText(dialogMessage);
+
+        if( value != null ) {
+            this.edittext.setText(value);
+        }
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        super.onDialogClosed(positiveResult);
+
+        if( positiveResult ) {
+            String new_value = edittext.getText().toString();
+            if( callChangeListener(new_value) ) {
+                setValue(new_value);
+            }
+        }
+    }
+
+    public String getText() {
+        return value;
+    }
+
+    private void setValue(String value) {
+        final boolean changed = !TextUtils.equals(this.value, value);
+        if( changed || !value_set ) {
+            this.value = value;
+            value_set = true;
+            persistString(value);
+            if( changed ) {
+                notifyChanged();
+            }
+        }
+    }
+
+    @Override
+    protected Object onGetDefaultValue(TypedArray a, int index) {
+        return a.getString(index);
+    }
+
+    @Override
+    protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
+        setValue(restoreValue ? getPersistedString(value) : (String) defaultValue);
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        final Parcelable superState = super.onSaveInstanceState();
+        if( isPersistent() ) {
+            return superState;
+        }
+
+        final SavedState state = new SavedState(superState);
+        state.value = value;
+        return state;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if( state == null || !state.getClass().equals(SavedState.class) ) {
+            super.onRestoreInstanceState(state);
+            return;
+        }
+
+        SavedState myState = (SavedState)state;
+        super.onRestoreInstanceState(myState.getSuperState());
+        setValue(myState.value);
+    }
+
+    private static class SavedState extends BaseSavedState {
+        String value;
+
+        SavedState(Parcel source) {
+            super(source);
+            value = source.readString();
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeString(value);
+        }
+
+        SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        public static final Parcelable.Creator<SavedState> CREATOR =
+                new Parcelable.Creator<SavedState>() {
+                    public SavedState createFromParcel(Parcel in) {
+                        return new SavedState(in);
+                    }
+
+                    public SavedState[] newArray(int size) {
+                        return new SavedState[size];
+                    }
+                };
+    }
+}
diff --git a/app/src/main/java/net/sourceforge/opencamera/ui/PopupView.java b/app/src/main/java/net/sourceforge/opencamera/ui/PopupView.java
index 875dc0385ae31e6b52e5fbab282aa8fa2811584b..8100aa0f0f2eba41ea0e4673cf6b5c6c56dc6f17 100644
--- a/app/src/main/java/net/sourceforge/opencamera/ui/PopupView.java
+++ b/app/src/main/java/net/sourceforge/opencamera/ui/PopupView.java
@@ -15,17 +15,20 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.hardware.camera2.CameraExtensionCharacteristics;
 import android.os.Build;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
@@ -38,10 +41,11 @@ import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.ScrollView;
-import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.ImageView.ScaleType;
 
+import androidx.appcompat.widget.SwitchCompat;
+
 /** This defines the UI for the "popup" button, that provides quick access to a
  *  range of options.
  */
@@ -114,8 +118,10 @@ public class PopupView extends LinearLayout {
 		}*/
 
         final Preview preview = main_activity.getPreview();
+        boolean is_camera_extension = main_activity.getApplicationInterface().isCameraExtensionPref();
         if( MyDebug.LOG )
             Log.d(TAG, "PopupView time 2: " + (System.nanoTime() - debug_time));
+
         if( !main_activity.getMainUI().showCycleFlashIcon() )
         {
             List<String> supported_flash_values = preview.getSupportedFlashValues();
@@ -214,6 +220,26 @@ public class PopupView extends LinearLayout {
                 photo_modes.add( getResources().getString(use_expanded_menu ? R.string.photo_mode_focus_bracketing_full : R.string.photo_mode_focus_bracketing) );
                 photo_mode_values.add( MyApplicationInterface.PhotoMode.FocusBracketing );
             }
+            if( main_activity.supportsCameraExtension(CameraExtensionCharacteristics.EXTENSION_AUTOMATIC) ) {
+                photo_modes.add( getResources().getString(use_expanded_menu ? R.string.photo_mode_x_auto_full : R.string.photo_mode_x_auto) );
+                photo_mode_values.add( MyApplicationInterface.PhotoMode.X_Auto );
+            }
+            if( main_activity.supportsCameraExtension(CameraExtensionCharacteristics.EXTENSION_HDR) ) {
+                photo_modes.add( getResources().getString(use_expanded_menu ? R.string.photo_mode_x_hdr_full : R.string.photo_mode_x_hdr) );
+                photo_mode_values.add( MyApplicationInterface.PhotoMode.X_HDR );
+            }
+            if( main_activity.supportsCameraExtension(CameraExtensionCharacteristics.EXTENSION_NIGHT) ) {
+                photo_modes.add( getResources().getString(use_expanded_menu ? R.string.photo_mode_x_night_full : R.string.photo_mode_x_night) );
+                photo_mode_values.add( MyApplicationInterface.PhotoMode.X_Night );
+            }
+            if( main_activity.supportsCameraExtension(CameraExtensionCharacteristics.EXTENSION_BOKEH) ) {
+                photo_modes.add( getResources().getString(use_expanded_menu ? R.string.photo_mode_x_bokeh_full : R.string.photo_mode_x_bokeh) );
+                photo_mode_values.add( MyApplicationInterface.PhotoMode.X_Bokeh );
+            }
+            if( main_activity.supportsCameraExtension(CameraExtensionCharacteristics.EXTENSION_BEAUTY) ) {
+                photo_modes.add( getResources().getString(use_expanded_menu ? R.string.photo_mode_x_beauty_full : R.string.photo_mode_x_beauty) );
+                photo_mode_values.add( MyApplicationInterface.PhotoMode.X_Beauty );
+            }
             if( preview.isVideo() ) {
                 // only show photo modes when in photo mode, not video mode!
                 // (photo modes not supported for photo snapshot whilst recording video)
@@ -383,7 +409,7 @@ public class PopupView extends LinearLayout {
                         public void run() {
                             if (MyDebug.LOG)
                                 Log.d(TAG, "update settings due to resolution change");
-                            main_activity.updateForSettings("", true); // keep the popupview open
+                            main_activity.updateForSettings(true, "", true); // keep the popupview open
                         }
                     };
 
@@ -398,8 +424,11 @@ public class PopupView extends LinearLayout {
                         editor.apply();
 
                         // make it easier to scroll through the list of resolutions without a pause each time
+                        // need a longer time for extension modes, due to the need to camera reopening (which will cause the
+                        // popup menu to close)
+                        final long delay_time = main_activity.getApplicationInterface().isCameraExtensionPref() ? 800 : 400;
                         handler.removeCallbacks(update_runnable);
-                        handler.postDelayed(update_runnable, 400);
+                        handler.postDelayed(update_runnable, delay_time);
                     }
 
                     @Override
@@ -464,7 +493,7 @@ public class PopupView extends LinearLayout {
                         public void run() {
                             if( MyDebug.LOG )
                                 Log.d(TAG, "update settings due to video resolution change");
-                            main_activity.updateForSettings("", true); // keep the popupview open
+                            main_activity.updateForSettings(true, "", true); // keep the popupview open
                         }
                     };
 
@@ -506,7 +535,8 @@ public class PopupView extends LinearLayout {
             if( MyDebug.LOG )
                 Log.d(TAG, "PopupView time 10: " + (System.nanoTime() - debug_time));
 
-            if( preview.getSupportedApertures() != null ) {
+            // apertures probably not supported for camera extensions anyway
+            if( preview.getSupportedApertures() != null && !is_camera_extension ) {
                 if( MyDebug.LOG )
                     Log.d(TAG, "add apertures");
 
@@ -698,9 +728,12 @@ public class PopupView extends LinearLayout {
                     }
                 });
 
-                //CheckBox checkBox = new CheckBox(main_activity);
-                Switch checkBox = new Switch(main_activity);
+                @SuppressLint("InflateParams")
+                final View switch_view = LayoutInflater.from(context).inflate(R.layout.popupview_switch, null);
+                final SwitchCompat checkBox = switch_view.findViewById(R.id.popupview_switch);
+
                 checkBox.setText(getResources().getString(R.string.focus_bracketing_add_infinity));
+
                 {
                     // align the checkbox a bit better
                     checkBox.setGravity(Gravity.RIGHT);
@@ -771,8 +804,8 @@ public class PopupView extends LinearLayout {
                             @Override
                             public void run() {
                                 if (MyDebug.LOG)
-                                    Log.d(TAG, "update settings due to resolution change");
-                                main_activity.updateForSettings("", true); // keep the popupview open
+                                    Log.d(TAG, "update settings due to video capture rate change");
+                                main_activity.updateForSettings(true, "", true); // keep the popupview open
                             }
                         };
 
@@ -812,12 +845,12 @@ public class PopupView extends LinearLayout {
                             old_video_capture_rate_index = video_capture_rate_index;
 
                             if( keep_popup ) {
-                                // make it easier to scroll through the list of resolutions without a pause each time
+                                // make it easier to scroll through the list of capture rates without a pause each time
                                 handler.removeCallbacks(update_runnable);
                                 handler.postDelayed(update_runnable, 400);
                             }
                             else {
-                                main_activity.updateForSettings(toast_message, keep_popup);
+                                main_activity.updateForSettings(true, toast_message, keep_popup);
                             }
                         }
                         @Override
@@ -981,8 +1014,10 @@ public class PopupView extends LinearLayout {
             if( MyDebug.LOG )
                 Log.d(TAG, "PopupView time 13: " + (System.nanoTime() - debug_time));
 
+            // white balance modes, scene modes, color effects
+            // all of these are only supported when not using extension mode
             // popup should only be opened if we have a camera controller, but check just to be safe
-            if( preview.getCameraController() != null ) {
+            if( preview.getCameraController() != null && !is_camera_extension ) {
                 List<String> supported_white_balances = preview.getSupportedWhiteBalances();
                 List<String> supported_white_balances_entries = null;
                 if( supported_white_balances != null ) {
@@ -1016,7 +1051,7 @@ public class PopupView extends LinearLayout {
                         if( preview.getCameraController() != null ) {
                             if( preview.getCameraController().sceneModeAffectsFunctionality() ) {
                                 // need to call updateForSettings() and close the popup, as changing scene mode can change available camera features
-                                main_activity.updateForSettings(getResources().getString(R.string.scene_mode) + ": " + main_activity.getMainUI().getEntryForSceneMode(selected_value));
+                                main_activity.updateForSettings(true, getResources().getString(R.string.scene_mode) + ": " + main_activity.getMainUI().getEntryForSceneMode(selected_value));
                                 main_activity.closePopup();
                             }
                             else {
@@ -1054,6 +1089,9 @@ public class PopupView extends LinearLayout {
         }
 
         setBackgroundColor(getResources().getColor(R.color.color_popup_bg));
+
+        if( MyDebug.LOG )
+            Log.d(TAG, "Overall PopupView time: " + (System.nanoTime() - debug_time));
     }
 
     int getTotalWidth() {
@@ -1099,6 +1137,21 @@ public class PopupView extends LinearLayout {
                 case Panorama:
                     toast_message = getResources().getString(R.string.photo_mode_panorama_full);
                     break;
+                case X_Auto:
+                    toast_message = getResources().getString(R.string.photo_mode_x_auto_full);
+                    break;
+                case X_HDR:
+                    toast_message = getResources().getString(R.string.photo_mode_x_hdr_full);
+                    break;
+                case X_Night:
+                    toast_message = getResources().getString(R.string.photo_mode_x_night_full);
+                    break;
+                case X_Bokeh:
+                    toast_message = getResources().getString(R.string.photo_mode_x_bokeh_full);
+                    break;
+                case X_Beauty:
+                    toast_message = getResources().getString(R.string.photo_mode_x_beauty_full);
+                    break;
             }
             final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(main_activity);
             SharedPreferences.Editor editor = sharedPreferences.edit();
@@ -1127,6 +1180,21 @@ public class PopupView extends LinearLayout {
                 case Panorama:
                     editor.putString(PreferenceKeys.PhotoModePreferenceKey, "preference_photo_mode_panorama");
                     break;
+                case X_Auto:
+                    editor.putString(PreferenceKeys.PhotoModePreferenceKey, "preference_photo_mode_x_auto");
+                    break;
+                case X_HDR:
+                    editor.putString(PreferenceKeys.PhotoModePreferenceKey, "preference_photo_mode_x_hdr");
+                    break;
+                case X_Night:
+                    editor.putString(PreferenceKeys.PhotoModePreferenceKey, "preference_photo_mode_x_night");
+                    break;
+                case X_Bokeh:
+                    editor.putString(PreferenceKeys.PhotoModePreferenceKey, "preference_photo_mode_x_bokeh");
+                    break;
+                case X_Beauty:
+                    editor.putString(PreferenceKeys.PhotoModePreferenceKey, "preference_photo_mode_x_beauty");
+                    break;
                 default:
                     if (MyDebug.LOG)
                         Log.e(TAG, "unknown new_photo_mode: " + new_photo_mode);
@@ -1156,7 +1224,7 @@ public class PopupView extends LinearLayout {
             }
 
             main_activity.getApplicationInterface().getDrawPreview().updateSettings(); // because we cache the photomode
-            main_activity.updateForSettings(toast_message); // need to setup the camera again, as options may change (e.g., required burst mode, or whether RAW is allowed in this mode)
+            main_activity.updateForSettings(true, toast_message); // need to setup the camera again, as options may change (e.g., required burst mode, or whether RAW is allowed in this mode)
             main_activity.getMainUI().destroyPopup(); // need to recreate popup for new selection
         }
     }
@@ -1228,6 +1296,10 @@ public class PopupView extends LinearLayout {
         createButtonOptions(this, this.getContext(), total_width_dp, main_activity.getMainUI().getTestUIButtonsMap(), supported_options, icons_id, values_id, prefix_string, true, current_value, max_buttons_per_row, test_key, listener);
     }
 
+    public static String getButtonOptionString(boolean include_prefix, String prefix_string, String supported_option) {
+        return (include_prefix ? prefix_string : "") + "\n" + supported_option;
+    }
+
     static List<View> createButtonOptions(ViewGroup parent, Context context, int total_width_dp, Map<String, View> test_ui_buttons, List<String> supported_options, int icons_id, int values_id, String prefix_string, boolean include_prefix, String current_value, int max_buttons_per_row, String test_key, final ButtonOptionsPopupListener listener) {
         if( MyDebug.LOG )
             Log.d(TAG, "createButtonOptions");
@@ -1338,13 +1410,13 @@ public class PopupView extends LinearLayout {
                     button_string = supported_option;
                 }
                 else if( prefix_string.equalsIgnoreCase("ISO") && supported_option.length() >= 4 && supported_option.substring(0, 4).equalsIgnoreCase("ISO_") ) {
-                    button_string = (include_prefix ? prefix_string : "") + "\n" + supported_option.substring(4);
+                    button_string = getButtonOptionString(include_prefix, prefix_string, supported_option.substring(4));
                 }
                 else if( prefix_string.equalsIgnoreCase("ISO") && supported_option.length() >= 3 && supported_option.substring(0, 3).equalsIgnoreCase("ISO") ) {
-                    button_string = (include_prefix ? prefix_string : "") + "\n" + supported_option.substring(3);
+                    button_string = getButtonOptionString(include_prefix, prefix_string, supported_option.substring(3));
                 }
                 else {
-                    button_string = (include_prefix ? prefix_string : "") + "\n" + supported_option;
+                    button_string = getButtonOptionString(include_prefix, prefix_string, supported_option);
                 }
                 if( MyDebug.LOG )
                     Log.d(TAG, "button_string: " + button_string);
@@ -1378,7 +1450,10 @@ public class PopupView extends LinearLayout {
                     view.setPadding(imageButtonPadding, imageButtonPadding, imageButtonPadding, imageButtonPadding);
                 }
                 else {
-                    Button button = new Button(context);
+                    @SuppressLint("InflateParams")
+                    final View button_view = LayoutInflater.from(context).inflate(R.layout.popupview_button, null);
+                    final Button button = button_view.findViewById(R.id.button);
+
                     button.setBackgroundColor(Color.TRANSPARENT); // workaround for Android 6 crash! Also looks nicer anyway...
                     view = button;
                     buttons.add(view);
@@ -1480,16 +1555,21 @@ public class PopupView extends LinearLayout {
     }
 
     private void addTitleToPopup(final String title) {
-        TextView text_view = new TextView(this.getContext());
+        final long debug_time = System.nanoTime();
+
+        @SuppressLint("InflateParams")
+        final View view = LayoutInflater.from(this.getContext()).inflate(R.layout.popupview_textview, null);
+        final TextView text_view = view.findViewById(R.id.text_view);
+
         text_view.setText(title + ":");
-        text_view.setTextColor(Color.WHITE);
-        text_view.setGravity(Gravity.CENTER);
         text_view.setTextSize(TypedValue.COMPLEX_UNIT_DIP, title_text_size_dip);
         text_view.setTypeface(null, Typeface.BOLD);
         text_view.setPadding(0, 5, 0, 5);
         //text_view.setBackgroundColor(Color.GRAY); // debug
         text_view.setBackgroundColor(getResources().getColor(R.color.color_popup_title_bg));
         this.addView(text_view);
+        if( MyDebug.LOG )
+            Log.d(TAG, "addTitleToPopup time: " + (System.nanoTime() - debug_time));
     }
 
     private abstract static class RadioOptionsListener {
@@ -1659,7 +1739,16 @@ public class PopupView extends LinearLayout {
             }
             if( MyDebug.LOG )
                 Log.d(TAG, "addRadioOptionsToGroup time 1: " + (System.nanoTime() - debug_time));
-            RadioButton button = new RadioButton(this.getContext());
+
+            // Inflating from XML made opening the radio button sub-menus much slower on old devices (e.g., Galaxy Nexus),
+            // however testing showed this is also just as slow if we programmatically create a new AppCompatRadioButton().
+            // I.e., the slowdown is due to using AppCompatRadioButton (which AppCompat will automatically use if creating
+            // a RadioButton from XML) rather than inflating from XML.
+            // Whilst creating a new RadioButton() was faster, we can't do that anymore due to emoji policy!
+            @SuppressLint("InflateParams")
+            final View view = LayoutInflater.from(this.getContext()).inflate(R.layout.popupview_radiobutton, null);
+            final RadioButton button = view.findViewById(R.id.popupview_radiobutton);
+
             if( MyDebug.LOG )
                 Log.d(TAG, "addRadioOptionsToGroup time 2: " + (System.nanoTime() - debug_time));
 
@@ -1703,7 +1792,7 @@ public class PopupView extends LinearLayout {
                         listener.onClick(supported_option_value);
                     }
                     else {
-                        main_activity.updateForSettings(title + ": " + supported_option_entry);
+                        main_activity.updateForSettings(true, title + ": " + supported_option_entry);
                         main_activity.closePopup();
                     }
                 }
@@ -1749,25 +1838,18 @@ public class PopupView extends LinearLayout {
             }
 
             final MainActivity main_activity = (MainActivity)this.getContext();
-			/*final Button prev_button = new Button(this.getContext());
-			//prev_button.setBackgroundResource(R.drawable.exposure);
-			prev_button.setBackgroundColor(Color.TRANSPARENT); // workaround for Android 6 crash!
-			prev_button.setText("<");
-			this.addView(prev_button);*/
 
-            LinearLayout ll2 = new LinearLayout(this.getContext());
-            ll2.setOrientation(LinearLayout.HORIZONTAL);
-            if( !title_in_options ) {
-                ll2.setPadding(0,40,0, 0);
-            }
+            final long debug_time = System.nanoTime();
 
+            @SuppressLint("InflateParams")
+            final View ll2 = LayoutInflater.from(this.getContext()).inflate(R.layout.popupview_arrayoptions, null);
+            final TextView text_view = ll2.findViewById(R.id.text_view);
+            final ImageButton prev_button = ll2.findViewById(R.id.button_left);
+            final ImageButton next_button = ll2.findViewById(R.id.button_right);
 
-            final TextView text_view = new TextView(this.getContext());
             setArrayOptionsText(supported_options, title, text_view, title_in_options, title_in_options_first_only, current_index);
             //text_view.setBackgroundColor(Color.GRAY); // debug
             text_view.setTextSize(TypedValue.COMPLEX_UNIT_DIP, standard_text_size_dip);
-            text_view.setTextColor(Color.WHITE);
-            text_view.setGravity(Gravity.CENTER);
             text_view.setSingleLine(true); // if text too long for the button, we'd rather not have wordwrap, even if it means cutting some text off
             LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, 1.0f);
             // Yuck! We want the arrow_button_w to be fairly large so that users can touch the arrow buttons easily, but if
@@ -1779,9 +1861,7 @@ public class PopupView extends LinearLayout {
 
             final float scale = getResources().getDisplayMetrics().density;
             final int padding = (int) (0 * scale + 0.5f); // convert dps to pixels
-            final ImageButton prev_button = new ImageButton(this.getContext());
             prev_button.setBackgroundColor(Color.TRANSPARENT); // workaround for Android 6 crash!
-            ll2.addView(prev_button);
             prev_button.setImageDrawable(this.getResources().getDrawable(R.drawable.ic_arrow_left));
             prev_button.setPadding(padding, padding, padding, padding);
             ViewGroup.LayoutParams vg_params = prev_button.getLayoutParams();
@@ -1792,12 +1872,10 @@ public class PopupView extends LinearLayout {
             prev_button.setContentDescription( getResources().getString(R.string.previous) + " " + title);
             main_activity.getMainUI().getTestUIButtonsMap().put(test_key + "_PREV", prev_button);
 
-            ll2.addView(text_view);
+            //ll2.addView(text_view);
             main_activity.getMainUI().getTestUIButtonsMap().put(test_key, text_view);
 
-            final ImageButton next_button = new ImageButton(this.getContext());
             next_button.setBackgroundColor(Color.TRANSPARENT); // workaround for Android 6 crash!
-            ll2.addView(next_button);
             next_button.setImageDrawable(this.getResources().getDrawable(R.drawable.ic_arrow_right));
             next_button.setPadding(padding, padding, padding, padding);
             vg_params = next_button.getLayoutParams();
@@ -1838,6 +1916,9 @@ public class PopupView extends LinearLayout {
             });
 
             this.addView(ll2);
+
+            if( MyDebug.LOG )
+                Log.d(TAG, "addArrayOptionsToPopup time: " + (System.nanoTime() - debug_time));
         }
     }
 }
diff --git a/app/src/main/res/drawable-hdpi/baseline_bedtime_white_48.png b/app/src/main/res/drawable-hdpi/baseline_bedtime_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f775b967672071173d9d74319596563202c2cf4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_bedtime_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_delete_white_48.png b/app/src/main/res/drawable-hdpi/baseline_delete_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..aadf7229ee75795998b33c2dd239d0a2c4cc69e6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_delete_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_face_retouching_natural_white_48.png b/app/src/main/res/drawable-hdpi/baseline_face_retouching_natural_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5ee6b45a25ab42fa5f38c6bc54eb160b3db6dc6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_face_retouching_natural_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_portrait_white_48.png b/app/src/main/res/drawable-hdpi/baseline_portrait_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e6aeda802f437a86decd9c306e0acffc732cdb9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_portrait_white_48.png differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_switch_camera_white_48.png b/app/src/main/res/drawable-hdpi/baseline_switch_camera_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..27e8659083c7ec3f9ed7ac2f6da0e7c8752b5e6c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/baseline_switch_camera_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_bedtime_white_48.png b/app/src/main/res/drawable-mdpi/baseline_bedtime_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..de0eac8c8a9306cff28058a6f54f6535461276ed
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_bedtime_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_delete_white_48.png b/app/src/main/res/drawable-mdpi/baseline_delete_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad2fa12f66498700c7434afaa8ce7a2d017b693e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_delete_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_face_retouching_natural_white_48.png b/app/src/main/res/drawable-mdpi/baseline_face_retouching_natural_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7035beeb2e094b4a1f98c2e89d49f4b931c3ea7
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_face_retouching_natural_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_portrait_white_48.png b/app/src/main/res/drawable-mdpi/baseline_portrait_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..10e3f08b8a3bb4be84bfba1ddb6080b5e0bbde7c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_portrait_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_switch_camera_white_48.png b/app/src/main/res/drawable-mdpi/baseline_switch_camera_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..b981fc24f73d9bb95b22b37e274e363380f6e78c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/baseline_switch_camera_white_48.png differ
diff --git a/app/src/main/res/drawable-mdpi/expo_icon.png b/app/src/main/res/drawable-mdpi/expo_icon.png
index 5cf89e836713e1213a47e54bd4441ea76657b2e6..1ac5d28f3bbba70c884dbd6f4b44de60a49c18bd 100644
Binary files a/app/src/main/res/drawable-mdpi/expo_icon.png and b/app/src/main/res/drawable-mdpi/expo_icon.png differ
diff --git a/app/src/main/res/drawable-mdpi/focus_bracket_icon.png b/app/src/main/res/drawable-mdpi/focus_bracket_icon.png
deleted file mode 100644
index 8042ba781062f2249d471e3b071fa9c57f83a413..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/focus_bracket_icon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/focus_mode_auto.png b/app/src/main/res/drawable-mdpi/focus_mode_auto.png
index 65593db0f97873735bbe551d2c702e7e72bb4f9d..d4a27da69de6ebd36017e13a6759a03874e8ea36 100644
Binary files a/app/src/main/res/drawable-mdpi/focus_mode_auto.png and b/app/src/main/res/drawable-mdpi/focus_mode_auto.png differ
diff --git a/app/src/main/res/drawable-mdpi/focus_mode_continuous_picture.png b/app/src/main/res/drawable-mdpi/focus_mode_continuous_picture.png
index 24bcb7d5e427273a5aaf9f7e5a391cc2143ccd21..2979dafd62c8c915fc0373b220d1e0dc5f9514d1 100644
Binary files a/app/src/main/res/drawable-mdpi/focus_mode_continuous_picture.png and b/app/src/main/res/drawable-mdpi/focus_mode_continuous_picture.png differ
diff --git a/app/src/main/res/drawable-mdpi/focus_mode_continuous_video.png b/app/src/main/res/drawable-mdpi/focus_mode_continuous_video.png
index 24bcb7d5e427273a5aaf9f7e5a391cc2143ccd21..2979dafd62c8c915fc0373b220d1e0dc5f9514d1 100644
Binary files a/app/src/main/res/drawable-mdpi/focus_mode_continuous_video.png and b/app/src/main/res/drawable-mdpi/focus_mode_continuous_video.png differ
diff --git a/app/src/main/res/drawable-mdpi/focus_mode_edof.png b/app/src/main/res/drawable-mdpi/focus_mode_edof.png
index 7a74bab00af967cd60583fa96fbd97e19dcd75ad..6c5474f3205f4aec604e8426cd3f247fcf17fcf6 100644
Binary files a/app/src/main/res/drawable-mdpi/focus_mode_edof.png and b/app/src/main/res/drawable-mdpi/focus_mode_edof.png differ
diff --git a/app/src/main/res/drawable-mdpi/focus_mode_fixed.png b/app/src/main/res/drawable-mdpi/focus_mode_fixed.png
index 8f07487c24eeeb87f173df73197bb4dffe5e0276..5d03fd580f60a4b160b8ba412007a6a0c7bf50d8 100644
Binary files a/app/src/main/res/drawable-mdpi/focus_mode_fixed.png and b/app/src/main/res/drawable-mdpi/focus_mode_fixed.png differ
diff --git a/app/src/main/res/drawable-mdpi/focus_mode_infinity.png b/app/src/main/res/drawable-mdpi/focus_mode_infinity.png
index 7e8c1502004d2bb2086ae62571f9d5c010631937..3068e51e7070c3506218e3df76df3759dda4dfef 100644
Binary files a/app/src/main/res/drawable-mdpi/focus_mode_infinity.png and b/app/src/main/res/drawable-mdpi/focus_mode_infinity.png differ
diff --git a/app/src/main/res/drawable-mdpi/focus_mode_manual.png b/app/src/main/res/drawable-mdpi/focus_mode_manual.png
index b7e5fbbaad9c4e5c87731450df3e6c63fb23d984..4efce75eb1dfe3f9c66aadfdd2874e24356fa82e 100644
Binary files a/app/src/main/res/drawable-mdpi/focus_mode_manual.png and b/app/src/main/res/drawable-mdpi/focus_mode_manual.png differ
diff --git a/app/src/main/res/drawable-mdpi/white_balance_locked.png b/app/src/main/res/drawable-mdpi/white_balance_locked.png
index 70f72b066bffaaf64d05586d7233c49cf39e0e97..d8e976a1fbda4305459f6cbe8ae7606e8f9dba38 100644
Binary files a/app/src/main/res/drawable-mdpi/white_balance_locked.png and b/app/src/main/res/drawable-mdpi/white_balance_locked.png differ
diff --git a/app/src/main/res/drawable-mdpi/white_balance_unlocked.png b/app/src/main/res/drawable-mdpi/white_balance_unlocked.png
index 6191a2339f32dd14cf9abab856013c80c5218996..249c781d47117a5536086ce2a16f0b45e35aaa93 100644
Binary files a/app/src/main/res/drawable-mdpi/white_balance_unlocked.png and b/app/src/main/res/drawable-mdpi/white_balance_unlocked.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_bedtime_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_bedtime_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2ab295001eafa8807759d38ba3a97be2244367d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_bedtime_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_delete_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_delete_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..a73379951d7a8eece2b6698bfb08eeea2665c8ef
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_delete_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_face_retouching_natural_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_face_retouching_natural_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e412cc265621ea7207337ee5e97c9adca014378
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_face_retouching_natural_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_portrait_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_portrait_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1289cb11170503795f2582be7d5feba69b84694
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_portrait_white_48.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_switch_camera_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_switch_camera_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..3754beb48642930ca7b66109847269d29f7b3408
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/baseline_switch_camera_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_bedtime_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_bedtime_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..dabbb83879dc473c9b8ef74b23542db5cc15879a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_bedtime_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_delete_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_delete_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..c647fead353a482f98553fbbfe139a1344d77d7e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_delete_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_face_retouching_natural_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_face_retouching_natural_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..9457ceb411ad4d4a606263679a68d0cf13b89064
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_face_retouching_natural_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_portrait_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_portrait_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..df4b6784cdc4e235b4e36c4796d66cedc5eba763
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_portrait_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_switch_camera_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_switch_camera_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c63ba16287c69011c8f214f7bcc85948cb51bba
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/baseline_switch_camera_white_48.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/expo_icon.png b/app/src/main/res/drawable-xxhdpi/expo_icon.png
index e84008a50dfc19de1b6ea5892c4fd405d9318c31..e68d4dbf497f88a9869534343930923e9cb7e33c 100644
Binary files a/app/src/main/res/drawable-xxhdpi/expo_icon.png and b/app/src/main/res/drawable-xxhdpi/expo_icon.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/focus_bracket_icon.png b/app/src/main/res/drawable-xxhdpi/focus_bracket_icon.png
deleted file mode 100644
index aab12557a15122c44bf1cffd0459254f014a6e01..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/focus_bracket_icon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_bedtime_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_bedtime_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bda163cf49514723c35ca808db415425cae2046
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_bedtime_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_delete_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_delete_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..b40da7917b111877f34a7377a38ffa69d27a43e9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_delete_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_face_retouching_natural_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_face_retouching_natural_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a8acc337a1217fc493687517cc93238c25a4640
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_face_retouching_natural_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_portrait_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_portrait_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c0064bd1e3410f270ee7b9c845c7d53dade4b16
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_portrait_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_switch_camera_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_switch_camera_white_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2a60a8ece20af48f1e23547d9848e80b9265952
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/baseline_switch_camera_white_48.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/flash_auto.png b/app/src/main/res/drawable-xxxhdpi/flash_auto.png
new file mode 100644
index 0000000000000000000000000000000000000000..60e6515190dfee513b261b8da911e88b1611f929
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/flash_auto.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/flash_off.png b/app/src/main/res/drawable-xxxhdpi/flash_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e8637c8f6524eefa94327c30430be2bc7dc0eb3
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/flash_off.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/flash_on.png b/app/src/main/res/drawable-xxxhdpi/flash_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d8f1c9b81df59ca6b48e7b3753e287c0cfe509f
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/flash_on.png differ
diff --git a/app/src/main/res/layout/activity_device_select.xml b/app/src/main/res/layout/activity_device_select.xml
index 930c4b4c6e677c827e760a0879e0414c06964916..b8d79cf7b92a95a94d4b511f67bb714ec7e698c7 100644
--- a/app/src/main/res/layout/activity_device_select.xml
+++ b/app/src/main/res/layout/activity_device_select.xml
@@ -28,8 +28,9 @@
             android:layout_marginTop="0dp"
             android:text="@string/bluetooth_scan" />
 
+        <!--android:id="@android:id/list"-->
         <ListView
-            android:id="@android:id/list"
+            android:id="@+id/list"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
diff --git a/app/src/main/res/layout/alertdialog_edittext.xml b/app/src/main/res/layout/alertdialog_edittext.xml
new file mode 100644
index 0000000000000000000000000000000000000000..134cf479ab4f9cf289f36d5ae5536868c2dc87a0
--- /dev/null
+++ b/app/src/main/res/layout/alertdialog_edittext.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generic xml for use with AlertDialog where we want an EditText.
+    Used in several places, so customisations should be done programatically in code - this is
+    also why we don't set a "hint" here in the XML; this should be done by the caller. Similarly
+    for the autofillHints.
+    Important not to create EditTexts dynamically in code, due to Google Play emoji policy...
+    -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <EditText
+        android:id="@+id/edit_text"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textMultiLine"
+        tools:ignore="Autofill,LabelFor"
+        />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/alertdialog_textview.xml b/app/src/main/res/layout/alertdialog_textview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..87ef8dcd055d614026cb28ee42bbec32833d53be
--- /dev/null
+++ b/app/src/main/res/layout/alertdialog_textview.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generic xml for use with creating a TextView for AlertDialog.
+    Used in several places, so customisations should be done programatically in code.
+    Important not to create TextViews dynamically in code, due to Google Play emoji policy...
+    -->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/text_view"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:visibility="visible"
+    />
diff --git a/app/src/main/res/layout/arrayseekbarpreference.xml b/app/src/main/res/layout/arrayseekbarpreference.xml
index 994fee8d8950dfd3314418d4db8235ce9e075626..d0a6a391739b734177777daf5ea0aa2bdbb960c9 100644
--- a/app/src/main/res/layout/arrayseekbarpreference.xml
+++ b/app/src/main/res/layout/arrayseekbarpreference.xml
@@ -13,6 +13,7 @@
 
     <SeekBar
         android:id="@+id/arrayseekbarpreference_seekbar"
+        android:contentDescription="@string/array_seekbar_preference_seekbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/myedittextpreference.xml b/app/src/main/res/layout/myedittextpreference.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4ca3fa6c9a43ed9543fa844ec5d44baf9935a03e
--- /dev/null
+++ b/app/src/main/res/layout/myedittextpreference.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- See documentation in MyEditTextPreference.java for why we have this.
+    Since this is used in multiple places, we don't set the hint (which seems to be standard
+    behaviour for EditTextPreference anyway.) Similarly for the autofillHints.
+    Also note we intentionally don't set a contentDescription, else this would get a Google Play
+    pre-launch warning:
+        This editable TextView has an android:contentDescription. A screen reader may read this
+        attribute instead of the editable content when the user is navigating.
+    The inputType is set programmatically by MyEditTextPreference.java.
+    -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <TextView
+        android:id="@+id/myedittextpreference_summary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        />
+    <EditText
+        android:id="@+id/myedittextpreference_edittext"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="24dp"
+        tools:ignore="Autofill,LabelFor,TextFields"
+        />
+</LinearLayout>
diff --git a/app/src/main/res/layout/popupview_arrayoptions.xml b/app/src/main/res/layout/popupview_arrayoptions.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2429e25706bfd698ce331b9dfea64a98cf58ad5d
--- /dev/null
+++ b/app/src/main/res/layout/popupview_arrayoptions.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generic xml for use with creating the UI for PopupView.addArrayOptionsToPopup().
+    Further customisations are done programatically in code.
+    Important not to create TextViews dynamically in code, due to Google Play emoji policy...
+    -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <Button
+        android:id="@+id/button_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+    <TextView
+        android:id="@+id/text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        android:gravity="center"
+        android:textColor="#ffffffff"
+        />
+    <Button
+        android:id="@+id/button_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+</LinearLayout>
diff --git a/app/src/main/res/layout/popupview_button.xml b/app/src/main/res/layout/popupview_button.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3b200f4affdbd7af019de6c303da44a70b93eb66
--- /dev/null
+++ b/app/src/main/res/layout/popupview_button.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generic xml for use with creating a Button for PopupView.
+    Used in several places, so customisations should be done programatically in code.
+    Important not to create TextViews dynamically in code, due to Google Play emoji policy...
+    -->
+<Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/button"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    />
diff --git a/app/src/main/res/layout/popupview_radiobutton.xml b/app/src/main/res/layout/popupview_radiobutton.xml
new file mode 100644
index 0000000000000000000000000000000000000000..093c9316102e8cc8d4797406a4c2be679fea7492
--- /dev/null
+++ b/app/src/main/res/layout/popupview_radiobutton.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generic xml for use with creating a RadioButton for PopupView.
+    Used in several places, so customisations should be done programatically in code.
+    Important not to create TextViews dynamically in code, due to Google Play emoji policy...
+    -->
+<RadioButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/popupview_radiobutton"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    />
diff --git a/app/src/main/res/layout/popupview_switch.xml b/app/src/main/res/layout/popupview_switch.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e6b5fa125905f71cb9e34f98db649776da8ebdb0
--- /dev/null
+++ b/app/src/main/res/layout/popupview_switch.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generic xml for use with creating a Switch for PopupView.
+    Used in several places, so customisations should be done programatically in code.
+    Important not to create TextViews dynamically in code, due to Google Play emoji policy...
+    Note that we still need to use SwitchCompat directly instead of Switch, as it's documented
+    under SwitchCompat that unlike other classes, this won't automatically be changed to the
+    AppCompat equivalent even when created in XML.
+    -->
+<androidx.appcompat.widget.SwitchCompat
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/popupview_switch"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    />
diff --git a/app/src/main/res/layout/popupview_textview.xml b/app/src/main/res/layout/popupview_textview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7e4c439890b13bce5074fa63e2c6c9e1b7787ed6
--- /dev/null
+++ b/app/src/main/res/layout/popupview_textview.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generic xml for use with creating a TextView for PopupView.
+    Used in several places, so customisations should be done programatically in code.
+    Important not to create TextViews dynamically in code, due to Google Play emoji policy...
+    We ignore the "Overdraw" warning as (when checking for Android warnings for entire application)
+    we get a warning Android/Lint/Performance/"Overdraw: Painting regions more than once" for
+    android:background - this is spurious, as we don't use this xml for a root view.
+    -->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/text_view"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:visibility="visible"
+    android:gravity="center"
+    android:textColor="#ffffffff"
+    android:background="#ff212121"
+    tools:ignore="Overdraw"
+    />
diff --git a/app/src/main/res/layout/stamp_image_text.xml b/app/src/main/res/layout/stamp_image_text.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d63a23bd0195d94b34af8adf125729889b41cb9e
--- /dev/null
+++ b/app/src/main/res/layout/stamp_image_text.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generic xml for use with creating a TextView so we can stamp text onto images.
+    Used in several places, so customisations should be done programatically in code.
+    Important not to create TextViews dynamically in code, due to Google Play emoji policy...
+    -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/text_view"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/toast_textview.xml b/app/src/main/res/layout/toast_textview.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2d26286347ab443be49a758583503b28eab9b497
--- /dev/null
+++ b/app/src/main/res/layout/toast_textview.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- TextView used for our custom toasts.
+    Important not to create TextViews dynamically in code, due to Google Play emoji policy...
+    -->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/text_view"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:visibility="visible"
+    android:textColor="@android:color/white"
+    />
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index c00202823049e8d5b1590e1223f20fef8a966353..c2b1c0c91ed1d60a5da0285f997f03415f712eda 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -1,9 +1,10 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/action_settings"/>
 
 </menu>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 1cba9d7af4ddcef5b3b062b0b237b2bab367ed42..5667b75bcb96d4478c61c7a31770bae5225e8e7f 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -107,7 +107,6 @@
     <string name="preference_volume_keys">Клавішы рэгулявання гучнасці</string>
     <string name="preference_save_location">Захаваць месца</string>
     <string name="preference_save_location_summary">Тэчка для захавання фота / відэа файлаў</string>
-    <string name="preference_using_saf">Выкарыстоўваць сховішча Access Framework</string>
     <string name="preference_using_saf_summary">Ці варта выкарыстоўваць сховішча Access Framework для захавання фотаздымкаў і відэазапісаў</string>
     <string name="preference_save_photo_prefix">Захаваць фотапрэфікс</string>
     <string name="preference_save_photo_prefix_summary">Выкарыстоўваць прэфікс для захавання фотаздымкаў</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index b1c724848393c76de2f9715e08a324cc08438246..04e2a7b0b3689b08c6e12729046b90039c59f192 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -108,7 +108,6 @@
 
     <string name="preference_save_location">Uložit polohu</string>
     <string name="preference_save_location_summary">Složka pro uložení fotek/videa</string>
-    <string name="preference_using_saf">Použít Storage Access Framework</string>
     <string name="preference_using_saf_summary">Zdali použít Storage Access Framework pro uložení fotek a videí</string>
     <string name="preference_save_photo_prefix">Uložit předponu pro fotografie</string>
     <string name="preference_save_photo_prefix_summary">Předpona používaná při ukládání fotografií</string>
diff --git a/app/src/main/res/values-de/arrays.xml b/app/src/main/res/values-de/arrays.xml
index d1efcb09578937d27eec01311c92532d358335ce..e9ceebfd34684efbc470e639a3146a959c19a2de 100644
--- a/app/src/main/res/values-de/arrays.xml
+++ b/app/src/main/res/values-de/arrays.xml
@@ -242,16 +242,6 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>Keine</item>
-        <item>Lautes Geräusch</item>
-        <item>Sprachkommando: \"cheese\"</item>
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
     <string-array name="preference_save_zulu_time_entries">
         <item>Ortszeit</item>
         <item>UTC- (Zulu-) Zeit</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a337c2ea8be2baa76a226168d072e476f46573ba..e70587f1abe6bc092af9d15116d6f8e9c86cbd05 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -110,7 +110,6 @@
     <string name="preference_audio_noise_control_sensitivity_summary">Mikroempfindlichkeit für lautes Geräusch</string>
     <string name="preference_save_location">Speicherort</string>
     <string name="preference_save_location_summary">Ordner, wo die Fotos/Videos gespeichert werden</string>
-    <string name="preference_using_saf">Benutze Storage Access Framework</string>
     <string name="preference_using_saf_summary">Für das Speichern der Fotos/Videos Storage Access Framework verwenden. Dies sollte aktiviert werden, um das Speichern auf externen SD-Karten zu ermöglichen.</string>
     <string name="preference_save_photo_prefix">Foto-Präfix</string>
     <string name="preference_save_photo_prefix_summary">Den Präfix für die Dateinamen der Fotos einstellen</string>
@@ -273,19 +272,11 @@
     <string name="audio_control_stop">Stoppe Sprach/Geräusch-Steuerung</string>
     <string name="speech_recognizer_started">Sag \"cheese\"</string>
     <string name="audio_listener_started">Mache ein lautes Geräusch</string>
-    <string name="auto_stabilise_info">Autostabilisierung dreht die Fotos so, dass sie waagerecht erscheinen.
-\n
-\nDies bedeutet aber auch eine geringere Auflösung des Fotos aufgrund der Drehung und Beschneidung.</string>
-    <string name="raw_info">DNG-Dateien enthalten die völlig unkomprimierte und unbearbeitete Bildinformation der Kamera. 
-\n
-\nManche Galerie-Apps erkennen das DNG-Format nicht. DNG-Dateien können in spezialisierten Foto-Editor-Apps wie Snapseed oder Lightroom verwendet werden. 
-\n
-\nVerschiedene Bildbearbeitungsoptionen wie Fotostempel oder Autostabilisierung werden nur bei nicht-DNG-Dateien (wie JPEG) angewandt und nicht bei DNG-Dateien.</string>
-    <string name="hdr_info">Der HDR-Modus ist nützlich für Motive mit starkem Kontrast. Dabei werden mehrere Bilder mit verschiedener Belichtung aufgenommen und miteinander für das Endfoto kombiniert.
-\n
-\nHDR ist nicht für bewegte Szenen geeignet und kann Farbverfälschungen bewirken.
-\n
-\nFotos im HDR-Modus aufnehmen benötigt mehr Rechenzeit.</string>
+
+    <string name="auto_stabilise_info">Autostabilisierung rotiert die Fotos so, dass sie waagerecht erscheinen.\n\nDies bedeutet aber auch eine geringere Auflösung aufgrund von Rotation und Beschneidung.</string>
+    <string name="raw_info">DNG-Dateien enthalten die volle, unkomprimierte Bildinformation der Kamera. Manche Galerie-Apps erkennen das DNG-Format nicht. DNG-Dateien können in  spezialisierten Foto-Editor-Apps verwendet werden. Verschiedene Bildbearbeitungsoptionen wie \"Fotostempel\" oder \"Autostabilisierung\" werden nur bei JPEG-Dateien angewandt und nicht bei DNG-Dateien.</string>
+    <string name="hdr_info">Der HDR-Modus ist nützlich für Motive mit starkem Kontrast. Dabei werden mehrere Bilder mit verschiedener Belichtung kombiniert.\n\nHDR ist nicht für bewegte Szenen geeignet, kann Farbänderungen bewirken und benötigt mehr Zeit.</string>
+
     <string name="dont_show_again">Nicht wieder zeigen</string>
     <string name="photo_mode">Foto Modus</string>
     <string name="photo_mode_standard">Std</string>
@@ -305,9 +296,9 @@
     <string name="no_permission">BERECHTIGUNGEN NICHT VERFÜGBAR</string>
     <string name="permission_rationale_title">Berechtigung benötigt</string>
     <string name="permission_rationale_camera">Kamera Berechtigung wird benötigt um die Kamera zu aktivieren</string>
-    <string name="permission_rationale_storage">Speicher-Berechtiung benötigt zum Speichern von Fotos</string>
-    <string name="permission_rationale_record_audio">Mikrofon-Berechtigung benötigt um Audio mit dem Video aufzuzeichnen</string>
-    <string name="permission_rationale_location">Standort-Berechtigung für das Geotagging benötigt (das Speichern von Standortdaten in Fotos und Videos). Standort-Berechtigung ist auch notwendig, um mit Bluetooth LE Fernsteuerungen zu verbinden.</string>
+    <string name="permission_rationale_location">Location-Berechtigung für das Geotagging benötigt (Speicherung der Standortdaten in
+        Fotos und Videos). Location-Berechtigung wird auch benötigt, um eine Verbindung zu Bluetooth LE Fernbedienungen herzustellen (Android 11 or earlier).</string>
+
     <string name="preference_category_photo_debugging">Debug-Optionen</string>
     <string name="preference_category_video_debugging">Debug-Optionen</string>
     <string name="preference_camera2_fake_flash">Benutze alternative Blitz Methode</string>
@@ -440,6 +431,7 @@
     <string name="preference_exif_copyright">Copyright</string>
     <string name="preference_exif_copyright_summary">Text für den "Copyright"-Eintrag in den Foto-Metadaten (nur JPEG-Format, freilassen, falls nicht verwendet.)</string>
     <string name="processing">Bearbeitung…</string>
+
     <string name="preference_raw_no">Nur JPEG</string>
     <string name="preference_raw_yes">JPEG und DNG (RAW)</string>
     <string name="preference_raw_only">Nur DNG (RAW)</string>
@@ -449,11 +441,41 @@
     <string name="preference_stamp_dateformat_mmddyyyy">MM/TT/JJJJ</string>
     <string name="preference_stamp_dateformat_none">Kein Datum-Stempel</string>
     <string name="preference_fast_burst_n_images">Anzahl Fotos</string>
+    <string name="preference_fast_burst_n_images_entries_2">2</string>
+    <string name="preference_fast_burst_n_images_entries_3">3</string>
+    <string name="preference_fast_burst_n_images_entries_4">4</string>
+    <string name="preference_fast_burst_n_images_entries_5">5</string>
+    <string name="preference_fast_burst_n_images_entries_6">6</string>
+    <string name="preference_fast_burst_n_images_entries_8">8</string>
+    <string name="preference_fast_burst_n_images_entries_10">10</string>
+    <string name="preference_fast_burst_n_images_entries_12">12</string>
+    <string name="preference_fast_burst_n_images_entries_15">15</string>
+    <string name="preference_fast_burst_n_images_entries_20">20</string>
+
     <string name="preference_focus_bracketing_n_images">Anzahl Fotos</string>
+    <string name="preference_focus_bracketing_n_images_entries_2">2</string>
+    <string name="preference_focus_bracketing_n_images_entries_3">3</string>
+    <string name="preference_focus_bracketing_n_images_entries_4">4</string>
+    <string name="preference_focus_bracketing_n_images_entries_5">5</string>
+    <string name="preference_focus_bracketing_n_images_entries_6">6</string>
+    <string name="preference_focus_bracketing_n_images_entries_8">8</string>
+    <string name="preference_focus_bracketing_n_images_entries_10">10</string>
+    <string name="preference_focus_bracketing_n_images_entries_12">12</string>
+    <string name="preference_focus_bracketing_n_images_entries_15">15</string>
+    <string name="preference_focus_bracketing_n_images_entries_20">20</string>
+    <string name="preference_focus_bracketing_n_images_entries_25">25</string>
+    <string name="preference_focus_bracketing_n_images_entries_30">30</string>
+    <string name="preference_focus_bracketing_n_images_entries_40">40</string>
+    <string name="preference_focus_bracketing_n_images_entries_50">50</string>
+    <string name="preference_focus_bracketing_n_images_entries_100">100</string>
+    <string name="preference_focus_bracketing_n_images_entries_150">150</string>
+    <string name="preference_focus_bracketing_n_images_entries_200">200</string>
+
     <string name="preference_video_capture_rate">Geschwindigkeit</string>
     <string name="preference_video_capture_rate_normal">Normal</string>
     <string name="slow_motion_disabled">Zeitlupe aus</string>
     <string name="slow_motion_enabled">Zeitlupe ein</string>
+
     <string name="flash_off">Ohne Blitz</string>
     <string name="flash_auto">Automatischer Blitz</string>
     <string name="flash_on">Mit Blitz</string>
@@ -477,14 +499,15 @@
     <string name="saf_permission_failed_open_image">Bild kann nicht geöffnet werden</string>
     <string name="preference_camera2_photo_video_recording">Ermögliche Fotos während der Videoaufnahme</string>
     <string name="preference_camera2_photo_video_recording_summary">Ermögliche Fotos während der Videoaudnahme. Diese Option ausschalten, falls Probleme mit dem Camera-2-API auftreten.</string>
-    <string name="preference_video_log">Video-Bildprofile</string>
-    <string name="preference_video_log_summary">Aktiviere Standard- oder flaches Bildprofil für den Video-Modus
-\n%s</string>
-    <string name="preference_video_log_off">Standard</string>
-    <string name="preference_video_log_low">Log (Niedrig)</string>
-    <string name="preference_video_log_medium">Log (Mittel)</string>
-    <string name="preference_video_log_strong">Log (Stark)</string>
-    <string name="preference_video_log_extra_strong">Log (Extrastark)</string>
+
+    <string name="preference_video_log">Flaches (Log-) Video-Profil</string>
+    <string name="preference_video_log_summary">Aktiviere ein flaches (Log-) Profil für den Video-Modus\n%s</string>
+    <string name="preference_video_log_off">Aus</string>
+    <string name="preference_video_log_fine">Fein</string>
+    <string name="preference_video_log_low">Schwach</string>
+    <string name="preference_video_log_medium">Mittel</string>
+    <string name="preference_video_log_strong">Stark</string>
+    <string name="preference_video_log_extra_strong">Extra stark</string>
     <string name="video_log">Log-Profil</string>
     <string name="preference_record_audio_src_camcorder">Camcorder</string>
     <string name="preference_record_audio_src_mic">Externes Mikrofon</string>
@@ -536,12 +559,24 @@
     <string name="accuracy_high">Hoch</string>
     <string name="accuracy_unknown">Unbekannt</string>
     <string name="preference_units_distance">Entfernungseinheit</string>
-    <string name="preference_units_distance_ft">Fuß</string>
-    <string name="preference_units_distance_m">Meter</string>
     <string name="preference_units_distance_summary">Verwendet für GPS-Höhe, Fotostempel und Video-Untertitel\n%s</string>
+    <string name="preference_units_distance_m">Meter</string>
+    <string name="preference_units_distance_ft">Fuß</string>
+    <string name="feet_abbreviation">ft</string> <!-- symbol short for feet -->
+
     <string name="preference_show_whats_new">Zeige den What\'s-New-Dialog</string>
-    <string name="preference_show_whats_new_summary">Zeigt Informationen zu neuen Features und Verbesserungen, wenn die App aktualisiert wurde</string>
-    <string name="preference_video_log_fine">Log (Fein)</string>
+    <string name="preference_show_whats_new_summary">Zeigt Info zu neuen Features und Verbesserungen wenn die App upgedatet wurde</string>
+
+    <string name="preference_screen_processing_settings">Verarbeitungseinstellungen…</string>
+
+    <string name="preference_noise_reduction_mode">Algorithmus zur Rauschunterdrückung</string>
+    <string name="preference_noise_reduction_mode_summary">Algorithmus, den der Kameratreiber zur Unterdrückung des Rauschens verwenden soll. Der Algorithmus zur Rauschunterdrückung versucht, die Bildqualität zu verbessern, indem er übermäßiges Rauschen das bei der Bildaufnahme entstanden ist (besonders be wenig einfallendem Licht) entfernt. (Beachte, dass diese Option im NR Aufnahme-Modus nicht verwendet wird.)\n%s</string>
+    <string name="noise_reduction_mode_default">Standard</string>
+    <string name="noise_reduction_mode_off">Aus</string>
+    <string name="noise_reduction_mode_minimal">Minimal</string>
+    <string name="noise_reduction_mode_fast">Schnell</string>
+    <string name="noise_reduction_mode_high_quality">Hohe Qualität</string>
+
     <string name="preference_focus_assist">Fokus-Assistenz</string>
     <string name="preference_focus_assist_summary">Zoomt näher bei manueller Fokussierung\n%s</string>
     <string name="preference_focus_assist_off">Aus</string>
@@ -696,8 +731,9 @@
     <string name="preference_water_type">Setze Salzwasser zur Tiefenberechnung</string>
     <string name="preference_water_type_summary">Für Unterwassergehäuse, verbessert die Genauigkeit bei korrekter Auswahl der Wasserart.</string>
     <string name="remote_connected">Fernsteurung verbunden</string>
-    <string name="preference_remote_type_kraken">Kraken Smart Schutzhülle</string>
+
     <string name="preference_stamp_geo_address">Verwende Adressen</string>
+    <!-- preference_stamp_geo_address_summary defined below -->
     <string name="preference_stamp_geo_address_both">Zeige zusätzlich zur GPS-Position die zugehörige Adresse an</string>
     <string name="preference_stamp_geo_address_prefer">Bevorzuge Adressdaten vor GPS-Koordinaten</string>
     <string name="preference_stamp_geo_address_no">Zeige keine Adressdaten an</string>
@@ -757,167 +793,120 @@
     <string name="bluetooth_scan">Scan</string>
     <string name="preference_stamp_style_shadowed">Schattierter Text</string>
     <string name="preference_stamp_style_plain">Normaler Text</string>
-    <string name="preferences_build_version">Build-Version</string>
-    <string name="preferences_about_app">Kamera ist eine Abänderung von OpenCamera</string>
-    <string name="preferences_authors">Autoren</string>
-    <string name="preferences_source_code">Quellcode</string>
-    <string name="preferences_licence">Lizenz</string>
-    <string name="preferences_app_info_title">Information über Kamera</string>
-    <string name="preferences_service_terms">Nutzungsbedingungen</string>
-    <string name="preference_camera_api_old">Originale Kamera-API</string>
-    <string name="preference_camera_api_summary">Wählen Sie Kamera 2 API aus, um Zusatzfunktionen wie manueller Modus für die Belichtungszeit, Fokus, Weißabgleich, sowie RAW (sofern vom Gerät unterstützt) zu aktivieren, die unter Umständen nicht auf allen Geräten einwandfrei funktionieren. Eine Änderung der API führt zu einem Neustart.
-\n%s</string>
-    <string name="preference_privacy_policy_online">Datenschutzerklärung im Netz</string>
-    <string name="preference_privacy_policy_summary">Drücken, um die Datenschutzrichtlinie anzuzeigen</string>
-    <string name="preference_privacy_policy">Datenschutzerklärung</string>
-    <string name="preference_camera_api_camera2">Kamera 2 API</string>
-    <string name="preference_camera_api">Kamera API</string>
-    <string name="preference_image_format_summary">Wählen Sie das Dateiformat für Fotospeicherung aus. Dies betrifft Standard-Fotos (keine RAW). Bemerkung: PNG ist nicht wirklich verlustfrei, denn es ist von JPEG mit 100%%-iger Qualität konvertiert.
-\n%s</string>
-    <string name="exposure_compensation_seekbar">Suchleiste um den Belichtungsausgleich zu ändern</string>
-    <string name="camera_id">ID</string>
-    <string name="preference_panorama_save_all_plus_debug">Originalbilder speichern mit Fehlerbehandlungs-XML</string>
-    <string name="preference_panorama_save_all">Originalbilder speichern</string>
-    <string name="preference_panorama_save_no">Keine Originalbilder speichern</string>
-    <string name="preference_panorama_save_summary">Soll das Originalbild im Panoramamodus gespeichert werden\? Das wird das Abspeichern von Panoramafotos verlangsamen. Es erlaubt aber, eine XML-Datei zu speichern, was hilfreich für Problemmeldungen sein kann.
-\n%s</string>
-    <string name="preference_panorama_save">Originale Panoramabilder</string>
-    <string name="panorama_info">Um ein Panorama-Bild aufzunehmen, halten Sie Ihr Gerät in horizontaler Stellung und nehmen Sie ein Foto auf. Dann bewegen Sie Ihr Gerät entweder nach links oder nach rechts, um den weißen Kreis über den blauen Punkt zu bringen. Nachdem das neue Bild aufgenommen wurde, bewegen Sie Ihr Gerät weiter und bringen es jedes Mal mit einem neuen blauen Punkt zur Überdeckung. 
-\n
-\nKlicken Sie auf das Hakensymbol, um das Panorama zu speichern, oder das Kreuzsymbol um abzubrechen.
-\n
-\nBeachten Sie, dass Panoramafotos einige Zeit zur Verarbeitung und Speicherung benötigen.</string>
-    <string name="preference_panorama_crop_summary">Ob im Panorama-Modus die gewellten Grenzen entfernt werden sollen
-\n%s</string>
-    <string name="preference_panorama_crop">Panorama Auto-Zuschneidung</string>
-    <string name="failed_to_process_panorama">Panorama-Bild konnte nicht erstellt werden</string>
+    <string name="preference_stamp_style_background">Text mit schatiertem Hintergrund</string>
+
+    <string name="image_saving_notification">Speichere Bilder…</string>
+
+    <string name="finish_panorama">Panorama fertigstellen</string>
+    <string name="cancel_panorama">Panorama abbrechen</string>
     <string name="panorama_cancelled">Panorama abgebrochen</string>
-    <string name="cancel_panorama">Panorama wird abgebrochen</string>
-    <string name="finish_panorama">Panorama wird beendet</string>
-    <string name="image_saving_notification">Bilder werden gespeichert…</string>
-    <string name="preference_stamp_style_background">Text mit getöntem Hintergrund</string>
-    <string name="noise_reduction_mode_high_quality">Hohe Qualität</string>
-    <string name="noise_reduction_mode_fast">Schnell</string>
-    <string name="noise_reduction_mode_minimal">Minimal</string>
-    <string name="noise_reduction_mode_off">Aus</string>
-    <string name="noise_reduction_mode_default">Standard</string>
-    <string name="preference_noise_reduction_mode_summary">Der Algorithmus, den der Kameratreiber für Rauschreduzierung benutzen soll. Der Rauschreduzierungs-Algorithmus versucht, die Bildqualität zu verbessern, indem er überschüssiges Rauschen entfernt, das beim Aufnehmen entsteht, vor allem in dunklen Bedingungen. (Das ist nicht wegen des Rauschreduzierungs-Fotomodus, und diese Einstellung wird im NR-Fotomodus ignoriert.)
-\n%s</string>
-    <string name="preference_noise_reduction_mode">Rauschreduzierung-Algorithmus</string>
-    <string name="preference_screen_processing_settings">Einstellungen werden verarbeitet…</string>
-    <string name="preference_edge_mode_summary">Der Algorithmus, den der Kameratreiber für Kantenglättung benutzen soll. Kantenglättung verbessert Schärfe und Details im aufgenommen Bild. (Diese Einstellung wird im NR Foto Modus ignoriert.)
-\n%s</string>
-    <string name="preference_edge_mode">Kantenglättung-Algorithmus</string>
-    <string name="feet_abbreviation">Fuß</string>
-    <string name="preference_focus_bracketing_n_images_entries_200">200</string>
-    <string name="preference_focus_bracketing_n_images_entries_150">150</string>
-    <string name="preference_focus_bracketing_n_images_entries_100">100</string>
-    <string name="preference_focus_bracketing_n_images_entries_50">50</string>
-    <string name="preference_focus_bracketing_n_images_entries_40">40</string>
-    <string name="preference_focus_bracketing_n_images_entries_30">30</string>
-    <string name="preference_focus_bracketing_n_images_entries_25">25</string>
-    <string name="preference_focus_bracketing_n_images_entries_20">20</string>
-    <string name="preference_focus_bracketing_n_images_entries_15">15</string>
-    <string name="preference_focus_bracketing_n_images_entries_12">12</string>
-    <string name="preference_focus_bracketing_n_images_entries_10">10</string>
-    <string name="preference_focus_bracketing_n_images_entries_8">8</string>
-    <string name="preference_focus_bracketing_n_images_entries_6">6</string>
-    <string name="preference_focus_bracketing_n_images_entries_5">5</string>
-    <string name="preference_focus_bracketing_n_images_entries_4">4</string>
-    <string name="preference_focus_bracketing_n_images_entries_3">3</string>
-    <string name="preference_focus_bracketing_n_images_entries_2">2</string>
-    <string name="preference_fast_burst_n_images_entries_20">20</string>
-    <string name="preference_fast_burst_n_images_entries_15">15</string>
-    <string name="preference_fast_burst_n_images_entries_12">12</string>
-    <string name="preference_fast_burst_n_images_entries_10">10</string>
-    <string name="preference_fast_burst_n_images_entries_8">8</string>
-    <string name="preference_fast_burst_n_images_entries_6">6</string>
-    <string name="preference_fast_burst_n_images_entries_5">5</string>
-    <string name="preference_fast_burst_n_images_entries_4">4</string>
-    <string name="preference_fast_burst_n_images_entries_3">3</string>
-    <string name="preference_fast_burst_n_images_entries_2">2</string>
+    <string name="failed_to_process_panorama">Panorama-Bild konnte nicht erstellt werden</string>
+
+    <string name="preference_panorama_crop">Panorama Auto-Crop</string>
+    <string name="preference_panorama_crop_summary">Im Panorama Modus wellige Bereiche entfernen\n%s</string>
+
+    <string name="panorama_info">Um ein Panoramabild aufzunehmen, halte das Gerät im Hochformat und klicke auf den Auslöser zum Start des Panoramas. Drehe dann das Gerät entweder nach links oder rechts, um den zentrierten weißen Kreis über den blauen Punkt zu bewegen. Nachdem jedes neue Bild aufgenommen wurde, drehe das Gerät weiter, um jeden neuen blauen Punkt, der nacheinander erscheint, abzudecken.\n\nKlicke auf das Häkchen-Symbol, um das Panorama zu speichern oder auf das Kreuz-Symbol, um abzubrechen.\n\nBeachte, dass die Verarbeitung und Speicherung von Panoramafotos Zeit in Anspruch nehmen kann.</string>
+
+    <string name="preference_panorama_save">Panorama Originalbilder</string>
+    <string name="preference_panorama_save_summary">Ob Originalbilder im Panorama-Modus gespeichert werden sollen. Die Speicherung der Panoramafotos wird dadurch langsamer. Ermöglicht auch die Option eine XML-Datei zu speichern, was bei der Meldung von Problemen mit Panoramafotos hilfreich sein kann.\n%s</string>
+
+    <string name="preference_panorama_save_no">Originalbilder nicht speichern</string>
+    <string name="preference_panorama_save_all">Originalbilder speichern</string>
+    <string name="preference_panorama_save_all_plus_debug">Originalbilder und Debug-XML speichern</string>
+
+    <string name="camera_id">ID</string> <!-- ID as in camera ID -->
+
+    <string name="exposure_compensation_seekbar">Suchfeld zur Änderung der Belichtungskorrektur</string>
+
+    <string name="preference_image_format_summary">Wähle das Dateiformat zum Speichern der Fotos. Das wirkt sich nur auf \"Standard-\" (nicht RAW-) Fotos aus. Merke: Das PNG-Format ist nicht verlustlos, es wird aus einem JPEG mit 100%%iger Qualität konvertiert.\n%s</string>
+
+    <string name="preference_camera_api">Camera-API</string>
+    <string name="preference_camera_api_summary">Wähle das Camera2-API um extra Features wie manuelle Modi für Belichtung, Fokus, Weißabgleich sowie RAW-Format (falls vom Gerät unterstützt) zu nutzen. Die Änderung des API verursacht einen Neustart der App.\n%s</string>
+    <string name="preference_camera_api_old">Original Camera-API</string>
+    <string name="preference_camera_api_camera2">Camera2-API</string>
+
+    <string name="preference_audio_control_summary">Foto/Video aufnehmen, wenn ein Geräusch erkannt wird.
+        Wenn aktiviert, nutze die Mikrofon-Taste auf dem Bildschirm, um die Erkennung zu starten/stoppen.
+        \n%s</string>
+
+    <!-- beware of string being too long to display! -->
+    <string name="preference_stamp_geo_address_summary">Wenn möglich, nutze eine Adresse bei der Speicherung des GPS Standorts.
+        Diese Option erfordert, dass Ihr Gerät Standortdaten über das Internet an einen Dritten überträgt,
+        um GPS in eine Adresse umzuwandeln. Siehe https://developer.android.com/reference/android/location/Geocoder .
+        Gibt keine Garantien für Verfügbarkeit oder Genauigkeit. Es wird nicht garantiert, dass die Ergebnisse aussagekräftig oder korrekt sind.
+        \n%s</string>
+
+    <string name="intro_text">Zum Fokussieren berühren und blaue Kamerataste drücken, um Bilder aufzunehmen.
+        \n\nUm die maximale Bildschirmhelligkeit zu deaktivieren, siehe Einstellungen/Benutzeroberfläche/\"Maximale Helligkeit erzwingen\".
+        Zur Speicherung auf der SD-Karte auf Android 5+, siehe Einstellungen/Mehr Kamera-Einstellungen…/\"Storage Access Framework\".
+        Für weitere Hilfe, klicke auf  \"Online-Hilfe\" in den Einstellungen.
+    </string>
+
     <string name="preference_select_remote">Wähle eine Fernsteuerung</string>
+
+    <string name="preference_video_rec709">REC709</string>
+    <string name="preference_video_srgb">sRGB</string>
+    <string name="preference_video_gamma">Gamma</string>
+    <string name="preference_video_profile_gamma">Video Gamma-Wert</string>
+    <string name="preference_video_profile_gamma_summary">Gamma-Wert für Videos, wenn Video-Profil Gamma ausgewählt wurde\n%s</string>
+    <string name="preference_video_profile_gamma_1_6">1,6</string>
+    <string name="preference_video_profile_gamma_1_8">1,8</string>
+    <string name="preference_video_profile_gamma_1_9">1,9</string>
+    <string name="preference_video_profile_gamma_2_0">2,0</string>
+    <string name="preference_video_profile_gamma_2_1">2,1</string>
+    <string name="preference_video_profile_gamma_2_2">2,2</string>
+    <string name="preference_video_profile_gamma_2_3">2,3</string>
+    <string name="preference_video_profile_gamma_2_4">2,4</string>
+    <string name="preference_video_profile_gamma_2_6">2,6</string>
+    <string name="preference_video_profile_gamma_2_8">2,8</string>
+
     <string name="preference_immersive_mode_off">Nichts ausblenden</string>
+    <string name="preference_immersive_mode_low_profile">Nur Navigationstasten auf dem Bildschirm dimmen</string>
     <string name="preference_immersive_mode_navigation">Nur Navigationstasten ausblenden</string>
     <string name="preference_immersive_mode_gui">Alle Einstellelemente ausblenden</string>
     <string name="preference_immersive_mode_everything">Alles ausblenden</string>
-    <string name="aperture">Blende</string>
-    <string name="preference_multi_cam_button">Symbol für mehrere Kameras</string>
-    <string name="switch_multi_camera">Zwischen mehreren Kameras wechseln</string>
-    <string name="switch_to_unknown_camera">Kamera wechseln</string>
+
+    <string name="preference_ghost_image_alpha">Geisterbild-Durchsichtigkeit</string>
+    <string name="preference_ghost_image_alpha_summary">Alpha-Wert für Geisterbilder. Umso niedriger der Wert, desto transparenter das Geisterbild.\n%s</string>
+
+    <string name="preference_zebra_stripes_foreground_color">Zebrastreifen-Vordergrundfarbe</string>
+    <string name="preference_zebra_stripes_foreground_color_summary">Zu verwendende Vorderundfarbe für Zebrastreifen.\n%s</string>
+    <string name="preference_zebra_stripes_background_color">Zebrastreifen-Hintergrundfarbe</string>
+    <string name="preference_zebra_stripes_background_color_summary">Zu verwendende Hintergrundfarbe für Zebrastreifen.\n%s</string>
+
+    <string name="preference_zebra_stripes_color_black">Schwarz</string>
+    <string name="preference_zebra_stripes_color_red">Rot</string>
+    <string name="preference_zebra_stripes_color_orange">Orange</string>
+    <string name="preference_zebra_stripes_color_transparent">Transparent</string>
+    <string name="preference_zebra_stripes_color_white">Weiß</string>
+
+    <string name="external_camera">Externe Kamera</string>
     <string name="ultrawide">Ultraweit</string>
-    <string name="intro_text">Tippe, um zu fokussieren, und drücke das weiße Kamerasymbol, um Fotos aufzunehmen.
-\n
-\nUm die maximale Bildschirmhelligkeit zu deaktivieren, gehe zu Einstellungen/Benutzeroberfläche/„Maximale Helligkeit erzwingen“. Um ab Android 5 oder höher auf der SD-Karte zu speichern, gehe zu Einstellungen/Mehr Kamera-Einstellungen …/„Benutze Storage Access Framework“. Für weitere Hilfe tippe auf „Online-Hilfe“ in den Einstellungen.</string>
-    <string name="preference_stamp_geo_address_summary">Falls möglich, eine Adresse beim Stempeln von GPS-Standorten verwenden. Diese Option erfordert eine Internetverbindung. Wenn aktiviert, werden Standortdaten über das Internet an einen Drittanbieter übermittelt, um die GPS-Koordinaten in eine Adresse umzuwandeln. Siehe https://developer.android.com/reference/android/location/Geocoder. 
-\n%s</string>
-    <string name="preference_audio_control_summary">Foto-/Video per Geräuscherkennung oder Sprachbefehl aufnehmen. Wenn diese Funktion aktiviert ist, können Sie mit der Mikrofontaste auf dem Bildschirm die Aufnahmebereitschaft starten/stoppen. Beachten Sie, dass die Sprachbefehlsoption den Android-Spracherkennungsdienst verwendet: Wenn diese Option verwendet wird, werden Audiodaten wahrscheinlich an entfernte Server gesendet, um die Spracherkennung durchzuführen. 
-\n%s</string>
+
+    <string name="switch_to_external_camera">Zu externer Kamera wechseln</string>
+    <string name="switch_to_unknown_camera">Kamera wechseln</string>
+    <string name="switch_multi_camera">Zwischen mehreren Kameras wechseln</string>
+    <string name="preference_multi_cam_button">Tasten für mehrere Kameras</string>
+    <string name="preference_multi_cam_button_summary">Falls aktiviert, werden verschiedene Tasten verwendet, um zwischen (mehreren) Front- und Rück-Kameras zu wechseln. Falls deaktiviert, rotiert die Taste zum Wechsel der Kamera durch alle Kameras hindurch.</string>
+
     <string name="preference_show_camera_id">Kamera-ID anzeigen</string>
-    <string name="switch_to_external_camera">Wechsle zu externer Kamera</string>
-    <string name="external_camera">Externe Kamera</string>
-    <string name="preference_zebra_stripes_color_white">Weiß</string>
-    <string name="preference_zebra_stripes_color_transparent">Transparent</string>
-    <string name="preference_zebra_stripes_color_orange">Orange</string>
-    <string name="preference_zebra_stripes_color_red">Rot</string>
-    <string name="preference_zebra_stripes_color_black">Schwarz</string>
-    <string name="preference_ghost_image_alpha">Ghost image Transparenz</string>
-    <string name="preference_video_profile_gamma_2_8">2.8</string>
-    <string name="preference_video_profile_gamma_2_6">2.6</string>
-    <string name="preference_video_profile_gamma_2_4">2.4</string>
-    <string name="preference_video_profile_gamma_2_3">2.3</string>
-    <string name="preference_video_profile_gamma_2_2">2.2</string>
-    <string name="preference_video_profile_gamma_2_1">2.1</string>
-    <string name="preference_video_profile_gamma_2_0">2.0</string>
-    <string name="preference_video_profile_gamma_1_9">1.9</string>
-    <string name="preference_video_profile_gamma_1_8">1.8</string>
-    <string name="preference_video_profile_gamma_1_6">1.6</string>
-    <string name="preference_video_profile_gamma_summary">Gamma-Wert für Video, falls Video-Bildprofil auf Gamma gestellt ist
-\n%s</string>
-    <string name="preference_video_profile_gamma">Video Gamma-Wert</string>
-    <string name="preference_video_gamma">Gamma</string>
-    <string name="preference_video_srgb">sRGB</string>
-    <string name="preference_show_camera_id_summary">Aktuelle Kamer- ID auf dem Bildschirm anzeigen</string>
-    <string name="preference_allow_long_press">Erlaube Aktionen bei langem Drücken</string>
-    <string name="preference_allow_long_press_summary">Aktionen bei langem Drücken erlauben (z.B. langes Drücken auf die Foto-Galerie, um den Speicherort zu ändern).</string>
-    <string name="error_features_frame_rate">Bildwiederholrate</string>
-    <string name="error_features_bitrate">Bitrate</string>
+    <string name="preference_show_camera_id_summary">Aktuelle Kamera-ID auf dem Bildschirm anzeigen</string>
+
+    <string name="preference_allow_long_press">Aktionen über langen Tastendruck erlauben</string>
+    <string name="preference_allow_long_press_summary">Ob Aktionen durch langen Tastendruck aktiviert werden(z.B. Langer Druck auf Gallery-Symbol zur Änderung des Speicherortes).</string>
+
+    <string name="aperture">Blende</string>
+
     <string name="error_features_4k">4K UHD</string>
-    <string name="preference_licence_google_icons">Material-Design-Symbole von Google</string>
-    <string name="preference_licence_open_camera">Kamera</string>
-    <string name="preference_comment_ypr_summary">Roll-Nick-Gier-Winkel des Geräts in den Exif-Daten des Fotos speichern (nur JPEG)</string>
-    <string name="preference_comment_ypr">Roll-Nick-Gier-Winkel speichern</string>
-    <string name="error_features_slow_motion">Zeitlupe</string>
-    <string name="preference_licence_google_icons_text">Kamera verwendet Symbole von Googles Material Design Icons (https://developer.android.com/design/downloads/index.html , https://design.google.com/icons/ , https://github.com/google/material-design-icons/ , https://google.github.io/material-design-icons/) unter der Apache-Lizenz Version 2.0. Einige Symbole wurden angepasst. Tippen Sie hier für den vollständigen Lizenztext.</string>
-    <string name="preference_licence_open_camera_text">Kamera ist urheberrechtlich geschützt © 2013-2019 Mark Harman, veröffentlicht unter der GPL v3 oder neuer. Tippen Sie hier für den vollständigen Lizenztext.</string>
-    <string name="preference_screen_licences">Open-Source-Lizenzen</string>
-    <string name="preference_privacy_policy_text" translatable="false"> shouldn\'t be translated </string>
-    <string name="preference_multi_cam_button_summary">Wenn aktiviert, werden unterschiedliche Tasten benutzt, um zwischen Vorder- und Rückkameras zu wechseln. Wenn deaktiviert, werden mit dem Kamera-Wechselsymbol alle Kameras durchgelaufen.</string>
-    <string name="preference_zebra_stripes_background_color_summary">Streifenfarbe für den Hintergrund, wenn Zebrastreifen angezeigt werden
-\n%s</string>
-    <string name="preference_zebra_stripes_background_color">Zebrastreifen-Hintergrundfarbe</string>
-    <string name="preference_zebra_stripes_foreground_color_summary">Streifenfarbe für den Vordergrund, wenn Zebrastreifen angezeigt werden
-\n%s</string>
-    <string name="preference_zebra_stripes_foreground_color">Zebrastreifen-Vordergrundfarbe</string>
-    <string name="preference_ghost_image_alpha_summary">Alphawert, der für Doppelbelichtungen benutzt wird. Ein niedriger Wert erzeugt mehr Transparenz, ein höherer mehr Opazität.
-\n%s</string>
-    <string name="preference_immersive_mode_low_profile">Nur die virtuellen Bildschirmtasten dimmen</string>
-    <string name="preference_video_rec709">REC709</string>
-    <string name="whats_new_text"> <small>[Dieses Dialogfeld wird angezeigt, wenn Kamera aktualisiert wird. Sie können ihn deaktivieren unter Einstellungen/Benutzeroberfläche/Neuigkeiten anzeigen.]</small> 
-\n
-\n<b>v1.48:</b>
-\n<ul> <li>Neues Symbol für mehrere Kameras. Wenn dein Gerät mehrere Vorder-/Rückkameras hat, wird das Symbol, was früher zwischen Vorder- und Rückansicht gewechselt hat, jetzt zwischen den einzelnen Kameras wechseln. Wenn du die alte Funktionsweise zurück haben möchtest, dann deaktiviere Einstellungen/Benutzeroberfläche/„Symbol für mehrere Kameras“. (Nur unterstützt für Geräte, welche mehrere Kameras an Drittanbieter-Apps zur Verfügung stellen.)
-\n</li> <li>Autolevel-Funktion zeigt jetzt ein Rechteck um das Ergebnisfoto an.
-\n</li> <li>Blenden-Kontrolle für unterstützte Geräte. (nur Camera2 API)
-\n</li> <li>Mehr benutzerdefinierte Videoprofile.
-\n</li> <li>Neue Option, um die Alphawerte für Doppelbilder einzustellen.
-\n</li> <li>Optionen zum Speichern von Zebrastreifen-Farben.
-\n</li> <li>Option zum Speichern der Geräteausrichtung im EXIF-Nutzerkommentar.
-\n</li> <li>Option zum Ausschalten der Funktionen nach langem Drücken.
-\n</li> <li>Bessere Vollbildnutzung mit weitem Seitenverhältnis auf Geräten mit digitalen Navigationstasten.
-\n</li> <li>Fehlerbehebungen und Anwenderschnittstellen-Verbesserungen.
-\n</li> </ul> </string>
-    <string name="back_button_label">Zurück</string>
-    <string name="next_button_label">Weiter</string>
-    <string name="skip_button_label">Überspringen</string>
+    <string name="error_features_bitrate">Bitrate</string>
+    <string name="error_features_frame_rate">Framerate</string>
+    <string name="error_features_slow_motion">Slow-Motion</string>
+
+    <string name="preference_comment_ypr">Eigentliche Eulerwinkel speichern</string>
+    <string name="preference_comment_ypr_summary">Speichern der drei Euler-Winkel (Drehlage des Geräts im EXIF Benutzerkommentar des Fotos (nur im JPEG-Format)</string>
+
+    <string name="preference_audio_control_none">Keine</string>
+    <string name="preference_audio_control_noise">Lautes Geräusch</string>
+    <string name="preference_audio_control_voice">Sprachkommando: \"cheese\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 2ff5bea0220c41ddb6451219c4451129dda1e6b7..bd281cdfd54c98cf872bb3e7b636e49416e5f1f3 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -110,7 +110,6 @@
     <string name="preference_audio_noise_control_sensitivity_summary">Επίπεδο θορύβου ευαισθησίας για τον ήχο</string>
     <string name="preference_save_location">Χώρος αποθήκευσης</string>
     <string name="preference_save_location_summary">Φάκελος για αποθήκευση φωτογραφίας/βίντεο</string>
-    <string name="preference_using_saf">Χρήση αποθήκευσης πρόσβασης πλαισίου</string>
     <string name="preference_using_saf_summary">Αν θέλετε χρησιμοποιήστε την Πρόσβαση αποθήκευσης πλαισίου για την αποθήκευση φωτογραφιών και βίντεο</string>
     <string name="preference_save_photo_prefix">Αποθήκευση προθέματος φωτογραφιών</string>
     <string name="preference_save_photo_prefix_summary">Πρόθεμα για την αποθήκευση αρχείων φωτογραφιών</string>
@@ -280,7 +279,7 @@
     <string name="audio_listener_started">Κάντε έναν δυνατό θόρυβο</string>
 
     <string name="auto_stabilise_info">Το αυτόματο επίπεδο θα περιστρέφει αυτόματα τις φωτογραφίες ώστε να εμφανίζονται επίπεδες.\n\nΣημειώστε ότι αυτό σημαίνει ότι οι εικόνες θα έχουν ελαφρώς χαμηλότερη ανάλυση (λόγω της περιστροφής και της περικοπής\'s που απαιτείται).</string>
-    <string name="raw_info">DNG αρχεία περιέχουν πλήρες ασυμπίεστα και μη επεξεργασμένα στοιχεία από την φωτογραφική μηχανή σας.\n\nΟι περισσότερες εφαρμογές δεν\'t αναγνωρίζουν αρχείαDNG, αντίθετα θα πρέπει να χρησιμοποιείται εξειδικευμένες εφαρμογές, όπως το Snapseed η το Lightroom.\n\nΣημειώστε ότι οι διάφορες επιλογές επεξεργασίας όπως η "Σφραγίδα φωτογραφιών" και "Αυτόματο επίπεδο" ισχύουν μόνο για εικόνες JPEG, και όχι DNG.\n\nΤα DNG αρχεία καταλαμβάνουν πολύ χώρο, ένα αρχείο εξερευνητής μπορεί να είναι χρήσιμο για τη μεταφορά ή τη διαγραφή τους.\n\nΤα DNG αρχεία αποθηκεύονται μόνο στο πρότυπο.</string>
+    <string name="raw_info">DNG αρχεία περιέχουν πλήρες ασυμπίεστα και μη επεξεργασμένα στοιχεία από την φωτογραφική μηχανή σας.\n\nΟι περισσότερες εφαρμογές δεν\'t αναγνωρίζουν αρχείαDNG, αντίθετα θα πρέπει να χρησιμοποιείται εξειδικευμένες εφαρμογές.\n\nΣημειώστε ότι οι διάφορες επιλογές επεξεργασίας όπως η "Σφραγίδα φωτογραφιών" και "Αυτόματο επίπεδο" ισχύουν μόνο για εικόνες JPEG, και όχι DNG.\n\nΤα DNG αρχεία καταλαμβάνουν πολύ χώρο, ένα αρχείο εξερευνητής μπορεί να είναι χρήσιμο για τη μεταφορά ή τη διαγραφή τους.\n\nΤα DNG αρχεία αποθηκεύονται μόνο στο πρότυπο.</string>
     <string name="hdr_info">Η λειτουργία HDR είναι χρήσιμη για λήψεις με μεγάλες διαφορές στην φωτεινότητα. Λειτουργεί με πολλαπλές λήψεις σε διαφορετικές εκθέσεις, και τις συνδυάζει για να δημιουργήσει την τελική εικόνα.\n\nΣημειώστε ότι το HDR δεν είναι κατάλληλο για σκηνές με γρήγορη κίνηση, και μπορεί να οδηγήσει σε λιγότερο ακριβή αναπαραγωγή των χρωμάτων.\n\nΗ λήψη φωτογραφιών σε λειτουργία HDR θα είναι πιο αργή.</string>
 
     <string name="dont_show_again">Καμμία εμφάνιση ξανά</string>
@@ -298,9 +297,6 @@
     <string name="no_permission">Η ΑΔΕΙΑ ΧΡΗΣΗΣ ΔΕΝ ΕΙΝΑΙ ΔΙΑΘΕΣΙΜΗ</string>
     <string name="permission_rationale_title">Απαιτείται άδεια χρήσης</string>
     <string name="permission_rationale_camera">Απαιτείται άδεια χρήσης για ενεργοποίηση της κάμερας</string>
-    <string name="permission_rationale_storage">Απαιτείται άδεια αποθήκευσης για αποθήκευση</string>
-    <string name="permission_rationale_record_audio">Απαιτείται άδεια χρήσης μικροφώνου για καταγραφή ήχου</string>
-    <string name="permission_rationale_location">Απαιτείται άδεια χρήσης τοποθεσίας</string>
 
     <string name="preference_category_photo_debugging">Επιλογές εντοπισμού σφαλμάτων</string>
     <string name="preference_category_video_debugging">Επιλογές εντοπισμού σφαλμάτων</string>
diff --git a/app/src/main/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml
index 2737fac05945b777b5f8059cc23b40c4f0a98f97..7e4a0bf138b99edb4bddd289e3f8c0ac69992e60 100644
--- a/app/src/main/res/values-es/arrays.xml
+++ b/app/src/main/res/values-es/arrays.xml
@@ -242,16 +242,6 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>Ninguno</item>
-        <item>Ruido fuerte</item>
-        <item>Comando de voz: \"cheese\"</item>
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
     <string-array name="preference_save_zulu_time_entries">
         <item>Hora local</item>
         <item>UTC (Zulu)</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ec01f195f5034b52925958419e3268bb0c791e7c..56007855a598e8e4d85f79ea9ea4b624a108f60f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -112,7 +112,6 @@
     <string name="preference_audio_noise_control_sensitivity_summary">Sensibilidad al nivel de ruido para la opción de audio (ruido fuerte)</string>
     <string name="preference_save_location">Carpeta de almacenamiento</string>
     <string name="preference_save_location_summary">Carpeta para guardar los archivos de foto/video</string>
-    <string name="preference_using_saf">Utilizar el Framework de Acceso del Almacenamiento</string>
     <string name="preference_using_saf_summary">Utilice el Framework de Acceso del Almacenamiento para guardar fotos y videos</string>
     <string name="preference_save_photo_prefix">Prefijo de foto</string>
     <string name="preference_save_photo_prefix_summary">Prefijo utilizado para el nombre de las fotos</string>
@@ -276,7 +275,7 @@
     <string name="speech_recognizer_started">Decir \"cheese\"</string>
     <string name="audio_listener_started">Introducir un ruido fuerte</string>
     <string name="auto_stabilise_info">El nivel automático rotará ligeramente las fotos para que aparezcan niveladas.\n\nTenga en cuenta que las imágenes saldrán con una resolución ligeramente menor (debido a la rotación y al recorte que se requiere).</string>
-    <string name="raw_info">Los archivos DNG contienen la información completa sin comprimir y sin procesar de su cámara.\n\nLa mayoría de las aplicaciones de la galería no reconocerán DNG, sino que se deben usar con aplicaciones especializadas como Snapseed o Lightroom.\n\nTenga en cuenta que varias opciones de procesamiento, como el estampado de las fotos y el nivel automático, solo se aplicarán a las imágenes JPEG, y no a las imágenes DNG\n\nLos archivos DNG ocupan mucho espacio; una aplicación de explorador de archivos puede ser útil para transferirlos o eliminarlos.\n\nLos archivos DNG solo se guardan en los modos de fotografía estándar o DRO (D-Range Optimise).</string>
+    <string name="raw_info">Los archivos DNG contienen la información completa sin comprimir y sin procesar de su cámara.\n\nLa mayoría de las aplicaciones de la galería no reconocerán DNG, sino que se deben usar con aplicaciones especializadas.\n\nTenga en cuenta que varias opciones de procesamiento, como el estampado de las fotos y el nivel automático, solo se aplicarán a las imágenes JPEG, y no a las imágenes DNG\n\nLos archivos DNG ocupan mucho espacio; una aplicación de explorador de archivos puede ser útil para transferirlos o eliminarlos.\n\nLos archivos DNG solo se guardan en los modos de fotografía estándar o DRO (D-Range Optimise).</string>
     <string name="hdr_info">El modo HDR es útil para tomas con una gran variación de brillo. Funciona tomando múltiples tomas con diferentes exposiciones y combinándolas para crear la imagen final.\n\nTenga en cuenta que el HDR no es adecuado para escenas con movimiento rápido y puede dar como resultado una reproducción de color menos precisa.\n\nTomar fotos en modo HDR será más lento.</string>
     <string name="dont_show_again">No mostrar de nuevo</string>
     <string name="photo_mode">Modo de foto</string>
@@ -295,9 +294,7 @@
     <string name="no_permission">PERMISOS NO DISPONIBLES</string>
     <string name="permission_rationale_title">Permiso requerido</string>
     <string name="permission_rationale_camera">Se requiere el permiso de la cámara para habilitarla</string>
-    <string name="permission_rationale_storage">Permiso de lectura / escritura de almacenamiento para guardar fotos</string>
-    <string name="permission_rationale_record_audio">Se requiere el permiso de micrófono para grabar vídeo con audio</string>
-    <string name="permission_rationale_location">Se requiere el permiso de ubicación para geoetiquetar</string>
+
     <string name="preference_category_photo_debugging">Opciones de depuración</string>
     <string name="preference_category_video_debugging">Opciones de depuración</string>
     <string name="preference_camera2_fake_flash">Utilizar un método de flash alternativo</string>
@@ -563,331 +560,9 @@
     <string name="preference_immersive_mode_navigation">Sólo ocultar los botones de navegación en pantalla</string>
     <string name="preference_immersive_mode_gui">Ocultar interfaz de usuario</string>
     <string name="preference_immersive_mode_everything">Ocultar todo</string>
-    <string name="preference_video_output_format_3gpp">3GPP</string>
-    <string name="preference_video_output_format_mpeg4_hevc">MPEG4 HEVC</string>
-    <string name="preference_video_output_format_mpeg4_h264">MPEG4 H264</string>
-    <string name="preference_video_output_format_default">Estándar</string>
-    <string name="preference_video_output_format_summary">Formato de archivo de vídeo, audio y códecs
-\n%s</string>
-    <string name="preference_video_output_format">Formato de video</string>
-    <string name="preference_hdr_contrast_enhancement_always">Siempre</string>
-    <string name="preference_hdr_contrast_enhancement_smart">Inteligente</string>
-    <string name="preference_hdr_contrast_enhancement_off">Apagado</string>
-    <string name="preference_hdr_contrast_enhancement_summary">Cuándo utilizar un algoritmo de mejora del contraste para el HDR. Esto puede mejorar la apariencia en los casos en que hay un rango dinámico muy alto en la escena, y también da un aspecto HDR a los resultados.
-\n%s</string>
-    <string name="preference_hdr_contrast_enhancement">Mejora de contraste HDR</string>
-    <string name="preference_crop_guide_2">2 (2:1)</string>
-    <string name="cancelled_focus_bracketing">Horquilla de enfoque cancelada</string>
-    <string name="preference_video_max_filesize_9gb">9GB</string>
-    <string name="preference_video_max_filesize_5gb">5GB</string>
-    <string name="preference_video_max_filesize_2gb">2GB</string>
-    <string name="preference_burst_interval_0_5s">0.5s</string>
-    <string name="next">Próximo</string>
-    <string name="previous">Previo</string>
-    <string name="exposure_compensation_zoom">Aumentar o disminuir la compensación de la exposición</string>
-    <string name="preference_focus_assist_4x">4x</string>
-    <string name="preference_focus_assist_2x">2x</string>
-    <string name="preference_focus_assist_off">Apagado</string>
-    <string name="preference_focus_assist_summary">Si se debe hacer zoom al ajustar la distancia de enfoque manual
-\n%s</string>
-    <string name="preference_focus_assist">Asistente de enfoque</string>
-    <string name="noise_reduction_mode_high_quality">Alta calidád</string>
-    <string name="noise_reduction_mode_fast">Rápido</string>
-    <string name="noise_reduction_mode_minimal">Minimo</string>
-    <string name="noise_reduction_mode_off">Apagado</string>
-    <string name="noise_reduction_mode_default">Estándar</string>
-    <string name="preference_noise_reduction_mode_summary">Algoritmo que el controlador de la cámara debe utilizar para aplicar la reducción de ruido. El algoritmo de reducción de ruido intenta mejorar la calidad de la imagen eliminando el ruido excesivo añadido por el proceso de captura, especialmente en condiciones de oscuridad. (Tenga en cuenta que esto no está relacionado con el modo de foto de reducción de ruido, y de hecho este ajuste se ignora en el modo de foto NR).
-\n%s</string>
-    <string name="preference_noise_reduction_mode">Algoritmo de reducción de ruido</string>
-    <string name="preference_screen_processing_settings">Procesando los ajustes…</string>
-    <string name="preference_edge_mode_summary">Algoritmo que el controlador de la cámara debe utilizar para aplicar la mejora de bordes. La mejora de los bordes mejora la nitidez y los detalles de la imagen capturada. (Este ajuste se ignora en el modo de foto NR).
-\n%s</string>
-    <string name="preference_edge_mode">Algoritmo de modo de borde</string>
-    <string name="preference_show_whats_new_summary">Si se muestra información sobre las nuevas características y mejoras cuando la aplicación se ha actualizado</string>
-    <string name="preference_show_whats_new">Muestra el diálogo de Novedades</string>
-    <string name="feet_abbreviation">ft</string>
-    <string name="preference_units_distance_ft">Pies</string>
-    <string name="preference_units_distance_m">Metros</string>
-    <string name="preference_units_distance_summary">Se utiliza para la altitud del GPS para el sello de la foto y los subtítulos de vídeo
-\n%s</string>
-    <string name="preference_units_distance">Unidad de distancia</string>
-    <string name="accuracy_unknown">Desconocido</string>
-    <string name="accuracy_high">Alto</string>
-    <string name="accuracy_medium">Medio</string>
-    <string name="accuracy_low">Bajo</string>
-    <string name="accuracy_unreliable">Inconfiable</string>
-    <string name="magnetic_accuracy_info">El compás de su dispositivo necesita ser calibrado para mejorar su precisión. Esto puede hacerse moviendo el dispositivo en forma de 8.
-\n
-\nPrecisión actual:</string>
-    <string name="magnetic_accuracy_title">Dirección del compás</string>
-    <string name="focus_bracketing_add_infinity">Añadir distancia infinita</string>
-    <string name="focus_bracketing_target_distance">Distancia del objetivo de la horquilla de enfoque</string>
-    <string name="focus_bracketing_source_distance">Distancia de la fuente de la horquilla de enfoque</string>
-    <string name="photo_mode_focus_bracketing_full">Horquilla de enfoque</string>
-    <string name="photo_mode_focus_bracketing">Foco {}</string>
-    <string name="preference_show_video_max_amp_summary">Mostrar o no el nivel de audio en pantalla al grabar un vídeo</string>
-    <string name="preference_show_video_max_amp">Mostrar el medidor de nivel de audio</string>
-    <string name="preference_video_bitrate_200000000">200Mbps</string>
-    <string name="preference_video_bitrate_150000000">150Mbps</string>
-    <string name="preference_record_audio_src_unprocessed">Sin procesar</string>
-    <string name="preference_record_audio_src_voice_recognition">Optimizado para reconocimiento de voz</string>
-    <string name="video_log">Perfil de registro</string>
-    <string name="preference_video_log_extra_strong">Registro (Extra fuerte)</string>
-    <string name="preference_video_log_strong">Registro (Fuerte)</string>
-    <string name="preference_video_log_medium">Registro (Medio)</string>
-    <string name="preference_video_log_low">Registro (Bajo)</string>
-    <string name="preference_video_log_fine">Registro</string>
-    <string name="preference_video_log_off">Estándar</string>
-    <string name="preference_video_log_summary">Establecer perfil de imagen estándar o plano para el modo de vídeo
-\n%s</string>
-    <string name="preference_video_log">Perfiles de imagen de vídeo</string>
-    <string name="preference_camera2_photo_video_recording_summary">Permitir hacer fotos mientras se graban vídeos. Desactiva esta opción si hay problemas con la grabación de vídeo con la API Camera2 activada en tu dispositivo.</string>
-    <string name="preference_camera2_photo_video_recording">Permitir tomar fotos mientras se graba el vídeo</string>
-    <string name="saf_permission_failed_open_image">No se puede abrir esta imagen</string>
-    <string name="open_files_saf_exception_ghost">No se encontró ningún diálogo de archivo en este dispositivo, la opción de Ghost image no es compatible</string>
-    <string name="preference_ghost_image_selected">Imagen seleccionada</string>
-    <string name="preference_ghost_image_last">Ùltima foto</string>
-    <string name="preference_ghost_image_off">Apagado</string>
-    <string name="preference_ghost_image_summary">Superponer una imagen, para ayudar a la alineación.
-\n%s</string>
-    <string name="preference_focus_bracketing_n_images_entries_200">200</string>
-    <string name="preference_focus_bracketing_n_images_entries_150">150</string>
-    <string name="preference_focus_bracketing_n_images_entries_100">100</string>
-    <string name="preference_focus_bracketing_n_images_entries_50">50</string>
-    <string name="preference_focus_bracketing_n_images_entries_40">40</string>
-    <string name="preference_focus_bracketing_n_images_entries_30">30</string>
-    <string name="preference_focus_bracketing_n_images_entries_25">25</string>
-    <string name="preference_focus_bracketing_n_images_entries_20">20</string>
-    <string name="preference_focus_bracketing_n_images_entries_15">15</string>
-    <string name="preference_focus_bracketing_n_images_entries_12">12</string>
-    <string name="preference_focus_bracketing_n_images_entries_10">10</string>
-    <string name="preference_focus_bracketing_n_images_entries_8">8</string>
-    <string name="preference_focus_bracketing_n_images_entries_6">6</string>
-    <string name="preference_focus_bracketing_n_images_entries_5">5</string>
-    <string name="preference_focus_bracketing_n_images_entries_4">4</string>
-    <string name="preference_focus_bracketing_n_images_entries_3">3</string>
-    <string name="preference_focus_bracketing_n_images_entries_2">2</string>
-    <string name="preference_focus_bracketing_n_images">Número de fotos</string>
-    <string name="preference_category_exif_tags">Etiquetas EXIF personalizadas</string>
-    <string name="preference_video_fps_default">Estándar</string>
-    <string name="preference_stamp_geo_address_no">No mostrar dirección</string>
-    <string name="preference_stamp_geo_address_prefer">Preferir dirección a coordenadas GPS</string>
-    <string name="preference_stamp_geo_address_both">Mostrar la dirección si es posible, además de las coordenadas GPS</string>
-    <string name="preference_stamp_geo_address">Utilizar las direcciones</string>
-    <string name="preference_remote_type_kraken">Carcasa inteligente Kraken</string>
-    <string name="remote_connected">Conectado a distancia</string>
-    <string name="preference_water_type_summary">Para las carcasas subacuáticas, mejora la precisión si se selecciona el tipo de agua correcto.</string>
-    <string name="preference_water_type">Utilizar saltwater para el cálculo de la profundidad</string>
-    <string name="preference_remote_disconnect_screen_dim_summary">Sugerencia: ajuste el brillo estándar al nivel mínimo antes de iniciar la cámara.</string>
-    <string name="preference_remote_disconnect_screen_dim">Atenuar la pantalla si el mando se desconecta</string>
-    <string name="unknown_device">Dispositivo desconocido</string>
-    <string name="bluetooth_not_supported">Bluetooth no soportado.</string>
-    <string name="scan_ble">Escaneo de dispositivos BLE</string>
-    <string name="ble_not_supported">BLE no está soportado</string>
-    <string name="preference_remote_type">Tipo de dispositivo remoto</string>
-    <string name="preference_enable_remote_summary">Activar mando a distancia Bluetooth LE (BLE)</string>
-    <string name="preference_enable_remote">Activar mando a distancia Bluetooth LE</string>
-    <string name="preference_screen_remote_control">Mando a distancia Bluetooth LE…</string>
-    <string name="photo_mode_panorama_full">Panorama</string>
-    <string name="photo_mode_panorama">Panorama</string>
-    <string name="preference_nr_mode_low_light_message">Modo de poca luz: mantenga la cámara estáble</string>
-    <string name="exposure_unlock">Desbloquear exposición</string>
-    <string name="preference_show_exposure_lock_summary">Si se muestra un icono en pantalla para bloquear o desbloquear la exposición</string>
-    <string name="preference_show_exposure_lock">Mostrar el icono de bloqueo de exposición automática</string>
-    <string name="white_balance_unlocked">Balance de blancos desbloqueado</string>
-    <string name="white_balance_locked">Balance de blancos bloqueado</string>
-    <string name="white_balance_unlock">Desbloquear balance de blancos</string>
-    <string name="white_balance_lock">Bloquear balance de blancos</string>
-    <string name="preference_show_white_balance_lock_summary">Si se muestra un icono en pantalla para bloquear o desbloquear el balance de blancos automático</string>
-    <string name="preference_show_white_balance_lock">Mostrar el icono de bloqueo del balance de blancos automático</string>
-    <string name="preference_show_textstamp_summary">Si se muestra un icono en pantalla para especificar el texto personalizado a estampar en la foto</string>
-    <string name="preference_show_textstamp">Mostrar texto personalizado para el icono de sello fotográfico</string>
-    <string name="stamp_disabled">Sello fotográfico desactivado</string>
-    <string name="stamp_enabled">Sello fotográfico activado</string>
-    <string name="stamp_disable">Desactivar sello de foto</string>
-    <string name="stamp_enable">Activar sello fotográfico</string>
-    <string name="preference_show_stamp_summary">Si se muestra un icono en pantalla para activar o desactivar el sello fotográfico</string>
-    <string name="preference_show_stamp">Mostrar el icono de la foto del sello</string>
-    <string name="auto_level_disable">Desactivar autonivelación</string>
-    <string name="auto_level_enable">Activar autonivelación</string>
-    <string name="preference_show_auto_level_summary">Si se muestra un icono en pantalla para activar o desactivar la autonivelación. Si se activa la función de autonivelación, las fotos se rotarán para que se nivelen automáticamente con el horizonte.</string>
-    <string name="preference_show_auto_level">Mostrar icono de autonivelación</string>
-    <string name="face_detection_disabled">Detección de rostro desactivada</string>
-    <string name="face_detection_enabled">Detección de rostro activada</string>
-    <string name="face_detection_disable">Desactivar detección de rostro</string>
-    <string name="face_detection_enable">Activar detección de rostro</string>
-    <string name="preference_show_face_detection_summary">Si se muestra un icono en pantalla para activar o desactivar la detección de rostros</string>
-    <string name="preference_show_face_detection">Mostrar icono de detección facial</string>
-    <string name="preference_ui_placement_top">Iconos a lo largo de la parte superior (retrato)</string>
-    <string name="preference_nr_mode_low_light">Poca luz</string>
-    <string name="preference_nr_mode_normal">Normal</string>
-    <string name="preference_nr_mode">Modo NR</string>
-    <string name="preference_image_format_png">PNG</string>
-    <string name="preference_image_format_webp">WebP</string>
-    <string name="preference_image_format_jpeg">JPEG</string>
-    <string name="preference_image_format">Formato de imágen</string>
-    <string name="open_files_saf_exception_generic">No se encontró ningún diálogo de archivo en este dispositivo, la opción no es compatible</string>
-    <string name="restore_settings_failed">Fallo en el restablecimiento de la configuración</string>
-    <string name="save_settings_failed">Fallo al guardar la configuración</string>
-    <string name="saved_settings">Configuración guardada</string>
-    <string name="preference_restore_settings_question">Esta opción le permite seleccionar uno de los archivos de configuración que guardó previamente. Tenga en cuenta que la selección de un archivo reemplazará todos los ajustes actuales!</string>
-    <string name="preference_restore_settings_summary">Restablece los ajustes guardados anteriormente. Esta acción reemplazará todos los ajustes actuales con los ajustes guardados.</string>
-    <string name="preference_restore_settings">Restaurar la configuración</string>
-    <string name="preference_save_settings_filename">Nombre de la configuración guardada</string>
-    <string name="preference_save_settings_summary">Guardar todos los ajustes de la cámara en un archivo</string>
-    <string name="preference_save_settings">Guardar ajustes</string>
-    <string name="preference_screen_settings_manager">Gestor de configuración</string>
-    <string name="preference_video_output_format_webm">WebM (audio no soportado)</string>
-    <string name="no_burst">no repetir</string>
-    <string name="preference_ghost_image">Imagen Ghost</string>
-    <string name="whats_new_text">" &lt;small&gt;[Este diálogo se muestra cuando se actualiza la cámara. Se puede desactivar en Ajustes/Guía de usuario en pantalla/Mostrar diálogo de novedades]&lt;/small&gt;. 
-\n
-\n&lt;b&gt;v1.48:&lt;/b&gt;
-\n &lt;ul&gt; &lt;li&gt;Nuevo icono para múltiples cámaras. Si tu dispositivo tiene varias cámaras delanteras/traseras, el icono existente para cambiar de cámara cambiará entre la cámara delantera y la trasera; el nuevo icono, en cambio, alternará entre las múltiples cámaras delanteras o traseras. Si prefieres el comportamiento anterior, desactiva Ajustes/Guía en pantalla/\"Icono de múltiples cámaras\". (Nota, sólo se admite para los dispositivos que exponen múltiples cámaras a las aplicaciones de terceros).
-\n&lt;/li&gt; &lt;li&gt;La función de nivelación automática ahora muestra un rectángulo en pantalla para mostrar el marco de la foto resultante.
-\n&lt;/li&gt; &lt;li&gt;Control de apertura, para dispositivos que lo soporten. (Sólo la API de Camera2).
-\n&lt;/li&gt; &lt;li&gt;Más perfiles de vídeo personalizados.
-\n&lt;/li&gt; &lt;li&gt;Nueva opción de valor alfa para la opción de imagen Ghost.
-\n&lt;/li&gt; &lt;li&gt;Opciones para colores de las franjas de cebra.
-\n&lt;/li&gt; &lt;li&gt;Opción para almacenar la guiñada/pitch/roll actual del dispositivo en el comentario de usuario Exif.
-\n&lt;/li&gt; &lt;li&gt;Opción para desactivar las acciones de pulsación larga.
-\n&lt;/li&gt; &lt;li&gt;Mejor uso de la pantalla completa con relaciones de aspecto amplias en dispositivos con botones de navegación en pantalla.
-\n&lt;/li&gt; &lt;li&gt;Corrección de errores y mejoras en la interfaz de usuario. "</string>
-    <string name="preference_licence_google_icons_text">Camera utiliza los iconos de Material Design de Google (https://developer.android.com/design/downloads/index.html , https://design.google.com/icons/ , https://github.com/google/material-design-icons/ , https://google.github.io/material-design-icons/) bajo la licencia Apache versión 2.0. Algunos iconos incluyen modificaciones. Pulse aquí para ver el texto completo de la licencia.</string>
-    <string name="preference_licence_google_icons">íconos Material Design de Google</string>
-    <string name="preference_licence_open_camera_text">Cámara es © 2013-2019 Mark Harman, publicada bajo la GPL v3 o posterior. Pulse aquí para ver el texto completo de la licencia.</string>
-    <string name="preference_licence_open_camera">Cámara</string>
-    <string name="preference_screen_licences">Licencias de código abierto</string>
-    <string name="error_features_slow_motion">Cámara lenta</string>
-    <string name="error_features_frame_rate">Velocidad de cuadro</string>
-    <string name="error_features_bitrate">Tasa de bits</string>
-    <string name="error_features_4k">4K UHD</string>
-    <string name="aperture">Abertura</string>
-    <string name="preference_allow_long_press_summary">Permitir acciones de pulsación larga (por ejemplo, pulsación larga en la galería para cambiar la ubicación de guardado).</string>
-    <string name="preference_allow_long_press">Permitir acciones de pulsación larga</string>
-    <string name="preference_show_camera_id_summary">Mostrar número de identificación de la cámara actual en pantalla</string>
-    <string name="preference_show_camera_id">Mostrar ID de la cámara</string>
-    <string name="preference_multi_cam_button_summary">Si está activado, utilice botones separados para cambiar entre las cámaras delanteras y traseras, y para cambiar entre varias cámaras delanteras y traseras. Si está desactivado, el icono de cambiar de cámara pasará por todas las cámaras.</string>
-    <string name="preference_multi_cam_button">ícono de cámaras múltiples</string>
-    <string name="switch_multi_camera">Cambiar entre cámaras múltiples</string>
-    <string name="switch_to_unknown_camera">Cambiar cámara</string>
-    <string name="switch_to_external_camera">Cambiar a cámara externa</string>
-    <string name="ultrawide">Ultra-ancho</string>
-    <string name="external_camera">Cámara externa</string>
-    <string name="preference_zebra_stripes_color_white">Blanco</string>
-    <string name="preference_zebra_stripes_color_transparent">Transparente</string>
-    <string name="preference_zebra_stripes_color_orange">Naranja</string>
-    <string name="preference_zebra_stripes_color_red">Rojo</string>
-    <string name="preference_zebra_stripes_color_black">Negro</string>
-    <string name="preference_zebra_stripes_background_color_summary">Color a utilizar para la franja de fondo cuando se muestran las rayas de cebra.
-\n%s</string>
-    <string name="preference_zebra_stripes_background_color">Color de fondo de las rayas de cebra</string>
-    <string name="preference_zebra_stripes_foreground_color_summary">Color a utilizar para la franja de primer plano cuando se muestren las rayas de cebra.
-\n%s</string>
-    <string name="preference_zebra_stripes_foreground_color">Color de las rayas de cebra en primer plano</string>
-    <string name="preference_ghost_image_alpha_summary">Valor alfa a utilizar para las imágenes Ghost. Un valor más bajo significa más transparente, más alto significa más opaco.
-\n%s</string>
-    <string name="preference_ghost_image_alpha">Opacidad de imagen Ghost</string>
-    <string name="preference_immersive_mode_low_profile">Atenúar solamente los botones virtuales de navegación en pantalla</string>
-    <string name="preference_video_profile_gamma_2_8">2.8</string>
-    <string name="preference_video_profile_gamma_2_6">2.6</string>
-    <string name="preference_video_profile_gamma_2_4">2.4</string>
-    <string name="preference_video_profile_gamma_2_3">2.3</string>
-    <string name="preference_video_profile_gamma_2_2">2.2</string>
-    <string name="preference_video_profile_gamma_2_1">2.1</string>
-    <string name="preference_video_profile_gamma_2_0">2.0</string>
-    <string name="preference_video_profile_gamma_1_9">1.9</string>
-    <string name="preference_video_profile_gamma_1_8">1.8</string>
-    <string name="preference_video_profile_gamma_1_6">1.6</string>
-    <string name="preference_video_profile_gamma_summary">Valor de gamma a utilizar para el vídeo si el perfil de imagen de vídeo está configurado como Gamma
-\n%s</string>
-    <string name="preference_camera_api_camera2">Cámara a API</string>
-    <string name="preference_camera_api_old">Cámara API original</string>
-    <string name="preference_camera_api_summary">Seleccione Cámara a API para habilitar funciones adicionales como los modos manuales para la exposición, el enfoque y el balance de blancos, junto con RAW (si el dispositivo lo admite). El cambio de la API provocará un reinicio.
-\n%s</string>
-    <string name="preference_camera_api">Cámara API</string>
-    <string name="preference_image_format_summary">Seleccione el formato utilizado para guardar las fotos. Esto afecta las fotos \"estándar\" (no RAW). Tenga en cuenta que el formato PNG no es realmente sin pérdidas, sino que se convierte a partir de un JPEG con una calidad del 100%.
-\n%s</string>
-    <string name="exposure_compensation_seekbar">Barra de búsqueda para cambiar la compensación de la exposición</string>
-    <string name="camera_id">ID</string>
-    <string name="preference_panorama_save_all_plus_debug">Guarda las imágenes originales más el XML de depuración</string>
-    <string name="preference_panorama_save_all">Guardar imágenes originales</string>
-    <string name="preference_panorama_save_no">No guardar imágenes originales</string>
-    <string name="preference_panorama_save_summary">Si se guardan las imágenes originales en modo panorámico. Tenga en cuenta que esto hará que guardar las fotos panorámicas sea más lento. También permite la opción de guardar un archivo XML que puede ser útil para reportar problemas con el panorama.
-\n%s</string>
-    <string name="preference_panorama_save">Imágenes panorama originales</string>
-    <string name="panorama_info">Para tomar una imagen panorámica, mantén tu dispositivo en orientación vertical y pulsa tomar foto para iniciar la panorámica. A continuación, gira el dispositivo hacia la izquierda o la derecha para mover el círculo blanco centrado sobre el punto azul. Después de capturar cada nueva imagen, sigue girando el dispositivo para cubrir cada nuevo punto azul que aparezca.
-\n
-\nPulsa tomar foto al final para guardar la panorámica, o en el icono de la cruz para cancelarla.
-\n
-\nTen en cuenta que las fotos panorámicas pueden tardar en procesarse y guardarse.</string>
-    <string name="preference_panorama_crop_summary">Para el modo panorámico, si se eliminan los límites ondulados
-\n%s</string>
-    <string name="preference_panorama_crop">Panorama de auto-recorte</string>
-    <string name="failed_to_process_panorama">Error al crear imágen panorama</string>
-    <string name="panorama_cancelled">Panorama cancelado</string>
-    <string name="cancel_panorama">Cancelar panorama</string>
-    <string name="finish_panorama">Terminar panorama</string>
-    <string name="image_saving_notification">Guardando imágenes…</string>
-    <string name="preference_stamp_style_background">Texto con fondo sombreado</string>
-    <string name="bluetooth_scan">Escanear</string>
-    <string name="bluetooth_current_remote">Mando actual:</string>
-    <string name="preference_show_cycle_raw_summary">Si se muestra un icono en pantalla para ver los modos RAW</string>
-    <string name="preference_show_cycle_raw">Mostrar ícono RAW</string>
-    <string name="cycle_raw">Ciclo de modos RAW</string>
-    <string name="preference_raw_focus_bracketing_summary">Si la opción RAW debe aplicarse también al modo de foto de horquillado de enfoque. Si esta opción está desactivada, sólo se guardarán los JPEG en los modos de foto de horquillado de enfoque.</string>
-    <string name="preference_raw_focus_bracketing">Permitir RAW para el horquillamiento de enfoque</string>
-    <string name="preference_raw_expo_bracketing_summary">Si la opción RAW debe aplicarse también para el modo fotográfico de horquillado de exposición (o para el modo HDR cuando \"Guardar todas las imágenes para el modo HDR\" está activado). Si esta opción está desactivada, sólo se guardarán los JPEG en esos modos de foto.</string>
-    <string name="preference_raw_expo_bracketing">Permitir RAW para el horquillado de la exposición</string>
-    <string name="preference_show_cycle_flash_summary">Si se muestra un icono en pantalla para ver las opciones de flash, en lugar de mostrar las opciones de flash en el menú emergente</string>
-    <string name="preference_show_cycle_flash">Mostrar ícono de flash</string>
-    <string name="cycle_flash">Ciclo de flashes</string>
-    <string name="preference_preview">Vista previa de cámara…</string>
-    <string name="remaining">Sobrante</string>
-    <string name="preference_focus_peaking_color_summary">Qué color utilizar para resaltar los bordes enfocados
-\n%s</string>
-    <string name="preference_focus_peaking_color">Color del pico de enfoque</string>
-    <string name="preference_focus_peaking_on">Encendido</string>
-    <string name="preference_focus_peaking_off">Apagado</string>
-    <string name="preference_focus_peaking_summary">Si esta opción está activada, losrealces se mostrarán en los bordes enfocados (contornos). Esto es principalmente útil para el enfoque manual, y puede ser utilizado para ayudar a determinar qué regiones de la imagen están enfocadas.
-\n%s</string>
-    <string name="preference_focus_peaking">Pico de enfoque</string>
-    <string name="preference_zebra_stripes_100pc">100%</string>
-    <string name="preference_zebra_stripes_99pc">99%</string>
-    <string name="preference_zebra_stripes_98pc">98%</string>
-    <string name="preference_zebra_stripes_97pc">97%</string>
-    <string name="preference_zebra_stripes_95pc">95%</string>
-    <string name="preference_zebra_stripes_93pc">93%</string>
-    <string name="preference_zebra_stripes_90pc">90%</string>
-    <string name="preference_zebra_stripes_80pc">80%</string>
-    <string name="preference_zebra_stripes_70pc">70%</string>
-    <string name="preference_zebra_stripes_off">Apagado</string>
-    <string name="preference_zebra_stripes_summary">Si esta opción está activada, se dibujarán rayas de cebra en la pantalla que mostrarán dónde está sobreexpuesta la vista previa de la cámara.
-\n%s</string>
-    <string name="preference_zebra_stripes">Mostrar rayas de cebra</string>
-    <string name="preference_histogram_lightness">Luminosidad (media de mín-máx)</string>
-    <string name="preference_histogram_intensity">Intensidad (Media)</string>
-    <string name="preference_histogram_value">Valor (Máximo)</string>
-    <string name="preference_histogram_luminance">Luminancia</string>
-    <string name="preference_histogram_rgb">Colores RGB</string>
-    <string name="preference_histogram_off">Apagado</string>
-    <string name="preference_histogram_summary">Si se muestra un histograma de los colores que aparecen en pantalla
-\n%s</string>
-    <string name="preference_histogram">Mostrar un histograma</string>
-    <string name="preference_location_disable">Dejar de almacenar datos de localización</string>
-    <string name="preference_location_enable">Almacenar datos de ubicación</string>
-    <string name="preference_show_store_location_summary">Si se muestra un icono en pantalla para activar o desactivar los datos de localización (geoetiquetado)</string>
-    <string name="preference_show_store_location">Mostrar icono de datos de localización de la tienda</string>
-    <string name="preference_video_profile_gamma">Valor de gamma de vídeo</string>
-    <string name="preference_video_gamma">Gamma</string>
-    <string name="preference_video_srgb">sRGB</string>
-    <string name="preference_video_rec709">REC709</string>
-    <string name="preference_select_remote">Seleccionar mando remoto</string>
-    <string name="intro_text">Toca para enfocar y pulsa el botón azul de la cámara para hacer fotos. 
-\n
-\nPara desactivar el brillo máximo de la pantalla, consulta Ajustes/Guía en pantalla/\"Forzar brillo máximo\". Para guardar en tarjetas SD en Android 5+, consulta Ajustes/Más controles de cámara/\"Usar marco de acceso al almacenamiento\". Para obtener más ayuda, haz clic en \"Ayuda en línea\" desde Ajustes.</string>
-    <string name="preference_stamp_geo_address_summary">Si es posible, utilice una dirección al estampar las ubicaciones GPS. Esta opción requiere una conexión a Internet. Tenga en cuenta que, si está activada, esto requiere que su dispositivo transmita los datos de ubicación a través de Internet a terceros para convertir las coordenadas GPS en una dirección. Consulte https://developer.android.com/reference/android/location/Geocoder . 
-\n%s</string>
-    <string name="preference_audio_control_summary">Tomar fotos/vídeos cuando se detecta un ruido, o por orden de voz. Cuando está activado, utiliza el botón del micrófono en pantalla para iniciar/detener la escucha. Tenga en cuenta que la opción de comando de voz utiliza el servicio de reconocimiento de voz de Android: al utilizar esta opción, es probable que los datos de audio se envíen a servidores remotos para realizar el reconocimiento de voz. 
-\n%s</string>
+
+    <string name="preference_audio_control_none">Ninguno</string>
+    <string name="preference_audio_control_noise">Ruido fuerte</string>
+    <string name="preference_audio_control_voice">Comando de voz: \"cheese\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/arrays.xml b/app/src/main/res/values-fr/arrays.xml
index 121eab85c5fb0a8d15ceab59968b1d4e174c39c5..98ee68b943eee2754cd699d55a2963394f9d3e0b 100644
--- a/app/src/main/res/values-fr/arrays.xml
+++ b/app/src/main/res/values-fr/arrays.xml
@@ -242,14 +242,4 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>Aucun</item>
-        <item>Bruit fort</item>
-        <item>Commande vocale : « cheese »</item>
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a8a30b687f626dc6da034cb0d3e67b6fdd9217c1..9abcb3acfa455051add4e21434ba2ad28de688ce 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -108,8 +108,7 @@
     <string name="preference_audio_noise_control_sensitivity_summary">Niveau de la sensibilité sonore pour l\'option contrôle audio (bruit fort)</string>
     <string name="preference_save_location">Dossier de stockage</string>
     <string name="preference_save_location_summary">Dossier où sont stockés les fichiers photo/vidéo</string>
-    <string name="preference_using_saf">Utiliser le Storage Access Framework</string>
-    <string name="preference_using_saf_summary">Utiliser ou non le Storage Access Framework pour sauvegarder des photos et des vidéos. Ceci devrait être activé pour permettre d\'enregistrer sur des cartes SD externes.</string>
+    <string name="preference_using_saf_summary">Utilise le Storage Access Framework pour enregistrer les photos et vidéos</string>
     <string name="preference_save_photo_prefix">Préfixe du nom de photo</string>
     <string name="preference_save_photo_prefix_summary">Le préfixe est utilisé pour le nom de fichier des photos</string>
     <string name="preference_save_video_prefix">Préfixe du nom de la vidéo</string>
@@ -203,7 +202,7 @@
     <string name="preference_video_bitrate_summary">Définir le débit approximatif des vidéos (plus élevé signifie une meilleure qualité, mais prend plus d\'espace disque ; et peut entraîner un échec de l\'enregistrement vidéo si le débit n\'est pas pris en charge)
 \n%s</string>
     <string name="preference_video_fps">Fréquence d\'images vidéo (environ)</string>
-    <string name="preference_video_fps_summary">Définir la fréquence d\'images (FPS) des vidéos (peut être approximative, non garantie, et peut entraîner l\'échec de l\'enregistrement vidéo si la fréquence d\'images n\'est pas prise en charge). Veuillez vérifier les vidéos produites pour déterminer la bonne fréquence d\'images. Notez que ce paramètre est ignoré pour les vidéos au ralenti. 
+    <string name="preference_video_fps_summary">Définir la fréquence d\'images (FPS) des vidéos (peut être approximative, non garantie, et peut entraîner l\'échec de l\'enregistrement vidéo si la fréquence d\'images n\'est pas prise en charge). Veuillez vérifier les vidéos produites pour déterminer la bonne fréquence d\'images. Notez que ce paramètre est ignoré pour les vidéos au ralenti.
 \n%s</string>
     <string name="preference_video_max_duration">Durée maximale de la vidéo</string>
     <string name="preference_video_max_duration_summary">L\'enregistrement vidéo s\'arrêtera après la durée spécifiée\n%s</string>
@@ -297,11 +296,14 @@
     <string name="preference_hdr_save_expo_summary">Si activé, en mode photo HDR les trois images utilisées seront enregistrées en supplément de la photo finale HDR. Notez que ceci ralentira l\'enregistrement, plus particulièrement si les options « Incrustation photo » ou « Auto-stabilisateur » sont aussi utilisées.</string>
     <string name="preference_raw">RAW</string>
     <string name="preference_save_zulu_time">Format de l\'heure pour le nom de fichier</string>
-    <string name="raw_info">Les fichiers DNG contiennent toutes les informations non compressées ni traitées de votre appareil photo. 
-\n 
-\nNotez que certaines applications de galerie ne reconnaissent pas les fichiers DNG. Les images DNG peuvent être utilisées avec des éditeurs d\'images spécialisés comme Snapseed ou Lightroom. 
-\n 
-\nNotez que certaines options comme « Incrustation photo » ou « Auto-stabilisateur » ne s\'appliquent que pour des images non DNG (JPEG, etc.).</string>
+    <string name="raw_info">Les fichiers DNG contiennent toutes les informations non compressées ni traitées de votre
+        caméra.\n\nLa plupart des applications d\'affichage d\'image ne reconnaissent pas le DNG. Vous devrez utiliser une app
+        spécialisée\n\nNotez que certaines options comme «\u00A0Incrustation photo\u00A0» ou
+        «\u00A0Auto-stabilisateur\u00A0» ne s\'appliquent que pour des images JPEG et pas DNG.\n\nLes fichiers DNG
+        utilisent beaucoup d\'espace disque, un explorateur de fichiers peut être utilise pour faire le ménage.\n\nLes
+        fichiers DNG ne sont enregistrés que dans le mode photo standard.
+    </string>
+
     <string name="duration_unlimited">Illimité</string>
     <string name="duration_3s">3 secondes</string>
     <string name="duration_5s">5 secondes</string>
@@ -455,7 +457,7 @@
     <string name="preference_audio_control_summary">Prendre une photo/vidéo lorsqu\'un bruit est détecté, ou sur commande vocale. Lorsque cette fonction est activée, utilisez le bouton du microphone à l\'écran pour démarrer/arrêter l\'écoute. Notez que l\'option de commande vocale utilise le service de reconnaissance vocale Android : lorsque vous utilisez cette option, les données audio sont probablement envoyées à des serveurs distants pour effectuer la reconnaissance vocale.
 
 \n%s</string>
-    <string name="preference_camera_api_summary">Sélectionner l\'API Camera2 pour activer des fonctions supplémentaires telles que les modes manuels d\'exposition, de mise au point, de balance des blancs, ainsi que le mode RAW (s\'il est pris en charge par l\'appareil). La modification de l\'API entraînera un redémarrage. 
+    <string name="preference_camera_api_summary">Sélectionner l\'API Camera2 pour activer des fonctions supplémentaires telles que les modes manuels d\'exposition, de mise au point, de balance des blancs, ainsi que le mode RAW (s\'il est pris en charge par l\'appareil). La modification de l\'API entraînera un redémarrage.
 \n%s</string>
     <string name="preference_image_format_summary">Sélectionner le format de fichier utilisé pour l\'enregistrement des photos. Cela concerne les photos \"standard\" (pas RAW). Notez que le format PNG n\'est pas vraiment sans perte, il est plutôt converti à partir d\'un JPEG avec une qualité de 100 %%.
 \n%s</string>
@@ -858,59 +860,9 @@
     <string name="preference_immersive_mode_navigation">Masquer uniquement les boutons de navigation virtuelle de l\'écran</string>
     <string name="preference_immersive_mode_gui">Masquer l\'interface graphique</string>
     <string name="preference_immersive_mode_everything">Tout masquer</string>
-    <string name="preference_zebra_stripes_93pc">93 %</string>
-    <string name="preference_zebra_stripes_95pc">95 %</string>
-    <string name="preference_zebra_stripes_97pc">97 %</string>
-    <string name="preference_zebra_stripes_98pc">98 %</string>
-    <string name="preference_zebra_stripes_99pc">99 %</string>
-    <string name="preference_select_remote">Choisir une télécommande</string>
-    <string name="preference_video_rec709">REC709</string>
-    <string name="preference_video_srgb">sRGB</string>
-    <string name="preference_video_gamma">Gamma</string>
-    <string name="preference_video_profile_gamma_summary">Valeur gamma à utiliser pour la vidéo si le profil de l\'image vidéo est défini sur Gamma
-\n%s</string>
-    <string name="preference_video_profile_gamma">Valeur du gamma vidéo</string>
-    <string name="preference_video_profile_gamma_1_6">1,6</string>
-    <string name="preference_video_profile_gamma_2_8">2,8</string>
-    <string name="preference_video_profile_gamma_2_6">2,6</string>
-    <string name="preference_video_profile_gamma_2_4">2,4</string>
-    <string name="preference_video_profile_gamma_2_3">2,3</string>
-    <string name="preference_video_profile_gamma_2_2">2,2</string>
-    <string name="preference_video_profile_gamma_2_1">2,1</string>
-    <string name="preference_video_profile_gamma_2_0">2,0</string>
-    <string name="preference_video_profile_gamma_1_9">1,9</string>
-    <string name="preference_video_profile_gamma_1_8">1,8</string>
-    <string name="preference_immersive_mode_low_profile">Atténuer seulement les boutons de navigation virtuelle à l\'écran</string>
-    <string name="preference_ghost_image_alpha">Opacité de l\'image fantôme</string>
-    <string name="preference_ghost_image_alpha_summary">Valeur alpha des images fantômes. Une valeur plus faible signifie plus transparent, plus élevée signifie plus opaque.
-\n%s</string>
-    <string name="preference_zebra_stripes_foreground_color_summary">Couleur à utiliser pour la bande en premier plan quand les bandes zébra sont affichées.
-\n%s</string>
-    <string name="preference_zebra_stripes_foreground_color">Couleur des bandes zébra au premier plan</string>
-    <string name="preference_zebra_stripes_background_color">Couleur des bandes zébra d\'arrière-plan</string>
-    <string name="preference_zebra_stripes_background_color_summary">Couleur à utiliser pour la bande en arrière plan quand les rayures sont affichées.
-\n%s</string>
-    <string name="preference_zebra_stripes_color_black">Noir</string>
-    <string name="preference_zebra_stripes_color_white">Blanc</string>
-    <string name="preference_zebra_stripes_color_transparent">Transparent</string>
-    <string name="preference_zebra_stripes_color_orange">Orange</string>
-    <string name="preference_zebra_stripes_color_red">Rouge</string>
-    <string name="external_camera">Caméra externe</string>
-    <string name="ultrawide">Grand-angle</string>
-    <string name="switch_to_external_camera">Basculer sur la caméra externe</string>
-    <string name="switch_to_unknown_camera">Changer de caméra</string>
-    <string name="switch_multi_camera">Basculer entre plusieurs caméras</string>
-    <string name="preference_multi_cam_button">Icône des caméras multiples</string>
-    <string name="preference_multi_cam_button_summary">Si activé, utilise des boutons séparés pour basculer entre caméras arrière/frontale, et pour basculer entre caméras multiples arrière/frontale. Si désactivé, l\'icône de basculement de caméra parcourra toutes les caméras.</string>
-    <string name="preference_show_camera_id">Afficher l\'identifiant de la caméra</string>
-    <string name="preference_show_camera_id_summary">Afficher le numéro d\'identification de la caméra actuelle à l\'écran</string>
-    <string name="preference_allow_long_press">Permettre des actions de pression longue</string>
-    <string name="preference_allow_long_press_summary">Permettre ou non les actions de pression longue (ex. : une pression longue sur la galerie pour changer la localisation de l\'enregistrement).</string>
-    <string name="aperture">Ouverture</string>
-    <string name="error_features_4k">4K UHD</string>
-    <string name="error_features_bitrate">Bitrate</string>
-    <string name="error_features_frame_rate">Fréquence d\'images</string>
-    <string name="error_features_slow_motion">Ralenti</string>
-    <string name="preference_comment_ypr_summary">Sauvegarder le lacet, le tangage et le roulis de l\'appareil dans le commentaire utilisateur Exif (format JPEG seulement)</string>
-    <string name="preference_comment_ypr">Sauvegarder le lacet, le tangage et le roulis</string>
+
+    <string name="preference_audio_control_none">Aucun</string>
+    <string name="preference_audio_control_noise">Bruit fort</string>
+    <string name="preference_audio_control_voice">Commande vocale : « cheese »</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/arrays.xml b/app/src/main/res/values-hu/arrays.xml
index 62be77f76de179a6869a9a8b6539de38010e0eb3..477173dbf362de4eb65de3f5beaeaa588f8f306d 100644
--- a/app/src/main/res/values-hu/arrays.xml
+++ b/app/src/main/res/values-hu/arrays.xml
@@ -242,16 +242,6 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>Nincs</item>
-        <item>Hangos zaj</item>
-        <item>Hangutasítás: \"csíííz\"</item>
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
     <string-array name="preference_save_zulu_time_entries">
         <item>Helyi idő</item>
         <item>UTC (Zulu)</item>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d160a5d956710a7b281b146a2e304a88e7778a74..b18ab46b7d0bbcc1fee055c1e245c5bacf4c57bc 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -112,7 +112,6 @@
     <string name="preference_audio_noise_control_sensitivity_summary">Hangvezérlés zajszintérzékenysége</string>
     <string name="preference_save_location">Mentés helye</string>
     <string name="preference_save_location_summary">Fotók, videofájlok mentésének könyvtára</string>
-    <string name="preference_using_saf">Storage Access Framework használata</string>
     <string name="preference_using_saf_summary">Használja-e az Storage Access Frameworkjét a fotók és videók mentéséhez</string>
     <string name="preference_save_photo_prefix">Fotó fájlnév előtag</string>
     <string name="preference_save_photo_prefix_summary">A fényképek mentésekor használt fájlnév előtag</string>
@@ -274,7 +273,7 @@
     <string name="speech_recognizer_started">Mondd, hogy „csíííz”</string>
     <string name="audio_listener_started">Csinálj hangos zajt</string>
     <string name="auto_stabilise_info">Az auto-stabilizálás automatikusan elforgatja a fotókat, hogy szintben legyenek.\n\nNe felejtsd el, hogy a képek így kicsit kisebb felbontásúak lesznek (a forgatás és vágás miatt).</string>
-    <string name="raw_info">A DNG fájlok a kamera teljes, tömörítetlen és feldolgozatlan adatait tartalmazzák.\n\nA legtöbb galéria alkalmazás nem ismeri a DNG formátumot, érdemes helyette specializált alkalmazást használni, mint például a Snapseed vagy a Lightroom.\n\nMegjegyzendő, hogy az utófeldolgozó beállítások, mint a „Fotók feliratozása” és „Auto-stabilizálás” csak a JPEG képekre kerülnek rá, a DNG-re nem.\n\nA DNG fájlok sokkal több helyet foglalnak; egy fájlkezelő alkalmazás hasznos lehet a másolásukhoz, törlésükhöz.\n\nDNG fájlok csak Normál és DRO fotómódban mentődnek.</string>
+    <string name="raw_info">A DNG fájlok a kamera teljes, tömörítetlen és feldolgozatlan adatait tartalmazzák.\n\nA legtöbb galéria alkalmazás nem ismeri a DNG formátumot, érdemes helyette specializált alkalmazást használni.\n\nMegjegyzendő, hogy az utófeldolgozó beállítások, mint a „Fotók feliratozása” és „Auto-stabilizálás” csak a JPEG képekre kerülnek rá, a DNG-re nem.\n\nA DNG fájlok sokkal több helyet foglalnak; egy fájlkezelő alkalmazás hasznos lehet a másolásukhoz, törlésükhöz.\n\nDNG fájlok csak Normál és DRO fotómódban mentődnek.</string>
     <string name="hdr_info">A HDR mód változó fényerejű felvételek készítésénél hasznos. Úgy működik, hogy több felvételt kész különböző expozíciós idővel, és ezeket összekombinálva hozza létre a végleges képet.\n\nMegjegyzendő, hogy a HDR nem alkalmas gyorsan mozgó tárgyak fotózására, mert kevésbé pontos színvisszaadást eredményez.\n\nA HDR fotók készítése lassabb.</string>
     <string name="dont_show_again">Ne jelenjen meg újra</string>
     <string name="photo_mode">Fotómód</string>
@@ -291,9 +290,7 @@
     <string name="no_permission">ENGEDÉLY NEM ELÉRHETŐ</string>
     <string name="permission_rationale_title">Engedély szükséges</string>
     <string name="permission_rationale_camera">A kamera eléréséhez „kamera engedély” szükséges</string>
-    <string name="permission_rationale_storage">A fotók mentéséhez írási/olvasási engedély szükséges</string>
-    <string name="permission_rationale_record_audio">Hangos videofelvétel készítéséhez mikrofon engedély szükséges</string>
-    <string name="permission_rationale_location">Geotaggeléshez helymeghatározás engedély szükséges</string>
+
     <string name="preference_category_photo_debugging">Hibakeresési lehetőségek</string>
     <string name="preference_category_video_debugging">Hibakeresési lehetőségek</string>
     <string name="preference_camera2_fake_flash">Alternatív vakukezelés használata</string>
@@ -481,6 +478,9 @@
     <string name="preference_immersive_mode_navigation">Csak a virtuális navigációs gombok elrejtése</string>
     <string name="preference_immersive_mode_gui">Kezelőfelület elrejtése</string>
     <string name="preference_immersive_mode_everything">Minden elrejtése</string>
-    <string name="next">Következő</string>
-    <string name="aperture">Rekesz</string>
+
+    <string name="preference_audio_control_none">Nincs</string>
+    <string name="preference_audio_control_noise">Hangos zaj</string>
+    <string name="preference_audio_control_voice">Hangutasítás: \"csíííz\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/arrays.xml b/app/src/main/res/values-it/arrays.xml
index abdeb6efcb89659843e07e112a188c8e2657cfba..ac9bc575c352a04063a9a6133bc8ae2205222817 100644
--- a/app/src/main/res/values-it/arrays.xml
+++ b/app/src/main/res/values-it/arrays.xml
@@ -242,16 +242,6 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>Nessuno</item>
-        <item>Rumore forte</item>
-        <item>Comando vocale: \"cheese\"</item>
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
     <string-array name="preference_save_zulu_time_entries">
         <item>Orario locale</item>
         <item>UTC (Zulu)</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 507c32cea39d44ac2d07eb00d7bd789c54f797d8..da74452293cf0a192cf7082fb355d5e7027c23f3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -3,30 +3,28 @@
     <string name="app_name">Fotocamera</string>
     <string name="action_settings">Impostazioni</string>
     <string name="action_popup">Impostazioni Popup</string>
-    <string name="intro_ok">OK (Non mostrare più questo avviso)</string>
-    <string name="on">On</string>
-    <!-- whether a setting is turned on, e.g., "Auto-stabilise: On" -->
-    <string name="off">Off</string>
-    <!-- whether a setting is turned off, e.g., "Auto-stabilise: Off" -->
-    <string name="choose_save_location">Scegli dove salvare:</string>
+    <string name="intro_ok">OK (Non mostrare più)</string>
+
+    <string name="on">Acceso</string> <!-- whether a setting is turned on, e.g., "Auto-level: On" -->
+    <string name="off">Spento</string> <!-- whether a setting is turned off, e.g., "Auto-level: Off" -->
+    
+    <string name="choose_save_location">Scegli la posizione di salvataggio:</string>
     <string name="clear_folder_history">Pulisci la cronologia delle cartelle</string>
-    <string name="clear_folder_history_question">Pulisco la cronologia delle cartelle\?</string>
-    <string name="changed_save_location">Posizione di salvataggio modificata in:</string>
+    <string name="clear_folder_history_question">Pulire la cronologia delle cartelle?</string>
+    <string name="choose_another_folder">Scegli un\'altra cartella</string>
+    <string name="changed_save_location">Posizione cambiata in:</string>
     <string name="stopped_recording_video">Registrazione video interrotta</string>
-    <string name="repeats_to_go">riproduci dall\'inizio</string>
-    <!--  intentionally starts lower case -->
-    <!-- @TODO PER FAVORE VERIFICARE QUESTA TRADUZIONE! -->
-    <string name="failed_to_reconnect_camera">non sono riuscito a riconnettere la fotocamera</string>
-    <string name="video_may_be_corrupted">Errore, il file video potrebbe essere danneggiato</string>
-    <string name="not_supported">non supportato sul tuo dispositivo</string>
-    <!--  intentionally starts lower case -->
-    <string name="video_error_unknown">errore sconosciuto, video interrotto</string>
-    <string name="video_error_server_died">Il server è morto, video interrotto</string>
+    <string name="repeats_to_go">riavvii restanti</string> <!--  intentionally starts lower case -->
+    <string name="failed_to_reconnect_camera">Fallita la riconnessione alla fotocamera</string>
+    <string name="video_may_be_corrupted">Errore, il video potrebbe essere danneggiato</string>
+    <string name="not_supported">non supportato sul tuo dispositivo</string> <!--  intentionally starts lower case -->
+    <string name="video_error_unknown">Errore sconosciuto, video interrotto</string>
+    <string name="video_error_server_died">Server non raggiungibile, video interrotto</string>
     <string name="video_max_duration">Il video ha raggiunto la durata massima</string>
     <string name="video_max_filesize">Il file video ha raggiunto la dimensione massima</string>
     <string name="exposure_compensation">Compensazione dell\'esposizione</string>
     <string name="fps">FPS</string>
-    <string name="focus_distance">Distanza Focus</string>
+    <string name="focus_distance">Distanza focus</string>
     <string name="infinite">Infinito</string>
     <string name="front_camera">Fotocamera frontale</string>
     <string name="back_camera">Fotocamera posteriore</string>
@@ -35,18 +33,18 @@
     <string name="exposure_locked">Esposizione bloccata</string>
     <string name="exposure_unlocked">Esposizione sbloccata</string>
     <string name="cancelled_timer">Timer annullato</string>
-    <string name="cancelled_repeat_mode">Scatto a raffica annullato</string>
+    <string name="cancelled_repeat_mode">Modalità scatto a raffica annullato</string>
     <string name="started_timer">Timer avviato</string>
-    <string name="failed_to_save_video">Salvataggio del file video fallito</string>
-    <string name="failed_to_record_video">Registrazione video fallita</string>
-    <string name="started_recording_video">Registrazione video avviata</string>
-    <string name="sorry">Mi spiace</string>
-    <string name="failed_to_save_photo">Salvataggio foto fallito</string>
-    <string name="failed_to_save_photo_raw">Salvataggio foto in formato RAW fallito</string>
-    <string name="failed_to_auto_stabilise">Auto-stabilizzazione fallita</string>
-    <string name="failed_to_start_camera_preview">Avvio anteprima fotocamera fallito</string>
-    <string name="taking_photo">Sto scattando</string>
-    <string name="failed_to_take_picture">Scatto fallito</string>
+    <string name="failed_to_save_video">Il salvataggio del file video è fallito</string>
+    <string name="failed_to_record_video">La registrazione del video è fallita</string>
+    <string name="started_recording_video">La registrazione del video è iniziata</string>
+    <string name="sorry">Spiacente</string>
+    <string name="failed_to_save_photo">Il salvataggio della foto è fallito</string>
+    <string name="failed_to_save_photo_raw">Il salvataggio in formato RAW è fallito</string>
+    <string name="failed_to_auto_stabilise">L\'auto-stabilizzazione è fallita</string>
+    <string name="failed_to_start_camera_preview">Fallita l\'inizializzazione della fotocamera</string>
+    <string name="taking_photo">Scatto della foto</string>
+    <string name="failed_to_take_picture">Lo scatto della foto è fallito</string>
     <string name="location_not_available">Posizione GPS non disponibile</string>
     <string name="photo_deleted">Foto eliminata</string>
     <string name="no_gallery_app">App galleria non disponibile</string>
@@ -58,7 +56,8 @@
     <string name="max_duration">Durata massima</string>
     <string name="color_effect">Effetto Colore</string>
     <string name="scene_mode">Modalità di scena</string>
-    <string name="white_balance">Bilanciamento del bianco</string>
+    <string name="white_balance">Bilanciamento bianco</string>
+    
     <string name="angle">Angolo</string>
     <string name="direction">Direzione</string>
     <string name="failed_to_open_camera_1">ERRORE APERTURA FOTOCAMERA.</string>
@@ -73,99 +72,100 @@
     <string name="metres_abbreviation">m</string>
     <!-- symbol short for metres -->
     <string name="preference_category_camera_effects">Effetti fotocamera</string>
-    <string name="preference_auto_stabilise">Auto-stabilizzatore</string>
-    <string name="preference_auto_stabilise_summary">Le immagini saranno ruotate per livellarle automaticamente (solo le foto) (è più lento a scattare e può bloccarsi su dispositivi con poca memoria)</string>
-    <!-- @TODO PER FAVORE RIGUARDARE "livellate" PERCHÈ SECONDO ME NON HA SENSO! -->
-    <string name="preference_color_effect">Applica un effetto colore</string>
-    <string name="preference_color_effect_summary">Applica l\'effetto colore selezionato alla foto</string>
-    <string name="preference_scene_mode">Applica una modalità scena</string>
-    <string name="preference_scene_mode_summary">Ottimizza la foto per scene differenti</string>
-    <string name="preference_white_balance">Imposta il bilanciamento del bianco</string>
-    <string name="preference_white_balance_summary">Scegli un\'impostazione per regolare il bilanciamento del bianco</string>
-    <string name="preference_iso">Imposta ISO</string>
+    <string name="preference_auto_stabilise">Auto-stabilizzazione</string>
+    <string name="preference_auto_stabilise_summary">Le immagini saranno ruotate in modo da raddrizzarle automaticamente (solo per le foto) (è più lento per fare foto e può fallire su dispositivi con poca memoria)</string>
+    <string name="preference_color_effect">Applica effetti colore</string>
+    <string name="preference_color_effect_summary">L\'effetto di colore selezionato è stato applicato alla foto</string>
+    <string name="preference_scene_mode">Applica modalità scenica</string>
+    <string name="preference_scene_mode_summary">Ottimizza la foto per differenti ambienti</string>
+    <string name="preference_white_balance">Imposta bilanciamento del bianco</string>
+    <string name="preference_white_balance_summary">Scegli un\'opzione per impostare il bilanciamento del bianco</string>
+    <string name="preference_iso">Imposta l\'ISO</string>
     <string name="preference_iso_summary">A un valore più alto corrisponde una maggiore sensibilità alla luce (potrebbe non funzionare su alcuni dispositivi)</string>
-    <string name="preference_exposure">Imposta la compensazione dell\'esposizione</string>
-    <string name="preference_exposure_summary">Imposta a 0 per compensazione d\'esposizione predefinita</string>
+    <string name="preference_exposure">Imposta la compensazione d\'esposizione</string>
+    <string name="preference_exposure_summary">Imposta a 0 per la compensazione d\'esposizione predefinita</string>
     <string name="preference_lock_orientation">Blocco orientamento foto/video</string>
-    <string name="preference_lock_orientation_summary">Se impostato, l\'orientamento del dispositivo verrà ignorato e l\'orientamento della foto/video sarà quello dell\'orientamento scelto
-\n%s</string>
+    <string name="preference_lock_orientation_summary">Se impostato, l\'orientamento del dispositivo sarà ignorato e l\'orientamento di foto e video sarà quello impostato\n%s</string>
     <string name="preference_face_detection">Riconoscimento volti</string>
     <string name="preference_face_detection_summary">Usa il riconoscimento volti invece dell\'area di messa a fuoco</string>
+
     <string name="preference_category_camera_controls">Controlli fotocamera</string>
     <string name="preference_timer">Timer</string>
-    <string name="preference_timer_beep">Beep del timer</string>
-    <string name="preference_timer_beep_summary">Emette un beep quando sono attivi il countdown o la modalità scatto a raffica ritardato</string>
+    <string name="preference_timer_beep">Suono timer</string>
+    <string name="preference_timer_beep_summary">Emette un suono quando parte il conto alla rovescia o per il ritardo nella modalità raffica</string>
     <string name="preference_timer_speak">Conto alla rovescia vocale</string>
-    <string name="preference_timer_speak_summary">Pronuncia il conto alla rovescia quando si attiva il timer o la modalità scatto ritardato (fino a 60 secondi)</string>
-    <string name="preference_burst_mode">Modalità a raffica</string>
-    <string name="preference_burst_interval">Intervallo modalità a raffica</string>
-    <string name="preference_screen_camera_controls_more">Altri controlli fotocamera…</string>
+    <string name="preference_timer_speak_summary">Pronuncia il conto alla rovescia del timer o il ritardo della modalità raffica (da 60 secondi)</string>
+    <string name="preference_burst_mode">Modalità raffica</string>
+    <string name="preference_burst_interval">Intervallo foto a raffica</string>
+    <string name="preference_screen_camera_controls_more">Più controlli fotocamera…</string>
     <string name="preference_touch_capture">Tocca per acquisire</string>
-    <string name="preference_touch_capture_summary">Scatta la foto toccando una o due volte l\'anteprima</string>
-    <string name="preference_pause_preview">Pausa dopo aver scattato</string>
-    <string name="preference_pause_preview_summary">Mette in pausa lo schermo dopo aver scattato, permettendo inoltre di condividere o cancellare la foto</string>
+    <string name="preference_touch_capture_summary">Scatta le foto semplicemente toccando l\'anteprima oppure toccando due volte</string>
+    <string name="preference_pause_preview">Pausa dopo aver scattato la foto</string>
+    <string name="preference_pause_preview_summary">Mette in pausa lo schermo dopo aver scattato la foto, permettendo inoltre di condividere o cancellare la foto</string>
     <string name="preference_shutter_sound">Suono otturatore</string>
     <string name="preference_shutter_sound_summary">Emette un suono quando scatta una foto</string>
     <string name="preference_volume_keys">Tasti volume</string>
-    <string name="preference_audio_control">Opzioni di controllo del suono</string>
-    <string name="preference_audio_noise_control_sensitivity">Sensibilità di controllo del suono</string>
-    <string name="preference_audio_noise_control_sensitivity_summary">Sensibilità del livello di rumore per l\'opzione di controllo del suono (rumore forte)</string>
+    <string name="preference_audio_control">Opzioni controllo audio</string>
+    <!-- preference_audio_control_summary defined below -->
+    <string name="preference_audio_noise_control_sensitivity">Sensibilità controllo audio</string>
+    <string name="preference_audio_noise_control_sensitivity_summary">Opzione per sensibilità del livello di rumore per il controllo audio (forte rumore)</string>
     <string name="preference_save_location">Posizione di salvataggio</string>
     <string name="preference_save_location_summary">Cartella in cui salvare foto e video</string>
-    <string name="preference_using_saf">Utilizza lo Storage Access Framework</string>
-    <string name="preference_using_saf_summary">Se utilizzare o meno lo Storage Access Framework per il salvataggio di foto e video. Devi abilitarlo per permettere il salvataggio su memoria SD esterna.</string>
-    <string name="preference_save_photo_prefix">Salva il prefisso per le foto</string>
-    <string name="preference_save_photo_prefix_summary">Prefisso da utilizzare come nome file nel salvataggio delle foto</string>
-    <string name="preference_save_video_prefix">Salva il prefisso per i video</string>
-    <string name="preference_save_video_prefix_summary">Prefisso da utilizzare come nome file nel salvataggio dei video</string>
-    <string name="preference_save_zulu_time">Formato TEMPO da utilizzare nel nome file</string>
-    <string name="preference_show_when_locked">Mostra la fotocamera anche se il dispositivo è bloccato</string>
-    <string name="preference_show_when_locked_summary">Se abilitato, la Fotocamera verrà mostrata anche se in blocco schermo (dovrai comunque sbloccare per avere accesso ad Impostazioni, Galleria, etc.)</string>
-    <string name="preference_lock_video">Blocca lo schermo mentre registri un video</string>
-    <string name="preference_lock_video_summary">Mentre si registra un video l\'interfaccia verrà bloccata per prevenire interruzioni accidentali. Trascina il dito sullo schermo per sbloccare. Infatti la registrazione video viene sempre interrotta nel caso in cui l\'app venga eseguita in background o lo schermo venga spento.</string>
+    <string name="preference_using_saf_summary">Utilizza Storage Access Framework per il salvataggio di foto e video</string>
+    <string name="preference_save_photo_prefix">Salva prefisso per foto</string>
+    <string name="preference_save_photo_prefix_summary">Prefisso da usare per il nome file di salvataggio delle foto</string>
+    <string name="preference_save_video_prefix">Salva prefisso per video</string>
+    <string name="preference_save_video_prefix_summary">Prefisso da usare per il nome file di salvataggio dei video</string>
+    <string name="preference_save_zulu_time">Formato tempo da utilizzare nel nome file</string>
+    <string name="preference_show_when_locked">Mostra la fotocamera quando dispositivo bloccato</string>
+    <string name="preference_show_when_locked_summary">Se abilitato, Open Camera sarà mostrata sopra il blocco schermo (dovrai comunque sbloccarlo per accedere a Impostazioni, Galleria, ecc.)</string>
+    <string name="preference_startup_focus">Autofocus all\'avvio</string>
+    <string name="preference_startup_focus_summary">Usa la messa a fuoco automatica quando Open Camera si avvia. Se il flash non dovesse attivarsi, disattiva questa opzione</string>
+    <string name="preference_lock_video">Blocco schermo nella registrazione video</string>
+    <string name="preference_lock_video_summary">Quando si registra un video l\'interfaccia sarà bloccata per prevenire accidentali interruzioni. Trascina il dito sullo schermo per sbloccare. Nota che la registrazione del video sarà interrotta se l\'app andrà in background o se lo schermo è oscurato.</string>
     <string name="preference_rotate_preview">Ruota anteprima</string>
-    <string name="preference_rotate_preview_summary">Scelta per ruotare l\'anteprima (non modificherà foto/video ottenuti)
-\n%s</string>
-    <string name="preference_screen_gui">GUI dello schermo…</string>
+    <string name="preference_rotate_preview_summary">Opzione per ruotare l\'anteprima (non avrà effetto sulle foto e i video)\n%s</string>
+    <string name="preference_screen_gui">Interfaccia schermo…</string>
     <string name="preference_preview_size">Dimensione anteprima</string>
-    <string name="preference_ui_placement">Posizionamento UI</string>
-    <string name="preference_immersive_mode">Modalità Immersiva</string>
+    <string name="preference_ui_placement">Posizionamento interfaccia</string>
+    <string name="preference_immersive_mode">Modalità immersiva</string>
     <string name="preference_show_zoom">Mostra zoom</string>
     <string name="preference_show_zoom_summary">Mostra il livello attuale di zoom sullo schermo (quando si zoomma)</string>
     <string name="preference_show_zoom_controls">Mostra i controlli zoom -/+</string>
-    <string name="preference_show_zoom_controls_summary">Mostra i pulsanti -/+ per il controllo dello zoom</string>
-    <string name="preference_show_zoom_slider_controls">Mostra una slider per lo zoom</string>
-    <string name="preference_show_zoom_slider_controls_summary">Mostra una slider per il controllo dello zoom</string>
+    <string name="preference_show_zoom_controls_summary">Mostra i bottoni -/+ per il controllo dello zoom</string>
+    <string name="preference_show_zoom_slider_controls">Mostra slider per lo zoom</string>
+    <string name="preference_show_zoom_slider_controls_summary">Mostra slider per il controllo dello zoom</string>
+    <string name="preference_show_iso">Mostra ISO</string>
+    <string name="preference_show_iso_summary">Mostra l\'attuale livello ISO. (Richiede l\'API Camera2.)</string>
     <string name="preference_free_memory">Mostra memoria disponibile</string>
     <string name="preference_free_memory_summary">Mostra la memoria disponibile del dispositivo sullo schermo</string>
-    <string name="preference_show_angle">Mostra angolo</string>
-    <string name="preference_show_angle_summary">Mostra l\'angolo di orientamento attuale del dispositivo sullo schermo</string>
-    <string name="preference_show_angle_line">Mostra linea orizzontale</string>
-    <string name="preference_show_angle_line_summary">Mostra una linea orizzontale sullo schermo</string>
-    <string name="preference_angle_highlight_color">Colore per evidenziare angolo/altezza</string>
-    <string name="preference_angle_highlight_color_summary">Colore per evidenziare quando la fotocamera è quasi a livello</string>
+    <string name="preference_show_angle">Mostra angolazione</string>
+    <string name="preference_show_angle_summary">Mostra l\'angolo attuale di orientamento sullo schermo</string>
+    <string name="preference_show_angle_line">Mostra orizzonte</string>
+    <string name="preference_show_angle_line_summary">Mostra la linea dell\'orizzonte sullo schermo</string>
+    <string name="preference_angle_highlight_color">Colore per evidenziare angolo/altitudine</string>
+    <string name="preference_angle_highlight_color_summary">Colore per evidenziare quando la camera raggiunge il livello</string>
     <string name="preference_show_geo_direction">Mostra direzione bussola</string>
     <string name="preference_show_geo_direction_summary">Mostra la direzione della bussola sullo schermo</string>
-    <string name="preference_show_time">Mostra l\'ora</string>
-    <string name="preference_show_time_summary">Mostra l\'ora corrente sul display</string>
+    <string name="preference_show_time">Mostra data/ora</string>
+    <string name="preference_show_time_summary">Visualizza l\'ora corrente sul display</string>
     <string name="preference_show_battery">Mostra batteria</string>
-    <string name="preference_show_battery_summary">Mostra sul display il livello di carica attuale della batteria</string>
-    <string name="preference_grid">Mostra la griglia</string>
-    <string name="grid">Griglia</string>
-    <!-- short form of Show a grid -->
-    <string name="preference_crop_guide">Mostra guida per ritaglio</string>
-    <string name="preference_crop_guide_summary">La guida per ritagliare mostra sullo schermo un rettangolo con il rapporto nelle proporzioni scelte - utile nel caso in cui si abbia intenzione di ritagliare la foto/il video con un determinato rapporto di proporzioni. Richiede la modalità foto WYSIWYG, o di essere in modalità video.
-\n%s</string>
-    <string name="preference_show_toasts">Visualizza messaggi</string>
-    <string name="preference_show_toasts_summary">Se mostrare o meno messaggi contenenti informazioni sullo schermo</string>
-    <string name="preference_take_photo_border">Visualizza un bordo mentre si scatta la foto</string>
-    <string name="preference_take_photo_border_summary">Visualizza un bordo sul display per indicare che si sta scattando una foto</string>
-    <string name="preference_keep_display_on">Mantieni display attivo</string>
-    <string name="preference_keep_display_on_summary">Se abilitato, il display non viene spento se la UI principale di Fotocamera è attiva</string>
+    <string name="preference_show_battery_summary">Visualizza sul display il livello corrente di carica della batteria</string>
+    <string name="preference_grid">Mostra griglia</string>
+    <string name="grid">Griglia</string> <!-- short form of Show a grid -->
+    <string name="preference_crop_guide">Mostra guida ritaglio</string>
+    <string name="preference_crop_guide_summary">La guida al ritaglio mostra sullo schermo un rettangolo che indica le proporzioni attuali - utile se in un secondo momento si ha intenzione di ritagliare la foto o il video ad un certo rapporto di proporzioni. Richiede la modalità foto WYSIWYG, o di essere in modalità video\n%s</string>
+    <string name="preference_show_toasts">Visualizza messaggi su schermo</string>
+    <string name="preference_show_toasts_summary">Consente di mostrare messaggi informativi sullo schermo</string>
     <string name="preference_thumbnail_animation">Mostra animazione miniatura</string>
-    <string name="preference_thumbnail_animation_summary">Mostra un\'animazione della miniatura in movimento mentre si scatta una fotografia</string>
+    <string name="preference_thumbnail_animation_summary">Mostra una miniatura in movimento quando si scatta una foto</string>
+    <string name="preference_take_photo_border">visualizza bordo su scatto foto</string>
+    <string name="preference_take_photo_border_summary">Visualizza bordo sul display per indicare che si sta scattando una foto</string>
+    <string name="preference_keep_display_on">Mantieni display attivo</string>
+    <string name="preference_keep_display_on_summary">Se abilitato, il display non viene spento fintanto che l\'interfaccia principale di Open Camera è attiva</string>
     <string name="preference_max_brightness">Forza luminosità massima</string>
-    <string name="preference_max_brightness_summary">Forza la massima luminosità dello schermo, invece di quella standard del dispositivo</string>
+    <string name="preference_max_brightness_summary">Imposta lo schermo al massimo della luminosità, invece di usare le impostazioni predefinite</string>
+    
     <string name="preference_category_camera_quality">Impostazioni Foto e Video</string>
     <string name="preference_screen_photo_settings">Impostazioni Foto…</string>
     <string name="preference_screen_video_settings">Impostazioni Video…</string>
@@ -175,76 +175,70 @@
     <string name="preference_quality_summary">Imposta la qualità delle foto salvate in JPEG o WebP (il valore standard è 90%%). Non ha effetto sul formato PNG.
 \n%s</string>
     <string name="preference_raw">RAW</string>
-    <string name="preference_location">Salva la localizzazione (Geotagging)</string>
-    <string name="preference_location_summary">Salva i dati della localizzazione GPS su foto/video (per le foto, i dati della localizzazione possono essere salvati solo se in formato JPEG e DNG)</string>
+    <string name="preference_location">Salva dati località (Geotagging)</string>
+    <string name="preference_location_summary">Salva le coordinate GPS nelle foto e nei video</string>
     <string name="preference_gps_direction">Salva direzione bussola</string>
-    <string name="preference_gps_direction_summary">Salva la direzione GPS della bussola nelle foto (solo per il formato JPEG)</string>
-    <string name="preference_require_location">Richiede dati di localizzazione</string>
-    <string name="preference_require_location_summary">Quando i dati di localizzazione sono abilitati, permette di scattare foto/video solo se i dati della localizzazione sono disponibili</string>
+    <string name="preference_gps_direction_summary">Salva la direzione GPS della bussola nelle foto</string>
+    <string name="preference_require_location">Richiedi dati posizione</string>
+    <string name="preference_require_location_summary">Se i dati posizione sono abilitati, sarà possibile fare foto o video solamente se i dati di posizione sono disponibili</string>
     <string name="preference_stamp">Timbro foto</string>
-    <string name="preference_stamp_summary">Timbra la foto con data e ora; anche con le informazioni GPS nel caso in cui i dati della localizzazione/direzione siano abilitati
-\n%s</string>
-    <string name="preference_stamp_dateformat">Formato timbro data</string>
-    <string name="preference_stamp_timeformat">Formato timbro ora</string>
+    <string name="preference_stamp_summary">Applica il timbro con data e ora sulle foto; e anche informazioni GPS se i dati di posizione/direzione sono abilitati\n%s</string>
+    <string name="preference_stamp_dateformat">Formato data/ora</string>
+    <string name="preference_stamp_timeformat">Formato data/ora</string>
     <string name="preference_stamp_gpsformat">Formato timbro GPS</string>
     <string name="preference_textstamp">Testo personalizzato</string>
-    <string name="preference_textstamp_summary">Timbro le foto conun testo personalizzato</string>
-    <string name="preference_stamp_fontsize">Dimensione Carattere</string>
-    <string name="preference_stamp_fontsize_summary">Dimensione del carattere da utilizzare per timbrare il testo su una foto</string>
-    <string name="preference_stamp_font_color">Colore Carattere</string>
-    <string name="preference_stamp_font_color_summary">Colore del carattere da utilizzare per timbrare il testo su una foto</string>
-    <string name="preference_stamp_style">Stile Testo</string>
-    <string name="preference_stamp_style_summary">Stile da utilizzare per timbrare testo su una foto
-\n%s</string>
+    <string name="preference_textstamp_summary">Applica il timbro sulle foto con testo personalizzato</string>
+    <string name="preference_stamp_fontsize">Dimensione carattere</string>
+    <string name="preference_stamp_fontsize_summary">Dimensione del carattere da utilizzare per il testo del timbro sulle foto</string>
+    <string name="preference_stamp_font_color">Colore carattere</string>
+    <string name="preference_stamp_font_color_summary">Colore del carattere da utilizzare per il testo del timbro sulle foto</string>
+    <string name="preference_stamp_style">Stile testo</string>
+    <string name="preference_stamp_style_summary">Stile da utilizzare per il testo del timbro sulle foto\n%s</string>
     <string name="preference_background_photo_saving">Usa processo in background</string>
-    <string name="preference_background_photo_saving_summary">Se salvare o meno le foto con un processo in background (per velocizzare l\'operazione)</string>
+    <string name="preference_background_photo_saving_summary">Salva le foto usando un processo secondario (per operazioni più rapide)</string>
     <string name="video_quality">Risoluzione video</string>
-    <string name="preference_force_video_4k">Forza video in 4K UHD (funziona solo su alcuni dispositivi)</string>
-    <string name="preference_force_video_4k_summary">Abilita la risoluzione 3840x2160 per registrare video con la fotocamera posteriore - questo hack può permettere a dispositivi 4k di funzionare con fotocamere 4k che non rendono disponibile l\'opzione alle app fotocamera di terze parti. Il funzionamento non è garantito, provalo prima di utlizzarlo sempre.</string>
-    <string name="preference_video_stabilization">Abilita stabilizzazione video digitale</string>
-    <string name="preference_video_stabilization_summary">La stabilizzazione video riduce i tremolii dovuti al movimento della videocamera sia nell\'anteprima che nei video registrati. Non occorre utilizzarlo se il dispositivo possiede la corrispondente funzione ottica (OIS).</string>
-    <string name="preference_video_bitrate">Bitrate del video (aprossimativo)</string>
-    <string name="preference_video_bitrate_summary">Imposta un bitrate aprossimativo per i video (più alto si traduce in una qualità superiore, ma consuma più spazio disco; la registrazione video potrebbe fallire se il bitrate non è supportato)
-\n%s</string>
-    <string name="preference_video_fps">Frame rate del video (aprossimativo)</string>
-    <string name="preference_video_fps_summary">Imposta il frame rate (FPS) dei video (approssimativamente, non è garantito che lo si raggiunga, e potrebbe far fallire la registrazione video se il frame rate non è supportato). Verifica sui video già presenti per conoscere il frame rate utitilizzato attualmente. L\'impostazione viene ignorata per i video in slow motion.
-\n%s</string>
-    <string name="preference_video_max_duration">Durata massima del video</string>
-    <string name="preference_video_max_duration_summary">La registrazione del video verrà interrotta alla durata specificata
-\n%s</string>
-    <string name="preference_video_restart">Riavvia il video una volta raggiunta la durata massima</string>
-    <string name="preference_video_restart_summary">Nel caso in cui il video sia stato interrotto per aver superato la durata massima (se impostata), questa scelta farà ripartire la registrazione, fino ad un dato numero di volte
-\n%s</string>
-    <!-- @TODO MA IN CHE SENSO? COSA FA? -->
-    <string name="preference_video_max_filesize">Dimensione massima del file video</string>
-    <string name="preference_video_max_filesize_summary">La registrazione del video verrà interrotta e/o riavviata (vedi opzione seguente) quando (approssimativamente) verrà raggiunta la dimensione massima del file indicata. Molti dispositivi Android hanno una dimensione massima dei video preimpostata (tipicamente intorno ai 2 o 4 GB), ma questa scelta permette di impostare un valore differente. Questa scelta non può essere utilizzata per aumentare il valore massimo prestabilito in fase di costruzione del dispositivo.
-\n%s</string>
-    <string name="preference_video_restart_max_filesize">Riavvia se raggiunta la dimensione massima del file</string>
-    <string name="preference_video_restart_max_filesize_summary">Se riavviare o meno automaticamente quando viene raggiunta la dimensione massima del file (sia la dimensione massima standard del file per il dispositivo, che una scelta dall\'utente)</string>
+    <string name="preference_force_video_4k">Forza video a 4K UHD (disponibile solo su alcuni dispositivi)</string>
+    <string name="preference_force_video_4k_summary">Abilita la risoluzione 3840x2160 per i video dalla fotocamera posteriore - funziona solo se il tuo dispositivo è tecnicamente in grado di registrare in 4K. In ogni caso potrebbe non funzionare, provalo prima di usarlo sul campo.</string>
+    <string name="preference_video_stabilization">Abilita stabilizzazione video</string>
+    <string name="preference_video_stabilization_summary">La stabilizzazione video riduce i tremolii durante il movimento della videocamera sia per l\'anteprima che per i video registrati. Potrebbe non essere necessario se il tuo dispositivo dispone della funzione di stabilizzazione ottica dell\'immagine (OIS)</string>
+    <string name="preference_video_bitrate">Video bitrate</string>
+    <string name="preference_video_bitrate_summary">Imposta il bitrate approssimativo per i video (più alto significa migliore qualità, ma file più grandi; inoltre la registrazione del video potrebbe fallire se un certo bitrate non è supportato dal dispositivo)\n%s</string>
+    <string name="preference_video_fps">Video frame rate (approx)</string>
+    <string name="preference_video_fps_summary">Imposta il frame rate (FPS) per i video (può essere approssimativo e non è garantito raggiungerlo, inoltre la registrazione potrebbe fallire se il frame rate non è supportato). Controlla i video risultanti per capire quale frame rate è stata utilizzata. Nota che questa impostazione viene ignorata per i video in slow motion.\n%s</string>
+    <string name="preference_video_max_duration">Durata massima dei video</string>
+    <string name="preference_video_max_duration_summary">La registrazione del video sarà interrotta ad una durata specifica\n%s</string>
+    <string name="preference_video_restart">Ricomincia il video dopo una certa durata</string>
+    <string name="preference_video_restart_summary">Se il video è stato interrotto dopo aver superato la durata massima (se impostata), questa opzione farà ricominciare il video, per un certo numero di volte\n%s</string>
+    <string name="preference_video_max_filesize">Dimensione massima di un video</string>
+    <string name="preference_video_max_filesize_summary">La registrazione del video verrà interrotta e/o riavviata (vedi opzione seguente) quando la dimensione massima (approssimativa) del file viene raggiunta. Nota che quasi tutti i dispositivi Android hanno come dimensione massima per i video valori tra i 2GB e i 4GB, ma questa opzione permette di impostare un valore specifico. Non può essere usata per aumentare il limite massimo del dispositivo.\n%s</string>
+    <string name="preference_video_restart_max_filesize">Riavvia su dimensione massima file</string>
+    <string name="preference_video_restart_max_filesize_summary">Determina se riavviare automaticamente quando viene raggiunta la dimensione massima del file (qualora sia specificata la dimensione massima per il file o un valore impostato dall\'utente)</string>
     <string name="preference_record_audio">Registrazione audio</string>
-    <string name="preference_record_audio_summary">Registra l\'audio mentre si registra il video</string>
+    <string name="preference_record_audio_summary">Registra anche l\'audio quando si registra un video</string>
     <string name="preference_record_audio_src">Sorgente audio</string>
-    <string name="preference_record_audio_src_summary">Quale microfono utilizzare per la registrazione audio. Fai attenzione che il risultato esatto della scelta dipende da come la stessa è implementata sul dispositivo.
-\n%s</string>
-    <string name="preference_record_audio_channels">Canali Audio</string>
-    <string name="preference_record_audio_channels_summary">Specifica modalità mono o stereo per la registrazione audio (la modalità stereo è supportata solo su alcuni modelli)</string>
+    <string name="preference_record_audio_src_summary">Il microfono da usare per la registrazione dell\'audio\n%s</string>
+    <string name="preference_record_audio_channels">Canali audio</string>
+    <string name="preference_record_audio_channels_summary">Specifica modalità mono o stereo per la registrazione audio (modalità stereo supportata solo su alcuni modelli)</string>
     <string name="preference_video_flash">Flash durante la registrazione video</string>
-    <string name="preference_video_flash_summary">Se abilitato, il flash sarà acceso/spento mentre si registra il video (può essere utilizzato per segnalare a distanza che la camera sta ancora registrando)</string>
+    <string name="preference_video_flash_summary">Se abilitato, il flash sarà acceso/spento quando si registra il video (può essere usato per capire a distanza se la telecamera sta ancora registrando)</string>
+    
     <string name="preference_category_online">Varie</string>
-    <string name="preference_online_help">Aiuto Online</string>
-    <string name="preference_online_help_summary">Apre il sito web di Fotocamera nel browser</string>
-    <string name="preference_donate">Dona per aiutare lo sviluppo</string>
-    <string name="preference_donate_summary">Se questa app ti piace, puoi sempre considerare di fare una donazione per aiutarne lo sviluppo. Puoi farlo acquistando l\'app my donation - tocca questa scelta per aprire la pagina dell\'app my donation. Grazie mille!</string>
+    <string name="preference_online_help">Aiuto online</string>
+    <string name="preference_online_help_summary">Apre il sito web di Open Camera nel browser</string>
+    <string name="preference_donate">Dona per supportare lo sviluppo</string>
+    <string name="preference_donate_summary">Se questa applicazione ti piace, considera la possibilità di fare una donazione. Puoi farlo comprando la mia \"app donazione\" - cliccando su questa opzione aprirai la pagina per la donazione. Grazie!</string>
     <string name="preference_use_camera2">Usa le API Camera2</string>
-    <string name="preference_use_camera2_summary">Abilita API Camera2 - offre caratteristiche extra, ma potrebbe non funzionare correttamente su tutti i modelli (potrebbe causare un riavvio)</string>
+    <string name="preference_use_camera2_summary">Abilita caratteristiche extra come la modalità manuale per esposizione, messa a fuoco, bilanciamento del bianco, e RAW (se supportato), ma potrebbe non funzionare correttamente su tutti i modelli (potrebbe causare un riavvio)</string>
     <string name="preference_about">Informazioni</string>
     <string name="preference_about_summary">App e informazioni di debug</string>
-    <string name="preference_reset">Ripristina le impostazioni</string>
-    <string name="preference_reset_summary">Riporta tutte le impostazioni di Fotocamera ai valori predefiniti</string>
-    <string name="preference_reset_question">Sei sicuro di voler resettare tutte le impostazioni di Fotocamera ai valori predefiniti\?</string>
+    <string name="preference_reset">Reset impostazioni</string>
+    <string name="preference_reset_summary">Reimposta tutti i settaggi di Open Camera ai valori predefiniti</string>
+    <string name="preference_reset_question">Sei sicuro di voler reimpostare tutti i settaggi di Open Camera ai valori predefiniti?</string>
+
     <string name="about_available">Disponibile</string>
     <string name="about_not_available">Non disponibile</string>
     <string name="about_copy_to_clipboard">Copia negli appunti</string>
+    
     <string name="take_photo">Scatta foto</string>
     <string name="gallery">Galleria</string>
     <string name="exposure">Esposizione</string>
@@ -256,14 +250,16 @@
     <string name="switch_to_video">Passa in modalità video</string>
     <string name="switch_to_photo">Passa in modalità foto</string>
     <string name="trash">Cancella ultima immagine</string>
-    <string name="share">Condividi Foto</string>
-    <string name="parent_folder">Cartella Superiore</string>
-    <string name="new_folder">Nuova Cartella</string>
-    <string name="cant_write_folder">Non posso scrivere su questa cartella</string>
-    <string name="cant_access_folder">Non posso accedere a questa cartella</string>
-    <string name="enter_new_folder">Inserisci il nuovo nome della cartella</string>
-    <string name="failed_create_folder">Non sono riuscito a creare la cartella</string>
+    <string name="share">Condividi foto</string>
+    
+    <string name="parent_folder">Cartella superiore</string>
+    <string name="new_folder">Nuova cartella</string>
+    <string name="cant_write_folder">Non puoi scrivere in questa cartella</string>
+    <string name="cant_access_folder">Non puoi accedere a questa cartella</string>
+    <string name="enter_new_folder">Inserisci il nome della nuova cartella</string>
+    <string name="failed_create_folder">Creazione della cartella fallita</string>
     <string name="folder_exists">Questa cartella esiste già</string>
+
     <string name="saf_select_save_location">Seleziona posizione di salvataggio</string>
     <string name="saf_cancelled">Storage Access Framework annullato</string>
     <string name="saf_permission_failed">Non posso salvare in questa cartella</string>
@@ -273,93 +269,93 @@
     <string name="start_video">Avvia registrazione video</string>
     <string name="stop_video">Ferma registrazione video</string>
     <string name="max_filesize">Dimensione massima file</string>
-    <string name="mb_abbreviation">MB</string>
-    <!-- abbreviazione per megabytes -->
-    <string name="gb_abbreviation">GB</string>
-    <!-- abbreviazione per gigabytes -->
-    <string name="audio_control_start">Avvia riproduzione audio</string>
-    <string name="audio_control_stop">Ferma riproduzione audio</string>
-    <string name="speech_recognizer_started">Dite \"cheese\"</string>
-    <string name="audio_listener_started">Emetti un rumore forte</string>
-    <string name="auto_stabilise_info">Auto-level ruoterà automaticamente le foto in modo che siano livellate.
-\n
-\nCiò significa che le immagini risulteranno in risoluzione leggermente inferiore (a causa della rotazione e del taglio necessari).</string>
-    <string name="raw_info">I file DNG contengono le informazioni non compresse e senza alcuna rielaborazione provenienti dalla fotocamera.
-\n
-\nAlcune app Galleria non sono in grado di riconoscere i file DNG. Questo formato può invece essere utilizzato con editor di immagini specializzati come Snapseed o Lightroom.
-\n
-\nDiverse opzioni di elaborazione come ad esempio Timbra foto e Auto-level funzioneranno solo con le immagini non-DNG (JPEG/etc), e non con le immagini DNG.</string>
-    <string name="hdr_info">La modalità HDR è utile per scatti con un\'ampia variazione della luminosità. Funziona scattando diverse foto ciascuna con esposizione differente, e assemblandole per creare l\'immagine finale.
-\n
-\nTale modalità non è indicata per scene che includono movimenti veloci, e possono risultare in una riproduzione dei colori meno accurata.
-\n
-\nGli scatti in modalità HDR saranno più lenti.</string>
+    <string name="mb_abbreviation">MB</string> <!-- symbol short for megabytes -->
+    <string name="gb_abbreviation">GB</string> <!-- symbol short for gigabytes -->
+
+    <string name="audio_control_start">Inizio registrazione audio</string>
+    <string name="audio_control_stop">Termina registrazione audio</string>
+    <string name="speech_recognizer_started">Comando vocale \"cheese\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+    <string name="audio_listener_started">Emetti un forte rumore</string>
+
+    <string name="auto_stabilise_info">Livello automatico ruota automaticamente le foto per raddrizzarle.\n\nCiò comporta che le immagini risulteranno di risoluzione leggermente più bassa (a causa della rotazione e del taglio che si sono resi necessari).</string>
+    <string name="raw_info">I file DNG contengono le informazioni complete (non compresse e senza alcuna rielaborazione) della fotocamera.\n\nAlcune app di galleria non sono in grado di riconoscere tale formato, che invece va utilizzato con app specifiche.\n\nLe opzioni di elaborazione come \"Timbro foto\" e \"Livello automatico\" si applicano unicamente alle immagini JPEG e simili, non al formato DNG.</string>
+    <string name="hdr_info">La modalità HDR è utile per scatti con un\'ampia variabilità nella luminosità. Funziona scattando diverse foto ciascuna con esposizione differente, e assemblandole per creare l\'immagine finale.\n\nSi noti che tale modalità non è indicata per scene che includono movimenti veloci, e possono proporre una riproduzione dei colori meno accurata.\n\nGli scatti di foto in modalità HDR potrebbe risultare più lenta.</string>
+
     <string name="dont_show_again">Non mostrare più</string>
-    <string name="photo_mode">Modalità Foto</string>
-    <string name="photo_mode_standard">Std</string>
-    <!-- keep short, as this shows in the popup menu -->
+
+    <string name="photo_mode">Modalità foto</string>
+    <string name="photo_mode_standard">Std</string> <!-- keep short, as this shows in the popup menu -->
     <string name="photo_mode_standard_full">Standard</string>
-    <string name="photo_mode_hdr">HDR</string>
-    <string name="photo_mode_expo_bracketing">Esposizione {}</string>
-    <string name="photo_mode_expo_bracketing_full">Esposizione Bracketing</string>
+    <string name="photo_mode_hdr">HDR</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode_expo_bracketing">Expo {}</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode_expo_bracketing_full">Bracketing (esposizione)</string>
+    <string name="photo_mode_fast_burst_full">Scatto rapido</string>
+    <string name="photo_mode_noise_reduction">NR</string> <!-- keep short, as this shows in the popup menu; probably shouldn't be translated? -->
+    <string name="photo_mode_noise_reduction_full">Riduzione rumore</string>
     <string name="preference_category_stamp">Timbro Foto</string>
     <string name="preference_hdr_save_expo">Salva tutte le immagini in modalità HDR</string>
-    <string name="preference_hdr_save_expo_summary">Se abilitata, utilizzando la modalità HDR, le tre foto con esposizione base verranno salvate, così come l\'immagine finale HDR. Questo risulterà in un\'attività di salvataggio più lenta, specialmente se sono utilizzate anche opzioni come \"Timbro foto\" o Auto-level.</string>
-    <string name="no_permission">PERMESSI NON DISPONIBILI</string>
-    <string name="permission_rationale_title">Permesso richiesto</string>
-    <string name="permission_rationale_camera">Il permesso di utilizzare la fotocamera è necessario per abilitare la fotocamera</string>
-    <string name="permission_rationale_storage">Per salvare le foto è richiesto il permesso di lettura/scrittura dello spazio disco</string>
-    <string name="permission_rationale_record_audio">Per registrare video con audio, così come per utilizzare le scelte di \"Controllo Audio\", è richiesto il permesso di utilizzo del Microfono</string>
-    <string name="permission_rationale_location">Devi permetterci di geolocalizzarti per poter utilizzare il geotagging (conservare i dati della localizzazione in foto e video). Il permesso di geolocalizzarti è necessario anche per connettere telecomandi Bluetooth LE.</string>
+    <string name="preference_hdr_save_expo_summary">Se abilitata, quando si usa la modalità HDR, le tre foto con esposizione base verranno salvate, così come il risultato finale dell\'elaborazione HDR. Ciò renderà l\'attività di salvataggio più lenta, specialmente se sono attive anche opzioni come \"Timbro foto\" o \"Livello automatico\".</string>
+
+    <string name="no_permission">PERMESSO NON DISPONIBILE</string>
+    <string name="permission_rationale_title">Richiesto permesso</string>
+    <string name="permission_rationale_camera">Il permesso di utilizzo della fotocamera è necessario per abilitare la fotocamera</string>
+    <string name="permission_rationale_location">Per utilizzare il geotagging è richiesto il permesso di rilevamento della posizione (Android 11 or earlier: necessario anche per collegarsi a dispositivi di controllo Bluetooth LE)</string>
+
     <string name="preference_category_photo_debugging">Opzioni di debugging</string>
     <string name="preference_category_video_debugging">Opzioni di debugging</string>
     <string name="preference_camera2_fake_flash">Usa metodo flash alternativo</string>
     <string name="preference_camera2_fake_flash_summary">Abilita questa opzione se il tuo dispositivo mostra un comportamento anomalo del flash con le API Camera2</string>
-    <string name="preference_expo_bracketing_n_images">Bracketing Esposizione</string>
-    <string name="preference_expo_bracketing_n_images_summary">Numero di immagini per la modalità bracketing esposizione
-\n%s</string>
-    <string name="preference_expo_bracketing_stops">Stop per Bracketing Esposizione</string>
-    <string name="preference_expo_bracketing_stops_summary">Quanti stop aggiungere/sottrarre per ottenere l\'immagine più/meno luminosa
-\n%s</string>
-    <string name="seconds_abbreviation">s</string>
-    <!-- abbrevizaione per secondi -->
-    <string name="video_no_free_space">Spazio per registrazione video insufficiente</string>
+
+    <string name="preference_expo_bracketing_n_images">Bracketing (esposizione)</string>
+    <string name="preference_expo_bracketing_n_images_summary">Numero di immagini per la modalità bracketing (nota anche come esposizione variata a forcella)\n%s</string>
+    <string name="preference_expo_bracketing_stops">Termina bracketing</string>
+    <string name="preference_expo_bracketing_stops_summary">Quanti fermi si vogliono aggiungere/sottrarre per ottenere l\'immagine più/meno luminosa\n%s</string>
+
+    <string name="preference_nr_save">Riduzione rumore su immagini originali</string>
+    <string name="preference_nr_save_summary">Determina se salvare le immagini originali in modalità riduzione del rumore. Potrebbe rallentare di molto il salvataggio delle foto.\n%s</string>
+
+    <string name="preference_nr_save_no">Non salvare le immagini originali</string>
+    <string name="preference_nr_save_single">Salva una singola immagine originale</string>
+    <string name="preference_nr_save_all">Salva tutte le immagini originali (lento)</string>
+
+    <string name="seconds_abbreviation">s</string> <!-- short for seconds -->
+
+    <string name="video_no_free_space">Spazio insufficiente per registrare video</string>
     <string name="video_power_critical">Video terminato\nIl livello della batteria è eccessivamente basso</string>
-    <string name="preference_video_low_power_check">Verifica livello di carica della batteria critico</string>
-    <string name="preference_video_low_power_check_summary">Interrompe registrazione video se il livello della batteria è eccessivamente basso. Questo aiuta a ridurre il rischio di ottenere video corrotti se il dispositivo dovesse spegnersi improvvisamente a causa di mancanza di carica della batteria.</string>
-    <string name="dark">Buio</string>
-    <!-- exposure compensation dark -->
-    <string name="bright">Luminoso</string>
-    <!-- exposure compensation bright -->
-    <string name="exposure_shutter_speed">Velocità Otturatore</string>
+    <string name="preference_video_low_power_check">Segnala batteria scarica</string>
+    <string name="preference_video_low_power_check_summary">Interrompe la registrazione video se il livello della batteria è eccessivamente basso. Ciò aiuta a ridurre il rischio di avere un file video corrotto se il dispositivo dovesse spegnersi improvvisamente a causa della batteria scarica.</string>
+
+    <string name="dark">Scuro</string> <!-- exposure compensation dark -->
+    <string name="bright">Luminoso</string> <!-- exposure compensation bright -->
+    <string name="exposure_shutter_speed">Velocità otturatore</string>
+
     <string name="camera_error">Errore critico della fotocamera</string>
     <string name="preference_camera2_fast_burst">Abilita raffica veloce HDR/expo</string>
     <string name="preference_camera2_fast_burst_summary">Permette acquisizione di scatti HDR/expo più veloce. Da disabilitare se il dispositivo presenta problemi nell\'acquisizione di foto in modalità HDR o Expo.</string>
     <string name="camera">Fotocamera</string>
     <string name="record_video">Registra video</string>
     <string name="selfie">Selfie</string>
-    <string name="preference_front_camera_mirror">Specchia la fotocamera frontale</string>
-    <string name="preference_front_camera_mirror_summary">Se specchiare o meno le foto realizzate utilizzando la fotocamera frontale
-\n%s</string>
+
+    <string name="preference_front_camera_mirror">Specchio camera frontale</string>
+    <string name="preference_front_camera_mirror_summary">Determina se riflettere a specchio le immagini usando la fotocamera frontale\n%s</string>
+
     <string name="preference_calibrate_level">Calibra livello angolo</string>
-    <string name="preference_calibrate_level_summary">Calibra l\'accelerometro del dispositivo, in modo che le scelte auto-level e on-screen level/angle funzionino correttamente</string>
-    <string name="preference_calibrate_level_dialog">Sistema il tuo dispositivo su una superficie piana orizzontale in modo che sia a livello (sia in verticale che orizzontale), e quindi seleziona Calibra.
-\n
-\nPremi Reset per rimuovere la calibrazione dal dispotivo.
-\n
-\nPremi il pulsante indietro per annullare.</string>
+    <string name="preference_calibrate_level_summary">Questa opzione calibra l\'accelerometro del dispositivo, in modo che sia il livello automatico che le opzioni livello/angolo su schermo funzionino correttamente.</string>
+    <string name="preference_calibrate_level_dialog">Sistema il tuo dispositivo su un piano orizzontale in modo che sia perfettamente a livello (è indifferente se con orientamento verticale o orizzontale), e poi seleziona Calibra.\n\nPremi Reset se vuoi rimuovere la calibrazione dal dispotivo.\n\nPremi il bottone Indietro per annullare.</string>
     <string name="preference_calibrate_level_calibrate">Calibra</string>
     <string name="preference_calibrate_level_reset">Reset</string>
     <string name="preference_calibrate_level_calibrated">Livello calibrato</string>
-    <string name="preference_calibrate_level_calibration_reset">Reset del livello di calibrazione</string>
-    <string name="photo_mode_dro">DRO</string>
-    <string name="preference_show_pitch_lines">Visulizza linee inclinazione (pitch)</string>
-    <string name="preference_show_pitch_lines_summary">Visualizza linee di inclinazione orizzontale</string>
-    <string name="preference_show_geo_direction_lines">Mostra linee di orientamento della bussola</string>
-    <string name="preference_show_geo_direction_lines_summary">Visualizza linee di orientamento della bussola</string>
-    <string name="preference_video_subtitle">Sottotitoli Video</string>
-    <string name="preference_video_subtitle_summary">Crea il file con i sottotitoli (.SRT) contenente data e ora; anche le informazioni GPS se i dati di posizione/orientamento sono abilitati
-\n%s</string>
+    <string name="preference_calibrate_level_calibration_reset">Reset livello calibrazione</string>
+
+    <string name="photo_mode_dro">DRO</string> <!-- keep short, as this shows in the popup menu -->
+
+    <string name="preference_show_pitch_lines">Mostra linee inclinazione (pitch)</string>
+    <string name="preference_show_pitch_lines_summary">Visualizza le linee di inclinazione orizzontale</string>
+    <string name="preference_show_geo_direction_lines">Visualizza le linee direzione bussola</string>
+    <string name="preference_show_geo_direction_lines_summary">Visualizza le linee di direzione della bussola</string>
+    <string name="preference_video_subtitle">Sottotitoli video</string>
+    <string name="preference_video_subtitle_summary">Crea un file con i sottotitoli (.SRT) contenente data e ora; ed anche le informazioni GPS se i dati di posizione/direzione sono abilitati\n%s</string>
+
     <string name="duration_unlimited">Illimitata</string>
     <string name="duration_3s">3 secondi</string>
     <string name="duration_5s">5 secondi</string>
@@ -384,12 +380,15 @@
     <string name="duration_30m">30 minuti</string>
     <string name="duration_45m">45 minuti</string>
     <string name="duration_1h">1 ora</string>
-    <string name="preference_show_take_photo">Mostra icona \"Scatta Foto\"</string>
-    <string name="preference_show_take_photo_summary">Mostra le icone per scattare le foto e registrare video. Deseleziona se preferisci scattare con altri metodi (ad esempio, se il dispositivo possiede un pulsante hardware per lo scatto, o si vogliono utilizzare i tasti volume).</string>
-    <string name="video_pause">Video in pausa</string>
-    <string name="video_resume">Video riavviato</string>
-    <string name="pause_video">Ferma la registrazione video</string>
-    <string name="resume_video">Riprendi la registrazione video</string>
+
+    <string name="preference_show_take_photo">Mostra icona Scatta Foto</string>
+    <string name="preference_show_take_photo_summary">Mostra le icone Scatta Foto e Registra Video. Deseleziona se preferisci usare un altro metodo per scattare foto (ad es. se il tuo dispositivo ha un bottone specifico, o se vuoi usare i tasti volume per farlo).</string>
+
+    <string name="video_pause">Pausa video</string>
+    <string name="video_resume">Riprendi video</string>
+    <string name="pause_video">Pausa registrazione video</string>
+    <string name="resume_video">Ripresa registrazione video</string>
+
     <string name="capturing">Acquisizione…</string>
     <string name="audio_listener_failed">Non sono riuscito a inizializzare l\'ascolto audio</string>
     <string name="failed_to_process_hdr">Non sono riuscito a creare l\'immagine HDR</string>
@@ -411,13 +410,14 @@
     <string name="scene_mode_landscape">Paesaggio</string>
     <string name="scene_mode_night">Notte</string>
     <string name="scene_mode_night_portrait">Ritratto notturno</string>
-    <string name="scene_mode_party">Party</string>
+    <string name="scene_mode_party">Festa</string>
     <string name="scene_mode_portrait">Ritratto</string>
     <string name="scene_mode_snow">Neve</string>
     <string name="scene_mode_sports">Sport</string>
-    <string name="scene_mode_steady_photo">Foto stabilizzata</string>
+    <string name="scene_mode_steady_photo">Stabilizzatore</string>
     <string name="scene_mode_sunset">Tramonto</string>
     <string name="scene_mode_theatre">Teatro</string>
+
     <string name="color_effect_aqua">Acqua</string>
     <string name="color_effect_blackboard">Lavagna nera</string>
     <string name="color_effect_mono">Mono</string>
@@ -427,21 +427,123 @@
     <string name="color_effect_sepia">Seppia</string>
     <string name="color_effect_solarize">Solarizza</string>
     <string name="color_effect_whiteboard">Lavagna bianca</string>
-    <string name="preference_video_fps_default">Predefinito</string>
+
+    <string name="whats_new">Novità:</string>
+    <string name="donate">Donazioni</string>
+
+    <!-- for accessibility, these strings for face detection will typically be spoken, e.g., through Google Talkback -->
+    <string name="face_detected">volto</string>
+    <string name="faces_detected">volti</string>
+    <string name="left_of_screen">a sinistra dello schermo</string>
+    <string name="right_of_screen">a destra dello schermo</string>
+    <string name="top_of_screen">in alto sullo schermo</string>
+    <string name="bottom_of_screen">alla base dello allo schermo</string>
+    <string name="centre_of_screen">al centro</string>
+
+    <string name="high_speed">Alta velocità</string> <!-- in the sense of high speed video frame rates -->
+
+    <string name="preference_video_fps_default">Default</string>
+
+    <string name="preference_category_exif_tags">Tag EXIF personalizzati</string>
+    <string name="preference_exif_artist">Artista</string>
+    <string name="preference_exif_artist_summary">Testo da inserire nei metadati della foto per il tag \"artista\" (solo JPEG). (Lasciare vuoto per eliminarlo.)</string>
+    <string name="preference_exif_copyright">Copyright</string>
+    <string name="preference_exif_copyright_summary">Testo da inserire nei metadati della foto per il tag \"copyright\" (solo JPEG). (Lasciare vuoto per eliminarlo.)</string>
+
+    <string name="processing">Elaborazione…</string>
+
     <string name="preference_raw_no">No</string>
     <string name="preference_raw_yes">Standard e DNG (RAW)</string>
+    <string name="preference_raw_only">Solo DNG (RAW)</string>
+
     <string name="preference_stamp_dateformat_default">Default</string>
-    <string name="preference_stamp_dateformat_yyyymmdd">aaaa-mm-gg (ISO 8601)</string>
-    <string name="preference_stamp_dateformat_ddmmyyyy">gg/mm/aaaa</string>
-    <string name="preference_stamp_dateformat_mmddyyyy">mm/gg/aaaa</string>
+    <string name="preference_stamp_dateformat_yyyymmdd">yyyy-mm-dd (ISO 8601)</string>
+    <string name="preference_stamp_dateformat_ddmmyyyy">dd/mm/yyyy</string>
+    <string name="preference_stamp_dateformat_mmddyyyy">mm/dd/yyyy</string>
     <string name="preference_stamp_dateformat_none">Nessuno</string>
+
+    <string name="preference_fast_burst_n_images">Numero di foto</string>
+    <string name="preference_fast_burst_n_images_entries_2">2</string>
+    <string name="preference_fast_burst_n_images_entries_3">3</string>
+    <string name="preference_fast_burst_n_images_entries_4">4</string>
+    <string name="preference_fast_burst_n_images_entries_5">5</string>
+    <string name="preference_fast_burst_n_images_entries_6">6</string>
+    <string name="preference_fast_burst_n_images_entries_8">8</string>
+    <string name="preference_fast_burst_n_images_entries_10">10</string>
+    <string name="preference_fast_burst_n_images_entries_12">12</string>
+    <string name="preference_fast_burst_n_images_entries_15">15</string>
+    <string name="preference_fast_burst_n_images_entries_20">20</string>
+
+    <string name="preference_focus_bracketing_n_images">Numero di foto</string>
+    <string name="preference_focus_bracketing_n_images_entries_2">2</string>
+    <string name="preference_focus_bracketing_n_images_entries_3">3</string>
+    <string name="preference_focus_bracketing_n_images_entries_4">4</string>
+    <string name="preference_focus_bracketing_n_images_entries_5">5</string>
+    <string name="preference_focus_bracketing_n_images_entries_6">6</string>
+    <string name="preference_focus_bracketing_n_images_entries_8">8</string>
+    <string name="preference_focus_bracketing_n_images_entries_10">10</string>
+    <string name="preference_focus_bracketing_n_images_entries_12">12</string>
+    <string name="preference_focus_bracketing_n_images_entries_15">15</string>
+    <string name="preference_focus_bracketing_n_images_entries_20">20</string>
+    <string name="preference_focus_bracketing_n_images_entries_25">25</string>
+    <string name="preference_focus_bracketing_n_images_entries_30">30</string>
+    <string name="preference_focus_bracketing_n_images_entries_40">40</string>
+    <string name="preference_focus_bracketing_n_images_entries_50">50</string>
+    <string name="preference_focus_bracketing_n_images_entries_100">100</string>
+    <string name="preference_focus_bracketing_n_images_entries_150">150</string>
+    <string name="preference_focus_bracketing_n_images_entries_200">200</string>
+
+    <string name="preference_video_capture_rate">Velocità</string>
+    <string name="preference_video_capture_rate_normal">Normale</string>
+    <string name="slow_motion_enabled">Slow motion abilitato</string>
+    <string name="slow_motion_disabled">Slow motion disabilitato</string>
+
+    <string name="flash_off">Flash spento</string>
+    <string name="flash_auto">Flash auto</string>
+    <string name="flash_on">Flash acceso</string>
     <string name="flash_torch">Torcia</string>
     <string name="flash_red_eye">Occhi rossi</string>
+    <string name="flash_frontscreen_auto">Flash schermo Auto</string>
+    <string name="flash_frontscreen_on">Flash schermo On</string>
+    <string name="flash_frontscreen_torch">Torcia schermo</string>
+
+    <string name="preference_antibanding">Anti-banding</string>
+    <string name="preference_antibanding_summary">Algoritmi che evitano lo sfarfallio della luce.\n%s</string>
+    <string name="anti_banding_auto">Auto</string>
+    <string name="anti_banding_50hz">50Hz</string>
+    <string name="anti_banding_60hz">60Hz</string>
+    <string name="anti_banding_off">Spento</string>
+
+    <string name="preference_ghost_image">Immagine fantasma</string>
+    <string name="preference_ghost_image_summary">Sovrappone un\'immagine, per facilitare l\'allineamento.\n%s</string>
+    <string name="preference_ghost_image_off">Spento</string>
+    <string name="preference_ghost_image_last">Ultimo scatto</string>
+    <string name="preference_ghost_image_selected">Immagine selezionata</string>
+
+    <string name="open_files_saf_exception_ghost">Scelta file non disponibile su questo dispositivo, opzione non supportata</string>
+    <string name="saf_permission_failed_open_image">Impossibile aprire questa immagine</string>
+
+    <string name="preference_camera2_photo_video_recording">Consenti foto durante registrazione video</string>
+    <string name="preference_camera2_photo_video_recording_summary">Permette lo scatto di foto durante la registrazione dei video. Da disabilitare in caso di problemi con la registrazione dei video quando l\'API Camera2 è attiva.</string>
+
+    <string name="preference_video_log">Profili immagini video</string>
+    <string name="preference_video_log_summary">Imposta un profilo immagine normale oppure piatto (poco contrasto, molte informazioni) per la modalità video\n%s</string>
+    <string name="preference_video_log_off">Default</string>
+    <string name="preference_video_log_fine">Log (Fine)</string>
+    <string name="preference_video_log_low">Log (Basso)</string>
+    <string name="preference_video_log_medium">Log (Medio)</string>
+    <string name="preference_video_log_strong">Log (Forte)</string>
+    <string name="preference_video_log_extra_strong">Log (Extra forte)</string>
+    <string name="video_log">Profilo log</string>
+
     <string name="preference_record_audio_src_camcorder">Videocamera</string>
     <string name="preference_record_audio_src_mic">Microfono esterno (se presente)</string>
-    <string name="preference_record_audio_src_default">Sorgente audio predefinita</string>
-    <string name="preference_record_audio_src_voice_communication">Ottimizzato per voce</string>
-    <string name="preference_video_bitrate_default">Predefinito</string>
+    <string name="preference_record_audio_src_default">Sorgente audio di default</string>
+    <string name="preference_record_audio_src_voice_communication">Ottimizzata per chiamate vocali</string>
+    <string name="preference_record_audio_src_voice_recognition">Ottimizzata per riconoscimento vocale</string>
+    <string name="preference_record_audio_src_unprocessed">Inalterata</string>
+
+    <string name="preference_video_bitrate_default">Default</string>
     <string name="preference_video_bitrate_100000">100kbps</string>
     <string name="preference_video_bitrate_200000">200kbps</string>
     <string name="preference_video_bitrate_500000">500kbps</string>
@@ -465,7 +567,65 @@
     <string name="preference_video_bitrate_80000000">80Mbps</string>
     <string name="preference_video_bitrate_90000000">90Mbps</string>
     <string name="preference_video_bitrate_100000000">100Mbps</string>
-    <string name="preference_burst_mode_off">Off</string>
+    <string name="preference_video_bitrate_150000000">150Mbps</string>
+    <string name="preference_video_bitrate_200000000">200Mbps</string>
+
+    <string name="no_burst">no raffica</string> <!-- string for burst mode not being supported for a resolution -->
+
+    <string name="preference_show_video_max_amp">Mostra indicatore livello audio</string>
+    <string name="preference_show_video_max_amp_summary">Determina se mostrare l\'indicatore del livello audio sullo schermo durante la registrazione video</string>
+
+    <string name="photo_mode_focus_bracketing">Focus {}</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode_focus_bracketing_full">Focus bracketing</string>
+
+    <string name="focus_bracketing_source_distance">Distanza origine focus bracketing</string>
+    <string name="focus_bracketing_target_distance">Distanza destinazione focus bracketing</string>
+
+    <string name="focus_bracketing_add_infinity">Aggiungi distanza infinita</string>
+
+    <string name="magnetic_accuracy_title">Direzione bussola</string>
+    <string name="magnetic_accuracy_info">La bussola del tuo dispositivo deve essere calibrata per migliorarne l\'accuratezza. Per farlo, muovi il tuo dispositivo seguendo una forma ad 8.\n\nAccuratezza attuale:</string>
+
+    <string name="accuracy_unreliable">Non affidabile</string>
+    <string name="accuracy_low">Bassa</string>
+    <string name="accuracy_medium">Media</string>
+    <string name="accuracy_high">Alta</string>
+    <string name="accuracy_unknown">Sconosciuta</string>
+
+    <string name="preference_units_distance">Unità di distanza</string>
+    <string name="preference_units_distance_summary">Usata per l\'altitudine GPS nella marcatura delle foto e nei sottotitoli dei video\n%s</string>
+    <string name="preference_units_distance_m">Metri</string>
+    <string name="preference_units_distance_ft">Piedi</string>
+    <string name="feet_abbreviation">ft</string> <!-- symbol short for feet -->
+
+    <string name="preference_show_whats_new">Mostra le ultime novità</string>
+    <string name="preference_show_whats_new_summary">Determina se visualizzare informazioni sulle ultime caratteristiche e migliorie quando l\'app viene aggiornata</string>
+
+    <string name="preference_edge_mode">Algoritmo modalità bordi</string>
+    <string name="preference_edge_mode_summary">Algoritmo da usare per migliorare i bordi. Questa funzione migliora la nitidezza e i dettagli delle foto scattate. (Impostazione ignorata quando la modalità riduzione del rumore delle foto è attiva.)\n%s</string>
+
+    <string name="preference_screen_processing_settings">Impostazioni di elaborazione…</string>
+
+    <string name="preference_noise_reduction_mode">Algoritmo di riduzione rumore</string>
+    <string name="preference_noise_reduction_mode_summary">Algoritmo da usare per applicare la riduzione del rumore. Questa funzione tenta di migliorare la qualità delle foto rimuovendo il rumore eccessivo catturato durante lo scatto, specialmente in condizioni di oscurità. (Nota che non si tratta della modalità \"Riduzione rumore\" delle foto, infatti in quella modalità questa impostazione viene disattivata.)\n%s</string>
+    <string name="noise_reduction_mode_default">Default</string>
+    <string name="noise_reduction_mode_off">Spento</string>
+    <string name="noise_reduction_mode_minimal">Minimo</string>
+    <string name="noise_reduction_mode_fast">Veloce</string>
+    <string name="noise_reduction_mode_high_quality">Alta qualità</string>
+
+    <string name="preference_focus_assist">Assistenza focus</string>
+    <string name="preference_focus_assist_summary">Determina se ingrandire (zoom) quando si regola la distanza manuale di messa a fuoco\n%s</string>
+    <string name="preference_focus_assist_off">Spento</string>
+    <string name="preference_focus_assist_2x">2x</string>
+    <string name="preference_focus_assist_4x">4x</string>
+
+    <string name="exposure_compensation_zoom">Aumenta o diminuisci compensazione esposizione</string>
+
+    <string name="previous">Precedente</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) for "<" button on popup menu -->
+    <string name="next">Successivo</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) for ">" button on popup menu -->
+
+    <string name="preference_burst_mode_off">Spento</string>
     <string name="preference_burst_mode_2x">2x</string>
     <string name="preference_burst_mode_3x">3x</string>
     <string name="preference_burst_mode_4x">4x</string>
@@ -479,7 +639,9 @@
     <string name="preference_burst_mode_200x">200x</string>
     <string name="preference_burst_mode_500x">500x</string>
     <string name="preference_burst_mode_unlimited">Illimitato</string>
-    <string name="preference_burst_interval_no_delay">Nessun intervallo</string>
+
+    <string name="preference_burst_interval_no_delay">Nessun ritardo</string>
+    <string name="preference_burst_interval_0_5s">0.5s</string>
     <string name="preference_burst_interval_1s">1s</string>
     <string name="preference_burst_interval_2s">2s</string>
     <string name="preference_burst_interval_3s">3s</string>
@@ -502,7 +664,13 @@
     <string name="preference_video_max_filesize_300mb">300MB</string>
     <string name="preference_video_max_filesize_500mb">500MB</string>
     <string name="preference_video_max_filesize_1gb">1GB</string>
-    <string name="preference_crop_guide_none">Nessuna</string>
+    <string name="preference_video_max_filesize_2gb">2GB</string>
+    <string name="preference_video_max_filesize_5gb">5GB</string>
+    <string name="preference_video_max_filesize_9gb">9GB</string>
+
+    <string name="cancelled_focus_bracketing">Annullato focus bracketing</string>
+
+    <string name="preference_crop_guide_none">Nessuno</string>
     <string name="preference_crop_guide_1">1 (1:1)</string>
     <string name="preference_crop_guide_1_25">1.25 (5:4)</string>
     <string name="preference_crop_guide_1_33">1.33 (4:3)</string>
@@ -510,6 +678,7 @@
     <string name="preference_crop_guide_1_5">1.5 (3:2)</string>
     <string name="preference_crop_guide_1_78">1.78 (16:9)</string>
     <string name="preference_crop_guide_1_85">1.85 (37:20)</string>
+    <string name="preference_crop_guide_2">2 (2:1)</string>
     <string name="preference_crop_guide_2_33">2.33 (21:9)</string>
     <string name="preference_crop_guide_2_35">2.35 (47:20)</string>
     <string name="preference_crop_guide_2_4">2.4 (12:5)</string>
@@ -520,419 +689,282 @@
     <string name="preference_audio_noise_control_sensitivity_m1">-1</string>
     <string name="preference_audio_noise_control_sensitivity_m2">-2</string>
     <string name="preference_audio_noise_control_sensitivity_m3">-3 (bassa sensibilità)</string>
-    <string name="preference_ui_placement_left">Interfaccia utente per mancini</string>
-    <string name="preference_ui_placement_right">Interfaccia utente per destri</string>
-    <string name="preference_stamp_style_shadowed">Testo ombreggiato</string>
-    <string name="preference_stamp_style_plain">Solo Testo</string>
-    <string name="preferences_build_version">Versione build</string>
-    <string name="preferences_about_app">Camera è un fork di OpenCamera</string>
-    <string name="preferences_authors">Autori</string>
-    <string name="preferences_source_code">Sorgente</string>
-    <string name="preferences_licence">Licenza</string>
-    <string name="preferences_app_info_title">Informazioni su Camera</string>
-    <string name="preferences_service_terms">Termini di servizio</string>
-    <string name="next">Successivo</string>
-    <string name="processing">In lavorazione…</string>
-    <string name="preference_startup_focus_summary">Se eseguire o meno l\'auto-focus all\'avvio di Fotocamera. Se riscontri il problema del flash che si accende all\'avvio, disabilita questa opzione</string>
-    <string name="preference_nr_save_no">Non salvare le immagini originali</string>
-    <string name="preference_burst_interval_0_5s">0.5s</string>
-    <string name="previous">Precedente</string>
-    <string name="exposure_compensation_zoom">Aumenta o diminuisce la compensazione dell\'esposizione</string>
-    <string name="preference_focus_assist_4x">4x</string>
-    <string name="preference_focus_assist_2x">2x</string>
-    <string name="preference_focus_assist_off">Off</string>
-    <string name="preference_focus_assist_summary">Se azionare o no lo zoom mentre si sistema la distanza manuale di messa a fuoco
-\n%s</string>
-    <string name="preference_focus_assist">Messa a fuoco assistita</string>
-    <string name="noise_reduction_mode_high_quality">Alta Qualità</string>
-    <string name="noise_reduction_mode_fast">Veloce</string>
-    <string name="noise_reduction_mode_minimal">Minima</string>
-    <string name="noise_reduction_mode_off">Off</string>
-    <string name="noise_reduction_mode_default">Default</string>
-    <string name="preference_noise_reduction_mode_summary">Algoritmo che dovresti utilizzare per ottenere la riduzione del rumore. L\'algoritmo per la riduzione del rumore cerca di migliorare la qualità dell\'immagine rimuovendo il rumore eccessivo aggiunto dal processo di cattura, specialmente in condizioni di scarsa luminosità. (Fai attenzione che ciò non ha relazione con la modalità fotografica Noise Reduction, e infatti questa impostazione viene ignorata se in modalità NR.)
-\n%s</string>
-    <string name="preference_noise_reduction_mode">Algoritmo di riduzione del rumore</string>
-    <string name="preference_screen_processing_settings">Applico le impostazioni…</string>
-    <string name="preference_edge_mode_summary">Algoritmo che l\'utilizzatore della fotocamera dovrebbe utilizzare per utilizzare le migliorie più avanzate. Queste migliorano accuratezza e dettagli dell\'immagine catturata. (Impostazione ignorata se in modalità foto NR.)
-\n%s</string>
-    <string name="preference_edge_mode">Algoritmo in modalità spinta</string>
-    <string name="preference_show_whats_new_summary">Se mostrare o meno informazioni su nuove funzionalità e miglioramenti dopo l\'aggiornamento dell\' app</string>
-    <string name="preference_show_whats_new">Mostra in caso di Novità</string>
-    <string name="feet_abbreviation">ft</string>
-    <string name="preference_units_distance_ft">Piedi</string>
-    <string name="preference_units_distance_m">Metri</string>
-    <string name="preference_units_distance_summary">Utilizzato come quota GPS da imprimere sulle foto e nei sottotitoli video
-\n%s</string>
-    <string name="preference_units_distance">Unità di misura</string>
-    <string name="accuracy_unknown">Sconosciuta</string>
-    <string name="accuracy_high">Alta</string>
-    <string name="accuracy_medium">Media</string>
-    <string name="accuracy_low">Bassa</string>
-    <string name="accuracy_unreliable">Inattendibile</string>
-    <string name="magnetic_accuracy_info">La bussola del dispositivo deve essere calibrata per accrescerne la precisione. Puoi farlo muovendo il dispositivo con un movimento a forma di 8.
-\n
-\nAccuratezza attuale:</string>
-    <string name="magnetic_accuracy_title">Orientamento Bussola</string>
-    <string name="focus_bracketing_add_infinity">Distanza infinita</string>
-    <string name="focus_bracketing_target_distance">Distanza esatta del bersaglio da mettere a fuoco</string>
-    <string name="photo_mode_focus_bracketing_full">Messa a Fuoco</string>
-    <string name="focus_bracketing_source_distance">Distanza soggetto da mettere a fuoco</string>
-    <string name="photo_mode_focus_bracketing">Fuoco {}</string>
-    <string name="preference_show_video_max_amp_summary">Se mostrare il livello audio sullo schermo mentre si registra un video</string>
-    <string name="preference_show_video_max_amp">Mostra livello audio</string>
-    <string name="no_burst">non esplosivo</string>
-    <string name="preference_video_bitrate_200000000">200Mbps</string>
-    <string name="preference_video_bitrate_150000000">150Mbps</string>
-    <string name="preference_record_audio_src_unprocessed">Non processato</string>
-    <string name="preference_record_audio_src_voice_recognition">Ottimizzato per il riconoscimento vocale</string>
-    <string name="video_log">Profilo log</string>
-    <string name="preference_video_log_extra_strong">Log (Molto grande)</string>
-    <string name="preference_video_log_strong">Log (Grande)</string>
-    <string name="preference_video_log_medium">Log (Medio)</string>
-    <string name="preference_video_log_low">Log (Scarso)</string>
-    <string name="preference_video_log_fine">Log (Di qualità)</string>
-    <string name="preference_video_log_off">Predefinito</string>
-    <string name="preference_video_log_summary">Abilita un profilo standard o di qualità in modalità video
-\n%s</string>
-    <string name="preference_video_log">Profili Video</string>
-    <string name="preference_camera2_photo_video_recording_summary">Permetti di scattare foto mentre registri video. Disabilitalo nel caso in cui riscontrassi problemi registrando un video con le API Camera 2 abilitate sul tuo dispositivo.</string>
-    <string name="preference_camera2_photo_video_recording">Permetti di scattare foto mentre registri video</string>
-    <string name="saf_permission_failed_open_image">Impossibile aprire questa immagine</string>
-    <string name="preference_ghost_image_selected">Immagine a scelta</string>
-    <string name="preference_ghost_image_last">Ultimo scatto</string>
-    <string name="preference_ghost_image_off">Off</string>
-    <string name="preference_ghost_image_summary">Sovrappone un immagine, per facilitare l\'allineamento.
-\n%s</string>
-    <string name="preference_ghost_image">Immagine fantasma</string>
-    <string name="anti_banding_off">Off</string>
-    <string name="anti_banding_50hz">50Hz</string>
-    <string name="anti_banding_60hz">60Hz</string>
-    <string name="anti_banding_auto">Automatico</string>
-    <string name="preference_antibanding_summary">Algoritmi che aiutano con lo sfarfallio.
-\n%s</string>
-    <string name="preference_antibanding">Anti-banding</string>
-    <string name="flash_frontscreen_torch">Luce Schermo</string>
-    <string name="flash_frontscreen_on">Screen Flash On</string>
-    <string name="flash_frontscreen_auto">Screen Flash Auto</string>
-    <string name="flash_on">Flash On</string>
-    <string name="flash_off">Flash Off</string>
-    <string name="flash_auto">Flash Auto</string>
-    <string name="slow_motion_disabled">Rallentatore disabilitato</string>
-    <string name="slow_motion_enabled">Rallentatore abilitato</string>
-    <string name="preference_video_capture_rate_normal">Normale</string>
-    <string name="preference_video_capture_rate">Velocità</string>
-    <string name="preference_focus_bracketing_n_images_entries_200">200</string>
-    <string name="preference_focus_bracketing_n_images_entries_150">150</string>
-    <string name="preference_focus_bracketing_n_images_entries_100">100</string>
-    <string name="preference_focus_bracketing_n_images_entries_50">50</string>
-    <string name="preference_focus_bracketing_n_images_entries_40">40</string>
-    <string name="preference_focus_bracketing_n_images_entries_30">30</string>
-    <string name="preference_focus_bracketing_n_images_entries_25">25</string>
-    <string name="preference_focus_bracketing_n_images_entries_20">20</string>
-    <string name="preference_focus_bracketing_n_images_entries_15">15</string>
-    <string name="preference_focus_bracketing_n_images_entries_12">12</string>
-    <string name="preference_focus_bracketing_n_images_entries_10">10</string>
-    <string name="preference_focus_bracketing_n_images_entries_8">8</string>
-    <string name="preference_focus_bracketing_n_images_entries_6">6</string>
-    <string name="preference_focus_bracketing_n_images_entries_5">5</string>
-    <string name="preference_focus_bracketing_n_images_entries_4">4</string>
-    <string name="preference_focus_bracketing_n_images_entries_3">3</string>
-    <string name="preference_focus_bracketing_n_images_entries_2">2</string>
-    <string name="photo_mode_fast_burst_full">Alta Sensibilità</string>
-    <string name="choose_another_folder">Scegli un\'altra cartella</string>
-    <string name="preference_focus_bracketing_n_images">Numero delle foto</string>
-    <string name="preference_fast_burst_n_images_entries_20">20</string>
-    <string name="preference_fast_burst_n_images_entries_15">15</string>
-    <string name="preference_fast_burst_n_images_entries_12">12</string>
-    <string name="preference_fast_burst_n_images_entries_10">10</string>
-    <string name="preference_fast_burst_n_images_entries_8">8</string>
-    <string name="preference_fast_burst_n_images_entries_6">6</string>
-    <string name="preference_fast_burst_n_images_entries_5">5</string>
-    <string name="preference_fast_burst_n_images_entries_4">4</string>
-    <string name="preference_fast_burst_n_images_entries_3">3</string>
-    <string name="preference_fast_burst_n_images_entries_2">2</string>
-    <string name="preference_fast_burst_n_images">Numero delle foto</string>
-    <string name="preference_raw_only">Solo DNG (RAW)</string>
-    <string name="preference_exif_copyright_summary">Testo da salvare nei metadati delle immagini come tag del copyright (solo in formato JPEG). (Lascia vuoto per non utilizzare.)</string>
-    <string name="preference_exif_copyright">Copyright</string>
-    <string name="preference_exif_artist_summary">Testo da salvare nei metadati delle immagini come tag dell\'artista (solo in formato JPEG). (Lascia vuoto per non utilizzare.)</string>
-    <string name="preference_exif_artist">Artista</string>
-    <string name="preference_category_exif_tags">tag EXIF personalizzati</string>
-    <string name="high_speed">Alta Velocità</string>
-    <string name="centre_of_screen">al centro</string>
-    <string name="bottom_of_screen">nello schermo in basso</string>
-    <string name="top_of_screen">nello schermo in alto</string>
-    <string name="right_of_screen">nello schermo a destra</string>
-    <string name="left_of_screen">nello schermo a sinistra</string>
-    <string name="faces_detected">visi</string>
-    <string name="face_detected">viso</string>
-    <string name="donate">Dona</string>
-    <string name="whats_new">Novità:</string>
-    <string name="preference_nr_save_all">Salva tutte le immagini originali (lento)</string>
-    <string name="preference_nr_save_single">Salva una sola immagine originale</string>
-    <string name="preference_nr_save_summary">Se sia il caso o no di salvare le immagini originali in modalità riduzione rumore. Potrebbe rallentare il salvataggio delle foto.
-\n%s</string>
-    <string name="preference_nr_save">Immagini originali Riduzione Rumore</string>
-    <string name="photo_mode_noise_reduction_full">Riduzione Rumore</string>
-    <string name="photo_mode_noise_reduction">RR</string>
-    <string name="photo_mode_fast_burst">[]]]</string>
-    <string name="preference_show_iso_summary">Mostra il livello ISO attuale. Quando è attiva la modalità flash automatico, un simbolo del flash indicherà anche che il flash si accenderà. (Richiede le API Camera2.)</string>
-    <string name="preference_show_iso">Mostra ISO</string>
-    <string name="preference_startup_focus">Esegui l\'auto-focus alla partenza</string>
-    <string name="auto_level_disable">Disabilita auto-level</string>
-    <string name="auto_level_enable">Abilta auto-level</string>
-    <string name="preference_show_auto_level_summary">Se mostrare o meno una icona sullo schermo per abilitare o disabilitare l\'auto-level. Quando l\'auto-level è abilitato, le foto evrrannoruotate in modo da allinearsi automaticamente all\'orizzonte.</string>
-    <string name="preference_show_auto_level">Mostra icona auto-level</string>
-    <string name="face_detection_disabled">Rilevamento volti disabilitato</string>
-    <string name="face_detection_enabled">Rilevamento volti abilitato</string>
-    <string name="face_detection_disable">Disabilita rilevamento volti</string>
-    <string name="face_detection_enable">Abilita rilevamento volti</string>
-    <string name="preference_show_face_detection_summary">Se mostrare o no un icona sullo schermo per abilitare o disabilitare il rilevamento volti</string>
-    <string name="preference_show_face_detection">Mostra icona rilevamento volti</string>
-    <string name="preference_ui_placement_top">Icone in alto (ritratto)</string>
-    <string name="preference_nr_mode_low_light">Bassa luminosità</string>
-    <string name="preference_nr_mode_normal">Normale</string>
-    <string name="preference_nr_mode">Modalità NR</string>
-    <string name="preference_image_format_png">PNG</string>
-    <string name="preference_image_format_webp">WebP</string>
-    <string name="preference_image_format_jpeg">JPEG</string>
-    <string name="preference_image_format">Formato immagine</string>
-    <string name="open_files_saf_exception_generic">Nessuna scelta disponibile per questo dispositivo, scelta non supportata</string>
-    <string name="restore_settings_failed">Non sono riuscito a ripristinare le impostazioni</string>
-    <string name="save_settings_failed">Non sono riuscito a salvare le impostazioni</string>
-    <string name="saved_settings">Impostazioni salvate</string>
-    <string name="preference_restore_settings_question">Questa scelta ti permette di selezionare uno dei file impostazioni precedentemente salvati. Fai attenzione che scegliendo un file da caricare andrai a sovrascrivere tutte le impostazioni attuali!</string>
-    <string name="preference_restore_settings_summary">Ripristina le impostazioni salvate precedentemente. Va a sovrascrivere tutte le impostazioni attuali con quelle salvate!</string>
-    <string name="preference_restore_settings">Ripristina impostazioni</string>
-    <string name="preference_save_settings_filename">Valore impostazioni salvato</string>
-    <string name="preference_save_settings_summary">Salva tutte le impostazioni di Fotocamera in un file</string>
-    <string name="preference_save_settings">Salva impostazioni</string>
-    <string name="preference_screen_settings_manager">Gestore impostazioni</string>
-    <string name="preference_video_output_format_webm">WebM (audio non supportato)</string>
-    <string name="preference_video_output_format_3gpp">3GPP</string>
-    <string name="preference_video_output_format_mpeg4_hevc">MPEG4 HEVC</string>
-    <string name="preference_video_output_format_mpeg4_h264">MPEG4 H264</string>
-    <string name="preference_video_output_format_default">Predefinito</string>
-    <string name="preference_video_output_format_summary">Formato file e codecs video e audio
-\n%s</string>
-    <string name="preference_video_output_format">Formato video</string>
-    <string name="preference_hdr_contrast_enhancement_always">Sempre</string>
+    <string name="preference_hdr_contrast_enhancement">Migliora contrasto HDR</string>
+    <string name="preference_hdr_contrast_enhancement_summary">Determina quando usare un algoritmo di contrasto per HDR. Può migliorare l\'aspetto nei casi in cui c\'è un intervallo dinamico molto elevato nella scena, e dà anche un \"aspetto HDR\" all\'immagine risultante.\n%s</string>
+    <string name="preference_hdr_contrast_enhancement_off">Spento</string>
     <string name="preference_hdr_contrast_enhancement_smart">Intelligente</string>
-    <string name="preference_hdr_contrast_enhancement_off">Off</string>
-    <string name="preference_hdr_contrast_enhancement_summary">Se utilizzare o no un algoritmo di miglioramento del contrasto HDR. Può migliorare l\'aspetto nei casi in cui sia presente nella scena una gamma dinamica molto elevata, e da una somiglianza HDR al risultato
-\n%s</string>
-    <string name="preference_hdr_contrast_enhancement">Miglioramento del contrasto HDR</string>
-    <string name="preference_crop_guide_2">2 (2:1)</string>
-    <string name="cancelled_focus_bracketing">Focus bracketing eliminato</string>
-    <string name="preference_video_max_filesize_9gb">9GB</string>
-    <string name="preference_video_max_filesize_5gb">5GB</string>
-    <string name="preference_video_max_filesize_2gb">2GB</string>
-    <string name="open_files_saf_exception_ghost">Nessuna scelta disponibile per questo dispositivo, immagine fantasma non è supportata</string>
-    <string name="preference_stamp_geo_address_no">Non mostrare indirizzi</string>
-    <string name="preference_stamp_geo_address_prefer">Preferisci indirizzi alle coordinate GPS</string>
-    <string name="preference_stamp_geo_address_both">Se possibile, mostra l\'indirizzo in aggiunta alle coordinate GPS</string>
-    <string name="preference_stamp_geo_address">Utilizza indirizzi</string>
-    <string name="preference_remote_type_kraken">Kraken Smart Housing</string>
-    <string name="remote_connected">Telecomando connesso</string>
-    <string name="preference_water_type_summary">Nell\'utilizzo subacqueo, migliora l\'accuratezza nel caso in cui sia selezionata la tipologia d\'acqua corretta.</string>
-    <string name="preference_water_type">Utilizza Saltwater per calcoli accurati</string>
-    <string name="preference_remote_disconnect_screen_dim_summary">Suggerimento: imposta la luminosità di default dello schermo al livello più basso prima di lanciare Fotocamera.</string>
-    <string name="preference_remote_disconnect_screen_dim">Attenua la luminosità dello schermo se il telecomando si disconnette</string>
-    <string name="unknown_device">Dispositivo sconosciuto</string>
-    <string name="bluetooth_not_supported">Bluetooth non supportato.</string>
-    <string name="scan_ble">Scansione dispositivi BLE</string>
-    <string name="ble_not_supported">BLE non supportato</string>
-    <string name="preference_remote_type">Tipo di telecomando</string>
-    <string name="preference_enable_remote_summary">Abilita telecomandi Bluetooth LE (BLE)</string>
-    <string name="preference_enable_remote">Abilita telecomando Bluetooth LE</string>
-    <string name="preference_screen_remote_control">Telecomando Bluetooth LE…</string>
-    <string name="photo_mode_panorama_full">Panorama</string>
-    <string name="photo_mode_panorama">Panorama</string>
-    <string name="preference_nr_mode_low_light_message">Modalità a bassa luminosità: mantieni ferma la fotocamera</string>
+    <string name="preference_hdr_contrast_enhancement_always">Sempre</string>
+
+    <string name="preference_video_output_format">Formato video</string>
+    <string name="preference_video_output_format_summary">Formati file e codec per video e audio\n%s</string>
+
+    <string name="preference_video_output_format_default">Default</string>
+    <string name="preference_video_output_format_mpeg4_h264">MPEG4 H264</string>
+    <string name="preference_video_output_format_mpeg4_hevc">MPEG4 HEVC</string>
+    <string name="preference_video_output_format_3gpp">3GPP</string>
+    <string name="preference_video_output_format_webm">WebM (audio non supportato)</string>
+
+    <string name="preference_screen_settings_manager">Gestione impostazioni</string>
+
+    <string name="preference_save_settings">Salva impostazioni</string>
+    <string name="preference_save_settings_summary">Salva tutte le impostazioni di Open Camera in un file</string>
+    <string name="preference_save_settings_filename">Nome per le impostazioni salvate</string>
+
+    <string name="preference_restore_settings">Ripristina impostazioni</string>
+    <string name="preference_restore_settings_summary">Ripristina le impostazioni salvate in precedenza. Tutte le impostazioni correnti verranno sostituite con quelle salvate!</string>
+    <string name="preference_restore_settings_question">Questa opzione permette di scegliere un file di impostazioni precedentemente salvato. Attenzione, scegliendo un file tutte le impostazioni correnti verranno sostituite con quelle salvate!</string>
+
+    <string name="saved_settings">Impostazioni salvate</string>
+    <string name="save_settings_failed">Salvataggio impostazioni fallito</string>
+    <string name="restore_settings_failed">Ripristino impostazioni fallito</string>
+    <string name="open_files_saf_exception_generic">Scelta file non disponibile su questo dispositivo, opzione non supportata</string>
+
+    <string name="preference_image_format">Formato immagine</string>
+    <string name="preference_image_format_jpeg">JPEG</string>
+    <string name="preference_image_format_webp">WebP</string>
+    <string name="preference_image_format_png">PNG</string>
+
+    <!-- beware of these strings for preference_nr_mode* being too long, otherwise too wide for popup menu -->
+    <string name="preference_nr_mode">Modo NR</string>
+    <string name="preference_nr_mode_normal">Normale</string>
+    <string name="preference_nr_mode_low_light">Luce bassa</string>
+
+    <string name="preference_ui_placement_left">Interfaccia utente mancini</string>
+    <string name="preference_ui_placement_right">Interfaccia utente destrorsi</string>
+    <string name="preference_ui_placement_top">Icone in alto</string>
+
+    <string name="preference_show_face_detection">Mostra icona riconoscimento volti</string>
+    <string name="preference_show_face_detection_summary">Determina se mostrare sullo schermo l\'icona del riconoscimento volti</string>
+    <string name="face_detection_enable">Abilita riconoscimento volti</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="face_detection_disable">Disabilita riconoscimento volti</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="face_detection_enabled">Riconoscimento volti abilitato</string>
+    <string name="face_detection_disabled">Riconoscimento volti disabilitato</string>
+
+    <string name="preference_show_auto_level">Mostra icona livello automatico</string>
+    <string name="preference_show_auto_level_summary">Determina se mostrare sullo schermo l\'icona per abilitare o disabilitare il livello automatico. Quanto il livello automatico è abilitato, le foto vengono ruotate in modo da essere automaticamente a livello con l\'orizzonte.</string>
+    <string name="auto_level_enable">Abilita livello automatico</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="auto_level_disable">Disabilita livello automatico</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+
+    <string name="preference_show_stamp">Mostra icona timbro foto</string>
+    <string name="preference_show_stamp_summary">Determina se mostrare sullo schermo l\'icona per abilitare o disabilitare il timbro sulle foto</string>
+    <string name="stamp_enable">Abilita timbro foto</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="stamp_disable">Disabilita timbro foto</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="stamp_enabled">Timbro foto abilitato</string>
+    <string name="stamp_disabled">Timbro foto disabilitato</string>
+
+    <string name="preference_show_textstamp">Mostra icona timbro personalizzato</string>
+    <string name="preference_show_textstamp_summary">Determina se mostrare sullo schermo l\'icona per specificare il testo personalizzato da timbrare sulle foto</string>
+
+    <string name="preference_show_white_balance_lock">Mostra icona blocco bilanciamento</string>
+    <string name="preference_show_white_balance_lock_summary">Determina se mostrare sullo schermo l\'icona per bloccare o sbloccare il bianciamento automatico del bianco</string>
+    <string name="white_balance_lock">Blocca bilanciamento bianco</string>
+    <string name="white_balance_unlock">Sblocca bilanciamento bianco</string>
+    <string name="white_balance_locked">Bilanciamento bianco bloccato</string>
+    <string name="white_balance_unlocked">Bilanciamento bianco sbloccato</string>
+
+    <string name="preference_show_exposure_lock">Mostra icona blocco esposizione</string>
+    <string name="preference_show_exposure_lock_summary">Determina se mostrare sullo schermo l\'icona per bloccare o sbloccare l\'esposizione</string>
     <string name="exposure_unlock">Sblocca esposizione</string>
-    <string name="preference_show_exposure_lock_summary">Se mostrare o meno sullo schermo un\'icona per bloccare o sbloccare l\'esposizione</string>
-    <string name="preference_show_exposure_lock">Mostra icona per il blocco esposizione automatica</string>
-    <string name="white_balance_unlocked">Bilanciamento del bianco sbloccato</string>
-    <string name="white_balance_locked">Bilanciamento del bianco bloccato</string>
-    <string name="white_balance_unlock">Sblocca bilanciamento del bianco</string>
-    <string name="white_balance_lock">Blocca bilanciamento del bianco</string>
-    <string name="preference_show_white_balance_lock_summary">Se mostrare o meno sullo schermo un\'icona per bloccare o sbloccare il bilanciamento automatico del bianco</string>
-    <string name="preference_show_white_balance_lock">Mostra icona di blocco del bilanciamento automatico del bianco</string>
-    <string name="preference_show_textstamp_summary">Se mostrare o meno un\'icona sullo schermo per specificare un testo personalizzato da stampare sulla foto</string>
-    <string name="preference_show_textstamp">Icona mostra testo personalizzato su foto</string>
-    <string name="stamp_disabled">Stampa informazioni su foto disabilitata</string>
-    <string name="stamp_enabled">Stampa informazioni su foto abilitata</string>
-    <string name="stamp_disable">Disabilita stampa informazioni su foto</string>
-    <string name="stamp_enable">Abilita stampa informazioni su foto</string>
-    <string name="preference_show_stamp_summary">Se mostrare o meno un\'icona sullo schermo per abilitare o disabilitare la stampa informazioni su foto</string>
-    <string name="preference_show_stamp">Mostra icona stampa informazioni su foto</string>
-    <string name="preference_licence_online_text">Tocca qui per ottenere informazioni complete sulle licenze (si apre nel browser).</string>
-    <string name="preference_licence_online">Licenze online</string>
-    <string name="preference_licence_google_icons">Icone Material Design di Google</string>
-    <string name="preference_licence_open_camera_text">Fotocamera © 2013–2019 Mark Harman, rilasciato sotto GPL v3 o successive. Tocca qui per il testo completo della licenza.</string>
-    <string name="preference_licence_open_camera">Fotocamera</string>
-    <string name="preference_screen_licences">Licenze Open Source</string>
-    <string name="speech_recognizer_extra_info">(L\'audio verrà inviato da Android
-\n ad un server remoto per il 
-\n riconoscimento vocale.)</string>
-    <string name="preference_privacy_policy_online">Policy Privacy Online</string>
-    <string name="preference_privacy_policy_summary">Premi per visualizzzare la policy sulla Privacy</string>
-    <string name="preference_privacy_policy">Privacy policy</string>
-    <string name="intro_text">Tocca lo schermo per mettere a fuoco e premi il pulsante bianco a forma di fotocamera per scattare.
-\n
-\nPer disabilitare la luminosità massima dello schermo, vai su Impostazioni/On screen GUI/\"Forza massima luminosità\". Per salvare sulla card SD con Android 5+, vai su Impostazioni/Altri controlli fotocamera/\"Utilizza Storage Access Framework\". Se occorre altro aiuto, premi su \"Aiuto Online\" in Impostazioni.</string>
-    <string name="preference_stamp_geo_address_summary">Se possibile, riporta sulla foto l\'indirizzo della località al posto dei dati GPS. Questa scelta richiede una connessione Internet attiva. Se abilitata, richiede al tuo dispositivo di trasmetter i dati tramite Internet ad un servizio terzo per convertire le coordinate GPS in un indirizzo. Informazioni su https://developer.android.com/reference/android/location/Geocoder .
-\n%s</string>
-    <string name="preference_image_format_summary">Scegli in quale formato salvare le foto. Sarà utilizzato per le foto \"standard\" (non RAW). Il formato PNG non è esattamente lossless, dato che viene convertito partendo da un JPEG con qualità al 100%.
-\n%s</string>
-    <string name="preference_audio_control_summary">Scatta una foto/video quando rileva un rumore o un comando vocale. Dopo averlo abilitato, premi il microfono che appare sullo schermo per far partire/fermare l\'ascolto. La scelta comando vocale utilizza il servizio di riconoscimento vocale di Android: utilizzando questa scelta, l\'audio verrà inviato a dei server remoti per eseguirlo.
-\n%s</string>
-    <string name="preference_camera_api_camera2">API Camera2</string>
-    <string name="preference_camera_api_old">API fotocamera originali</string>
-    <string name="preference_camera_api_summary">Scegli le API Camera2 insieme a RAW (se supportato dal dispositivo) per abilitare funzionalità extra come esposizione, messa a fuoco, bilanciamento del bianco manuali. Se modifichi le API da utilizzare, il dispositivo verrà riavviato.
-\n%s</string>
-    <string name="preference_camera_api">Camera API</string>
-    <string name="preference_focus_peaking_off">Off</string>
-    <string name="preference_zebra_stripes_off">Off</string>
-    <string name="preference_histogram_off">Off</string>
-    <string name="exposure_compensation_seekbar">Barra di modifica della compensazione dell\'esposizione</string>
-    <string name="camera_id">ID</string>
-    <string name="preference_panorama_save_all_plus_debug">Salva gli originali e il file di debug in formato XML</string>
-    <string name="preference_panorama_save_all">Salva gli originali</string>
-    <string name="preference_panorama_save_no">Non salvare gli originali</string>
-    <string name="preference_panorama_save_summary">Se salvare o meno gli originali in modalità panorama. Ciò rallenterà il processo di salvataggio delle foto panoramiche. Inoltre abilita la scelta per salvare un file XML utile a riportare i problemi rilevati in modalità panorama.
-\n%s</string>
-    <string name="preference_panorama_save">Originali del Panorama</string>
-    <string name="panorama_info">Per scattare una panoramica, mantieni il dispositivo in verticale, e aziona lo scatto per farlo partire. Quindi muovi il dispositivo verso destra o verso sinistra fino a quando il cerchio bianco ricopre il punto blu. Dopo che la foto è stata scattata, ruota ancora una volta il dispositivo fino a coprire i successivi punti blu che appariranno a loro volta.
-\n
-\nAl termine, scegli di salvare il panorama o la X per cancellarlo.
-\n
-\nLe foto panoramiche possono impiegare parecchio tempo per essere processate e salvate.</string>
-    <string name="preference_panorama_crop_summary">In modalità panorama, se rimuovere o meno i bordi mossi
-\n%s</string>
-    <string name="preference_panorama_crop">Ritaglia automaticamente il Panorama</string>
-    <string name="failed_to_process_panorama">Non sono riuscito a creare il Panorama</string>
-    <string name="panorama_cancelled">Panorama eliminato</string>
-    <string name="cancel_panorama">Elimina panorama</string>
-    <string name="finish_panorama">Fine panorama</string>
-    <string name="image_saving_notification">Salvataggio immagini…</string>
-    <string name="preference_stamp_style_background">Testo su sfondo opaco</string>
-    <string name="bluetooth_scan">Cerca</string>
-    <string name="bluetooth_current_remote">Telecomando attuale:</string>
-    <string name="preference_show_cycle_raw_summary">Se mostrare o meno un\'icona sullo schermo che scorre tra le modalità RAW</string>
-    <string name="preference_show_cycle_raw">Mostra icona RAW</string>
-    <string name="cycle_raw">Scorri modalità RAW</string>
-    <string name="preference_raw_expo_bracketing_summary">Se la scelta RAW sia disponibile o meno anche per le foto in modalità braketing esposizione (o in modalità HDR se si abilita \"Salva tutte le immagini in modalità HDR\"). Disabilitando la scelta, le foto in queste modalità verranno salvate solo in formato JPEG.</string>
-    <string name="preference_raw_focus_bracketing_summary">Se la scelta RAW sia disponibile o meno anche per le foto in modalità focus braketing. Disabilitando la scelta, le foto in modalità focus braketing verranno salvate solo in formato JPEG.</string>
-    <string name="preference_raw_focus_bracketing">Permetti RAW in modalità focus braketing</string>
-    <string name="preference_raw_expo_bracketing">Permetti RAW per braketing esposizione</string>
-    <string name="preference_show_cycle_flash_summary">Se mostrare o meno un\'icona sullo schermo che scorre tra le opzioni flash, invece di mostrare un menu a popup con le opzioni stesse</string>
-    <string name="preference_show_cycle_flash">Mostra icona flash</string>
-    <string name="cycle_flash">Scorri opzioni flash</string>
-    <string name="preference_preview">Anteprima foto…</string>
-    <string name="remaining">Rimanenti</string>
-    <string name="preference_focus_peaking_color_summary">Quale colore utilizzare per evidenziare le zone a fuoco
-\n%s</string>
-    <string name="preference_focus_peaking_color">Colore per messa a fuoco</string>
-    <string name="preference_focus_peaking_on">On</string>
-    <string name="preference_focus_peaking">Verifica messa a fuoco</string>
-    <string name="preference_focus_peaking_summary">Selezionando questa scelta, verranno evidenziate le zone (i contorni) a fuoco. Molto utile in modalità fuoco manuale, serve per aiutare a capire quali parti dell\'immagine risultano a fuoco.
-\n%s</string>
-    <string name="preference_zebra_stripes_100pc">100%</string>
-    <string name="preference_zebra_stripes_90pc">90%</string>
-    <string name="preference_zebra_stripes_80pc">80%</string>
-    <string name="preference_zebra_stripes_70pc">70%</string>
-    <string name="preference_zebra_stripes_summary">Selezionando questa scelta, verra disegnato sullo schermo un effetto bianco e nero che mostra quali punti dell\'anteprima della foto sono sovraesposti.
-\n%s</string>
-    <string name="preference_zebra_stripes">Mostra sovraesposizione</string>
-    <string name="preference_histogram_lightness">Luminosità (Media tra minimo-massimo)</string>
-    <string name="preference_histogram_intensity">Intensità (Media)</string>
-    <string name="preference_histogram_value">Valore (Massimo)</string>
-    <string name="preference_histogram_luminance">Luminosità</string>
+
+    <string name="preference_nr_mode_low_light_message">Modalità luce bassa: tenere ferma la fotocamera</string>
+
+    <string name="photo_mode_panorama">Pano</string> <!-- keep short, as this shows in the popup menu; probably shouldn't be translated? -->
+    <string name="photo_mode_panorama_full">Panorama</string>
+
+    <string name="preference_screen_remote_control">Controllo remoto Bluetooth LE…</string>
+    <string name="preference_enable_remote">Abilita controllo remoto Bluetooth LE</string>
+    <string name="preference_enable_remote_summary">Abilita dispositivi di controllo remoto Bluetooth LE (BLE)</string>
+    <string name="preference_remote_type">Tipo di dispositivo remoto</string>
+
+    <string name="ble_not_supported">BLE non supportato</string>
+    <string name="scan_ble">Scansione dispositivi BLE</string>
+    <string name="bluetooth_not_supported">Bluetooth non supportato.</string>
+    <string name="unknown_device">Dispositivo sconosciuto</string>
+    <string name="preference_remote_disconnect_screen_dim">Riduci luminosità schermo su disconnessione</string>
+    <string name="preference_remote_disconnect_screen_dim_summary">Suggerimento: imposta la luminosità di default al minimo prima di avviare Open Camera.</string>
+    <string name="preference_water_type">Usa Saltwater per il calcolo della profondità</string>
+    <string name="preference_water_type_summary">Per gli alloggiamenti subacquei, improva l\'accuratezza se viene selezionato il tipo corretto di acqua.</string>
+    <string name="remote_connected">Dispositivo remoto collegato</string>
+
+    <string name="preference_stamp_geo_address">Usa indirizzi</string>
+    <!-- preference_stamp_geo_address_summary defined below -->
+    <string name="preference_stamp_geo_address_both">Mostra l\'indirizzo se possibile, oltre alle coordinate GPS</string>
+    <string name="preference_stamp_geo_address_prefer">Preferisci l\'indirizzo alle coordinate GPS</string>
+    <string name="preference_stamp_geo_address_no">Non mostrare l\'indirizzo</string>
+
+    <string name="preference_show_store_location">Mostra icona salva dati posizione</string>
+    <string name="preference_show_store_location_summary">Determina se mostrare sullo schermo l\'icona per abilitare o disabilitare i dati di posizione (geotagging)</string>
+    <string name="preference_location_enable">Salva dati posizione</string>
+    <string name="preference_location_disable">Smetti di salvare i dati posizione</string>
+
+    <string name="preference_histogram">Mostra un istogramma</string>
+    <string name="preference_histogram_summary">Determina se mostrare sullo schermo un istogramma dei colori\n%s</string>
+    <string name="preference_histogram_off">Spento</string>
     <string name="preference_histogram_rgb">Colori RGB</string>
-    <string name="preference_histogram_summary">Se mostrare o meno l\'istogramma dei colori presenti sullo schermo
-\n%s</string>
-    <string name="preference_histogram">Mostra istogramma</string>
-    <string name="preference_location_disable">Non salvare dati localizzazione</string>
-    <string name="preference_location_enable">Salva dati localizzazione</string>
-    <string name="preference_show_store_location_summary">Se mostrare o meno un\'icona sullo schermo per abilitare o disabilitare la localizzazione (geotagging)</string>
-    <string name="preference_show_store_location">Mostra icona salva dati localizzazione</string>
-    <string name="preference_privacy_policy_text"> whether a setting is turned on, e.g., \"Auto-stabilise: On\" </string>
-    <string name="preference_licence_google_icons_text">Fotocamera utilizza icone dal Google\'s Material Design icons (https://developer.android.com/design/downloads/index.html , https://design.google.com/icons/ , https://github.com/google/material-design-icons/ , https://google.github.io/material-design-icons/) rilasciate sotto la licenza Apache versione 2.0. Alcune icone sono state modificate. Tocca qui per il testo completo della licenza.</string>
-    <string name="whats_new_text"> <small>[Questo testo viene mostrato ad ogni aggiornamento di FotoCamera. Puoi disabilitarlo da Impostazioni/On screen GUI/Mostra Novità.]</small>
-\n
-\n<b>v1.48:</b>
-\n <ul> <li>New icon for multiple cameras. If your device has multiple front/back cameras, then the existing icon to switch cameras will switch between front and back camera; the new icon will instead cycle between the multiple front or back cameras. If you prefer the old behaviour, disable Settings/On screen GUI/\"Multiple cameras icon\". (Note, only supported for devices that expose multiple cameras to third party applications.)
-\n</li> <li>Auto-level feature now shows on-screen rectangle to show the frame of the resultant photo.
-\n</li> <li>Aperture control, for devices that support this. (Camera2 API only.)
-\n</li> <li>More custom video profiles.
-\n</li> <li>New option for alpha value for ghost image option.
-\n</li> <li>Options for zebra stripe colours.
-\n</li> <li>Option for storing device\'s current yaw/pitch/roll in Exif user comment.
-\n</li> <li>Option to disable long press actions.
-\n</li> <li>Better use of full screen with wide aspect ratios on devices with on-screen navigation buttons.
-\n</li> <li>Bug fixes and UI improvements.
-\n</li> </ul> </string>
-    <string name="preference_immersive_mode_off">Off</string>
-    <string name="preference_immersive_mode_navigation">Nascondi i tasti di navigazione virtuali on-screen</string>
-    <string name="preference_immersive_mode_gui">Nascondi GUI</string>
+    <string name="preference_histogram_luminance">Luminanza</string>
+    <string name="preference_histogram_value">Valore (Massimo)</string>
+    <string name="preference_histogram_intensity">Intensità (Medio)</string>
+    <string name="preference_histogram_lightness">Luminosità (Media di min-max)</string>
+
+    <string name="preference_zebra_stripes">Mostra strisce zebra</string>
+    <string name="preference_zebra_stripes_summary">Se questa opzione è abilitata, le strisce zebra verranno mostrate sullo schermo mostrando dove l\'anteprima dell\'immagine è sovraesposta.\n%s</string>
+    <string name="preference_zebra_stripes_off">Spento</string>
+    <string name="preference_zebra_stripes_70pc">70%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_80pc">80%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_90pc">90%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_93pc">93%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_95pc">95%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_97pc">97%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_98pc">98%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_99pc">99%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_100pc">100%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+
+    <string name="preference_focus_peaking">Focus peaking</string>
+    <string name="preference_focus_peaking_summary">Se questa opzione è abilitata, verranno evidenziate le aree a fuoco (contorni). Serve principalmente per la messa a fuoco manuale, e può essere usato per aiutare a determinare quali zoni dell\'immagine sono a fuoco.\n%s</string>
+    <string name="preference_focus_peaking_off">Spento</string>
+    <string name="preference_focus_peaking_on">Acceso</string>
+    <string name="preference_focus_peaking_color">Colore del focus peaking</string>
+    <string name="preference_focus_peaking_color_summary">Quale colore usare per evidenziare i bordi a fuoco\n%s</string>
+
+    <string name="remaining">Restanti</string> <!-- images remaining for "processing" -->
+
+    <string name="preference_preview">Anteprima fotocamera…</string>
+
+    <string name="cycle_flash">Commuta flash</string>
+    <string name="preference_show_cycle_flash">Mostra icona flash</string>
+    <string name="preference_show_cycle_flash_summary">Determina se mostrare su schermo l\'icona per commutare tra le opzioni del flash, invece di mostrare le opzioni sul menù popup. Nota che la torcia non è utilizzabile quando questa icona è attiva.</string>
+
+    <string name="preference_raw_expo_bracketing">Consenti RAW per expo bracketing</string>
+    <string name="preference_raw_expo_bracketing_summary">Determina se l\'opzione RAW va anche applicata alla modalità expo bracketing per le foto (o alla modalità HDR quando \"Salva tutte le immagini in HDR\" è attivo). Se questa opzione è disattivata, solo i formati JPEG saranno salvati in questa modalità.</string>
+
+    <string name="preference_raw_focus_bracketing">Consenti RAW per focus bracketing</string>
+    <string name="preference_raw_focus_bracketing_summary">Determina se l\'opzione RAW va anche applicata alla modalità focus bracketing per le foto. Se questa opzione è disattivata, solo i formati JPEG saranno salvati in questa modalità.</string>
+
+    <string name="cycle_raw">Commuta modalità RAW</string>
+    <string name="preference_show_cycle_raw">Mostra icona RAW</string>
+    <string name="preference_show_cycle_raw_summary">Determina se mostrare su schermo l\'icona per commutare tra le modalità RAW.</string>
+
+    <string name="bluetooth_current_remote">Dispositivo remoto attuale:</string>
+    <string name="bluetooth_scan">Scansione</string>
+
+    <string name="preference_stamp_style_shadowed">Testo ombreggiato</string>
+    <string name="preference_stamp_style_plain">Testo semplice</string>
+    <string name="preference_stamp_style_background">Testo con sfondo ombreggiato</string>
+
+    <string name="image_saving_notification">Salvataggio immagini…</string>
+
+    <string name="finish_panorama">Termina panorama</string>
+    <string name="cancel_panorama">Annulla panorama</string>
+    <string name="panorama_cancelled">Panorama annullato</string>
+    <string name="failed_to_process_panorama">Creazione immagine panorama fallita</string>
+
+    <string name="preference_panorama_crop">Auto-ritaglia panorama</string>
+    <string name="preference_panorama_crop_summary">In modalità panorama, determina se rimuovere i bordi storti\n%s</string>
+
+    <string name="panorama_info">Per scattare un\'immagine panoramica, tieni il dispositivo in orientamento verticale e clicca per scattare una foto per avviare il panorama. Poi ruota il dispositivo a sinistra o a destra per spostare il cerchio bianco centrale sul punto blu. Dopo che ogni nuova immagine è stata catturata, continua a ruotare il dispositivo per coprire ogni nuovo punto blu che appare successivamente.\n\nClicca sul segno di spunta per salvare il panorama, o sull\'icona a croce per annullare.\n\Nota che le foto panoramiche possono richiedere tempo per essere elaborate e salvate.</string>
+
+    <string name="preference_panorama_save">Immagini originali panorama</string>
+    <string name="preference_panorama_save_summary">Determina se salvare le immagini originali in modalità panorama. Nota che questo rallenterà il salvataggio delle foto panorama. Consente anche di salvare un file XML che può essere utile per segnalare problemi con la modalità panorama.\n%s</string>
+
+    <string name="preference_panorama_save_no">Non salvare le immagini originali</string>
+    <string name="preference_panorama_save_all">Salva le immagini originali</string>
+    <string name="preference_panorama_save_all_plus_debug">Salva le immagini originali più il debug XML</string>
+
+    <string name="camera_id">ID</string> <!-- ID as in camera ID -->
+
+    <string name="exposure_compensation_seekbar">Barra per cambiare la compensazione dell\'esposizione</string>
+
+    <string name="preference_image_format_summary">Scegli il formato file da usare per salvare le foto. Questo verrà usato per la scelta \"standard\" (non RAW). Solo JPEG supporta il salvataggio dei metadati Exif. Nota che il formato PNG non è realmente lossless, ma viene convertito da una JPEG al 100%% di qualità.\n%s</string>
+
+    <string name="preference_camera_api">API fotocamera</string>
+    <string name="preference_camera_api_summary">Scegli l\'API Camera2 per abilitare funzioni extra come la modalità manuale per esposizione, messa a fuoco, bilanciamento del bianco, e RAW (se supportato dal dispositivo). Cambiare l\'API provocherà un riavvio.\n%s</string>
+    <string name="preference_camera_api_old">API originale della fotocamera</string>
+    <string name="preference_camera_api_camera2">API Camera2</string>
+
+    <string name="preference_audio_control_summary">Scatta foto/video quando viene rilevato un rumore.
+        Quando è abilitato, usa il pulsante del microfono sullo schermo per avviare/interrompere l\'ascolto.
+        \n%s</string>
+
+    <!-- beware of string being too long to display! -->
+    <string name="preference_stamp_geo_address_summary">Se possibile, ottieni indirizzi dalle posizioni GPS (per timbro foto e sottotitoli video).
+        Se abilitata, ciò richiede che il tuo dispositivo trasmetta i dati di posizione attraverso Internet a terze parti
+        per convertire le coordinate GPS in indirizzi. Vedi https://developer.android.com/reference/android/location/Geocoder .
+        Ciò non fornisce garanzie sulla disponibilità o sull\'accuratezza. Non è garantito che i risultati siano significativi o corretti.
+        \n%s</string>
+
+    <string name="intro_text">Tocca per mettere a fuoco e premi il pulsante blu della fotocamera per scattare foto.
+        \n\nPer disabilitare la massima luminosità dello schermo, vedi Impostazioni/Interfaccia schermo/\"Forza la massima luminosità\".
+        Per salvare su schede SD su Android 5+, vedi Impostazioni/Altri controlli fotocamera/\"Storage Access Framework\".
+        Per ulteriore aiuto, clicca su \"Aiuto online\" da Impostazioni.
+    </string>
+
+    <string name="preference_select_remote">Scegli dispositivo remoto</string>
+
+    <string name="preference_video_rec709">REC709</string>
+    <string name="preference_video_srgb">sRGB</string>
+    <string name="preference_video_gamma">Gamma</string>
+    <string name="preference_video_profile_gamma">Valore gamma video</string>
+    <string name="preference_video_profile_gamma_summary">Il valore di gamma da usare per i video se il profilo di immagine video è impostato su Gamma\n%s</string>
+    <string name="preference_video_profile_gamma_1_6">1.6</string>
+    <string name="preference_video_profile_gamma_1_8">1.8</string>
+    <string name="preference_video_profile_gamma_1_9">1.9</string>
+    <string name="preference_video_profile_gamma_2_0">2.0</string>
+    <string name="preference_video_profile_gamma_2_1">2.1</string>
+    <string name="preference_video_profile_gamma_2_2">2.2</string>
+    <string name="preference_video_profile_gamma_2_3">2.3</string>
+    <string name="preference_video_profile_gamma_2_4">2.4</string>
+    <string name="preference_video_profile_gamma_2_6">2.6</string>
+    <string name="preference_video_profile_gamma_2_8">2.8</string>
+
+    <string name="preference_immersive_mode_off">Spento</string>
+    <string name="preference_immersive_mode_low_profile">Riduci solo la luminosità dei bottoni di navigazione</string>
+    <string name="preference_immersive_mode_navigation">Nascondi i bottoni di navigazione</string>
+    <string name="preference_immersive_mode_gui">Nascondi l\'interfaccia</string>
     <string name="preference_immersive_mode_everything">Nascondi tutto</string>
-    <string name="preference_comment_ypr">Salva imbardata, angolo e rollio</string>
-    <string name="preference_comment_ypr_summary">Salva i valori di angolazione, imbardata e rollio sui commenti Exif utente (solo formato JPEG)</string>
-    <string name="error_features_slow_motion">Rallentatore</string>
-    <string name="error_features_frame_rate">Frame rate</string>
-    <string name="error_features_bitrate">Bitrate</string>
-    <string name="error_features_4k">4K UHD</string>
-    <string name="aperture">Apertura</string>
-    <string name="preference_allow_long_press_summary">Se abilitare o meno azioni legate alla pressione prolungata (ad es., premi a lungo su galleria per modificare il punto di salvataggio).</string>
-    <string name="preference_allow_long_press">Permetti azioni a seguito di pressione prolungata</string>
-    <string name="preference_show_camera_id_summary">Mostra il numero ID corrispondente alla fotocamera attuale sullo schermo</string>
-    <string name="preference_show_camera_id">Mostra ID fotocamera</string>
-    <string name="preference_multi_cam_button_summary">Se abilitato, usa pulsanti separati per passare da fotocamera frontale/posteriore, e tra le diverse fotocamere frontali/posteriori. Se disabilitato, l\'icona Cambia Fotocamera passerà attraverso tutte le fotocamere disponibili.</string>
-    <string name="preference_multi_cam_button">Icona diverse fotocamere</string>
-    <string name="switch_multi_camera">Cambia tra le diverse fotocamere</string>
-    <string name="switch_to_unknown_camera">Cambia fotocamera</string>
-    <string name="switch_to_external_camera">Passa alla camera esterna</string>
-    <string name="ultrawide">Grandangolo</string>
-    <string name="external_camera">Fotocamera esterna</string>
-    <string name="preference_zebra_stripes_color_white">Bianco</string>
-    <string name="preference_zebra_stripes_color_transparent">Trasparente</string>
-    <string name="preference_zebra_stripes_color_orange">Arancione</string>
-    <string name="preference_zebra_stripes_color_red">Rossso</string>
-    <string name="preference_zebra_stripes_color_black">Nero</string>
-    <string name="preference_zebra_stripes_background_color_summary">Colore da utilizzare per le strisce in sottofondo mentre proietta le strisce zebra.
-\n%s</string>
-    <string name="preference_zebra_stripes_background_color">Colore strisce zebra di sfondo</string>
-    <string name="preference_zebra_stripes_foreground_color_summary">Colore da utilizzare per le strisce in primo piano mentre proietta le strisce zebra.
-\n%s</string>
-    <string name="preference_zebra_stripes_foreground_color">Colore strisce zebra in primo piano</string>
-    <string name="preference_ghost_image_alpha_summary">Valore Alfa da utilizzare per immagine fantasma. un valore più basso significa più trasparente, più alto significa più opaco.
-\n%s</string>
+
     <string name="preference_ghost_image_alpha">Opacità immagine fantasma</string>
-    <string name="preference_immersive_mode_low_profile">Attenua solo i pulsanti di navigazione virtuali on-screen</string>
-    <string name="preference_video_profile_gamma_2_8">2.8</string>
-    <string name="preference_video_profile_gamma_2_6">2.6</string>
-    <string name="preference_video_profile_gamma_2_4">2.4</string>
-    <string name="preference_video_profile_gamma_2_3">2.3</string>
-    <string name="preference_video_profile_gamma_2_2">2.2</string>
-    <string name="preference_video_profile_gamma_2_1">2.1</string>
-    <string name="preference_video_profile_gamma_2_0">2.0</string>
-    <string name="preference_video_profile_gamma_1_9">1.9</string>
-    <string name="preference_video_profile_gamma_1_8">1.8</string>
-    <string name="preference_video_profile_gamma_1_6">1.6</string>
-    <string name="preference_video_profile_gamma_summary">Valore gamma da utilizzare nel video se il profilo video è impostato su Gamma
-\n%s</string>
-    <string name="preference_video_profile_gamma">Valore gamma video</string>
-    <string name="preference_video_gamma">Gamma</string>
-    <string name="preference_video_srgb">sRGB</string>
-    <string name="preference_video_rec709">REC709</string>
-    <string name="preference_select_remote">Scegli telecomando</string>
-    <string name="preference_zebra_stripes_99pc">99%</string>
-    <string name="preference_zebra_stripes_98pc">98%</string>
-    <string name="preference_zebra_stripes_97pc">97%</string>
-    <string name="preference_zebra_stripes_95pc">95%</string>
-    <string name="preference_zebra_stripes_93pc">93%</string>
-    <string name="skip_button_label">Salta</string>
-    <string name="next_button_label">Prossimo</string>
-    <string name="back_button_label">Indietro</string>
+    <string name="preference_ghost_image_alpha_summary">Il valore alfada usare per le immagini fantasma. Un valore più basso significa più trasparente, più alto significa più opaco.\n%s</string>
+
+    <string name="preference_zebra_stripes_foreground_color">Colore primo piano strisce zebra</string>
+    <string name="preference_zebra_stripes_foreground_color_summary">Colore da usare per le strisce zebra in primo piano quando sono attive.\n%s</string>
+    <string name="preference_zebra_stripes_background_color">Colore sfondo strisce zebra</string>
+    <string name="preference_zebra_stripes_background_color_summary">Colore da usare per le strisce zebra sullo sfondo quando sono attive.\n%s</string>
+
+    <string name="preference_zebra_stripes_color_black">Nero</string>
+    <string name="preference_zebra_stripes_color_red">Rosso</string>
+    <string name="preference_zebra_stripes_color_orange">Arancione</string>
+    <string name="preference_zebra_stripes_color_transparent">Trasparente</string>
+    <string name="preference_zebra_stripes_color_white">Bianco</string>
+
+    <string name="external_camera">Fotocamera esterna</string>
+    <string name="ultrawide">Ultra-wide</string>
+
+    <string name="switch_to_external_camera">Passa alla fotocamera esterna</string>
+    <string name="switch_to_unknown_camera">Commuta fotocamera</string>
+    <string name="switch_multi_camera">Commuta tra fotocamere multiple</string>
+    <string name="preference_multi_cam_button">Icona fotocamere multiple</string>
+    <string name="preference_multi_cam_button_summary">Se abilitato, usa pulsanti separati per passare dalla fotocamera anteriore a quella posteriore e per passare dalla fotocamere multiple anteriori o posteriori. Se disabilitato, l\'icona \"Commuta fotocamera\" commuta ciclicamente tra le telecamere disponibili.</string>
+
+    <string name="preference_show_camera_id">Mostra ID fotocamera</string>
+    <string name="preference_show_camera_id_summary">Visualizza sullo schermo il numero ID della fotocamera attualmente in uso</string>
+
+    <string name="preference_allow_long_press">Allow long press actions</string>
+    <string name="preference_allow_long_press_summary">Whether to allow long press actions (e.g., long press on gallery to change save location).</string>
+
+    <string name="aperture">Apertura</string>
+
+    <string name="error_features_4k">4K UHD</string>
+    <string name="error_features_bitrate">Bitrate</string>
+    <string name="error_features_frame_rate">Frame rate</string>
+    <string name="error_features_slow_motion">Slow motion</string>
+
+    <string name="preference_comment_ypr">Salva imbardata, beccheggio e rollio</string>
+    <string name="preference_comment_ypr_summary">Salva imbardata, beccheggio e rollio del dispositivo nei commenti utente dei metadati Exif delle foto (solo formato JPEG)</string>
+
+    <string name="array_seekbar_preference_seekbar">Barra per cambiare il valore attuale di preferenza</string>
+
+    <string name="preference_audio_control_none">Nessuno</string>
+    <string name="preference_audio_control_noise">Rumore forte</string>
+    <string name="preference_audio_control_voice">Comando vocale: \"cheese\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/arrays.xml b/app/src/main/res/values-ja/arrays.xml
index 296b7ef75fd101cad68016f2306c3a0204f34e93..75750bb4745ee911e933fb0a2405e0c99a434cc7 100644
--- a/app/src/main/res/values-ja/arrays.xml
+++ b/app/src/main/res/values-ja/arrays.xml
@@ -242,16 +242,6 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>なし</item>
-        <item>音に反応</item>
-        <item>音声コマンド: \"チーズ\"</item> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
     <string-array name="preference_save_zulu_time_entries">
         <item>ローカルタイム</item>
         <item>UTC協定世界時</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index fe25856d14ccd3f78dd43274d0a175a7fae89428..6845ae484f5ffefc9c42b2183269911aeaf37771 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -112,7 +112,6 @@
     <string name="preference_audio_noise_control_sensitivity_summary">音に対する感度の設定</string>
     <string name="preference_save_location">保存場所</string>
     <string name="preference_save_location_summary">写真/ビデオを保存するフォルダを決めます</string>
-    <string name="preference_using_saf">ストレージへのフレームワークを使用する</string>
     <string name="preference_using_saf_summary">写真やビデオを保存する際にStorage Accessフレームワークを使用するかどうかを選択します。外付けのSDカードに保存する場合はこの設定が必要となります。</string>
     <string name="preference_save_photo_prefix">保存する写真の命名ルール</string>
     <string name="preference_save_photo_prefix_summary">保存する写真のファイル名の手前につける内容を設定します</string>
@@ -299,10 +298,9 @@
     <string name="no_permission">カメラの権限がありません</string>
     <string name="permission_rationale_title">権限が必要です</string>
     <string name="permission_rationale_camera">カメラを有効にするにはカメラの権限が必要です</string>
-    <string name="permission_rationale_storage">写真を保存するにはストレージの読み書き権限が必要です</string>
     <string name="permission_rationale_record_audio">音声付き動画の撮影と音声コントロールを使用するにはマイクの権限が必要です</string>
     <string name="permission_rationale_location">ジオタギング(位置情報を写真やビデオに付加する)には位置情報の権限が必要です。
-        位置情報の権限はBluetooth LE リモートコントロールデバイスの接続にも必要です。</string>
+        位置情報の権限はBluetooth LE リモートコントロールデバイスの接続にも必要です (Android 11 or earlier)。</string>
 
     <string name="preference_category_photo_debugging">デバッグ用オプション</string>
     <string name="preference_category_video_debugging">デバッグ用オプション</string>
@@ -844,21 +842,20 @@
     <string name="preference_camera_api_old">従来のカメラ用API</string>
     <string name="preference_camera_api_camera2">Camera2 API</string>
 
-    <string name="preference_audio_control_summary">音または音声コマンドに反応して撮影/録画を行います。
+    <string name="preference_audio_control_summary">音に反応して撮影/録音します。
         この機能をオンにした場合、画面上に表示されるマイクボタンを使用してリスニングをスタート/ストップします。
-        注意:音声コマンドにはAndroidの音声認識サービスを使用します。このオプションを使用する場合、音声データは
-        音声認識のためリモートサーバーへ送信されます。
         \n%s</string>
 
+    <!-- beware of string being too long to display! -->
     <string name="preference_stamp_geo_address_summary">もし可能であれば、GPS座標と一緒に住所もスタンプします。
-        この機能にはインターネット接続が必要です。
         注意:住所の使用が有効になっている場合、GPS座標から住所への変換をするため端末の位置情報を含むリクエストが第三者へ送信されます。
         詳しくはこちら https://developer.android.com/reference/android/location/Geocoder
+        この機能は、可用性または正確性を保証するものではありません。 結果は最良の推測であり、意味のあるものや正しいものであるとは限りません。
         \n%s</string>
 
     <string name="intro_text">フォーカスするには画面をタッチ、そして写真を撮るには青いカメラボタンを押します。
         \n\n画面の輝度が最大になるのを無効にする場合は、[設定]->[画面表示設定]->[明るさを常に最大にする]をオフにします。
-        Android5以降の端末でSDカードに保存するには、[設定]->[カメラ制御の詳細設定]->[ストレージへのフレームワークを使う]を設定します。
+        Android5以降の端末でSDカードに保存するには、[設定]->[Storage Access Framework]を設定します。
         詳しくは、[設定]->[オンラインヘルプ]をご覧ください。
     </string>
 
@@ -868,4 +865,9 @@
     <string name="preference_immersive_mode_navigation">スクリーンボタンのみ隠す</string>
     <string name="preference_immersive_mode_gui">GUIを隠す</string>
     <string name="preference_immersive_mode_everything">すべてを隠す</string>
+
+    <string name="preference_audio_control_none">なし</string>
+    <string name="preference_audio_control_noise">音に反応</string>
+    <string name="preference_audio_control_voice">音声コマンド: \"チーズ\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
diff --git a/app/src/main/res/values-nb/arrays.xml b/app/src/main/res/values-nb/arrays.xml
index b1d5b42f1a52d7d58e69bea513669fc5aa91f1a2..9347585caf2ca2d5d58655c41632c50773db3861 100644
--- a/app/src/main/res/values-nb/arrays.xml
+++ b/app/src/main/res/values-nb/arrays.xml
@@ -242,16 +242,6 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>Ingen</item>
-        <item>Høy støy</item>
-        <item>Stemmekommando: \"cheese\"</item>
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
     <string-array name="preference_save_zulu_time_entries">
         <item>Lokal tid</item>
         <item>UTC</item>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index cf7a2f8408cb65ecd5c4c1372bb0cf7ba381e2c8..fb91d9f8ad022447ca902832f7cf6ad85995de0a 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -111,7 +111,6 @@
     <string name="preference_audio_noise_control_sensitivity_summary">Innstillingen for støynivåsensitiviteten for lyd (Høy støy)</string>
     <string name="preference_save_location">Lagringsplasseringen</string>
     <string name="preference_save_location_summary">Mappen som bildene/videoen skal lagres i.</string>
-    <string name="preference_using_saf">Bruk lagringstilgangsrammeverket</string>
     <string name="preference_using_saf_summary">Hvorvidt lagringstilgangsrammeverk skal brukes til å lagre bilder og videoer.</string>
     <string name="preference_save_photo_prefix">Forstavelsen til fotolagring</string>
     <string name="preference_save_photo_prefix_summary">Forstavelsen som skal brukes til lagringsfilnavnene til bildene.</string>
@@ -281,7 +280,7 @@
     <string name="audio_listener_started">Lag en høy lyd</string>
 
     <string name="auto_stabilise_info">Auto-vater vil automatisk rotere bildene dine slik at de ser ut til å være i vater. \n\nBemerk at dette betyr at bilder automatisk vil litt lavere oppløsning (på grunn av roteringen og klippingen som er påkrevd).</string>
-    <string name="raw_info">DNG-filer inneholder de fulle ukomprimerte og uprosesserte informasjonene fra ditt kamera.\n\nDe fleste galleriapper vil ikke kjenne igjen DNG, og de bør istedet brukes med spesialiserende apper som Snapseed eller Lightroom.\n\nBemerk at diverse prosesseringsinnstillinger som "Stemple bilder" og "Auto-stabiliser" kun gjelder for JPEG-bildene, og ikke for DNG-bildene.\n\nDNG-filer tar opp veldig mye plass; en filutforsker-app kan være nyttig for å overføre eller slette dem.\n\nDNG-filer lagres kun i Standard- og DRO-fotomodusene.</string>
+    <string name="raw_info">DNG-filer inneholder de fulle ukomprimerte og uprosesserte informasjonene fra ditt kamera.\n\nDe fleste galleriapper vil ikke kjenne igjen DNG, og de bør istedet brukes med spesialiserende apper.\n\nBemerk at diverse prosesseringsinnstillinger som "Stemple bilder" og "Auto-stabiliser" kun gjelder for JPEG-bildene, og ikke for DNG-bildene.\n\nDNG-filer tar opp veldig mye plass; en filutforsker-app kan være nyttig for å overføre eller slette dem.\n\nDNG-filer lagres kun i Standard- og DRO-fotomodusene.</string>
     <string name="hdr_info">HDR-modus er nyttig for takninger som har stor variasjon i lysstyrke. Det virker ved at man tar flere bilder med forskjellige eksponeringer, og kombinerer dem til å forme ett endelig bilde.\n\n Bemerk at HDR ikke er egnet for scener med raske bevegelser, og kan føre til mindre nøyaktig fargerepresentasjon.\n\nÅ ta bilder i HDR-modus vil være tregere.</string>
 
     <string name="dont_show_again">Ikke vis igjen</string>
@@ -300,9 +299,6 @@
     <string name="no_permission">TILLATELSER ER IKKE TILGJENGELIGE</string>
     <string name="permission_rationale_title">Tillatelse er påkrevd</string>
     <string name="permission_rationale_camera">Kameratillatelse er påkrevd for å kunne bruke kameraet.</string>
-    <string name="permission_rationale_storage">Skrive-/lese-lagringstillatelse er påkrevd for å kunne lagre bilder.</string>
-    <string name="permission_rationale_record_audio">Mikrofontillatelse er påkrevd for å kunne ta opp videoer med lyd.</string>
-    <string name="permission_rationale_location">Posisjonstillatelse er påkrevd for geotagging.</string>
 
     <string name="preference_category_photo_debugging">Avlusingsinnstillinger</string>
     <string name="preference_category_video_debugging">Avlusingsinnstillinger</string>
@@ -565,4 +561,9 @@
     <string name="preference_immersive_mode_navigation">Skjul bare de virtuelle navigasjonsknappene</string>
     <string name="preference_immersive_mode_gui">Skjul grensesnittet</string>
     <string name="preference_immersive_mode_everything">Skjul alt</string>
+
+    <string name="preference_audio_control_none">Ingen</string>
+    <string name="preference_audio_control_noise">Høy støy</string>
+    <string name="preference_audio_control_voice">Stemmekommando: \"cheese\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
diff --git a/app/src/main/res/values-pl/arrays.xml b/app/src/main/res/values-pl/arrays.xml
index a5faaf0494c5c9f96221f31e8547c27909358a97..c41c7de9565023ef32288dce9c5cab3d06c845e3 100644
--- a/app/src/main/res/values-pl/arrays.xml
+++ b/app/src/main/res/values-pl/arrays.xml
@@ -242,16 +242,6 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>Wyłączone</item>
-        <item>Głośny dźwięk</item>
-        <item>Komenda głosowa: \"cheese\"</item>
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
     <string-array name="preference_save_zulu_time_entries">
         <item>Czas lokalny</item>
         <item>UTC (Zulu)</item>
@@ -281,8 +271,8 @@
         <item>3</item>
     </string-array>
     <string-array name="preference_front_camera_mirror_entries">
-        <item>No mirror</item>
-        <item>Mirror photo</item>
+        <item>Bez lustra</item>
+        <item>Odbicie lustrzane</item>
     </string-array>
     <string-array name="preference_front_camera_mirror_values">
         <item>preference_front_camera_mirror_no</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b335066570fddfac00f973bc31df8a63dcd73740..fe5b020fee17a320ebd2d18ea1f004683159b2ef 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2,26 +2,26 @@
 <resources>
     <string name="app_name">Camera</string>
     <string name="action_settings">Ustawienia</string>
-    <string name="action_popup">Ustawienia</string>
+    <string name="action_popup">Ustawienia wyskakujących okienek</string>
     <string name="intro_ok">OK (Ta wiadomość nie pokaże się ponownie)</string>
-    <string name="on">Włączone</string>
+    <string name="on">Włączono</string>
     <!-- whether a setting is turned on, e.g., "Auto-level: On" -->
-    <string name="off">Wyłączone</string>
+    <string name="off">Wyłączono</string>
     <!-- whether a setting is turned off, e.g., "Auto-level: Off" -->
     <string name="choose_save_location">Wybierz miejsce zapisywania:</string>
     <string name="clear_folder_history">Wyczyść historię folderów</string>
     <string name="clear_folder_history_question">Wyczyścić historię folderów?</string>
     <string name="choose_another_folder">Wybierz inny folder</string>
     <string name="changed_save_location">Zmieniono miejsce zapisywania na:</string>
-    <string name="stopped_recording_video">Zatrzymano nagrywanie wideo</string>
+    <string name="stopped_recording_video">Zatrzymano nagrywanie filmu</string>
     <string name="repeats_to_go">pozostało powtórzeń</string>
     <!--    intentionally starts lower case -->
     <string name="failed_to_reconnect_camera">Nie udało się połączyć z aparatem</string>
     <string name="video_may_be_corrupted">Błąd, nagranie może być uszkodzone</string>
-    <string name="not_supported">nie wspierane na Twoim urządzeniu</string>
+    <string name="not_supported">Niewspierane na Twoim urządzeniu</string>
     <!--    intentionally starts lower case -->
     <string name="video_error_unknown">Nieznany błąd, wideo wstrzymane</string>
-    <string name="video_error_server_died">Serwer padł, wideo wstrzymane</string>
+    <string name="video_error_server_died">Błąd serwera, wideo wstrzymane</string>
     <string name="video_max_duration">Nagranie osiągnęło maksymalną długość</string>
     <string name="video_max_filesize">Nagranie osiągnęło maksymalny rozmiar pliku</string>
     <string name="exposure_compensation">Korekta ekspozycji</string>
@@ -35,22 +35,22 @@
     <string name="exposure_locked">Ekspozycja zablokowana</string>
     <string name="exposure_unlocked">Ekspozycja odblokowana</string>
     <string name="cancelled_timer">Anulowano samowyzwalacz</string>
-    <string name="cancelled_repeat_mode">Anulowano tryb seryjny</string>
+    <string name="cancelled_repeat_mode">Anulowano serię</string>
     <string name="started_timer">Włączono timer</string>
     <string name="failed_to_save_video">Nie udało się zapisać pliku wideo</string>
     <string name="failed_to_record_video">Nie udało się nagrać wideo</string>
     <string name="started_recording_video">Rozpoczęto nagrywanie wideo</string>
-    <string name="sorry">Sorry</string>
+    <string name="sorry">Niestety</string>
     <string name="failed_to_save_photo">Nie udało się zapisać zdjęcia</string>
     <string name="failed_to_save_photo_raw">Nie udało się zapisać zdjęcia w RAW</string>
     <string name="failed_to_auto_stabilise">Nie udało się wypoziomować</string>
-    <string name="failed_to_start_camera_preview">Nie udało się</string>
-    <string name="taking_photo">Wykonywanie zdjęcia</string>
+    <string name="failed_to_start_camera_preview">Nie udało się uruchomić podglądu aparatu</string>
+    <string name="taking_photo">Robienie zdjęcia</string>
     <string name="failed_to_take_picture">Nie udało się zrobić zdjęcia</string>
     <string name="location_not_available">Lokalizacja GPS niedostępna</string>
-    <string name="photo_deleted">Zdjęcie skasowane</string>
-    <string name="no_gallery_app">Brak aplikacji galerii</string>
-    <string name="screen_is_locked">Ekran zablokowany\nprzesuń aby odblokować</string>
+    <string name="photo_deleted">Zdjęcie usunięte</string>
+    <string name="no_gallery_app">Brak aplikacji do przeglądania zdjęć</string>
+    <string name="screen_is_locked">Ekran zablokowany\nprzesuń palcem, aby odblokować</string>
     <string name="unlocked">Odblokowano</string>
     <string name="auto_stabilise_not_supported">Autopoziomowanie niedostępne\nna tym urządzeniu</string>
     <string name="audio_disabled">Dźwięk wyłączony</string>
@@ -58,6 +58,7 @@
     <string name="color_effect">Efekt koloru</string>
     <string name="scene_mode">Tryb scenerii</string>
     <string name="white_balance">Balans bieli</string>
+
     <string name="angle">Kąt</string>
     <string name="direction">Kierunek</string>
     <string name="failed_to_open_camera_1">BŁĄD APARATU</string>
@@ -67,50 +68,49 @@
     <string name="zoom">Przybliżenie</string>
     <string name="free_memory">Wolne</string>
     <string name="screen_lock_message_1">[ZABLOKOWANE:</string>
-    <string name="screen_lock_message_2">Przesuń aby odblokować]</string>
+    <string name="screen_lock_message_2">Przesuń palcem, aby odblokować]</string>
     <string name="failed_to_stamp">Nie udało się dodać stempla</string>
-    <string name="metres_abbreviation">m</string>
-    <!-- symbol short for metres -->
+    <string name="metres_abbreviation">m</string> <!-- symbol short for metres -->
+
     <string name="preference_category_camera_effects">Efekty aparatu</string>
     <string name="preference_auto_stabilise">Autopoziomowanie</string>
-    <string name="preference_auto_stabilise_summary">Zdjęcia będą obracane i wyrównane do poziomu (wolniejszy zapis zdjęcia, może się nie udać na urządzeniach z małą ilością pamięci)</string>
+    <string name="preference_auto_stabilise_summary">Zdjęcia będą obracane i wyrównywane do poziomu (wolniejszy zapis zdjęcia, może się nie udać na urządzeniach z małą ilością pamięci)</string>
     <string name="preference_color_effect">Nałóż efekt kolorystyczny</string>
     <string name="preference_color_effect_summary">Nakłada efekt kolorystyczny na zdjęcie</string>
     <string name="preference_scene_mode">Zastosuj tryb scenerii</string>
-    <string name="preference_scene_mode_summary">Optymalizuje zdjęcie dla innych scenerii</string>
+    <string name="preference_scene_mode_summary">Optymalizuj zdjęcie dla innych scenerii</string>
     <string name="preference_white_balance">Ustaw balans bieli</string>
-    <string name="preference_white_balance_summary">Wybierz ustawienie aby dopasować balans bieli</string>
+    <string name="preference_white_balance_summary">Wybierz to ustawienie, aby dopasować balans bieli</string>
     <string name="preference_iso">Ustaw czułość ISO</string>
     <string name="preference_iso_summary">Wyższa wartość oznacza większą czułość na światło (może nie działać na niektórych urządzeniach)</string>
     <string name="preference_exposure">Ustaw korektę ekspozycji</string>
     <string name="preference_exposure_summary">Ustaw 0 dla domyślnej korekty ekspozycji</string>
-    <string name="preference_lock_orientation">Zablokuj orientację zdjęcia/wideo</string>
-    <string name="preference_lock_orientation_summary">Jeśli ustawione, orientacja urządzenia będzie pomijana i zostanie zastosowana określona\n%s</string>
+    <string name="preference_lock_orientation">Zablokuj orientację zdjęcia/filmu</string>
+    <string name="preference_lock_orientation_summary">Jeśli ustawione, orientacja urządzenia będzie ignorowana, priorytet będzie miała wybrana opcja\n%s</string>
     <string name="preference_face_detection">Wykrywanie twarzy</string>
     <string name="preference_face_detection_summary">Używa wykrywania twarzy zamiast obszarów ostrości</string>
+
     <string name="preference_category_camera_controls">Sterowanie aparatem</string>
     <string name="preference_timer">Samowyzwalacz</string>
     <string name="preference_timer_beep">Dźwięk samowyzwalacza</string>
     <string name="preference_timer_beep_summary">Dźwięk pikania podczas odliczania samowyzwalacza lub między zdjęciami serii</string>
     <string name="preference_timer_speak">Głosowe odliczanie</string>
     <string name="preference_timer_speak_summary">Głosowe odliczanie dla wyzwalacza lub zdjęć seryjnych (od 60 sekund)</string>
-    <string name="preference_burst_mode">Seria</string>
-    <!-- also used in popup menu, so shouldn't be too long a string -->
-    <string name="preference_burst_interval">Interwał trybu seryjnego</string>
+    <string name="preference_burst_mode">Seria</string> <!-- also used in popup menu, so shouldn't be too long a string -->
+    <string name="preference_burst_interval">Interwał Serii</string>
     <string name="preference_screen_camera_controls_more">Więcej ustawień aparatu…</string>
     <string name="preference_touch_capture">Dotknij, aby zrobić zdjęcie</string>
     <string name="preference_touch_capture_summary">Zrób zdjęcie poprzez pojedyncze lub podwójne dotknięcie</string>
     <string name="preference_pause_preview">Pauza po zrobieniu zdjęcia</string>
     <string name="preference_pause_preview_summary">Wstrzymaj podgląd po zrobieniu zdjęcia, z możliwością udostępnienia lub usunięcia</string>
     <string name="preference_shutter_sound">Dźwięk migawki</string>
-    <string name="preference_shutter_sound_summary">Odtwarza dźwięk podczas wykonywania zdjęcia</string>
+    <string name="preference_shutter_sound_summary">Odtwarza dźwięk podczas robienia zdjęcia</string>
     <string name="preference_volume_keys">Klawisze głośności</string>
     <string name="preference_audio_control">Aktywacja za pomocą dźwięków</string>
     <string name="preference_audio_noise_control_sensitivity">Wrażliwość sterowania dźwiękiem</string>
-    <string name="preference_audio_noise_control_sensitivity_summary">Poziom wrażliwości na dźwięki aktywujące aparat</string>
+    <string name="preference_audio_noise_control_sensitivity_summary">Poziom wrażliwości na głośne dźwięki aktywujące aparat</string>
     <string name="preference_save_location">Lokalizacja zapisu</string>
     <string name="preference_save_location_summary">Folder, do którego będą zapisywane pliki</string>
-    <string name="preference_using_saf">Używaj SAF (systemowa obsługa dostępu do pamięci)</string>
     <string name="preference_using_saf_summary">Używa Storage Access Framework do zapisu plików zdjęć i filmów</string>
     <string name="preference_save_photo_prefix">Przedrostek nazw zdjęć</string>
     <string name="preference_save_photo_prefix_summary">Przedrostek używany w nazwach plików zdjęć</string>
@@ -118,69 +118,69 @@
     <string name="preference_save_video_prefix_summary">Przedrostek używany w nazwach plików filmów</string>
     <string name="preference_save_zulu_time">Format czasu w nazwie pliku</string>
     <string name="preference_show_when_locked">Pokaż aparat gdy zablokowany</string>
-    <string name="preference_show_when_locked_summary">Jeśli włączone, Camera będzie widoczny ponad ekranem blokady (dostęp do opcji, galerii itp. wymaga odblokowania)</string>
-    <string name="preference_startup_focus">Automatyczne ustawianie ostrości podczas uruchamiania</string>
-    <string name="preference_startup_focus_summary">Czy autofokus ma być uruchamiany podczas włączania aplikacji. Jeśli występuje problem z włączaniem lampy błyskowej podczas uruchamiania, wyłącz tę opcję</string>
-    <string name="preference_lock_video">Blokowanie ekranu podczas nagrywania filmu</string>
-    <string name="preference_lock_video_summary">Podczas nagrywania filmu interfejs jest blokowany aby zapobiec przypadkowemu zatrzymaniu. Przeciągnij ekran aby odblokować. Nagrywanie zostanie przerwane jeśli aplikacja działa w tle lub ekran jest pusty.</string>
-    <string name="preference_rotate_preview">Obracanie podglądu</string>
-    <string name="preference_rotate_preview_summary">Umożliwia obtót podglądu (nie wpływa na zapisywane pliki)\n%s</string>
+    <string name="preference_show_when_locked_summary">Jeśli włączone, aplikacja Open Camera będzie widoczna ponad ekranem blokady (dostęp do opcji, galerii itp. wymaga odblokowania)</string>
+    <string name="preference_startup_focus">Automatyczna ostrość podczas uruchamiania</string>
+    <string name="preference_startup_focus_summary">Autofokus będzie uruchamiany podczas włączania aplikacji. Jeśli występuje problem z włączaniem lampy błyskowej podczas uruchamiania, wyłącz tę opcję</string>
+    <string name="preference_lock_video">Blokuj ekranu podczas nagrywania filmu</string>
+    <string name="preference_lock_video_summary">Podczas nagrywania filmu interfejs będzie zablokowany, aby zapobiec przypadkowemu zatrzymaniu nagrania. Przesuń palcem po ekranie, aby odblokować. Pamiętaj, że nagrywanie zostanie przerwane jeśli aplikacja zacznie działać w tle lub ekran zostanie wygaszony.</string>
+    <string name="preference_rotate_preview">Obracaj podgląd</string>
+    <string name="preference_rotate_preview_summary">Umożliwia obrót podglądu (nie wpływa na zapisywane pliki)\n%s</string>
     <string name="preference_screen_gui">Interfejs fotografowania…</string>
     <string name="preference_preview_size">Rozmiar podglądu</string>
     <string name="preference_ui_placement">Położenie interfejsu</string>
     <string name="preference_immersive_mode">Tryb pełnoekranowy</string>
-    <string name="preference_show_zoom">Pokaż przybliżenie</string>
-    <string name="preference_show_zoom_summary">Wyświetla poziom przybliżenia na ekranie (jeśli</string>
-    <string name="preference_show_zoom_controls">Pokaż przyciski -/+ przybliżenia</string>
-    <string name="preference_show_zoom_controls_summary">Wyświetla przyciski -/+ do kontroli stopnia przybliżenia</string>
-    <string name="preference_show_zoom_slider_controls">Pokaż suwak przybliżenia</string>
-    <string name="preference_show_zoom_slider_controls_summary">Wyświetla suwak ustawienia stopnia przyliżenia</string>
-    <string name="preference_show_iso">Pokaż ISO</string>
-    <string name="preference_show_iso_summary">Wyświetla aktualną czułość ISO. Przy załączonej lampie, pojawi się także symbol lampy błyskowej jeśli ta ma się zaświecić. (wymaga Camera2 API)</string>
-    <string name="preference_free_memory">Pokaż dostepną pamięć</string>
-    <string name="preference_free_memory_summary">Wyświetla na ekranie dostępną w urządzeniu wolną pamięć</string>
-    <string name="preference_show_angle">Pokaż kąt</string>
+    <string name="preference_show_zoom">Przybliżenie</string>
+    <string name="preference_show_zoom_summary">Wyświetla aktualną wartość przybliżenia na ekranie (jeśli przybliżenie zostanie użyte)</string>
+    <string name="preference_show_zoom_controls">Przyciski przybliżenia</string>
+    <string name="preference_show_zoom_controls_summary">Wyświetla przyciski -/+ do kontroli wartości przybliżenia</string>
+    <string name="preference_show_zoom_slider_controls">Suwak przybliżenia</string>
+    <string name="preference_show_zoom_slider_controls_summary">Wyświetla suwak do zmiany wartości przybliżenia</string>
+    <string name="preference_show_iso">ISO</string>
+    <string name="preference_show_iso_summary">Wyświetla aktualną czułość ISO. (Wymaga Camera2 API)</string>
+    <string name="preference_free_memory">Dostępna pamięć</string>
+    <string name="preference_free_memory_summary">Wyświetla na ekranie dostępną ilość pamięci w urządzeniu</string>
+    <string name="preference_show_angle">Kąt</string>
     <string name="preference_show_angle_summary">Wyświetla na ekranie aktualny kąt odchylenia urządzenia od poziomu</string>
-    <string name="preference_show_angle_line">Pokaż linię poziomu</string>
+    <string name="preference_show_angle_line">Linia poziomu</string>
     <string name="preference_show_angle_line_summary">Wyświetla poziomą linię</string>
-    <string name="preference_angle_highlight_color">Wyróżnienie kąta</string>
-    <string name="preference_angle_highlight_color_summary">Kąt wyświetli się w jaskrawym kolorze gdy będzie bliski poziomu</string>
-    <string name="preference_show_geo_direction">Pokaż kompas</string>
+    <string name="preference_angle_highlight_color">Kolor wyróżnienia kąta/wysokości</string>
+    <string name="preference_angle_highlight_color_summary">Wybrany kolor pokaże się, gdy kąt nachylenia aparatu będzie bliski poziomu</string>
+    <string name="preference_show_geo_direction">Kompas</string>
     <string name="preference_show_geo_direction_summary">Wyświetla kompas na ekranie</string>
-    <string name="preference_show_time">Pokaż czas</string>
+    <string name="preference_show_time">Czas</string>
     <string name="preference_show_time_summary">Wyświetla na ekranie aktualny czas</string>
-    <string name="preference_show_battery">Pokaż baterię</string>
+    <string name="preference_show_battery">Bateria</string>
     <string name="preference_show_battery_summary">Wyświetla na ekranie aktualny poziom baterii</string>
-    <string name="preference_grid">Pokaż kratkę</string>
-    <string name="grid">Kratka</string>
+    <string name="preference_grid">Pokaż siatkę</string>
+    <string name="grid">Siatka</string>
     <!-- short form of Show a grid -->
-    <string name="preference_crop_guide">Pokaż prowadnice kadrowania</string>
+    <string name="preference_crop_guide">Prowadnice kadrowania</string>
     <string name="preference_crop_guide_summary">Prowadnice pokazują jak wyglądają wybrane proporcje obrazu. Jest to przydatne gdy chcemy później przyciąć zdjęcie do innych proporcji niż plik z aparatu. Wymaga trybu WYSIWYG lub trybu filmowania\n%s</string>
-    <string name="preference_show_toasts">Pokaż wyskakujące powiadomienia</string>
-    <string name="preference_show_toasts_summary">Czy pokazywać wyskakujące powiadomienia</string>
-    <string name="preference_thumbnail_animation">Pokaż animację miniaturki</string>
-    <string name="preference_thumbnail_animation_summary">Wyświetla animowaną miniaturkę po wykonaniu zdjęcia</string>
-    <string name="preference_take_photo_border">Pokazuj ramkę</string>
+    <string name="preference_show_toasts">Wyskakujące powiadomienia</string>
+    <string name="preference_show_toasts_summary">Pokazuje wyskakujące powiadomienia</string>
+    <string name="preference_thumbnail_animation">Animacja miniaturki</string>
+    <string name="preference_thumbnail_animation_summary">Wyświetla animowaną miniaturkę po zrobieniu zdjęcia</string>
+    <string name="preference_take_photo_border">Ramka</string>
     <string name="preference_take_photo_border_summary">Wyświetla ramkę wokół ekranu po wykonaniu zdjęcia</string>
     <string name="preference_keep_display_on">Utrzymuj ekran włączony</string>
-    <string name="preference_keep_display_on_summary">Ekran nie wyłączy się jeśli główny ekran Camera jest aktywny</string>
+    <string name="preference_keep_display_on_summary">Ekran nie wyłączy się jeśli główny ekran aplikacji Open Camera będzie aktywny</string>
     <string name="preference_max_brightness">Wymuś maksymalną jasność</string>
-    <string name="preference_max_brightness_summary">Wymusza maksymalną jasność ekranu pomijając aktualne systemowe ustawienia</string>
+    <string name="preference_max_brightness_summary">Wymusza maksymalną jasność ekranu pomijając ustawienie systemu operacyjnego urządzenia</string>
     <string name="preference_category_camera_quality">Ustawienia zdjęć i filmów</string>
     <string name="preference_screen_photo_settings">Ustawienia zdjęć…</string>
     <string name="preference_screen_video_settings">Ustawienia filmów…</string>
     <string name="preference_screen_location_settings">Ustawienia lokalizacji…</string>
-    <string name="preference_resolution">Rozdzielczość</string>
+    <string name="preference_resolution">Rozdzielczość aparatu</string>
     <string name="preference_quality">Jakość obrazu</string>
     <string name="preference_quality_summary">Ustaw jakość zapisywanych plików JPEG (domyślna wartość to 90%%)\n%s</string>
     <!-- '%' is encoded as '%%' - a single % can crash devices, and this isn't picked up by Android Lint! -->
     <string name="preference_raw">RAW</string>
-    <string name="preference_location">Zapisuj dane geolokalizacji</string>
-    <string name="preference_location_summary">Zapisuje współrzędne geograficzne w zdjęciach i filmach</string>
+    <string name="preference_location">Zapisuj dane lokalizacji (Geolokalizacja)</string>
+    <string name="preference_location_summary">Zapisuje dane lokalizacji GPS na zdjęciach/filmach (w przypadku zdjęć dane lokalizacji mogą być przechowywane tylko w formatach JPEG i DNG)</string>
     <string name="preference_gps_direction">Zapisuj kierunek kompasu</string>
-    <string name="preference_gps_direction_summary">Zapisuje kierunek kompasu GPS</string>
+    <string name="preference_gps_direction_summary">Zapisuje kierunek kompasu GPS na zdjęciach (tylko format JPEG)</string>
     <string name="preference_require_location">Wymagaj danych geolokalizacji</string>
-    <string name="preference_require_location_summary">Jeśli zapisywanie danych geolokalizacyjnych jest włączone, zapisanie zdjęcia lub filmu nastąpi tylko gdy te dane są dostępne</string>
+    <string name="preference_require_location_summary">Jeśli zapisywanie danych geolokalizacyjnych jest włączone, zapisanie zdjęcia lub filmu nastąpi tylko gdy te dane będą dostępne</string>
     <string name="preference_stamp">Stempluj zdjęcia</string>
     <string name="preference_stamp_summary">Stempluje zdjęcia datą i czasem, jeśli są dostępne także danymi z GPS\n%s</string>
     <string name="preference_stamp_dateformat">Format daty stempla</string>
@@ -188,51 +188,51 @@
     <string name="preference_stamp_gpsformat">Format stempla GPS</string>
     <string name="preference_textstamp">Własny tekst</string>
     <string name="preference_textstamp_summary">Określa własny tekst na stemplu</string>
-    <string name="preference_stamp_fontsize">Rozmiar fontu</string>
-    <string name="preference_stamp_fontsize_summary">Rozmiar fontu użytego do stemplowania zdjęcia</string>
-    <string name="preference_stamp_font_color">Kolor fontu</string>
-    <string name="preference_stamp_font_color_summary">Kolor fontu użytego do stemplowania zdjęcia</string>
+    <string name="preference_stamp_fontsize">Rozmiar czcionki</string>
+    <string name="preference_stamp_fontsize_summary">Rozmiar czcionki używanej do stemplowania zdjęcia</string>
+    <string name="preference_stamp_font_color">Kolor czcionki</string>
+    <string name="preference_stamp_font_color_summary">Kolor czcionki używanej do stemplowania zdjęcia</string>
     <string name="preference_stamp_style">Styl tekstu</string>
     <string name="preference_stamp_style_summary">Określa styl tekstu stempla\n%s</string>
     <string name="preference_background_photo_saving">Użyj wątku w tle</string>
-    <string name="preference_background_photo_saving_summary">Używanie wątku aplikacji działającego w tle do zapisu zdjęć (szybsze operacje)</string>
-    <string name="video_quality">Rozdzielczość filmów</string>
-    <string name="preference_force_video_4k">Wymuś nagrywanie filmów 4K UHD (działa tylko z niektórymi urządzeniami)</string>
-    <string name="preference_force_video_4k_summary">Włącza rozdzielczość 3840x2160 przy nagrywaniu filmów z tylnego aparatu. Ta opcja to hack, który pozwala urządzeniom z obsługą 4K na nagrywanie filmów w 4K mimo zablokowania takiej możliwości dla niefirmowych aplikacji nagrywających. Nie ma gwarancji, że to zadziała, proszę przetestować.</string>
-    <string name="preference_video_stabilization">Włącz stabilizację obrazu</string>
-    <string name="preference_video_stabilization_summary">Stabilizacja redukuje wstrząsy wywołane ruchem urządzenia. Działa w podglądzie jak i w zapisywanym pliku.</string>
-    <string name="preference_video_bitrate">Bitrate filmów (przybliżone)</string>
-    <string name="preference_video_bitrate_summary">Ustawia przybliżone bitrate filmów (wyższe oznacza lepszą jakość, ale zabiera więcej pamięci; ustawienie nieobsługiwanego bitrate może spowodować błąd zapisu)\n%s</string>
-    <string name="preference_video_fps">Częstotliwość klatek (przybliżone)</string>
-    <string name="preference_video_fps_summary">Ustawia częstotliwość klatek (kl/s) filmów (może być przybliżona, ustawienie nieobsługiwanej wartości może spowodować błąd zapisu)\n%s</string>
-    <string name="preference_video_max_duration">Maksymalny czas trwania</string>
+    <string name="preference_background_photo_saving_summary">Używa wątku aplikacji działającego w tle do zapisu zdjęć (dla szybszego działania)</string>
+    <string name="video_quality">Rozdzielczość Wideo</string>
+    <string name="preference_force_video_4k">Wymuś nagrywanie filmów 4K UHD (działa tylko na niektórych urządzeniach)</string>
+    <string name="preference_force_video_4k_summary">Włącza rozdzielczość 3840x2160 przy nagrywaniu filmów z tylnego aparatu. Ta opcja to hack, który pozwala urządzeniom z obsługą 4K na nagrywanie filmów w 4K, mimo zablokowania takiej możliwości dla niefirmowych aplikacji nagrywających. Nie ma gwarancji, że to zadziała, proszę przetestować.</string>
+    <string name="preference_video_stabilization">Cyfrowa stabilizacja obrazu</string>
+    <string name="preference_video_stabilization_summary">Stabilizacja redukuje wstrząsy wywołane ruchem urządzenia. Działa podczas podglądu oraz nagrywania filmów. Ta funkcja może być zbędna, jeżeli urządzenie zostało wyposażone w optyczną stabilizację obrazu (OIS)</string>
+    <string name="preference_video_bitrate">Bitrate filmów (przybliżony)</string>
+    <string name="preference_video_bitrate_summary">Ustawia przybliżony bitrate filmów (wyższa wartość oznacza lepszą jakość, ale zabiera więcej pamięci; ustawienie nieobsługiwanego bitrate może spowodować błąd zapisu)\n%s</string>
+    <string name="preference_video_fps">Częstotliwość klatek (przybliżona)</string>
+    <string name="preference_video_fps_summary">Ustawia częstotliwość klatek (kl/s) filmów (wartość przybliżona, może nie zadziałać, dodatkowo ustawienie nieobsługiwanej wartości może spowodować błąd zapisu)\n%s</string>
+    <string name="preference_video_max_duration">Określ czas nagrywania filmu</string>
     <string name="preference_video_max_duration_summary">Nagrywanie filmu zostanie zatrzymane po określonym czasie\n%s</string>
-    <string name="preference_video_restart">Restart nagrywania po maksymalnym czasie</string>
-    <string name="preference_video_restart_summary">Po zatrzymaniu nagrywania po maksymalnym czasie (jeśli jest ustawiony) zostanie rozpoczęte nowe nagranie (określoną ilość razy).\n%s</string>
-    <string name="preference_video_max_filesize">Maksymalny rozmiar pliku</string>
-    <string name="preference_video_max_filesize_summary">Nagrywanie filmu zostanie zatrzymane jeśli plik osiągnie określony rozmiar. Większość urządzeń z Androidem ma ustawioną maksymalną wielkość pliku wideo (2GB lub 4GB), ale ta opcja pozwala ustalić konkretną wartość\n%s</string>
-    <string name="preference_video_restart_max_filesize">Restart nagrywania po maksymalnym rozmiarze</string>
-    <string name="preference_video_restart_max_filesize_summary">Automatyczny restart nagrywania gdy rozmiar pliku osiągnie ustawioną maksymalną wartość</string>
+    <string name="preference_video_restart">Restart nagrywania według czasu</string>
+    <string name="preference_video_restart_summary">Jeśli nagranie zatrzymało się po osiągnięciu maksymalnego czasu trwania (jeśli został ustawiony), ta opcja spowoduje ponowne uruchomienie nagrywania, aż do określonej liczby razy\n%s</string>
+    <string name="preference_video_max_filesize">Określ rozmiar pliku nagrania</string>
+    <string name="preference_video_max_filesize_summary">Nagrywanie filmu zostanie zatrzymane, jeśli plik osiągnie określony rozmiar. Większość urządzeń z Androidem ma ustawioną maksymalną wielkość pliku wideo (2GB lub 4GB), ale ta opcja pozwala ustalić konkretną wartość\n%s</string>
+    <string name="preference_video_restart_max_filesize">Restart nagrywania według rozmiaru</string>
+    <string name="preference_video_restart_max_filesize_summary">Nagrywanie wznowi się automatycznie, gdy rozmiar pliku osiągnie ustawioną maksymalną wartość</string>
     <string name="preference_record_audio">Nagrywanie z dźwiękiem</string>
     <string name="preference_record_audio_summary">Nagrywanie filmu wraz z dźwiękiem</string>
     <string name="preference_record_audio_src">Źródło dźwięku</string>
     <string name="preference_record_audio_src_summary">Wybór mikrofonu, z którego będzie nagrywany dźwięk\n%s</string>
-    <string name="preference_record_audio_channels">Kanały dźwięku</string>
-    <string name="preference_record_audio_channels_summary">Wybór między dźwiękiem mono a stereo (dostępne na niektórych urządzeniach)</string>
-    <string name="preference_video_flash">Wskaźnik nagrywania</string>
-    <string name="preference_video_flash_summary">Jeśli włączone, lampa błyskowa będzie się włączać i wyłączać (przydatne w przypadku gdy chcemy z większej odległości stwierdzić czy aparat wciąż nagrywa)</string>
+    <string name="preference_record_audio_channels">Źródło dźwięku</string>
+    <string name="preference_record_audio_channels_summary">Wybór między dźwiękiem mono a stereo (dostępne tylko na niektórych urządzeniach)</string>
+    <string name="preference_video_flash">Błysk podczas nagrywania</string>
+    <string name="preference_video_flash_summary">Jeśli włączone, lampa błyskowa będzie się włączać i wyłączać (przydatne w przypadku gdy chcemy z większej odległości stwierdzić czy kamera wciąż nagrywa)</string>
     <string name="preference_category_online">Różne</string>
-    <string name="preference_online_help">Pomoc online</string>
-    <string name="preference_online_help_summary">Otwiera stronę Camera w przeglądarce internetowej</string>
+    <string name="preference_online_help">Pomoc on-line</string>
+    <string name="preference_online_help_summary">Otwiera stronę aplikacji Open Camera w przeglądarce internetowej</string>
     <string name="preference_donate">Przekaż darowiznę</string>
     <string name="preference_donate_summary">Jeśli spodobała Ci się ta aplikacja rozważ przekazanie darowizny, która wesprze rozwój aplikacji. Możesz to zrobić poprzez zakup specjalnej aplikacji - dotknij tutaj aby otworzyć stronę. Dzięki!</string>
-    <string name="preference_use_camera2">Używaj Camera2 API</string>
-    <string name="preference_use_camera2_summary">Włącza Camera2 API, które oferuje wiele dodatkowych funkcji, ale może działać niepoprawnie na niektórych urządzeniach (może spowodować restart)</string>
+    <string name="preference_use_camera2">Camera2 API</string>
+    <string name="preference_use_camera2_summary">Włącza interfejs Camera2 API, który oferuje wiele dodatkowych funkcji, ale może działać niepoprawnie na niektórych urządzeniach (powoduje restart aplikacji)</string>
     <string name="preference_about">O aplikacji</string>
     <string name="preference_about_summary">Informacje o aplikacji i debugowanie</string>
-    <string name="preference_reset">Reset ustawień</string>
-    <string name="preference_reset_summary">Resetuje wszystkie ustawienia do domyślnych wartości</string>
-    <string name="preference_reset_question">Jeśteś pewien, że chcesz przywrócić wszystkie ustawienia Camera do wartości domyślnych?</string>
+    <string name="preference_reset">Resetuj ustawienia</string>
+    <string name="preference_reset_summary">Resetuje wszystkie ustawienia do wartości domyślnych</string>
+    <string name="preference_reset_question">Na pewno chcesz przywrócić wszystkie ustawienia aplikacji Open Camera do wartości domyślnych?</string>
     <string name="about_available">Dostępne</string>
     <string name="about_not_available">Niedostępne</string>
     <string name="about_copy_to_clipboard">Kopiuj do schowka</string>
@@ -240,7 +240,7 @@
     <string name="gallery">Galeria</string>
     <string name="exposure">Ekspozycja</string>
     <string name="exposure_lock">Blokada ekspozycji</string>
-    <string name="focus_mode">Tryb autofokusa</string>
+    <string name="focus_mode">Tryb autofokusu</string>
     <string name="flash_mode">Tryb lampy</string>
     <string name="switch_to_front_camera">Przełącz na aparat przedni</string>
     <string name="switch_to_back_camera">Przełącz na aparat tylny</string>
@@ -252,86 +252,79 @@
     <string name="new_folder">Nowy folder</string>
     <string name="cant_write_folder">Nie można zapisywać w tym folderze</string>
     <string name="cant_access_folder">Brak dostępu do tego folderu</string>
-    <string name="enter_new_folder">Wpisz nazwnę nowego folderu</string>
+    <string name="enter_new_folder">Wpisz nazwę nowego folderu</string>
     <string name="failed_create_folder">Nie można utworzyć folderu</string>
     <string name="folder_exists">Folder już istnieje</string>
     <string name="saf_select_save_location">Wybierz miejsce zapisu</string>
-    <string name="saf_cancelled">Storage Access Framework anulowany</string>
+    <string name="saf_cancelled">SAF(Storage Access Framework) anulowano</string>
     <string name="saf_permission_failed">Nie można zapisać w tym folderze</string>
     <!-- the permission names such as Microphone should match what Android calls them in the App permission settings -->
     <string name="permission_record_audio_not_available">Brak pozwolenia na dostęp do mikrofonu</string>
     <string name="permission_location_not_available">Brak pozwolenia na dostęp do lokalizacji</string>
+
     <string name="start_video">Rozpoczęto nagrywanie filmu</string>
     <string name="stop_video">Zakończono nagrywanie filmu</string>
+
     <string name="max_filesize">Maksymalny rozmiar pliku</string>
-    <string name="mb_abbreviation">MB</string>
-    <!-- symbol short for megabytes -->
-    <string name="gb_abbreviation">GB</string>
-    <!-- symbol short for gigabytes -->
-    <string name="audio_control_start">Rozpoczęto nasłuch</string>
-    <string name="audio_control_stop">Zakończono nasłuch</string>
+    <string name="mb_abbreviation">MB</string>     <!-- symbol short for megabytes -->
+    <string name="gb_abbreviation">GB</string>     <!-- symbol short for gigabytes -->
+    <string name="audio_control_start">Rozpoczęto nasłuchiwanie</string>
+    <string name="audio_control_stop">Zakończono nasłuchiwanie</string>
     <string name="speech_recognizer_started">Powiedz \"cheese\"</string>
     <string name="audio_listener_started">Wydaj głośny dźwięk</string>
-    <string name="auto_stabilise_info">Autopoziomowanie obraca zdjęcia tak jakby były zrobione przy poziomicy.\n\nObrócone zdjęcia będą w nieco mniejszej rozdzielczości, gdyż po obróceniu konieczne jest wykadrowanie.</string>
-    <string name="raw_info">Pliki DNG zawierają nieskompresowane i nieprzetworzone dane z aparatu.\n\nWiększość aplikacji nie obsługuje formatu DNG dlatego najlepiej używać do ich edycji specjalnych aplikacji np. Snapseed lib Lightroom.\n\nOpcje takie jak stemplowanie lub autopoziomowanie nie mają zastosowania do plików DNG.\n\nPliki w formacie DNG zajmują dużo miejsca. Do przenoszenia lub kasowania ich można użyć menedżera plików.\n\nFormat DNG jest dostępny tylko w trybie standardowym i DRO.</string>
-    <string name="hdr_info">Tryb HDR jest przydatny w ujęciach z obszarami o dużych różnicach w jasności. Polega on na wykonaniu kilku zdjęć o różnej ekspozycji i połączeniu w jeden obraz.\n\nZauważ, że tryb HDR jest nieodpowiedni do fotografowania poruszających się obiektów, może to skutkować w mniej dokładną reprodukcję kolorów.\n\nWykonanie zdjęcia w HDR jest wolniejsze.</string>
+    <string name="auto_stabilise_info">Autopoziomowanie obraca zdjęcia tak jakby były zrobione przy poziomicy.\n\nObrócone zdjęcia będą w nieco mniejszej rozdzielczości, gdyż po obróceniu konieczne jest ich wykadrowanie.</string>
+    <string name="raw_info">Pliki DNG zawierają nieskompresowane i nieprzetworzone dane z aparatu.\n\nWiększość aplikacji nie obsługuje formatu DNG dlatego najlepiej używać do ich edycji specjalnych aplikacji.\n\nOpcje takie jak stemplowanie lub autopoziomowanie nie mają zastosowania do plików DNG.\n\nPliki w formacie DNG zajmują dużo miejsca. Do przenoszenia lub kasowania ich można użyć menedżera plików.\n\nFormat DNG jest dostępny tylko w trybie standardowym i DRO.</string>
+    <string name="hdr_info">Tryb HDR jest przydatny w ujęciach z obszarami o dużych różnicach w jasności. Polega on na wykonaniu kilku zdjęć o różnej ekspozycji i połączeniu w jeden obraz.\n\nZauważ, że tryb HDR jest nieodpowiedni do fotografowania poruszających się obiektów, może to skutkować w mniej dokładną reprodukcją kolorów.\n\nWykonanie zdjęcia w HDR jest wolniejsze.</string>
     <string name="dont_show_again">Nie pokazuj ponownie</string>
     <string name="photo_mode">Tryb fotografowania</string>
-    <string name="photo_mode_standard">Std</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode_standard">Sta</string> <!-- keep short, as this shows in the popup menu -->
     <string name="photo_mode_standard_full">Standard</string>
     <string name="photo_mode_hdr">HDR</string>
-    <string name="photo_mode_expo_bracketing">Expo {}</string>
+    <string name="photo_mode_expo_bracketing">Ekspo {}</string>
     <string name="photo_mode_expo_bracketing_full">Bracketing ekspozycji</string>
     <string name="preference_category_stamp">Stempel zdjęcia</string>
-    <string name="preference_hdr_save_expo">Zapisz wszystkie zdjęcia HDR</string>
+    <string name="preference_hdr_save_expo">Zapisz wszystkie zdjęcia dla HDR</string>
     <string name="preference_hdr_save_expo_summary">W trybie HDR zapisuje wszystkie zdjęcia, które posłużyły do powstania obrazu HDR. Może to spowodować wolniejszy zapis, zwłaszcza przy włączonej opcji stemplowania lub autopoziomowania.</string>
     <string name="no_permission">POZWOLENIA NIE SĄ DOSTĘPNE</string>
     <string name="permission_rationale_title">Wymagane pozwolenie</string>
     <string name="permission_rationale_camera">Wymagane pozwolenie na dostęp do aparatu</string>
-    <string name="permission_rationale_storage">Pozwolenie na odczyt/zapis jest wymagane</string>
-    <string name="permission_rationale_record_audio">Pozwolenie na dostęp do mikrofonu jest wymagane do nagrywania filmów z dźwiękiem</string>
-    <string name="permission_rationale_location">Pozwolenie na dostęp do lokalizacji jest wymagane do geotagowania</string>
-    <string name="preference_category_photo_debugging">Usuwanie błędów</string>
-    <string name="preference_category_video_debugging">Usuwanie błędów</string>
+    <string name="preference_category_photo_debugging">Opcje debugowania</string>
+    <string name="preference_category_video_debugging">Opcje debugowania</string>
     <string name="preference_camera2_fake_flash">Użyj alternatywnej lampy błyskowej</string>
     <string name="preference_camera2_fake_flash_summary">Włącz jeśli w Twoim urządzeniu lampa błyskowa przejawia dziwne zachowanie z Camera2 API</string>
     <string name="preference_expo_bracketing_n_images">Bracketing ekspozycji</string>
     <string name="preference_expo_bracketing_n_images_summary">Ilość obrazów w trybie bracketingu\n%s</string>
     <string name="preference_expo_bracketing_stops">Stopniowanie Bracketingu</string>
     <string name="preference_expo_bracketing_stops_summary">Jaki ustawić zakres wartości dla jaśniejszej/ciemniejszej ekspozycji\n%s</string>
-    <string name="seconds_abbreviation">s</string>
-    <!-- short for seconds -->
-    <string name="video_no_free_space">Brak wystarczającej ilości miejsca by zapisać film</string>
+    <string name="video_no_free_space">Brak wystarczającej ilości pamięci, aby nagrać film</string>
     <string name="video_power_critical">Filmowanie zatrzymane\nKrytyczny poziom baterii</string>
     <string name="preference_video_low_power_check">Sprawdzanie niskiego poziomu baterii</string>
-    <string name="preference_video_low_power_check_summary">Zatrzymuje filmowanie jeśli poziom baterii jest krytycznie niski. Zapobiega to utracie pliku z filmem w przypadku całkowitego wyczerpania się baterii.</string>
-    <string name="dark">Ciemniej</string>
-    <!-- exposure compensation dark -->
-    <string name="bright">Jaśniej</string>
-    <!-- exposure compensation bright -->
+    <string name="preference_video_low_power_check_summary">Zatrzymuje filmowanie, jeśli poziom baterii jest krytycznie niski. Zapobiega to utracie pliku z filmem w przypadku całkowitego wyczerpania się baterii.</string>
+    <string name="dark">Ciemniej</string>       <!-- exposure compensation dark -->
+    <string name="bright">Jaśniej</string>     <!-- exposure compensation bright -->
     <string name="exposure_shutter_speed">Czas migawki</string>
     <string name="camera_error">Poważny błąd aparatu</string>
-    <string name="preference_camera2_fast_burst">Włącz szybki HDR/bracketing</string>
-    <string name="preference_camera2_fast_burst_summary">Pozwala na szybsze wykonywanie zdjęć HDR lub bracketing. Wyłącz jeśli na Twoim urządzeniu powoduje błędy.</string>
+    <string name="preference_camera2_fast_burst">Szybka seria (HDR/bracketing)</string>
+    <string name="preference_camera2_fast_burst_summary">Pozwala na szybsze wykonywanie zdjęć HDR lub bracketing. Wyłącz, jeśli na Twoim urządzeniu powoduje błędy.</string>
     <string name="camera">Aparat</string>
     <string name="record_video">Nagraj film</string>
     <string name="selfie">Autoportret</string>
     <string name="preference_front_camera_mirror">Efekt lustra przedniego aparatu</string>
     <string name="preference_front_camera_mirror_summary">Włącza efekt lutrzanego odbicia dla przedniego aparatu\n%s</string>
-    <string name="preference_calibrate_level">Kalibracja poziomu</string>
-    <string name="preference_calibrate_level_summary">Ta opcja pozwala skalibrować akcelerometr urządzenia aby autopoziomowanie działało poprawnie.</string>
-    <string name="preference_calibrate_level_dialog">Postaw swoje urządzenie (pionowo lub poziomo) na płaskiej wypoziomowanej powierzchni a następnie wciśnij Kalibruj.\n\n Naciśnij Resetuj aby usunąć dane kalibracyjne.\n\nNaciśnij wstecz aby anulować.</string>
+    <string name="preference_calibrate_level">Kalibracja kąta nachylenia</string>
+    <string name="preference_calibrate_level_summary">Ta opcja pozwala skalibrować akcelerometr urządzenia, aby autopoziomowanie działało poprawnie.</string>
+    <string name="preference_calibrate_level_dialog">Umieść urządzenie na płaskiej poziomej powierzchni (w orientacji pionowej lub poziomej), następnie dotknij "Kalibruj".\n\n Dotykając "Resetuj", dane kalibracyjne zostaną usunięte.\n\nDotknij wstecz, aby anulować.</string>
     <string name="preference_calibrate_level_calibrate">Kalibruj</string>
     <string name="preference_calibrate_level_reset">Resetuj</string>
     <string name="preference_calibrate_level_calibrated">Poziom skalibrowany</string>
     <string name="preference_calibrate_level_calibration_reset">Reset kalibracji poziomu</string>
     <string name="photo_mode_dro">DRO</string>
-    <string name="preference_show_pitch_lines">Pokaż linie pochylenia</string>
+    <string name="preference_show_pitch_lines">Linie pochylenia</string>
     <string name="preference_show_pitch_lines_summary">Wyświetla poziome linie przechylenia</string>
-    <string name="preference_show_geo_direction_lines">Pokaż linie kompasu</string>
+    <string name="preference_show_geo_direction_lines">Linie kompasu</string>
     <string name="preference_show_geo_direction_lines_summary">Wyświetla linie kierunkowe kompasu</string>
     <string name="preference_video_subtitle">Napisy</string>
-    <string name="preference_video_subtitle_summary">Tworzy napisy (w formacie SRT), w których zapisywane są data, czas i dane GPS jeśli są włączone\n%s</string>
+    <string name="preference_video_subtitle_summary">Tworzy napisy (w formacie SRT), w których zostaną zapisane: data, czas i dane GPS (jeśli włączone)\n%s</string>
     <string name="duration_unlimited">Bez limitu</string>
     <string name="duration_3s">3 sekundy</string>
     <string name="duration_5s">5 sekund</string>
@@ -356,24 +349,31 @@
     <string name="duration_30m">30 minut</string>
     <string name="duration_45m">45 minut</string>
     <string name="duration_1h">1 godzina</string>
-    <string name="preference_show_take_photo">Pokaż ikonę Zrób zdjęcie</string>
+    <string name="preference_show_take_photo">Zrób zdjęcie</string>
     <string name="preference_show_take_photo_summary">Pokazuje przycisk do robienia zdjęć i nagrywania filmów. Można go wyłączyć na urządzeniach, które posiadają fizyczny przycisk aparatu.</string>
     <string name="video_pause">Film wstrzymany</string>
     <string name="video_resume">Film wznowiony</string>
-    <string name="pause_video">Pauza w filmowaniu</string>
-    <string name="resume_video">Kontynuowanie filmowania</string>
+    <string name="pause_video">Wstrzymaj filmowanie</string>
+    <string name="resume_video">Wznów filmowanie</string>
     <string name="capturing">Przechwytywanie…</string>
     <string name="audio_listener_failed">Nie udało się uruchomić nasłuchu</string>
     <string name="failed_to_process_hdr">Tworzenie obrazu HDR nie powiodło się</string>
     <string name="preference_video_fps_default">Domyślnie</string>
 
-    <string name="preference_raw_no">tylko JPEG</string>
+    <string name="preference_category_exif_tags">Własne znaczniki EXIF</string>
+    <string name="preference_exif_artist">Artysta</string>
+    <string name="preference_exif_artist_summary">Tekst do zapisania w metadanych obrazu dla znacznika artysty (tylko format JPEG). (Pozostaw puste dla żadnego)</string>
+    <string name="preference_exif_copyright">Prawa autorskie</string>
+    <string name="preference_exif_copyright_summary">Tekst do przechowywania w metadanych obrazu dla znacznika praw autorskich (tylko format JPEG). (Pozostaw puste dla żadnego)</string>
+
+    <string name="preference_raw_no">Tylko JPEG</string>
     <string name="preference_raw_yes">JPEG i DNG (RAW)</string>
+    <string name="preference_raw_only">Tylko DNG (RAW)</string>
 
     <string name="preference_stamp_dateformat_default">Domyślnie</string>
-    <string name="preference_stamp_dateformat_yyyymmdd">yyyy-mm-dd</string>
-    <string name="preference_stamp_dateformat_ddmmyyyy">dd/mm/yyyy</string>
-    <string name="preference_stamp_dateformat_mmddyyyy">mm/dd/yyyy</string>
+    <string name="preference_stamp_dateformat_yyyymmdd">rrrr-mm-dd</string>
+    <string name="preference_stamp_dateformat_ddmmyyyy">dd/mm/rrrr</string>
+    <string name="preference_stamp_dateformat_mmddyyyy">mm/dd/rrrr</string>
     <string name="preference_stamp_dateformat_none">Brak</string>
 
     <string name="flash_off">Lampa wyłączona</string>
@@ -384,11 +384,6 @@
     <string name="flash_frontscreen_auto">Błysk ekranowy auto</string>
     <string name="flash_frontscreen_on">Błysk ekranowy włączony</string>
 
-    <string name="preference_record_audio_src_camcorder">Aparat</string>
-    <string name="preference_record_audio_src_mic">Zewnętrzny mikrofon (jeśli podłączony)</string>
-    <string name="preference_record_audio_src_default">Domyślne źródło dźwięku</string>
-    <string name="preference_record_audio_src_voice_communication">Zoptymalizowane dla głosu</string>
-
     <string name="preference_video_bitrate_default">Domyślnie</string>
     <string name="preference_video_bitrate_100000">100kbps</string>
     <string name="preference_video_bitrate_200000">200kbps</string>
@@ -413,8 +408,10 @@
     <string name="preference_video_bitrate_80000000">80Mbps</string>
     <string name="preference_video_bitrate_90000000">90Mbps</string>
     <string name="preference_video_bitrate_100000000">100Mbps</string>
+    <string name="preference_video_bitrate_150000000">150Mbps</string>
+    <string name="preference_video_bitrate_200000000">200Mbps</string>
 
-    <string name="preference_burst_mode_off">Wyłączone</string>
+    <string name="preference_burst_mode_off">Wyłączono</string>
     <string name="preference_burst_mode_2x">2x</string>
     <string name="preference_burst_mode_3x">3x</string>
     <string name="preference_burst_mode_4x">4x</string>
@@ -453,8 +450,11 @@
     <string name="preference_video_max_filesize_300mb">300MB</string>
     <string name="preference_video_max_filesize_500mb">500MB</string>
     <string name="preference_video_max_filesize_1gb">1GB</string>
+    <string name="preference_video_max_filesize_2gb">2GB</string>
+    <string name="preference_video_max_filesize_5gb">5GB</string>
+    <string name="preference_video_max_filesize_9gb">9GB</string>
 
-    <string name="preference_crop_guide_none">None</string>
+    <string name="preference_crop_guide_none">Brak</string>
     <string name="preference_crop_guide_1">1 (1:1)</string>
     <string name="preference_crop_guide_1_25">1.25 (5:4)</string>
     <string name="preference_crop_guide_1_33">1.33 (4:3)</string>
@@ -462,6 +462,7 @@
     <string name="preference_crop_guide_1_5">1.5 (3:2)</string>
     <string name="preference_crop_guide_1_78">1.78 (16:9)</string>
     <string name="preference_crop_guide_1_85">1.85 (37:20)</string>
+    <string name="preference_crop_guide_2">2 (2:1)</string>
     <string name="preference_crop_guide_2_33">2.33 (21:9)</string>
     <string name="preference_crop_guide_2_35">2.35 (47:20)</string>
     <string name="preference_crop_guide_2_4">2.4 (12:5)</string>
@@ -476,20 +477,472 @@
 
     <string name="preference_ui_placement_left">Interfejs dla leworęcznych</string>
     <string name="preference_ui_placement_right">Interfejs dla praworęcznych</string>
+    <string name="preference_ui_placement_top">Ikony u góry (portret)</string>
+
+    <string name="photo_mode_fast_burst_full">Bracketing</string>
+    <string name="photo_mode_noise_reduction">RSz</string> <!-- keep short, as this shows in the popup menu; probably shouldn't be translated? -->
+    <string name="photo_mode_noise_reduction_full">Redukcja szumów</string>
+
+    <string name="preference_nr_save">Redukcja szumów zdjęć</string>
+    <string name="preference_nr_save_summary">Zapisuje oryginalne zdjęcia w trybie redukcji szumów. Pamiętaj, że może to znacznie spowolnić zapisywanie zdjęć.\n%s</string>
+    <string name="preference_nr_save_no">Nie zapisuj oryginalnych zdjęć</string>
+    <string name="preference_nr_save_single">Zapisz jedno oryginalne zdjęcie</string>
+    <string name="preference_nr_save_all">Zapisz wszystkie oryginalne zdjęcia (wolno)</string>
+
+    <string name="seconds_abbreviation">s</string> <!-- short for seconds -->
+
+    <string name="preference_fast_burst_n_images">Ilość zdjęć</string>
+    <string name="preference_fast_burst_n_images_entries_2">2</string>
+    <string name="preference_fast_burst_n_images_entries_3">3</string>
+    <string name="preference_fast_burst_n_images_entries_4">4</string>
+    <string name="preference_fast_burst_n_images_entries_5">5</string>
+    <string name="preference_fast_burst_n_images_entries_6">6</string>
+    <string name="preference_fast_burst_n_images_entries_8">8</string>
+    <string name="preference_fast_burst_n_images_entries_10">10</string>
+    <string name="preference_fast_burst_n_images_entries_12">12</string>
+    <string name="preference_fast_burst_n_images_entries_15">15</string>
+    <string name="preference_fast_burst_n_images_entries_20">20</string>
+
+    <string name="preference_focus_bracketing_n_images">Ilość zdjęć</string>
+    <string name="preference_focus_bracketing_n_images_entries_2">2</string>
+    <string name="preference_focus_bracketing_n_images_entries_3">3</string>
+    <string name="preference_focus_bracketing_n_images_entries_4">4</string>
+    <string name="preference_focus_bracketing_n_images_entries_5">5</string>
+    <string name="preference_focus_bracketing_n_images_entries_6">6</string>
+    <string name="preference_focus_bracketing_n_images_entries_8">8</string>
+    <string name="preference_focus_bracketing_n_images_entries_10">10</string>
+    <string name="preference_focus_bracketing_n_images_entries_12">12</string>
+    <string name="preference_focus_bracketing_n_images_entries_15">15</string>
+    <string name="preference_focus_bracketing_n_images_entries_20">20</string>
+    <string name="preference_focus_bracketing_n_images_entries_25">25</string>
+    <string name="preference_focus_bracketing_n_images_entries_30">30</string>
+    <string name="preference_focus_bracketing_n_images_entries_40">40</string>
+    <string name="preference_focus_bracketing_n_images_entries_50">50</string>
+    <string name="preference_focus_bracketing_n_images_entries_100">100</string>
+    <string name="preference_focus_bracketing_n_images_entries_150">150</string>
+    <string name="preference_focus_bracketing_n_images_entries_200">200</string>
+
+    <string name="preference_video_capture_rate">Szybkość</string>
+    <string name="preference_video_capture_rate_normal">Normalnie</string>
+    <string name="slow_motion_enabled">Zwolnione tempo włączone</string>
+    <string name="slow_motion_disabled">Zwolnione tempo wyłączone</string>
+
+    <string name="flash_frontscreen_torch">Ekranowa latarka</string>
+
+    <string name="preference_antibanding">Redukcja migotania</string>
+    <string name="preference_antibanding_summary">Algorytm redukuje migotanie światła.\n%s</string>
+    <string name="anti_banding_auto">Automatycznie</string>
+    <string name="anti_banding_50hz">50Hz</string>
+    <string name="anti_banding_60hz">60Hz</string>
+    <string name="anti_banding_off">Wyłącz</string>
+
+    <string name="preference_ghost_image">Efekt "ducha"</string>
+    <string name="preference_ghost_image_summary">Nakłada obraz, aby pomóc w wyrównaiu.\n%s</string>
+    <string name="preference_ghost_image_off">Wyłączony</string>
+    <string name="preference_ghost_image_last">Ostatnie zrobione zdjęcie</string>
+    <string name="preference_ghost_image_selected">Wybrane zdjęcie</string>
+
+    <string name="open_files_saf_exception_ghost">Na tym urządzeniu nie znaleziono okna dialogowego pliku, opcja efektu "ducha" nie jest obsługiwana</string>
+    <string name="saf_permission_failed_open_image">Nie można otworzyć tego obrazu</string>
+
+    <string name="preference_camera2_photo_video_recording">Zezwalaj na zdjęcia podczas nagrywania filmu</string>
+    <string name="preference_camera2_photo_video_recording_summary">Umożliwia robienie zdjęć podczas nagrywania filmów. Wyłącz tę opcję, jeśli występują problemy z nagrywaniem wideo przy włączonym interfejsie Camera2 API na Twoim urządzeniu.</string>
+
+    <string name="preference_video_log">Profile Wideo</string>
+    <string name="preference_video_log_summary">Ustaw standardowy lub płaski profil obrazu dla trybu wideo\n%s</string>
+    <string name="preference_video_log_off">Domyślny</string>
+    <string name="preference_video_log_fine">Log (Drobny)</string>
+    <string name="preference_video_log_low">Log (Niki)</string>
+    <string name="preference_video_log_medium">Log (Średni)</string>
+    <string name="preference_video_log_strong">Log (Silny)</string>
+    <string name="preference_video_log_extra_strong">Log (Bardzo silny)</string>
+    <string name="video_log">Profil logarytmiczny</string>
+
+    <string name="preference_record_audio_src_camcorder">Kamera Wideo</string>
+    <string name="preference_record_audio_src_mic">Zewnętrzny mikrofon (jeśli dostępny)</string>
+    <string name="preference_record_audio_src_default">Domyślne źródło dźwięku</string>
+    <string name="preference_record_audio_src_voice_communication">Zoptymalizowano dla połączeń głosowych</string>
+    <string name="preference_record_audio_src_voice_recognition">Zoptymalizowano dla rozpoznawania mowy</string>
+    <string name="preference_record_audio_src_unprocessed">Bez przetwarzania</string>
+
+    <string name="no_burst">Bez serii</string> <!-- string for burst mode not being supported for a resolution -->
+
+    <string name="preference_show_video_max_amp">Miernik poziomu dźwięku</string>
+    <string name="preference_show_video_max_amp_summary">Pokazuje poziom dźwięku na ekranie podczas nagrywania filmu</string>
+
+    <string name="photo_mode_focus_bracketing">Ostr. {}</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode_focus_bracketing_full">Bracketing ostrości</string>
+
+    <string name="focus_bracketing_source_distance">Odległość źródła braketingu ostrości</string>
+    <string name="focus_bracketing_target_distance">Odległość docelowa braketingu ostrości</string>
+
+    <string name="focus_bracketing_add_infinity">Dodaj nieskończoną odległość</string>
+
+    <string name="magnetic_accuracy_title">Dokładność kompasu</string>
+    <string name="magnetic_accuracy_info">Kompas Twojego urządzenia wymaga kalibracji, aby poprawić jego dokładność. Można to zrobić, poruszając urządzenie ruchem ósemkowym.\n\nAktualna dokładność:</string>
+
+    <string name="accuracy_unreliable">Niedokładny</string>
+    <string name="accuracy_low">Niski</string>
+    <string name="accuracy_medium">Średni</string>
+    <string name="accuracy_high">Wysoki</string>
+    <string name="accuracy_unknown">Nieznany</string>
+
+    <string name="preference_units_distance">Jednostka odległości</string>
+    <string name="preference_units_distance_summary">Służy do określania wysokości GPS w przypadku stemplowania zdjęć oraz napisów do filmów\n%s</string>
+    <string name="preference_units_distance_m">Metry</string>
+    <string name="preference_units_distance_ft">Stopy</string>
+    <string name="feet_abbreviation">ft</string> <!-- symbol short for feet -->
+
+    <string name="preference_show_whats_new">Co nowego</string>
+    <string name="preference_show_whats_new_summary">Wyświetla informacje o nowych funkcjach i ulepszeniach po zaktualizowaniu aplikacji</string>
+
+    <string name="preference_edge_mode">Algorytm trybu krawędziowego</string>
+    <string name="preference_edge_mode_summary">Algorytm, którego powinien używać sterownik aparatu dla wzmocnienia krawędzi. Wzmocnienie krawędzi poprawia ostrość i szczegóły na przechwyconym obrazie. (To ustawienie jest ignorowane w trybie zdjęć RSz).\n%s</string>
+
+    <string name="preference_screen_processing_settings">Ustawienia przetwarzania…</string>
+
+    <string name="preference_noise_reduction_mode">Algorytm redukcji szumów</string>
+    <string name="preference_noise_reduction_mode_summary">Algorytm, którego powinien używać sterownik aparatu do stosowania redukcji szumów. Algorytm redukcji szumów próbuje poprawić jakość obrazu poprzez usunięcie nadmiernego szumu dodawanego przez proces przechwytywania, szczególnie w ciemnych warunkach. (Zwróć uwagę, że nie jest to związane z trybem zdjęć z redukcją szumów, w rzeczywistości to ustawienie jest ignorowane w trybie zdjęć RSz).\n%s</string>
+    <string name="noise_reduction_mode_default">Domyślny</string>
+    <string name="noise_reduction_mode_off">Wyłączony</string>
+    <string name="noise_reduction_mode_minimal">Minimalny</string>
+    <string name="noise_reduction_mode_fast">Szybki</string>
+    <string name="noise_reduction_mode_high_quality">Wysoka jakość</string>
+
+    <string name="preference_focus_assist">Wspomaganie ostrości</string>
+    <string name="preference_focus_assist_summary">Powiększa podczas ustawiania ręcznej odległości ogniskowej\n%s</string>
+    <string name="preference_focus_assist_off">Wyłączono</string>
+    <string name="preference_focus_assist_2x">2x</string>
+    <string name="preference_focus_assist_4x">4x</string>
+
+    <string name="exposure_compensation_zoom">Zwiększ lub zmniejsz kompensację ekspozycji</string>
+
+    <string name="previous">Wstecz</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) for "<" button on popup menu -->
+    <string name="next">Dalej</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) for ">" button on popup menu -->
+
+    <string name="cancelled_focus_bracketing">Anulowano braketing ostrości</string>
+
+    <string name="preference_hdr_contrast_enhancement">Poprawa kontrastu HDR</string>
+    <string name="preference_hdr_contrast_enhancement_summary">Może poprawić wygląd w przypadkach, gdy w scenie występuje bardzo duży zakres dynamiki, a także nadać wynikom „wygląd HDR”.\n%s</string>
+    <string name="preference_hdr_contrast_enhancement_off">Wyłączona</string>
+    <string name="preference_hdr_contrast_enhancement_smart">Sprytna</string>
+    <string name="preference_hdr_contrast_enhancement_always">Zawsze</string>
+
+    <string name="preference_video_output_format">Format Wideo</string>
+    <string name="preference_video_output_format_summary">Format plików wideo, audio oraz kodeki\n%s</string>
+
+    <string name="preference_video_output_format_default">Domyślny</string>
+    <string name="preference_video_output_format_mpeg4_h264">MPEG4 H264</string>
+    <string name="preference_video_output_format_mpeg4_hevc">MPEG4 HEVC</string>
+    <string name="preference_video_output_format_3gpp">3GPP</string>
+    <string name="preference_video_output_format_webm">WebM (dźwięk nie jest obsługiwany)</string>
+
+    <string name="preference_screen_settings_manager">Menedżer ustawień</string>
+
+    <string name="preference_save_settings">Zapisz ustawienia</string>
+    <string name="preference_save_settings_summary">Zapisuje wszystkie ustawienia aplikacji Open Camera w pliku</string>
+    <string name="preference_save_settings_filename">Nazwa zapisanych ustawień</string>
+
+    <string name="preference_restore_settings">Przywróć ustawienia</string>
+    <string name="preference_restore_settings_summary">Przywraca zapisane wcześniej ustawienia. Spowoduje to nadpisanie wszystkich bieżących ustawień!</string>
+    <string name="preference_restore_settings_question">Ta opcja umożliwia wybranie jednego z wcześniej zapisanych plików ustawień. Uwaga, wybranie pliku do załadowania spowoduje nadpisanie wszystkich bieżących ustawień!</string>
+
+    <string name="saved_settings">Ustawienia zostały zapisane</string>
+    <string name="save_settings_failed">Nie udało się zapisać ustawień</string>
+    <string name="restore_settings_failed">Nie udało się przywrócić ustawień</string>
+    <string name="open_files_saf_exception_generic">Na tym urządzeniu nie znaleziono okna dialogowego pliku, opcja nie jest obsługiwana</string>
+
+    <string name="preference_image_format">Format zdjęć</string>
+    <string name="preference_image_format_jpeg">JPEG</string>
+    <string name="preference_image_format_webp">WebP</string>
+    <string name="preference_image_format_png">PNG</string>
+
+    <!-- beware of these strings for preference_nr_mode* being too long, otherwise too wide for popup menu -->
+    <string name="preference_nr_mode">Tryb RSz</string>
+    <string name="preference_nr_mode_normal">Normalny</string>
+    <string name="preference_nr_mode_low_light">Słabe oświetlenie</string>
+
+       <string name="preference_show_face_detection">Wykrywanie twarzy</string>
+    <string name="preference_show_face_detection_summary">Wyświetla ikonę na ekranie do włączania lub wyłączania wykrywania twarzy</string>
+    <string name="face_detection_enable">Włącz wykrywanie twarzy</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="face_detection_disable">Wyłącz wykrywanie twarzy</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="face_detection_enabled">Wykrywanie twarzy włączone</string>
+    <string name="face_detection_disabled">Wykrywanie twarzy wyłączone</string>
+
+    <string name="preference_show_auto_level">Automatyczne poziomowanie</string>
+    <string name="preference_show_auto_level_summary">Wyświetla ikonę na ekranie do włączania lub wyłączania automatycznego poziomowania. Gdy automatyczne poziomowanie jest włączone, zdjęcia będą obracane, tak aby były automatycznie wyrównane z horyzontem.</string>
+    <string name="auto_level_enable">Włącz automatyczne poziomowanie</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="auto_level_disable">Wyłącz automatyczne poziomowanie</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+
+    <string name="preference_show_stamp">Stempel</string>
+    <string name="preference_show_stamp_summary">Wyświetla ikonę na ekranie do włączania lub wyłączania stempla fotograficznego</string>
+    <string name="stamp_enable">Włącz stemplowanie zdjęć</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="stamp_disable">Wyłącz stemplowanie zdjęć</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="stamp_enabled">Stemplowanie zdjęć włączone</string>
+    <string name="stamp_disabled">Stemplowanie zdjęć wyłączone</string>
+
+    <string name="preference_show_textstamp">Własny stempel tekstowy</string>
+    <string name="preference_show_textstamp_summary">Pokazuje ikonę na ekranie do określenia własnego tekstu, który ma zostać umieszczony na zdjęciu</string>
 
-    <string name="preference_stamp_style_shadowed">Cieniowany tekst</string>
-    <string name="preference_stamp_style_plain">Czysty tekst</string>
-    <string name="preferences_about_title">About</string>
-    <string name="preferences_build_version">Wersja kompilacji</string>
-    <string name="preferences_about_app">Kamera jest rozwidlona z OpenCamera</string>
-    <string name="preferences_authors">Autor</string>
-    <string name="preferences_source_code">Kod źródłowy</string>
-    <string name="preferences_licence">Licencja</string>
-    <string name="preferences_app_info_title">Informacje o kamerze</string>
-    <string name="preferences_service_terms">Warunki usługi</string>
-
-    <string name="preference_immersive_mode_off">Wyłączone</string>
-    <string name="preference_immersive_mode_navigation">Ukryj tylko przyciski nawigacyjne</string>
-    <string name="preference_immersive_mode_gui">Ukryj graficzny interfejs</string>
+    <string name="preference_show_white_balance_lock">Blokada automatycznego balansu bieli</string>
+    <string name="preference_show_white_balance_lock_summary">Wyświetla na ekranie ikonę do blokowania lub odblokowywania automatycznego balansu bieli</string>
+    <string name="white_balance_lock">Zablokuj balans bieli</string>
+    <string name="white_balance_unlock">Odblokuj balans bieli</string>
+    <string name="white_balance_locked">Balans bieli zablokowany</string>
+    <string name="white_balance_unlocked">Balans bieli odblokowany</string>
+
+    <string name="preference_show_exposure_lock">Blokada automatycznej ekspozycji</string>
+    <string name="preference_show_exposure_lock_summary">Wyświetla ikonę na ekranie do blokowania lub odblokowywania ekspozycji</string>
+    <string name="exposure_unlock">Odblokuj ekspozycję</string>
+
+    <string name="preference_nr_mode_low_light_message">Tryb słabego oświetlenia: trzymaj aparat stabilnie</string>
+
+    <string name="photo_mode_panorama">Pano</string> <!-- keep short, as this shows in the popup menu; probably shouldn't be translated? -->
+    <string name="photo_mode_panorama_full">Panorama</string>
+
+    <string name="preference_screen_remote_control">Zdalne sterowanie poprzez Bluetooth LE…</string>
+    <string name="preference_enable_remote">Włącz zdalne sterowanie poprzez Bluetooth LE</string>
+    <string name="preference_enable_remote_summary">Włącz urządzenia zdalnego sterowania Bluetooth LE (BLE)</string>
+    <string name="preference_remote_type">Typ urządzenia zdalnego</string>
+
+    <string name="ble_not_supported">BLE niewspierany</string>
+    <string name="scan_ble">Skanowanie urządzeń BLE</string>
+    <string name="bluetooth_not_supported">Bluetooth niewspierany.</string>
+    <string name="unknown_device">Nieznane urządzenie</string>
+    <string name="preference_remote_disconnect_screen_dim">Przyciemnij ekran, jeśli nastąpi rozłączenie</string>
+    <string name="preference_remote_disconnect_screen_dim_summary">Wskazówka: ustaw domyślną jasność na minimalny poziom przed uruchomieniem aplikacji Open Camera.</string>
+    <string name="preference_water_type">Użyj słonej wody do obliczeń głębokości</string>
+    <string name="preference_water_type_summary">W przypadku obudów podwodnych poprawia dokładność, jeśli zostanie wybrany właściwy rodzaj wody.</string>
+    <string name="remote_connected">Połączono zdalnie</string>
+
+    <string name="preference_stamp_geo_address">Użyj adresów</string>
+    <!-- preference_stamp_geo_address_summary defined below -->
+    <string name="preference_stamp_geo_address_both">Wyświetlaj adres jeśli to możliwe oprócz współrzędnych GPS</string>
+    <string name="preference_stamp_geo_address_prefer">Preferuj adres aniżeli współrzędne GPS</string>
+    <string name="preference_stamp_geo_address_no">Nie wyświetlaj adresu</string>
+
+    <string name="preference_show_store_location">Dane lokalizacji</string>
+    <string name="preference_show_store_location_summary">Wyświetla ikonę na ekranie do włączania lub wyłączania danych lokalizacji (geotagowanie)</string>
+    <string name="preference_location_enable">Przechowuj dane o lokalizacji</string>
+    <string name="preference_location_disable">Przestań przechowywać dane o lokalizacji</string>
+
+    <string name="preference_histogram">Histogram</string>
+    <string name="preference_histogram_summary">Wyświetla histogram kolorów pokazanych na ekranie\n%s</string>
+    <string name="preference_histogram_off">Wyłącz</string>
+    <string name="preference_histogram_rgb">Kolory RGB</string>
+    <string name="preference_histogram_luminance">Luminancja</string>
+    <string name="preference_histogram_value">Wartość (maksymalna)</string>
+    <string name="preference_histogram_intensity">Intensywność (średnia)</string>
+    <string name="preference_histogram_lightness">Jasność (średnia z min-maks)</string>
+
+    <string name="preference_zebra_stripes">Paski zebry</string>
+    <string name="preference_zebra_stripes_summary">Jeśli ta opcja jest włączona, na ekranie zostaną narysowane paski zebry, pokazujące miejsca, w których podgląd kamery jest prześwietlony.\n%s</string>
+    <string name="preference_zebra_stripes_off">Wyłącz</string>
+    <string name="preference_zebra_stripes_70pc">70%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_80pc">80%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_90pc">90%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_93pc">93%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_95pc">95%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_97pc">97%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_98pc">98%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_99pc">99%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_100pc">100%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+
+
+    <string name="preference_focus_peaking">Uwydatnienie ostrości</string>
+    <string name="preference_focus_peaking_summary">Jeśli ta opcja jest włączona, na ostrych krawędziach (konturach) zostaną pokazane podświetlenia. Jest to przydatne przede wszystkim przy ręcznym ustawianiu ostrości i może pomóc w określeniu, które obszary obrazu są ostre.\n%s</string>
+    <string name="preference_focus_peaking_off">Wyłączono</string>
+    <string name="preference_focus_peaking_on">Włączono</string>
+    <string name="preference_focus_peaking_color">Kolor uwydatnienia ostrości</string>
+    <string name="preference_focus_peaking_color_summary">Określa kolor, który będzie używany do podkreślenia ostrych krawędzi\n%s</string>
+
+    <string name="remaining">Pozostało</string> <!-- images remaining for "processing" -->
+
+    <string name="preference_preview">Podgląd aparatu…</string>
+
+    <string name="cycle_flash">Tryby flashowania</string>
+    <string name="preference_show_cycle_flash">Lampa błyskowa</string>
+    <string name="preference_show_cycle_flash_summary">Wyświetla ikonę na ekranie do przełączania opcji flash, zamiast wyświetlać opcje flash w menu podręcznym. Pamiętaj, że latarka nie jest dostępna, jeśli używasz tej ikony.</string>
+
+    <string name="preference_raw_expo_bracketing">Zezwalaj na format RAW dla braketingu ekspozycji</string>
+    <string name="preference_raw_expo_bracketing_summary">Określa, czy opcja RAW powinna mieć zastosowanie również w trybie zdjęć z braketingiem ekspozycji (lub w trybie HDR, gdy włączona jest opcja „Zapisz wszystkie obrazy w trybie HDR”). Jeśli ta opcja jest wyłączona w tych trybach zdjęć, będą zapisywane tylko pliki JPEG.</string>
+
+    <string name="preference_raw_focus_bracketing">Zezwalaj na format RAW dla braketingu ostrości</string>
+    <string name="preference_raw_focus_bracketing_summary">Określa, czy opcja RAW powinna mieć zastosowanie również w trybie zdjęć z braketingiem ostrości. Jeśli ta opcja jest wyłączona, tylko pliki JPEG będą zapisywane w trybach zdjęć z braketingiem ostrości.</string>
+
+    <string name="cycle_raw">Tryby RAW</string>
+    <string name="preference_show_cycle_raw">Ikona RAW</string>
+    <string name="preference_show_cycle_raw_summary">Wyświetla ikonę na ekranie umożliwiającą przełączanie między trybami RAW</string>
+
+    <string name="bluetooth_current_remote">Obecnie zdalny:</string>
+    <string name="bluetooth_scan">Skanowanie</string>
+
+    <string name="preference_stamp_style_shadowed">Tekst cieniowany</string>
+    <string name="preference_stamp_style_plain">Tekst zwykły</string>
+    <string name="preference_stamp_style_background">Tekst z zacienionym tłem</string>
+
+    <string name="image_saving_notification">Zapisywanie zdjęć…</string>
+
+    <string name="finish_panorama">Zakończ panoramę</string>
+    <string name="cancel_panorama">Anuluj panoramę</string>
+    <string name="panorama_cancelled">Panorama anulowana</string>
+    <string name="failed_to_process_panorama">Nie udało się utworzyć obrazu panoramy</string>
+
+    <string name="preference_panorama_crop">Automatyczne kadrowanie panoramy</string>
+    <string name="preference_panorama_crop_summary">W trybie panoramy: Usuwa faliste granice\n%s</string>
+
+    <string name="panorama_info">Aby zrobić zdjęcie panoramiczne, trzymając urządzenie pionowo dotknij przycisk "Zrób zdjęcie". Następnie skieruj urządzenie w lewo lub w prawo, tak aby białe kółko (na środku ekranu) pokryło się z niebieską kropką. Po przechwyceniu każdego nowego zdjęcia kieruj urządzenie, aby zakryć po kolei każdą nową niebieską kropkę.\n\nDotknij ikonkę "fajki", aby zapisać panoramę, lub ikonę "krzyżyka", aby anulować.\n\nPamiętaj, że przetwarzanie i zapisywanie zdjęć panoramicznych może zająć trochę czasu.</string>
+
+    <string name="preference_panorama_save">Oryginalne zdjęcia w trybie panoramy</string>
+    <string name="preference_panorama_save_summary">Zapisuje oryginalne obrazy w trybie panoramy. Pamiętaj, że spowolni to zapisywanie zdjęć panoramicznych. Daje także możliwość zapisania pliku XML, co może być przydatne przy zgłaszaniu problemów z panoramą.\n%s</string>
+
+    <string name="preference_panorama_save_no">Nie zapisuj oryginalnych zdjęć</string>
+    <string name="preference_panorama_save_all">Zapisz oryginalne zdjęcia</string>
+    <string name="preference_panorama_save_all_plus_debug">Zapisz oryginalne obrazy i debuguj XML</string>
+
+    <string name="camera_id">ID</string> <!-- ID as in camera ID -->
+
+    <string name="exposure_compensation_seekbar">Pasek do zmiany kompensacji ekspozycji</string>
+
+    <string name="preference_image_format_summary">Wybierz format pliku używany do zapisywania zdjęć. Dotyczy to zdjęć „standardowych” (nie RAW). Tylko JPEG obsługuje zapisywanie metadanych Exif. Zauważ, że format PNG nie jest naprawdę bezstratny, zamiast tego jest konwertowany z JPEG z jakością 100 %%.\n%s</string>
+
+    <string name="preference_camera_api">Interfejs aparatu (Camera API)</string>
+    <string name="preference_camera_api_summary">Wybierz interfejs (Camera2 API), aby włączyć dodatkowe funkcje, takie jak ręczne tryby ekspozycji, ostrości, balansu bieli oraz RAW (jeśli jest obsługiwany przez urządzenie). Zmiana interfejsu API spowoduje ponowne uruchomienie aplikacji.\n%s</string>
+    <string name="preference_camera_api_old">Oryginalny interfejs (Camera API)</string>
+    <string name="preference_camera_api_camera2">Camera2 API</string>
+
+    <string name="preference_audio_control_summary">Rób zdjęcia/nagrywaj filmy po wykryciu hałasu.
+        Po włączeniu użyj przycisku mikrofonu na ekranie, aby rozpocząć/zatrzymać nasłuchiwanie.
+        \n%s</string>
+
+    <!-- beware of string being too long to display! -->
+    <string name="preference_stamp_geo_address_summary">Jeśli to możliwe, uzyskaj adres z lokalizacji GPS (do stempla, lub napisów do filmów).
+        Jeśli ta opcja jest włączona, Twoje urządzenie będzie przesyłało dane o lokalizacji przez Internet do strony trzeciej
+        w celu konwersji współrzędnych GPS na adres. Zobacz stronę https://developer.android.com/reference/android/location/Geocoder .
+        Ta funkcja nie gwarantuje dostępności ani dokładności. Nie ma gwarancji, że wyniki będą znaczące lub poprawne.
+        \n%s</string>
+
+    <string name="intro_text">Dotknij, aby ustawić ostrość, i dotknij niebieski przycisk aparatu, aby robić zdjęcia.
+        \n\nWyłącza maksymalną jasność ekranu, zobacz Ustawienia -> "Interfejs fotografowania" -> "Wymuś maksymalną jasność".
+        Aby zapisać na kartach SD w Androidzie 5+, zobacz Ustawienia -> "Więcej ustawień aparatu" -> "Storage Access Framework".
+        Więcej na temat w Ustawieniach, w sekcji "Pomoc on-line".
+    </string>
+
+    <string name="preference_select_remote">Wybierz urządzenie zdalne</string>
+    <string name="preference_video_rec709">REC709</string>
+    <string name="preference_video_srgb">sRGB</string>
+    <string name="preference_video_gamma">Gamma</string>
+    <string name="preference_video_profile_gamma">Wartość gamma wideo</string>
+    <string name="preference_video_profile_gamma_summary">Wartość gamma do użycia dla wideo, jeśli profil obrazu wideo jest ustawiony na Gamma\n%s</string>
+    <string name="preference_video_profile_gamma_1_6">1.6</string>
+    <string name="preference_video_profile_gamma_1_8">1.8</string>
+    <string name="preference_video_profile_gamma_1_9">1.9</string>
+    <string name="preference_video_profile_gamma_2_0">2.0</string>
+    <string name="preference_video_profile_gamma_2_1">2.1</string>
+    <string name="preference_video_profile_gamma_2_2">2.2</string>
+    <string name="preference_video_profile_gamma_2_3">2.3</string>
+    <string name="preference_video_profile_gamma_2_4">2.4</string>
+    <string name="preference_video_profile_gamma_2_6">2.6</string>
+    <string name="preference_video_profile_gamma_2_8">2.8</string>
+
+    <string name="preference_immersive_mode_off">Wyłączono</string>
+    <string name="preference_immersive_mode_low_profile">Tylko przyciemnione wirtualne przyciski nawigacyjne na ekranie</string>
+    <string name="preference_immersive_mode_navigation">Ukryj wirtualne przyciski nawigacyjne na ekranie</string>
+    <string name="preference_immersive_mode_gui">Ukryj graficzny interfejs użytkownika</string>
     <string name="preference_immersive_mode_everything">Ukryj wszystko</string>
+
+    <string name="preference_ghost_image_alpha">Przezroczystość efektu "ducha"</string>
+    <string name="preference_ghost_image_alpha_summary">Wartość alfa używana dla efektu "ducha". Niższa wartość oznacza większą przezroczystość, wyższa oznacza niższą przezroczystość.\n%s</string>
+
+    <string name="preference_zebra_stripes_foreground_color">Kolor pierwszego planu w paski zebry</string>
+    <string name="preference_zebra_stripes_foreground_color_summary">Kolor paska pierwszego planu podczas wyświetlania pasków zebry.\n%s</string>
+    <string name="preference_zebra_stripes_background_color">Kolor tła pasków zebry</string>
+    <string name="preference_zebra_stripes_background_color_summary">Kolor paska tła podczas wyświetlania pasków zebry.\n%s</string>
+
+    <string name="preference_zebra_stripes_color_black">Czarny</string>
+    <string name="preference_zebra_stripes_color_red">Czerwony</string>
+    <string name="preference_zebra_stripes_color_orange">Pomarańczowy</string>
+    <string name="preference_zebra_stripes_color_transparent">Przezroczysty</string>
+    <string name="preference_zebra_stripes_color_white">Biały</string>
+
+    <string name="external_camera">Aparat zewnętrzny</string>
+    <string name="ultrawide">Bardzo szeroki</string>
+
+    <string name="switch_to_external_camera">Przełącz na aparat zewnętrzny</string>
+    <string name="switch_to_unknown_camera">Przełącz aparat</string>
+    <string name="switch_multi_camera">Przełączaj się między wieloma aparatami</string>
+    <string name="preference_multi_cam_button">Ikona wielu aparatów</string>
+    <string name="preference_multi_cam_button_summary">Jeśli ta opcja jest włączona, użyj oddzielnych przycisków do przełączania między przednimi/tylnymi aparatami oraz do przełączania między wieloma przednimi/tylnymi kamerami. Jeśli jest wyłączona, ikona Przełącz aparat będzie przełączać się między wszystkimi aparatami.</string>
+
+    <string name="preference_show_camera_id">Pokaż ID aparatu</string>
+    <string name="preference_show_camera_id_summary">Wyświetla aktualny numer ID aparatu na ekranie</string>
+
+    <string name="preference_allow_long_press">Zezwalaj na długie naciśnięcia</string>
+    <string name="preference_allow_long_press_summary">Zezwala na długie naciśnięcie (np. długie przytrzymanie ikonki galeria, zmienia lokalizację zapisywania zdjęć).</string>
+
+    <string name="aperture">Przysłona</string>
+
+    <string name="error_features_4k">4K UHD</string>
+    <string name="error_features_bitrate">Bitrate</string>
+    <string name="error_features_frame_rate">Częstotliwość wyświetlania klatek</string>
+    <string name="error_features_slow_motion">Zwolnione tempo</string>
+
+    <string name="preference_comment_ypr">Przechowuj odchylenie, nachylenie i przechylenie</string>
+    <string name="preference_comment_ypr_summary">Zapisz odchylenie, nachylenie i przechylenie urządzenia w komentarzu użytkownika Exif do zdjęcia (tylko format JPEG)</string>
+
+    <string name="array_seekbar_preference_seekbar">Pasek do zmiany bieżącej wartości preferencji</string>
+
+    <string name="white_balance_auto">Automatyczny</string>
+    <string name="white_balance_cloudy">Pochmurno</string>
+    <string name="white_balance_daylight">Światło dzienne</string>
+    <string name="white_balance_fluorescent">Świetlówka</string>
+    <string name="white_balance_incandescent">Żarówka</string>
+    <string name="white_balance_shade">Cień</string>
+    <string name="white_balance_twilight">Zmierzch</string>
+    <string name="white_balance_warm">Ciepły</string>
+    <string name="white_balance_manual">Ręczny</string>
+    <string name="scene_mode_action">Ruch</string>
+    <string name="scene_mode_barcode">Kod kreskowy</string>
+    <string name="scene_mode_beach">Plaża</string>
+    <string name="scene_mode_candlelight">Światło świeczki</string>
+    <string name="scene_mode_auto">Automatycznie</string>
+    <string name="scene_mode_fireworks">Sztuczne ognie</string>
+    <string name="scene_mode_landscape">Pejzaż</string>
+    <string name="scene_mode_night">Noc</string>
+    <string name="scene_mode_night_portrait">Portret w nocy</string>
+    <string name="scene_mode_party">Impreza</string>
+    <string name="scene_mode_portrait">Portret</string>
+    <string name="scene_mode_snow">Śnieg</string>
+    <string name="scene_mode_sports">Sporty</string>
+    <string name="scene_mode_steady_photo">Stateczne zdjęcie</string>
+    <string name="scene_mode_sunset">Zachód słońca</string>
+    <string name="scene_mode_theatre">Teatr</string>
+
+    <string name="color_effect_aqua">Woda</string>
+    <string name="color_effect_blackboard">Tablica</string>
+    <string name="color_effect_mono">Czarno-białe</string>
+    <string name="color_effect_negative">Negatyw</string>
+    <string name="color_effect_none">Brak</string>
+    <string name="color_effect_posterize">Plakat</string>
+    <string name="color_effect_sepia">Sepia</string>
+    <string name="color_effect_solarize">Nasłonecznianie</string>
+    <string name="color_effect_whiteboard">Tablica magnetyczna</string>
+
+    <string name="whats_new">Co nowego:</string>
+    <string name="donate">Przekaż darowiznę</string>
+
+    <!-- for accessibility, these strings for face detection will typically be spoken, e.g., through Google Talkback -->
+    <string name="face_detected">twarz</string>
+    <string name="faces_detected">twarze</string>
+    <string name="left_of_screen">z lewej strony ekranu</string>
+    <string name="right_of_screen">z prawej strony ekranu</string>
+    <string name="top_of_screen">u góry ekranu</string>
+    <string name="bottom_of_screen">na dole ekranu</string>
+    <string name="centre_of_screen">w środku</string>
+
+    <string name="high_speed">Duża prędkość</string> <!-- in the sense of high speed video frame rates -->
+
+    <string name="preference_audio_control_none">Wyłączone</string>
+    <string name="preference_audio_control_noise">Głośny dźwięk</string>
+    <string name="preference_audio_control_voice">Komenda głosowa: \"cheese\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/arrays.xml b/app/src/main/res/values-pt-rPT/arrays.xml
index e464ce02002fa3376a7e4358b3107fce07be39e1..960fc03fb57589cc72555341e589e03ae656b845 100644
--- a/app/src/main/res/values-pt-rPT/arrays.xml
+++ b/app/src/main/res/values-pt-rPT/arrays.xml
@@ -242,16 +242,6 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>Nenhum</item>
-        <item>Ruído alto</item>
-        <item>Comando de voz: \"cheese\"</item>
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
     <string-array name="preference_save_zulu_time_entries">
         <item>Hora local</item>
         <item>UTC (Zulu)</item>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 5f0c1d14a6448d393becbed3c12e0ca9fa48c7d5..7996b3b68bbbf774f948432744eeaf81413b3871 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -111,7 +111,6 @@
     <string name="preference_audio_noise_control_sensitivity_summary">Definir a sensibilidade do nível de ruído do áudio (ruído alto)</string>
     <string name="preference_save_location">Local de armazenamento</string>
     <string name="preference_save_location_summary">Pasta para guardar os ficheiros das fotografias/vídeos</string>
-    <string name="preference_using_saf">Usar Storage Access Framework</string>
     <string name="preference_using_saf_summary">Optar por usar o Storage Access Framework para guardar fotografias e vídeos</string>
     <string name="preference_save_photo_prefix">Prefixo das fotografias guardadas</string>
     <string name="preference_save_photo_prefix_summary">O prefixo usado para guardar o nome dos ficheiros das fotografias</string>
@@ -279,7 +278,7 @@
     <string name="audio_listener_started">Faça um ruído alto</string>
 
     <string name="auto_stabilise_info">Auto-estabilizar irá rodar automaticamente as fotografias para que aparentem estar niveladas.\n\nNote que isto significa que as imagens sairão com uma resolução ligeramente menor (devido à rotação e ao recorte que é necessário).</string>
-    <string name="raw_info">Ficheiros DNG contêm a informação total descomprimida e não processada da sua câmara.\n\nA maioria das aplicações de galeria não reconhecem DNG, em vez disso as mesmas devem ser usadas com aplicações especializadas como Snapseed ou Lightroom.\n\nNote que várias opções de processamento como "Carimbar fotografias" e "Auto-estabilizar" serão aplicadas apenas às imagens JPEG, e não às imagens DNG.\n\nFicheiros DNG utilizam muito espaço; um explorador de ficheiros poderá ser útil para transferir ou eliminar os mesmos.</string>
+    <string name="raw_info">Ficheiros DNG contêm a informação total descomprimida e não processada da sua câmara.\n\nA maioria das aplicações de galeria não reconhecem DNG, em vez disso as mesmas devem ser usadas com aplicações especializadas.\n\nNote que várias opções de processamento como "Carimbar fotografias" e "Auto-estabilizar" serão aplicadas apenas às imagens JPEG, e não às imagens DNG.\n\nFicheiros DNG utilizam muito espaço; um explorador de ficheiros poderá ser útil para transferir ou eliminar os mesmos.</string>
 
     <string name="dont_show_again">Não mostrar novamente</string>
 
@@ -432,4 +431,9 @@
     <string name="preference_immersive_mode_navigation">Apenas ocultar os botões de navegação virtuais</string>
     <string name="preference_immersive_mode_gui">Ocultar interface</string>
     <string name="preference_immersive_mode_everything">Ocultar tudo</string>
+
+    <string name="preference_audio_control_none">Nenhum</string>
+    <string name="preference_audio_control_noise">Ruído alto</string>
+    <string name="preference_audio_control_voice">Comando de voz: \"cheese\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
diff --git a/app/src/main/res/values-ru/arrays.xml b/app/src/main/res/values-ru/arrays.xml
index 01d45dc4adfe0d786d2faec474d24b6a3c411d5d..c783931a7c53e303d0aea538dfa9273755e4aeed 100644
--- a/app/src/main/res/values-ru/arrays.xml
+++ b/app/src/main/res/values-ru/arrays.xml
@@ -242,16 +242,6 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>Нет</item>
-        <item>Громкий шум</item>
-        <item>Голосовая команда: \"cheese\"</item>
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
     <string-array name="preference_save_zulu_time_entries">
         <item>Местное время</item>
         <item>UTC (Zulu)</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f90da14f50ce1613d8ca03b0632e6a00488e00c3..ca85e33e68c6df630b8d6a53ddd9f3b0378495df 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -48,7 +48,7 @@
     <string name="no_gallery_app">Галерея недоступна</string>
     <string name="screen_is_locked">Экран заблокирован,\nпроведите пальцем по экрану чтобы разблокировать</string>
     <string name="unlocked">Разблокировано</string>
-    <string name="auto_stabilise_not_supported">К сожалению, автостабилизация не\nподдерживается на данном устройстве</string>
+    <string name="auto_stabilise_not_supported">К сожалению, автостабилизация\nне поддерживается на данном устройстве</string>
     <string name="audio_disabled">Аудио выключено</string>
     <string name="max_duration">Макс. продолжительность</string>
     <string name="color_effect">Цветовой эффект</string>
@@ -56,7 +56,7 @@
     <string name="white_balance">Баланс белого</string>
     <string name="angle">Угол</string>
     <string name="direction">Направление</string>
-    <string name="failed_to_open_camera_1">Не удалось открыть камеру.</string>
+    <string name="failed_to_open_camera_1">Не удалось открыть камеру</string>
     <string name="failed_to_open_camera_2">Камера может быть использована</string>
     <string name="failed_to_open_camera_3">другим приложением?</string>
     <string name="iso">ISO</string>
@@ -153,8 +153,8 @@
     <string name="preference_crop_guide_summary">Отображение прямоугольника, показывающего соотношение сторон - полезно, если вы планируете обрезать фото/видео. Требуется режим фотосъемки WYSIWYG или режим видео\n%s</string>
     <string name="preference_show_toasts">Показывать всплывающие сообщения</string>
     <string name="preference_show_toasts_summary">Показывать всплывающие уведомления при работе</string>
-    <string name="preference_thumbnail_animation">Показать эскиз анимации</string>
-    <string name="preference_thumbnail_animation_summary">Отображение перемещения эскиза анимации при съемке фотографии</string>
+    <string name="preference_thumbnail_animation">Показать анимацию эскиза</string>
+    <string name="preference_thumbnail_animation_summary">Отображение анимации перемещения эскиза при съемке фотографии</string>
     <string name="preference_take_photo_border">Показывать рамку во время фотосъемки</string>
     <string name="preference_take_photo_border_summary">Показывать рамку на экране для индикации фотосъемки</string>
     <string name="preference_keep_display_on">Не выключать дисплей</string>
@@ -185,9 +185,9 @@
     <string name="preference_stamp_fontsize">Размер шрифта</string>
     <string name="preference_stamp_fontsize_summary">Размер шрифта для добавляемого на фотографию текста</string>
     <string name="preference_stamp_font_color">Цвет</string>
-    <string name="preference_stamp_font_color_summary">Цвет для добавляемого на фотографию текста</string>
+    <string name="preference_stamp_font_color_summary">Цвет текста добавляемого на фотографию</string>
     <string name="preference_stamp_style">Стиль</string>
-    <string name="preference_stamp_style_summary">Стиль для добавляемого на фотографию текста\n%s</string>
+    <string name="preference_stamp_style_summary">Стиль текста добавляемого на фотографию\n%s</string>
     <string name="preference_background_photo_saving">Использовать фоновый поток</string>
     <string name="preference_background_photo_saving_summary">Сохранять фото в фоновом потоке (для ускорения работы)</string>
     <string name="video_quality">Разрешение видео</string>
@@ -229,7 +229,7 @@
     <string name="preference_reset_summary">Сброс всех настроек Camera на стандартные значения</string>
     <string name="preference_reset_question">Сбросить все настройки Camera на стандартные значения?</string>
     <string name="about_available">Доступно</string>
-    <string name="about_not_available">Не доступно</string>
+    <string name="about_not_available">Недоступно</string>
     <string name="about_copy_to_clipboard">Копировать в буфер</string>
     <string name="take_photo">Сделать фото</string>
     <string name="gallery">Галерея</string>
@@ -291,8 +291,6 @@
     <string name="no_permission">РАЗРЕШЕНИЯ НЕ ДОСТУПНЫ</string>
     <string name="permission_rationale_title">Требуется разрешение</string>
     <string name="permission_rationale_camera">Требуется разрешение на доступ к камере для ее включения</string>
-    <string name="permission_rationale_storage">Требуется разрешение на чтение/запись для сохранения фото</string>
-    <string name="permission_rationale_record_audio">Требуется разрешение на доступ к микрофону для записи видео со звуком</string>
     <string name="permission_rationale_location">Требуется разрешение на определение местоположения для геотеггинга (хранение информации о местоположении
         внутри фото и видео). Разрешение на определение местоположения также требуется для подключения к устройствам удаленного управления по Bluetooth LE.</string>
     <string name="preference_category_photo_debugging">Настройки отладки</string>
@@ -376,7 +374,7 @@
     <string name="failed_to_process_hdr">Не удалось создать изображение в режиме HDR</string>
     <string name="white_balance_auto">Автоматически</string>
     <string name="white_balance_cloudy">Облачно</string>
-    <string name="white_balance_daylight">Светлый деньDaylight</string>
+    <string name="white_balance_daylight">Светлый день</string>
     <string name="white_balance_fluorescent">Свечение</string>
     <string name="white_balance_incandescent">Яркое свечение</string>
     <string name="white_balance_shade">Тень</string>
@@ -723,7 +721,7 @@
     <string name="preference_water_type">Использовать Saltwater для более точных вычислений</string>
     <string name="preference_water_type_summary">При размещении под водой улучшает точность, если выбран правильный тип воды.</string>
     <string name="remote_connected">Удаленное устройство подключено</string>
-    <string name="preference_remote_type_kraken">Kraken Smart Housing</string>
+
     <string name="preference_stamp_geo_address">Использовать адреса</string>
     <!-- preference_stamp_geo_address_summary defined below -->
     <string name="preference_stamp_geo_address_both">По возможности показывать адреса вместе с GPS-координатами</string>
@@ -809,96 +807,82 @@
     <string name="preference_camera_api_camera2">Camera2 API</string>
     <string name="preference_audio_control_summary">Снимать фото/видео при обнаружении шума или по голосовой команде.
         Если включено, используйте экранную кнопку микрофона для запуска/остановки слушания.
-        Важно: настройка голосовой команды использует службу распознавания речи Android. При использовании этой опции аудиоданные
-        могут быть переданы на удаленные серверы для распознавания речи.
         \n%s</string>
+
+    <!-- beware of string being too long to display! -->
     <string name="preference_stamp_geo_address_summary">По возможности использовать адрес при штамповании геолокации по GPS.
-        Для данной опции требуется наличие Интернет-соединения.
-        Важно: если включено, ваше устройство будет передавать данные геолокации сторонним лицам
-        для преобразования координат GPS в адрес. Смотрите https://developer.android.com/reference/android/location/Geocoder .
+        Если включено ваше устройство будет передавать данные геолокации сторонним лицам для преобразования GPS в адрес (developer.android.com/reference/android/location/Geocoder).
+        Не дает никаких гарантий доступности или точности. Результаты приблизительные.
         \n%s</string>
     <string name="intro_text">Коснитесь для фокуса и нажмите синюю кнопку камеры, чтобы сделать фото.
 \n
 \nДля отключения максимальной яркости экрана перейдите в Настройки/Экранный интерфейс…/\"Максимальная яркость\". Для сохранения на SD-карту на Android 5+ перейдите в Настройки/Дополнительные настройки…/\"Использовать Storage Access Framework\". Для получения подробностей нажмите \"Помощь в Интернете\" в меню Настройки.</string>
     <string name="preference_select_remote">Выбрать удаленное устройство</string>
+
+    <string name="preference_video_rec709">REC709</string>
+    <string name="preference_video_srgb">sRGB</string>
+    <string name="preference_video_gamma">Гамма</string>
+
+    <string name="preference_video_profile_gamma">Значение гаммы видео</string>
+    <string name="preference_video_profile_gamma_summary">Значение гаммы для видео при заданном профиле \"Гамма\"\n%s</string>
+    <string name="preference_video_profile_gamma_1_6">1.6</string>
+    <string name="preference_video_profile_gamma_1_8">1.8</string>
+    <string name="preference_video_profile_gamma_1_9">1.9</string>
+    <string name="preference_video_profile_gamma_2_0">2.0</string>
+    <string name="preference_video_profile_gamma_2_1">2.1</string>
+    <string name="preference_video_profile_gamma_2_2">2.2</string>
+    <string name="preference_video_profile_gamma_2_3">2.3</string>
+    <string name="preference_video_profile_gamma_2_4">2.4</string>
+    <string name="preference_video_profile_gamma_2_6">2.6</string>
+    <string name="preference_video_profile_gamma_2_8">2.8</string>
+
     <string name="preference_immersive_mode_off">Выключить</string>
+    <string name="preference_immersive_mode_low_profile">Только приглушить кнопки навигации</string>
     <string name="preference_immersive_mode_navigation">Скрыть кнопки навигации</string>
     <string name="preference_immersive_mode_gui">Скрыть интерфейс</string>
     <string name="preference_immersive_mode_everything">Скрыть все</string>
-    <string name="preferences_authors">Авторы</string>
-    <string name="preferences_service_terms">Условия предоставления услуг</string>
-    <string name="preference_video_srgb">sRGB</string>
-    <string name="preference_video_profile_gamma">Значение гаммы видео</string>
-    <string name="preference_video_gamma">Гамма</string>
-    <string name="preference_video_rec709">REC709</string>
+
+    <string name="preference_ghost_image_alpha">Непрозрачность призрачного изображения</string>
+    <string name="preference_ghost_image_alpha_summary">Значение альфа для призрачных изображений. Чем ниже значение, тем более прозрачным будет изображение, чем выше - тем более непрозрачным.\n%s</string>
+
+    <string name="preference_zebra_stripes_foreground_color">Цвет полос зебры на переднем плане</string>
+    <string name="preference_zebra_stripes_foreground_color_summary">Цвет на переднем плане при отображении полос зебры.\n%s</string>
+    <string name="preference_zebra_stripes_background_color">Цвет полос зебры на заднем плане</string>
+    <string name="preference_zebra_stripes_background_color_summary">Цвет на заднем плане при отображении полос зебры.\n%s</string>
+
+    <string name="preference_zebra_stripes_color_black">Черный</string>
+    <string name="preference_zebra_stripes_color_red">Красный</string>
+    <string name="preference_zebra_stripes_color_orange">Оранжевый</string>
+    <string name="preference_zebra_stripes_color_transparent">Прозрачный</string>
+    <string name="preference_zebra_stripes_color_white">Белый</string>
+
+    <string name="external_camera">Внешняя камера</string>
+    <string name="ultrawide">Ультраширокая камера</string>
+
+    <string name="switch_to_external_camera">Переключиться на внешнюю камеру</string>
+    <string name="switch_to_unknown_camera">Переключить камеру</string>
+    <string name="switch_multi_camera">Переключаться между несколькими камерами</string>
+    <string name="preference_multi_cam_button">Значок нескольких камер</string>
+    <string name="preference_multi_cam_button_summary">Если включено, использовать отдельные кнопки для переключения между фронтальной/задней камерами и между несколькими фронтальными/задними камерами. Если отключено, значок \"Переключить камеру\" будет циклически переключать все камеры.</string>
+
+    <string name="preference_show_camera_id">Показать ID камеры</string>
+    <string name="preference_show_camera_id_summary">Показывать номер ID текущей камеры на экране</string>
+
+    <string name="preference_allow_long_press">Разрешать действия при долгом нажатии</string>
+    <string name="preference_allow_long_press_summary">При возможности разрешать действия при долгом нажатии (например, долгое нажатие на галерею для изменения пути сохранения).</string>
+
     <string name="aperture">Апертура</string>
-    <string name="preferences_source_code">Исходный код</string>
-    <string name="preferences_licence">Лицензия</string>
-    <string name="preferences_build_version">Версия сборки</string>
-    <string name="preference_privacy_policy_text" translatable="false"> preference_audio_control_summary defined below </string>
-    <string name="whats_new_text"> <small>[Этот диалог показывается, когда приложение Камера обновлено. Вы можете выключить это в Настройки/Экранный интерфейс/Показывать диалог \"Что нового\?.\"]</small>
-\n
-\n<b>v1.48:</b>
-\n<ul> <li>Новый значок для нескольких камер. Если ваше устройство имеет несколько передних/задних камер, то существующий значок будет переключаться между передней и фронтальной камерой; вместо этого новый значок будет циклически переключаться между несколькими передними и фронтальными камерами. Если вы предпочитается старое переключение, то отключите его в Настройки/Экранный интерфейс/\"Значок нескольких камер\". (Обратите внимание, поддерживается только для устройств, которые предоставляют доступ к нескольким камерам сторонним приложениям.)
-\n</li> <li>Функция автоматического выравнивания теперь показывает на экране прямоугольник, чтобы показать рамку полученной фотографии.
-\n</li> <li>Управление диафрагмой для устройств, которые это поддерживают. (Только Camera2 API.)
-\n</li> <li>Больше пользовательских видео-профилей.
-\n</li> <li>Новая опция для альфа-значения для опции фантомного изображения.
-\n</li> <li>Опции для цветов полосок зебры.
-\n</li> <li>Опция для сохранения текущего рысканье / тангаж / угла в Exif комментариях пользователя на вашем устройстве.
-\n</li> <li>Опция для отключения действий на длительное нажатие.
-\n</li> <li>Лучшее использование полноэкранного режима с широким соотношением сторон на устройствах с экранными кнопками навигации.
-\n</li> <li>Исправления ошибок и улучшения пользовательского интерфейса.
-\n</li> </ul> </string>
-    <string name="preference_licence_google_icons_text">Камера использует иконки из Google\'s Material Design icons (https://developer.android.com/design/downloads/index.html , https://design.google.com/icons/ , https://github.com/google/material-design-icons/ , https://google.github.io/material-design-icons/) под Apache 2.0 лицензией. Некоторые иконки содержать модификации. Нажмите, чтобы посмотреть полный текст лицензии.</string>
-    <string name="preference_allow_long_press_summary">Разрешать ли действия по долгому нажатию (например: длительное нажатие нагалерею для изменения места сохранения).</string>
-    <string name="preference_multi_cam_button_summary">Если включено, то используются отдельные кнопки для переключения между передней/задней камерами, и для переключения между несколькими передними/задними камерами. Если отключено, то значёк \"Переключения Камеры\" будет циклично переключаться между всеми камерами.</string>
-    <string name="preference_zebra_stripes_background_color_summary">Цвет, который используется для полос заднего плана, когда показываются полосы зебры.
-\n%s</string>
-    <string name="preference_zebra_stripes_background_color">Цвет заднего плана для полос зебры</string>
-    <string name="preference_zebra_stripes_foreground_color_summary">Цвет, который используется для полос на переднем плане, когда показываются полосы зебры.
-\n%s</string>
-    <string name="preference_zebra_stripes_foreground_color">Цвет переднего плана для полос зебры</string>
-    <string name="preference_ghost_image_alpha_summary">Альфа значение используется для фантомных изображений. Маленькое значение означает большую прозрачность, а высокое значение характеризуется большей непрозрачностью.
-\n%s</string>
-    <string name="preference_ghost_image_alpha">Непрозрачность фантомного изображения</string>
-    <string name="preference_immersive_mode_low_profile">Только тусклые кнопки для виртуальной навигации на экране</string>
-    <string name="preference_video_profile_gamma_summary">Значение гаммы для видео, если для профиля видеоизображения установлено значение «Гамма».
-\n%s</string>
-    <string name="preferences_app_info_title">Информация о камере</string>
-    <string name="preferences_about_app">Приложение Камера является форком приложения OpenCamera</string>
-    <string name="preference_licence_google_icons">Иконки в стиле Material Design от Google</string>
-    <string name="preference_licence_open_camera_text">Приложение Камера © 2013–2019 Mark Harman. Выпущено под лицензией GPL v3 или новее. Нажмите здесь, чтобы увидеть полный текст лицензии.</string>
-    <string name="preference_licence_open_camera">Камера</string>
-    <string name="preference_screen_licences">Open Source Лицензии</string>
-    <string name="preference_comment_ypr_summary">Хранить угл, рысканье и тангаж в комментарии пользователя Exif к фотографии (только в формате JPEG)</string>
-    <string name="preference_comment_ypr">Хранить угл, рысканье, тангаж</string>
-    <string name="error_features_slow_motion">Эффект замедленного движения</string>
-    <string name="error_features_frame_rate">Частота кадров</string>
-    <string name="error_features_bitrate">Битрейт</string>
+
     <string name="error_features_4k">4K UHD</string>
-    <string name="preference_allow_long_press">Разрешить действия при длительном нажатии</string>
-    <string name="preference_show_camera_id_summary">Отображение текущего идентификатора камеры на экране</string>
-    <string name="preference_show_camera_id">Показывать идентификатор камеры</string>
-    <string name="preference_multi_cam_button">Значок нескольких камер</string>
-    <string name="switch_multi_camera">Переключение между несколькими камерами</string>
-    <string name="switch_to_unknown_camera">Переключить камеру</string>
-    <string name="switch_to_external_camera">Переключиться на внешнюю камеру</string>
-    <string name="ultrawide">Ультра-широкий</string>
-    <string name="external_camera">Внешняя камера</string>
-    <string name="preference_zebra_stripes_color_white">Белый</string>
-    <string name="preference_zebra_stripes_color_transparent">Прозрачность</string>
-    <string name="preference_zebra_stripes_color_orange">Оранжевый</string>
-    <string name="preference_zebra_stripes_color_red">Красный</string>
-    <string name="preference_zebra_stripes_color_black">Чёрный</string>
-    <string name="preference_video_profile_gamma_2_8">2.8</string>
-    <string name="preference_video_profile_gamma_2_6">2.6</string>
-    <string name="preference_video_profile_gamma_2_4">2.4</string>
-    <string name="preference_video_profile_gamma_2_3">2.3</string>
-    <string name="preference_video_profile_gamma_2_2">2.2</string>
-    <string name="preference_video_profile_gamma_2_1">2.1</string>
-    <string name="preference_video_profile_gamma_2_0">2.0</string>
-    <string name="preference_video_profile_gamma_1_9">1.9</string>
-    <string name="preference_video_profile_gamma_1_8">1.8</string>
-    <string name="preference_video_profile_gamma_1_6">1.6</string>
+    <string name="error_features_bitrate">Битрейт</string>
+    <string name="error_features_frame_rate">Частота кадров</string>
+    <string name="error_features_slow_motion">Замедление времени</string>
+
+    <string name="preference_comment_ypr">Сохранять связанную систему координат</string>
+    <string name="preference_comment_ypr_summary">Сохранять связанную систему координат устройства в EXIF фото в комментарии пользователя (только для формата JPEG)</string>
+
+    <string name="preference_audio_control_none">Нет</string>
+    <string name="preference_audio_control_noise">Громкий шум</string>
+    <string name="preference_audio_control_voice">Голосовая команда: \"cheese\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sl/arrays.xml b/app/src/main/res/values-sl/arrays.xml
index 1a300e136f16b638875ede6b6383ea8e1c54b0f4..e55a9622043decfcf074c3fdeaea5059497f89e4 100644
--- a/app/src/main/res/values-sl/arrays.xml
+++ b/app/src/main/res/values-sl/arrays.xml
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string-array name="focus_mode_icons">
+        <item>drawable/focus_mode_auto</item>
+        <item>drawable/focus_mode_infinity</item>
+        <item>drawable/baseline_filter_vintage_white_48</item>
+        <item>drawable/focus_mode_locked</item>
+        <item>drawable/focus_mode_manual</item>
+        <item>drawable/focus_mode_fixed</item>
+        <item>drawable/focus_mode_edof</item>
+        <item>drawable/focus_mode_continuous_picture</item>
+        <item>drawable/focus_mode_continuous_video</item>
+    </string-array>
     <string-array name="focus_mode_entries">
         <item>Samodejno ostrenje</item>
         <item>Ostrenje v neskončnosti</item>
         <item>Ostrenje makro</item>
-        <item>Zaklenjeno ostrenje</item>
+        <item>Ostrenje je zaklenjeno.</item>
         <item>Ročno ostrenje</item>
         <item>Pritrjeno ostrenje</item>
         <item>Ostrenje EDOF</item>
@@ -83,7 +94,7 @@
         <item>Ostrenje</item>
         <item>Povečaj/Pomanjšaj</item>
         <item>Spremeni raven osvetlitve</item>
-        <item>Vklopi/Izklopi samodejno izravnavo</item>
+        <item>Vklopi/Izklopi samodejno poravnavo</item>
         <item>Spremeni glasnost naprave</item>
         <item>Ne naredi ničesar</item>
     </string-array>
@@ -104,7 +115,7 @@
         <item>0</item>
         <item>180</item>
     </string-array>
-    <string-array name="preference_angle_highlight_color_entries">
+    <string-array name="preference_angle_highlight_color_entries"> <!-- n.b., also used for focus peaking colors -->
         <item>Rdeča</item>
         <item>Zelena</item>
         <item>Modra</item>
@@ -132,7 +143,7 @@
         <item>Zlata (4)</item>
         <item>Trikotnik (1)</item>
         <item>Trikotnik (2)</item>
-        <item>Diagonala</item>
+        <item>Diagonale</item>
     </string-array>
     <string-array name="preference_grid_values">
         <item>preference_grid_none</item>
@@ -170,7 +181,7 @@
     </string-array>
     <string-array name="preference_stamp_gpsformat_entries">
         <item>Privzeta</item>
-        <item>Stopinje/minute/sekunde</item>
+        <item>Stopinje/Minute/Sekunde</item>
         <item>Brez</item>
     </string-array>
     <string-array name="preference_stamp_gpsformat_values">
@@ -205,6 +216,16 @@
         <item>20</item>
         <item>22</item>
         <item>24</item>
+    </string-array>
+	<string-array name="preference_stamp_style_entries">
+        <item>@string/preference_stamp_style_plain</item>
+        <item>@string/preference_stamp_style_shadowed</item>
+        <item>@string/preference_stamp_style_background</item>
+    </string-array>
+    <string-array name="preference_stamp_style_values">
+        <item>preference_stamp_style_plain</item>
+        <item>preference_stamp_style_shadowed</item>
+        <item>preference_stamp_style_background</item>
     </string-array>
     <string-array name="preference_video_restart_entries">
         <item>Ne zaženi ponovno</item>
@@ -241,16 +262,6 @@
         <item>audio_default</item>
         <item>audio_mono</item>
         <item>audio_stereo</item>
-    </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>Brez</item>
-        <item>Glasen šum</item>
-        <item>Glasovni ukaz: \"cheese\"</item>
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
     </string-array>
 	<string-array name="preference_save_zulu_time_entries">
         <item>Krajevni čas</item>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index e6d1b313de66dc0dab38098a2978548765c7d511..0abcdc5e6459fc748a209d62f3c0ff7029fce8e5 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Open Camera</string>
+    <string name="app_name">Open Camera</string> <!-- shouldn't be translated, unless deemed appropriate e.g. alternative alphabets -->
     <string name="action_settings">Nastavitve</string>
     <string name="action_popup">Nastavitve pojavnih oken</string>
     <string name="intro_ok">V redu (to sporočilo se ne bo več prikazovalo)</string>
@@ -12,17 +12,17 @@
     <string name="choose_save_location">Izberite mesto za shranjevanje:</string>
     <string name="clear_folder_history">Počisti zgodovino mape</string>
     <string name="clear_folder_history_question">Počisti zgodovino mape?</string>
-    <string name="choose_another_folder">Izberite drugo mapo</string>
+    <string name="choose_another_folder">Izberite drugo mapo.</string>
     <string name="changed_save_location">Mesto za shranjevanje spremenjeno na:</string>
-    <string name="stopped_recording_video">Snemanje videoposnetka ustavljeno</string>
-    <string name="repeats_to_go">ponovitev preostalih</string> <!--  intentionally starts lower case -->
-    <string name="failed_to_reconnect_camera">Povezava s fotoaparatom je spodletela</string>
-    <string name="video_may_be_corrupted">Napaka, datoteka videoposnetka je morda pokvarjena</string>
-    <string name="not_supported">ni podprto na vaši napravi</string> <!--  intentionally starts lower case -->
-    <string name="video_error_unknown">Neznana napaka, videoposnetek ustavljen</string>
-    <string name="video_error_server_died">Strežnik se je sesul, videoposnetek ustavljen</string>
-    <string name="video_max_duration">Videoposnetek je dosegel najdaljše trajanje</string>
-    <string name="video_max_filesize">Videoposnetek je dosegel največjo velikost datoteke</string>
+    <string name="stopped_recording_video">Snemanje videoposnetka je ustavljeno.</string>
+    <string name="repeats_to_go">ponovitev je preostalih.</string> <!--  intentionally starts lower case -->
+    <string name="failed_to_reconnect_camera">Povezava s fotoaparatom je spodletela.</string>
+    <string name="video_may_be_corrupted">Napaka, datoteka videoposnetka je morda pokvarjena.</string>
+    <string name="not_supported">ni podprto na vaši napravi.</string> <!--  intentionally starts lower case -->
+    <string name="video_error_unknown">Neznana napaka, videoposnetek je ustavljen.</string>
+    <string name="video_error_server_died">Strežnik se je sesul, videoposnetek je ustavljen.</string>
+    <string name="video_max_duration">Videoposnetek je dosegel najdaljše trajanje.</string>
+    <string name="video_max_filesize">Videoposnetek je dosegel največjo velikost datoteke.</string>
     <string name="exposure_compensation">Izavnava osvetlitve</string>
     <string name="fps">sl./s</string>
     <string name="focus_distance">Razdalja ostrenja</string>
@@ -31,28 +31,28 @@
     <string name="back_camera">Zadnji fotoaparat</string>
     <string name="photo">Fotografija</string>
     <string name="video">Videoposnetek</string>
-    <string name="exposure_locked">Osvetlitev zaklenjena</string>
-    <string name="exposure_unlocked">Osvetlitev odklenjena</string>
-    <string name="cancelled_timer">Samosprožilec preklican</string>
-    <string name="cancelled_repeat_mode">Zaporedni način preklican</string>
-    <string name="started_timer">Odštevanje se je začelo</string>
-    <string name="failed_to_save_video">Shranjevanje datoteke videoposnetka je spodletelo</string>
-    <string name="failed_to_record_video">Snemanje videoposnetka je spodletelo</string>
-    <string name="started_recording_video">Snemanje videoposnetka se je začelo</string>
+    <string name="exposure_locked">Osvetlitev je zaklenjena.</string>
+    <string name="exposure_unlocked">Osvetlitev je odklenjena.</string>
+    <string name="cancelled_timer">Samosprožilec je preklican.</string>
+    <string name="cancelled_repeat_mode">Zaporedni način je preklican.</string>
+    <string name="started_timer">Odštevanje se je začelo.</string>
+    <string name="failed_to_save_video">Shranjevanje datoteke videoposnetka je spodletelo.</string>
+    <string name="failed_to_record_video">Snemanje videoposnetka je spodletelo.</string>
+    <string name="started_recording_video">Snemanje videoposnetka se je začelo.</string>
     <string name="sorry">Oprostite</string>
-    <string name="failed_to_save_photo">Shranjevanje fotografije je spodletelo</string>
-	<string name="failed_to_save_photo_raw">Shranjevanje fotografije v obliki RAW je spodletelo</string>
-    <string name="failed_to_auto_stabilise">Samodejna izravnava je spodletela</string>
-    <string name="failed_to_start_camera_preview">Zagon predogleda fotoaparata je spodletel</string>
-    <string name="taking_photo">Slikanje fotografije</string>
-    <string name="failed_to_take_picture">Slikanje fotografije je spodletelo</string>
-    <string name="location_not_available">Lokacija GPS ni na voljo</string>
-    <string name="photo_deleted">Fotografija izbrisana</string>
-    <string name="no_gallery_app">Program galerije ni na voljo</string>
-    <string name="screen_is_locked">Zaslon je zaklenjen\nPovlecite ga za odklepanje</string>
-    <string name="unlocked">Odklenjen</string>
-    <string name="auto_stabilise_not_supported">Žal na tej napravi samodejna\nizravnava ni podprta</string>
-    <string name="audio_disabled">Zvok onemogočen</string>
+    <string name="failed_to_save_photo">Shranjevanje fotografije je spodletelo.</string>
+	<string name="failed_to_save_photo_raw">Shranjevanje fotografije v obliki RAW je spodletelo.</string>
+    <string name="failed_to_auto_stabilise">Samodejna izravnava je spodletela.</string>
+    <string name="failed_to_start_camera_preview">Zagon predogleda fotoaparata je spodletel.</string>
+    <string name="taking_photo">Slikanje fotografije.</string>
+    <string name="failed_to_take_picture">Slikanje fotografije je spodletelo.</string>
+    <string name="location_not_available">Lokacija GPS ni na voljo.</string>
+    <string name="photo_deleted">Fotografija je izbrisana.</string>
+    <string name="no_gallery_app">Program za galerijo ni na voljo.</string>
+    <string name="screen_is_locked">Zaslon je zaklenjen.\nPovlecite ga za odklepanje.</string>
+    <string name="unlocked">Odklenjen.</string>
+    <string name="auto_stabilise_not_supported">Žal na tej napravi samodejna\nizravnava ni podprta.</string>
+    <string name="audio_disabled">Zvok je onemogočen.</string>
     <string name="max_duration">Najdaljše trajanje</string>
     <string name="color_effect">Barvni učinek</string>
     <string name="scene_mode">Način prizora</string>
@@ -61,7 +61,7 @@
     <string name="angle">Kot</string>
     <string name="direction">Smer</string>
     <string name="failed_to_open_camera_1">ODPIRANJE FOTOAPARATA JE SPODLETELO.</string>
-    <string name="failed_to_open_camera_2">FOTOAPARAT MORDA UPORABLJA</string>
+    <string name="failed_to_open_camera_2">ALI FOTOAPARAT MORDA UPORABLJA</string>
     <string name="failed_to_open_camera_3">DRUG PROGRAM?</string>
     <string name="iso">ISO</string>
     <string name="zoom">Povečava</string>
@@ -69,12 +69,12 @@
     <string name="screen_lock_message_1">[ZAKLENJENO:</string>
     <string name="screen_lock_message_2">povlecite za odklepanje]</string>
     
-    <string name="failed_to_stamp">Dodajanje časovnega žiga na fotografijo je spodletelo</string>
+    <string name="failed_to_stamp">Dodajanje časovnega žiga na fotografijo je spodletelo.</string>
     <string name="metres_abbreviation">m</string> <!-- symbol short for metres -->
     
     <string name="preference_category_camera_effects">Učinki fotoaparata</string>
     <string name="preference_auto_stabilise">Samodejno izravnaj</string>
-    <string name="preference_auto_stabilise_summary">Slike bodo zavrtene za samodejno vodoravno poravnavo (samo fotografije) (slikanje fotografij je počasnejše in lahko spodleti na napravah s premalo pomnilnika)</string>
+    <string name="preference_auto_stabilise_summary">Slike bodo zavrtene za samodejno vodoravno poravnavo (samo fotografije - slikanje fotografij je počasnejše in lahko spodleti na napravah s premalo pomnilnika)</string>
     <string name="preference_color_effect">Uporabi barvni učinek</string>
     <string name="preference_color_effect_summary">Uporabi izbrani bavni učinek za fotografije</string>
     <string name="preference_scene_mode">Uporabi način prizora</string>
@@ -90,7 +90,7 @@
     <string name="preference_face_detection">Zaznavanje obrazov</string>
     <string name="preference_face_detection_summary">Uporabi zaznavanje obrazov namesto področij ostrenja</string>
 
-    <string name="preference_category_camera_controls">Nadzor fotoaparata</string>
+    <string name="preference_category_camera_controls">Nastavitve fotoaparata</string>
     <string name="preference_timer">Samosprožilec</string>
     <string name="preference_timer_beep">Pisk samosprožilca</string>
     <string name="preference_timer_beep_summary">Zapiskaj ob odštevanju samosprožilca ali zakasnitvi zaporednega načina</string>
@@ -98,21 +98,21 @@
     <string name="preference_timer_speak_summary">Glasovno odštevanje samosprožilca ali zakasnitve zaporednega načina (od 60-ih s naprej)</string>
     <string name="preference_burst_mode">Zaporedje</string>
     <string name="preference_burst_interval">Razmik zaporednega načina</string>
-    <string name="preference_screen_camera_controls_more">Več nadzora fotoaparata …</string>
+    <string name="preference_screen_camera_controls_more">Več nastavitev fotoaparata …</string>
     <string name="preference_touch_capture">Dotik za zajem</string>
     <string name="preference_touch_capture_summary">Posnemi fotografijo z dotikom ali dvojnim dotikom predogleda</string>
     <string name="preference_pause_preview">Premor po slikanju fotografije</string>
     <string name="preference_pause_preview_summary">Premor zaslona po slikanju fotografje z možnostjo deljenja ali izbrisa fotografije</string>
-    <string name="preference_shutter_sound">Zvok zaslonke</string>
+    <string name="preference_shutter_sound">Zvok zaklopa</string>
     <string name="preference_shutter_sound_summary">Predvajaj zvok ob slikanju fotografije</string>
     <string name="preference_volume_keys">Gumba za glasnost</string>
     <string name="preference_audio_control">Možnosti nadzora zvoka</string>
+	<!-- preference_audio_control_summary defined below -->
     <string name="preference_audio_noise_control_sensitivity">Nadzor občutljivosti zvoka</string>
-    <string name="preference_audio_noise_control_sensitivity_summary">Možnost občutljivosti ravni šuma za zvok (glasen šum)</string>
+    <string name="preference_audio_noise_control_sensitivity_summary">Občutljivost ravni za možnost zvoka (glasen zvok)</string>
     <string name="preference_save_location">Mesto za shranjevanje</string>
     <string name="preference_save_location_summary">Mapa za shranjevanje datotek fotografij/videoposnetkov</string>
-    <string name="preference_using_saf">Uporabi ogrodje za dostop do pomnilniške naprave</string>
-    <string name="preference_using_saf_summary">Ali naj se uporabi ogrodje za dostop do pomnilniške naprave za shranjevanje fotografij in videoposnetkov</string>
+    <string name="preference_using_saf_summary">Ali naj se za shranjevanje fotografij in videoposnetkov uporabi ogrodje za dostop do pomnilniške naprave.  Omogočite to, da dovolite shranjevanje na zunanje kartice SD.  Na Androidih 10+ morate to možnost omogočiti, če želite shranjevati v mapo zunaj mape DCIM.</string>
     <string name="preference_save_photo_prefix">Predpona shranjenih fotografij</string>
     <string name="preference_save_photo_prefix_summary">Predpona imena datotek fotografij</string>
     <string name="preference_save_video_prefix">Predpona shranjenih videoposnetkov</string>
@@ -121,14 +121,14 @@
     <string name="preference_show_when_locked">Prikaži fotoaparat, ko je zaklenjeno</string>
     <string name="preference_show_when_locked_summary">Če je omogočeno, se bo Open Camera še vedno prikazoval nad zaklenjenim zaslonom (še vedno boste morali odkleniti za dostop do nastavitev, galerije itd.)</string>
     <string name="preference_startup_focus">Izvedi samodejno ostrenje ob zagonu</string>
-    <string name="preference_startup_focus_summary">Ali naj se izvede samodejno ostrenje ob zagonu Open Camere. Če imate težavo z vklopom bliskavice ob zagonu, onemogočite to možnost</string>
+    <string name="preference_startup_focus_summary">Ali naj se izvede samodejno ostrenje ob zagonu Open Camere.  Če imate težavo z vklopom bliskavice ob zagonu, onemogočite to možnost</string>
     <string name="preference_lock_video">Zakleni zaslon ob snemanju videoposnetkov</string>
-    <string name="preference_lock_video_summary">Ob snemanju videoposnetkov se bo gr. up. vmesnik zaklenil, da se prepreči naključna ustavitev snemanja. Povlecite zaslon za odklepanje. Upoštevajte, da se bo snemanje videoposnetkov vedno ustavilo, če se program postavi v ozadje ali zaslon izprazni.</string>
+    <string name="preference_lock_video_summary">Ob snemanju videoposnetkov se bo gr. up. vmesnik zaklenil, da se prepreči naključna ustavitev snemanja.  Povlecite zaslon za odklepanje.  Upoštevajte, da se bo snemanje videoposnetkov vedno ustavilo, če se program postavi v ozadje ali zaslon izprazni.</string>
     <string name="preference_rotate_preview">Zavrti predogled</string>
     <string name="preference_rotate_preview_summary">Možnost vrtenja predogleda (ne bo vplivalo na nastale fotografije/videoposnetke)\n%s</string>
     <string name="preference_screen_gui">Gr. up. vmesnik na zaslonu …</string>
     <string name="preference_preview_size">Velikost predogleda</string>
-    <string name="preference_ui_placement">Posavitev up. vmesnika</string>
+    <string name="preference_ui_placement">Postavitev up. vmesnika</string>
     <string name="preference_immersive_mode">Vdelan način</string>
     <string name="preference_show_zoom">Prikaži povečavo</string>
     <string name="preference_show_zoom_summary">Prikaži trenutno raven povečave na zaslonu (ob povečavi)</string>
@@ -137,7 +137,7 @@
     <string name="preference_show_zoom_slider_controls">Prikaži drsnik povečave</string>
     <string name="preference_show_zoom_slider_controls_summary">Prikaži drsnik za nadzor povečave</string>
     <string name="preference_show_iso">Prikaži ISO</string>
-    <string name="preference_show_iso_summary">Prikaži trenutno raven ISO. V načinu bliskavice bo simbol bliskavice tudi nakazal, da se bo sprožila bliskavica (zahteva API Camera2).</string>
+    <string name="preference_show_iso_summary">Prikaži trenutno raven ISO. (zahteva API Camera2).</string>
     <string name="preference_free_memory">Prikaži nezaseden prostor</string>
     <string name="preference_free_memory_summary">Na zaslonu prikaži količino nezasedenega prostora na pomnilniški napravi</string>
     <string name="preference_show_angle">Prikaži kot</string>
@@ -146,8 +146,8 @@
     <string name="preference_show_angle_line_summary">Prikaži črto vodoravne ravni</string>
     <string name="preference_angle_highlight_color">Barva poudarjanja kota/višine</string>
     <string name="preference_angle_highlight_color_summary">Barva poudarjanja, ko je fotoaparat skoraj vodoraven</string>
-    <string name="preference_show_geo_direction">Prikaži kompas</string>
-    <string name="preference_show_geo_direction_summary">Na zaslonu prikaži kompas s smerjo naprave</string>
+    <string name="preference_show_geo_direction">Prikaži smer neba</string>
+    <string name="preference_show_geo_direction_summary">Na zaslonu prikaži smer neba naprave</string>
     <string name="preference_show_time">Prikaži čas</string>
     <string name="preference_show_time_summary">Na zaslonu prikaži trenutni čas</string>
     <string name="preference_show_battery">Prikaži baterijo</string>
@@ -159,7 +159,7 @@
     <string name="preference_show_toasts">Prikaži \"pojavna\" sporočila</string>
     <string name="preference_show_toasts_summary">Ali naj se prikažejo \"pojavna\" sporočila</string>
     <string name="preference_thumbnail_animation">Prikaži animacijo sličice</string>
-    <string name="preference_thumbnail_animation_summary">Prikaži premikajočo animacijo sličice med slikanjem fotografije</string>
+    <string name="preference_thumbnail_animation_summary">Prikaži premikajočo se animacijo sličice med slikanjem fotografije</string>
     <string name="preference_take_photo_border">Prikaži obrobo med slikanjem fotografije</string>
     <string name="preference_take_photo_border_summary">Na zaslonu prikaži obrobo, da se nakaže slikanje fotografije</string>
     <string name="preference_keep_display_on">Pusti zaslon vklopljen</string>
@@ -173,12 +173,12 @@
     <string name="preference_screen_location_settings">Nastavitve lokacije …</string>
     <string name="preference_resolution">Ločljivost fotoaparata</string>
     <string name="preference_quality">Kakovost slik</string>
-    <string name="preference_quality_summary">Nastavite kakovost shranjenih slik JPEG (privzeta vrednost je 90 %%)\n%s</string>
+    <string name="preference_quality_summary">Nastavite kakovost shranjenih slik JPEG ali WebP (privzeta vrednost je 90 %%).  Nima učinka na obliko PNG.\n%s</string> <!-- '%' is encoded as '%%' - a single % can crash devices, and this isn't picked up by Android Lint! -->
 	<string name="preference_raw">RAW</string>
-    <string name="preference_location">Shrani podatke o lokaciji (označevanje z zemljepisnim položajem)</string>
-    <string name="preference_location_summary">Shrani podatke o lokaicji GPS v fotografijah/videoposnetkih</string>
-    <string name="preference_gps_direction">Shrani smer kompasa</string>
-    <string name="preference_gps_direction_summary">Shrani smer komapasa GPS v fotografijah</string>
+    <string name="preference_location">Shrani podatke o lokaciji (označevanje z zemljepisno lego)</string>
+    <string name="preference_location_summary">Shrani podatke o lokaciji GPS v fotografijah/videoposnetkih (v fotografijah se podatki o lokaciji lahko shranijo samo pri oblikah JPEG in DNG)</string>
+    <string name="preference_gps_direction">Shrani smer neba</string>
+    <string name="preference_gps_direction_summary">Shrani smer neba GPS v fotografijah (samo oblika JPEG)</string>
     <string name="preference_require_location">Zahtevaj podatke o lokaciji</string>
     <string name="preference_require_location_summary">Če so podatki o lokaciji omogočeni, snemaj fotografije/videoposnetke samo, če so ti podatki na voljo</string>
     <string name="preference_stamp">Časovni žig fotografij</string>
@@ -198,13 +198,13 @@
     <string name="preference_background_photo_saving_summary">Ali naj se fotografije shranjujejo z uporabo niti v ozadju (za hitrejše delovanje)</string>
     <string name="video_quality">Ločljivost videoposnetkov</string>
     <string name="preference_force_video_4k">Vsili vidosposnetke 4K UHD (deluje samo na nekaterih napravah)</string>
-    <string name="preference_force_video_4k_summary">Omogoči ločljivost 3840x2160 za snemanje videoposnetkov z zadnjo kamero - ta možnost je zaobidenje, ki bo morda omogočila naprave 4K s kamerami 4K, ki te možnosti ne razkrijejo programom za kamero tretjih oseb. Za delovanje tega ni nobenega zagotovila, preizkusite pred uporabo.</string>
+    <string name="preference_force_video_4k_summary">Omogoči ločljivost 3840x2160 za snemanje videoposnetkov z zadnjo kamero - ta možnost je zaobidenje, ki bo morda omogočila naprave 4K s kamerami 4K, ki te možnosti ne razkrijejo programom za kamero tretjih oseb.  Za delovanje tega ni nobenega zagotovila, preizkusite pred uporabo.</string>
     <string name="preference_video_stabilization">Omogoči ustalitev videoposnetkov</string>
     <string name="preference_video_stabilization_summary">Ustaltev videoposnetkov zmanjša tresenje zaradi gibanja kamere tako v predogledu, kot v posnetku.</string>
     <string name="preference_video_bitrate">Bitna hitrost videoposnetkov (pribl.)</string>
     <string name="preference_video_bitrate_summary">Nastavite pribl. hitrost videoposnetkov (višje vrednosti pomenijo boljšo kakovost, vendar zavzamejo več prostora na disku; snemanje videoposnetkov lahko spodleti, če bitna hitrost ni podprta)\n%s</string>
     <string name="preference_video_fps">Hitrost sličic videoposnetkov (pribl.)</string>
-    <string name="preference_video_fps_summary">Nastavite hitrost sličic (sl./s) videoposnetkov (je lahko približna. Doseganje nastavljene vrednosti ni zagotovljeno in snemanje videoposnetkov lahko spodleti, če hitrost sličic ni podprta)\n%s</string>
+    <string name="preference_video_fps_summary">Nastavite hitrost sličic (sl./s) videoposnetkov (je lahko približna. Doseganje nastavljene vrednosti ni zagotovljeno in snemanje videoposnetkov lahko spodleti, če hitrost sličic ni podprta).  Preverite nastali videoposnetek za dejansko uporabljeno hitrost sličic.  Upoštevajte, da se ta nastavitev pri počasnih posnetkih prezre.\n%s</string>
     <string name="preference_video_max_duration">Najdaljše trajanje videoposnetkov</string>
     <string name="preference_video_max_duration_summary">Snemanje videoposnetkov se bo ustavilo po tem času\n%s</string>
     <string name="preference_video_restart">Ponovno zaženi videoposnetek po najdaljšem trajanju</string>
@@ -216,7 +216,7 @@
     <string name="preference_record_audio">Snemaj zvok</string>
     <string name="preference_record_audio_summary">Snemaj zvok ob snemanju vidoposnetkov</string>
     <string name="preference_record_audio_src">Vir zvoka</string>
-    <string name="preference_record_audio_src_summary">Kateri mikrofon naj se uporabi za snemanje zvoka\n%s</string>
+    <string name="preference_record_audio_src_summary">Kateri mikrofon naj se uporabi za snemanje zvoka.  Upoštevajte, da je podrobno vedenje te možnosti odvisno od načina vdelave te možnosti v napravo.\n%s</string>
     <string name="preference_record_audio_channels">Zvočni kanali</string>
     <string name="preference_record_audio_channels_summary">Določite mono ali stereo za snemanje zvoka (stereo je podprt samo na nekaterih napravah)</string>
     <string name="preference_video_flash">Svetilka med snemanjem videoposnetkov</string>
@@ -224,11 +224,11 @@
     
     <string name="preference_category_online">Razno</string>
     <string name="preference_online_help">Spletna pomoč</string>
-    <string name="preference_online_help_summary">Zaženi spletno stran Open Camera v mojem brskalniku</string>
+    <string name="preference_online_help_summary">Zaženi spletno stran Open Camera v brskalniku</string>
     <string name="preference_donate">Daruj za podporo razvoju</string>
-    <string name="preference_donate_summary">Če vam je ta program všeč, razmislite o darovanju, da podprete razvoj. To lahko naredite z nakupom mojega "programa za darovanje" - kliknite na to možnost za odpiranje strani z mojim programom. Hvala!</string>
+    <string name="preference_donate_summary">Če vam je ta program všeč, razmislite o darovanju, da podprete razvoj.  To lahko naredite z nakupom mojega "programa za darovanje" - kliknite na to možnost za odpiranje strani z mojim programom. Hvala!</string>
     <string name="preference_use_camera2">Uporabi API Camera2</string>
-    <string name="preference_use_camera2_summary">Omogoči API Camera2 - ponuja dodatne značilnosti, vendar morda ne bo pravilno deloval na vseh napravah (lahko povzroči ponovni zagon)</string>
+    <string name="preference_use_camera2_summary">Omogoči dodatne značilnosti, kot so ročni načini za osvetlitev, ostrino, ravnovesje beline, kot tudi obliko RAW (če jo naprava podpira), vendar morda ne bo pravilno delovala na vseh napravah (lahko povzročijo ponovni zagon)</string>
     <string name="preference_about">O programu</string>
     <string name="preference_about_summary">Program in podatki za razhroščevanje</string>
     <string name="preference_reset">Ponastavi nastavitve</string>
@@ -254,20 +254,19 @@
     
     <string name="parent_folder">Nadrejena mapa</string>
     <string name="new_folder">Nova mapa</string>
-    <string name="cant_write_folder">V to mapo ni mogoče pisati</string>
-    <string name="cant_access_folder">Dostop do te mape ni mogoč</string>
-    <string name="enter_new_folder">Vnesite novo ime mape</string>
-    <string name="failed_create_folder">Ustvarjanje mape je spodletelo</string>
-    <string name="folder_exists">Mapa že obstaja</string>
-
-    <string name="saf_select_save_location">Izberite mesto za shranjevanje</string>
-    <string name="saf_cancelled">Ogrodje za dostop do pomnilniške naprave preklicano</string>
-	
-	<string name="saf_permission_failed">Ni mogoče shraniti v to mapo</string>
+    <string name="cant_write_folder">V to mapo ni mogoče pisati.</string>
+    <string name="cant_access_folder">Dostop do te mape ni mogoč.</string>
+    <string name="enter_new_folder">Vnesite novo ime mape.</string>
+    <string name="failed_create_folder">Ustvarjanje mape je spodletelo.</string>
+    <string name="folder_exists">Mapa že obstaja.</string>
+
+    <string name="saf_select_save_location">Izberite mesto za shranjevanje.</string>
+    <string name="saf_cancelled">Ogrodje za dostop do pomnilniške naprave je preklicano.</string>
+	<string name="saf_permission_failed">Ni mogoče shraniti v to mapo.</string>
     
     <!-- the permission names such as Microphone should match what Android calls them in the App permission settings -->
-    <string name="permission_record_audio_not_available">Dovoljenje za mikrofon ni na voljo</string>
-    <string name="permission_location_not_available">Dovoljenje za lokacijo ni na voljo</string>
+    <string name="permission_record_audio_not_available">Dovoljenje za mikrofon ni na voljo.</string>
+    <string name="permission_location_not_available">Dovoljenje za lokacijo ni na voljo.</string>
 
     <string name="start_video">Začni snemati videoposnetek</string>
     <string name="stop_video">Ustavi snemanje videoposnetka</string>
@@ -276,48 +275,49 @@
     <string name="mb_abbreviation">MB</string> <!-- symbol short for megabytes -->
 	<string name="gb_abbreviation">GB</string> <!-- symbol short for gigabytes -->
     
-    <string name="audio_control_start">Začni poslušati zvok</string>
-    <string name="audio_control_stop">Ustavi poslušanje zvoka</string>
-    <string name="speech_recognizer_started">Recite \"cheese\"</string>
-    <string name="audio_listener_started">Naredite glasen zvok</string>
+    <string name="audio_control_start">Začni zaznavati zvok</string>
+    <string name="audio_control_stop">Ustavi zaznavanje zvoka</string>
+    <string name="speech_recognizer_started">Recite \"cheese\".</string>
+    <string name="audio_listener_started">Naredite glasen zvok.</string>
 	
-	<string name="auto_stabilise_info">Samodejna izravnava bo zavrtela fotografije, da bodo videti poravnane.\n\nUpoštevajte, da se bo ločljivost slik rahlo zmanjšala (zaradi zahtevanega vrtenja in obrezovanja).</string>
-    <string name="raw_info">Datoteke DNG vsebujejo nestisnjene in neobdelane podatke iz fotoaparata.\n\nVečina programov za galerijo ne prepozna oblike DNG, zato jo uporabljajte s posebnimi programi, kot je Snapseed ali Lightroom.\n\nUpoštevajte, da se bodo razne možnosti obdelave, kot sta "Dodaj žig" in "Samodejno izravnaj", uporabile samo za slike JPEG in ne za slike DNG.\n\nDatoteke DNG zavzamejo veliko prosotra; za njihov izbris ali prenos lahko uporabite raziskovalca datotek.\n\nDatoteke DNG se shranjujejo samo v običajnem načinu ali načinu DRO.</string>
-    <string name="hdr_info">Način HDR je uporaben za posnetke z velikimi odstopanji v svetlosti. Deluje tako, da zajame več posnetkov z različnimi osvetlitvami in jih potem združi v končno sliko.\n\nUpoštevajte, da HDR ni primeren za hitro gibajoče prizore in lahko povzroči barvna odstopanja.\n\nSlikanje fotografij v načinu HDR je počasnejše.</string>
+	<string name="auto_stabilise_info">Samodejna poravnava bo zavrtela fotografije, da bodo videti poravnane.\n\nUpoštevajte, da se bo ločljivost slik rahlo zmanjšala (zaradi zahtevanega vrtenja in obrezovanja).</string>
+    <string name="raw_info">Datoteke DNG vsebujejo nestisnjene in neobdelane podatke iz fotoaparata.\n\nVečina programov za galerijo ne prepozna oblike DNG, zato jo uporabljajte s posebnimi programi.\n\nUpoštevajte, da se bodo razne možnosti obdelave, kot sta "Dodaj žig" in "Samodejno izravnaj", uporabile samo za slike, ki niso v obliki DNG (JPEG itd.).</string>
+    <string name="hdr_info">Način HDR je uporaben za posnetke z velikimi odstopanji v svetlosti.  Deluje tako, da zajame več posnetkov z različnimi osvetlitvami in jih potem združi v končno sliko.\n\nUpoštevajte, da HDR ni primeren za hitro gibajoče prizore in lahko povzroči barvna odstopanja.\n\nSlikanje fotografij v načinu HDR je počasnejše.</string>
 
     <string name="dont_show_again">Ne prikazuj več</string>
 
-    <string name="photo_mode">Način za fotografije</string>
-    <string name="photo_mode_standard">Std</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode">Način fotografiranja</string>
+    <string name="photo_mode_standard">Obič.</string> <!-- keep short, as this shows in the popup menu -->
     <string name="photo_mode_standard_full">Običajni</string>
     <string name="photo_mode_hdr">HDR</string>
-    <string name="photo_mode_expo_bracketing">Expo {}</string> <!-- keep short, as this shows in the popup menu -->
-    <string name="photo_mode_expo_bracketing_full">Korektura samodejne osvetlitve</string>
+    <string name="photo_mode_expo_bracketing">{} osvet.</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode_expo_bracketing_full">Stopnjevanje osvetlitve</string>
+    <string name="photo_mode_fast_burst_full">Hitro zaporedje</string>
     <string name="photo_mode_noise_reduction">NR</string> <!-- keep short, as this shows in the popup menu; probably shouldn't be translated? -->
 	<string name="photo_mode_noise_reduction_full">Zmanjševanje šuma</string>
     <string name="preference_category_stamp">Dodaj žig</string>
     <string name="preference_hdr_save_expo">Shrani vse slike za način HDR</string>
-    <string name="preference_hdr_save_expo_summary">Če je omogočeno, bodo ob uporabi načina HDR posnete tri osnovne slike kot tudi končna slika HDR. Upoštevajte, da bo shranevanje počasnejše, posebno, če uporabljate možnosti, kot sta \"Dodaj žig\" ali samodejno izravnavo.</string>
-
-    <string name="no_permission">DOVOLJENJA NISO NA VOLJO</string>
-    <string name="permission_rationale_title">Zahtevano je dovoljenje</string>
-    <string name="permission_rationale_camera">Za omogočanje fotoaparata je zahtevano dovoljenje za fotoaparat</string>
-    <string name="permission_rationale_storage">Za shranjevanje fotografij je zahtevano dovoljenje za branje/pisanje na pomnilniško napravo</string>
-    <string name="permission_rationale_record_audio">Za snemanje videoposnetkov z zvokom je zahtevano dovoljenje za mikrofon</string>
-    <string name="permission_rationale_location">Za označevanje z lokacijo je zahtevano dovoljenje za lokacijo</string>
+    <string name="preference_hdr_save_expo_summary">Če je omogočeno, bodo ob uporabi načina HDR posnete tri osnovne slike kot tudi končna slika HDR.  Upoštevajte, da bo shranevanje počasnejše, še posebno, če uporabljate možnosti, kot sta \"Dodaj žig\" ali samodejno izravnavo.</string>
+
+    <string name="no_permission">DOVOLJENJA NISO NA VOLJO.</string>
+    <string name="permission_rationale_title">Zahtevano je dovoljenje.</string>
+    <string name="permission_rationale_camera">Za omogočanje fotoaparata je zahtevano dovoljenje za fotoaparat.</string>
+    <string name="permission_rationale_record_audio">Za snemanje videoposnetkov z zvokom in uporabo možnosti \"Nadzor zvoka\" je zahtevano dovoljenje za mikrofon.</string>
+    <string name="permission_rationale_location">Za označevanje z zemljepisno lego (shranjevanje podatkov o zemljepisni legi
+		v fotografijah in videoposnetkih) je zahtevano dovoljenje za lokacijo.  To dovoljenje je zahtevano tudi za povezavo z napravami za oddaljeni nador Bluetooth LE  (Android 11 or earlier).</string>
 	
 	<string name="preference_category_photo_debugging">Možnosti razhroščevanja</string>
 	<string name="preference_category_video_debugging">Možnosti razhroščevanja</string>
     <string name="preference_camera2_fake_flash">Uporabi nadomestni način bliskavice</string>
     <string name="preference_camera2_fake_flash_summary">Omogočite, če se vaša naprava neobičajno vede z API-jem Camera2</string>
 
-    <string name="preference_expo_bracketing_n_images">Korektura sam. osvetlitve</string>
-    <string name="preference_expo_bracketing_n_images_summary">Število slik korekture samodejne osvetlitve\n%s</string>
-    <string name="preference_expo_bracketing_stops">Korak kor. sam. osvetlitve</string>
+    <string name="preference_expo_bracketing_n_images">Stopnjevanje osvetlitve</string>
+    <string name="preference_expo_bracketing_n_images_summary">Število slik stopnjevanja osvetlitve\n%s</string>
+    <string name="preference_expo_bracketing_stops">Korak stopnjevanja osvetlitve</string>
     <string name="preference_expo_bracketing_stops_summary">Število pozitivnih/negativnih korakov za najtemnejšo/najsvetlejšo sliko\n%s</string>
 	
 	<string name="preference_nr_save">Izvirne slike zmanjševanja šuma</string>
-    <string name="preference_nr_save_summary">Ali naj se izvirne slike shranijo v načinu zmanjševanja šuma. Upoštevajte, da se bodo pri tem slike shranjevale dalj časa.\n%s</string>
+    <string name="preference_nr_save_summary">Ali naj se izvirne slike shranijo v načinu zmanjševanja šuma.  Upoštevajte, da se bodo pri tem slike shranjevale dalj časa.\n%s</string>
 
     <string name="preference_nr_save_no">Ne shrani izvirnih slik</string>
     <string name="preference_nr_save_single">Shrani eno izvirno sliko</string>
@@ -325,34 +325,34 @@
 	
 	<string name="seconds_abbreviation">s</string> <!-- short for seconds -->
 
-    <string name="video_no_free_space">Ni dovolj nezasedenega prostora za snemanje videoposnetka</string>
-	<string name="video_power_critical">Videoposnetek se je ustavil\nRaven baterije je kritično nizka</string>
+    <string name="video_no_free_space">Ni dovolj nezasedenega prostora za snemanje videoposnetka.</string>
+	<string name="video_power_critical">Videoposnetek se je ustavil.\nRaven baterije je kritično nizka.</string>
     <string name="preference_video_low_power_check">Preveri za kritično stanje baterije</string>
-    <string name="preference_video_low_power_check_summary">Ustavi snemanje videoposnetka, če je raven baterije kritično nizka. Zmanjša tveganje okvare videoposnetka, če se naprava izklopi zaradi pomanjkanja energije.</string>
+    <string name="preference_video_low_power_check_summary">Ustavi snemanje videoposnetka, če je raven baterije kritično nizka.  Zmanjša tveganje okvare videoposnetka, če se naprava izklopi zaradi pomanjkanja energije</string>
 	
 	<string name="dark">Temna</string> <!-- exposure compensation dark -->
     <string name="bright">Svetla</string> <!-- exposure compensation bright -->
-    <string name="exposure_shutter_speed">Hitrost zaslonke</string>
+    <string name="exposure_shutter_speed">Hitrost zaklopa</string>
 	
 	<string name="camera_error">Resna napaka fotoaparata</string>
 	
-	<string name="preference_camera2_fast_burst">Omogoči hitro zaporedje HDR/kor. sam. osvetlitve</string>
-    <string name="preference_camera2_fast_burst_summary">Omogoča hitrejše slikanje fotografij s HDR-om/kor. sam. osvetlitve. Onemogočite, če ima vaša naprava pri slikanju fotografij z načinoma HDR/kor. sam. osvetlitve težave.</string>
+	<string name="preference_camera2_fast_burst">Omogoči hitro zaporedje HDR/osvetlitve</string>
+    <string name="preference_camera2_fast_burst_summary">Omogoča hitrejše slikanje fotografij s HDR-om/stopnjevanjem osvetlitvami.  Onemogočite, če ima vaša naprava pri slikanju fotografij z načinoma HDR/stopnjevanje osvetlitve težave.</string>
 	
 	<string name="camera">Fotoaparat</string>
 	<string name="record_video">Posnemi videoposnetek</string>
     <string name="selfie">Samoposnetek</string>
 
     <string name="preference_front_camera_mirror">Zrcaljenje sprednjega fotoaparata</string>
-    <string name="preference_front_camera_mirror_summary">Ali naj se ob uporabi sprednjega fotoaparata slike zrcalijo\n%s</string>
+    <string name="preference_front_camera_mirror_summary">Ali naj se ob uporabi sprednjega fotoaparata nastale slike zrcalijo\n%s</string>
 	
-	<string name="preference_calibrate_level">Kot ravni umerjanja</string>
-    <string name="preference_calibrate_level_summary">Ta možnost umeri pospeškomer naprave za pravilno delovanje samodejne izravnave in prikaza ravni/kota na zaslonu.</string>
+	<string name="preference_calibrate_level">Umeri kot ravni</string>
+    <string name="preference_calibrate_level_summary">Ta možnost umeri pospeškomer naprave za pravilno delovanje samodejne poravnave in prikaza ravni/kota na zaslonu.</string>
     <string name="preference_calibrate_level_dialog">Napravo postavite na ravno vodoravno površino in izberite Umeri.\n\nPritisnite Ponastavi za odstranitev umerjanja iz naprave.\n\nPritisnite gumb Nazaj za preklic.</string>
     <string name="preference_calibrate_level_calibrate">Umeri</string>
     <string name="preference_calibrate_level_reset">Ponastavi</string>
-    <string name="preference_calibrate_level_calibrated">Raven umerjena</string>
-    <string name="preference_calibrate_level_calibration_reset">Ponastavitev ravni umerjanja</string>
+    <string name="preference_calibrate_level_calibrated">Raven je umerjena.</string>
+    <string name="preference_calibrate_level_calibration_reset">Umerejanje ravni je ponastavljeno.</string>
 	
 	<string name="photo_mode_dro">DRO</string>
 	
@@ -389,17 +389,17 @@
     <string name="duration_1h">1 ura</string>
 	
 	<string name="preference_show_take_photo">Prikaži ikono za slikanje fotografije</string>
-    <string name="preference_show_take_photo_summary">Prikaži ikono za slikanje fotografij in snemanje videoposnetkov. Uporabno, če ima vaša naprava fizični sprožilec, ki bi ga raje uporabili.</string>
+    <string name="preference_show_take_photo_summary">Prikaži ikono za slikanje fotografij in snemanje videoposnetkov.  Uporabno, če ima vaša naprava fizični sprožilec, ki bi ga raje uporabili.</string>
 	
-	<string name="video_pause">Videoposnetek v premoru</string>
+	<string name="video_pause">Premor videoposnetka</string>
     <string name="video_resume">Nadaljevanje videoposnetka</string>
     <string name="pause_video">Premor snemanja</string>
     <string name="resume_video">Nadaljuj snemanje</string>
 	
 	<string name="capturing">Zajemanje …</string>
 	
-	<string name="audio_listener_failed">Začenjanje poslušanja zvoka je spodletelo</string>
-	<string name="failed_to_process_hdr">Ustvarjanje slike HDR je spodletelo</string>
+	<string name="audio_listener_failed">Začenjanje zaznavanja zvoka je spodletelo.</string>
+	<string name="failed_to_process_hdr">Ustvarjanje slike HDR je spodletelo.</string>
 	
 	<string name="white_balance_auto">Samodejno</string>
     <string name="white_balance_cloudy">Oblačno</string>
@@ -438,6 +438,9 @@
     <string name="color_effect_solarize">Solariziraj</string>
     <string name="color_effect_whiteboard">Bela tabla</string>
 	
+	<string name="whats_new">Novosti:</string>
+    <string name="donate">Daruj</string>
+
     <!-- for accessibility, these strings for face detection will typically be spoken, e.g., through Google Talkback -->
     <string name="face_detected">obraz</string>
     <string name="faces_detected">obrazi</string>
@@ -445,11 +448,23 @@
     <string name="right_of_screen">na desni strani zaslona</string>
     <string name="top_of_screen">na zgornji strani zaslona</string>
     <string name="bottom_of_screen">na spodnji strani zaslona</string>
+	<string name="centre_of_screen">na sredini</string>
+
+	<string name="high_speed">Visoka hitrost</string> <!-- in the sense of high speed video frame rates -->
 
     <string name="preference_video_fps_default">Privzeta</string>
 
-    <string name="preference_raw_no">Samo JPEG</string>
-    <string name="preference_raw_yes">JPEG in DNG (RAW)</string>
+	<string name="preference_category_exif_tags">Oznake EXIF po meri</string>
+    <string name="preference_exif_artist">Avtor</string>
+    <string name="preference_exif_artist_summary">Besedilo, ki se shrani med metapodatke slike v oznako "Avtor" (samo oblika JPEG)</string>
+    <string name="preference_exif_copyright">Avtorske pravice</string>
+    <string name="preference_exif_copyright_summary">Besedilo, ki se shrani med metapodatke slike v oznako "Avtorske pravice" (samo oblika JPEG)</string>
+
+    <string name="processing">Obdelovanje …</string>
+
+    <string name="preference_raw_no">Ne</string>
+    <string name="preference_raw_yes">Običajno in DNG (RAW)</string>
+	<string name="preference_raw_only">Samo DNG (RAW)</string>
 
     <string name="preference_stamp_dateformat_default">Privzeta</string>
     <string name="preference_stamp_dateformat_yyyymmdd">yyyy-mm-dd</string>
@@ -457,16 +472,86 @@
     <string name="preference_stamp_dateformat_mmddyyyy">mm/dd/yyyy</string>
     <string name="preference_stamp_dateformat_none">Brez</string>
 
-    <string name="flash_off">Bliskavica izk.</string>
+	<string name="preference_fast_burst_n_images">Št. fotografij</string>
+    <string name="preference_fast_burst_n_images_entries_2">2</string>
+    <string name="preference_fast_burst_n_images_entries_3">3</string>
+    <string name="preference_fast_burst_n_images_entries_4">4</string>
+    <string name="preference_fast_burst_n_images_entries_5">5</string>
+    <string name="preference_fast_burst_n_images_entries_6">6</string>
+    <string name="preference_fast_burst_n_images_entries_8">8</string>
+    <string name="preference_fast_burst_n_images_entries_10">10</string>
+    <string name="preference_fast_burst_n_images_entries_12">12</string>
+    <string name="preference_fast_burst_n_images_entries_15">15</string>
+    <string name="preference_fast_burst_n_images_entries_20">20</string>
+
+    <string name="preference_focus_bracketing_n_images">Št. fotografij</string>
+    <string name="preference_focus_bracketing_n_images_entries_2">2</string>
+    <string name="preference_focus_bracketing_n_images_entries_3">3</string>
+    <string name="preference_focus_bracketing_n_images_entries_4">4</string>
+    <string name="preference_focus_bracketing_n_images_entries_5">5</string>
+    <string name="preference_focus_bracketing_n_images_entries_6">6</string>
+    <string name="preference_focus_bracketing_n_images_entries_8">8</string>
+    <string name="preference_focus_bracketing_n_images_entries_10">10</string>
+    <string name="preference_focus_bracketing_n_images_entries_12">12</string>
+    <string name="preference_focus_bracketing_n_images_entries_15">15</string>
+    <string name="preference_focus_bracketing_n_images_entries_20">20</string>
+    <string name="preference_focus_bracketing_n_images_entries_25">25</string>
+    <string name="preference_focus_bracketing_n_images_entries_30">30</string>
+    <string name="preference_focus_bracketing_n_images_entries_40">40</string>
+    <string name="preference_focus_bracketing_n_images_entries_50">50</string>
+    <string name="preference_focus_bracketing_n_images_entries_100">100</string>
+    <string name="preference_focus_bracketing_n_images_entries_150">150</string>
+    <string name="preference_focus_bracketing_n_images_entries_200">200</string>
+
+    <string name="preference_video_capture_rate">Hitrost</string>
+    <string name="preference_video_capture_rate_normal">Običajna</string>
+    <string name="slow_motion_enabled">Počasni posnetek je omogočen.</string>
+    <string name="slow_motion_disabled">Počasni posnetek je onemogočen.</string>
+
+    <string name="flash_off">Bliskavica je izklopljena.</string>
     <string name="flash_auto">Samodejna bliskavica</string>
-    <string name="flash_on">Bliskavica vkl.</string>
+    <string name="flash_on">Bliskavica je vklopljena.</string>
     <string name="flash_torch">Svetilka</string>
     <string name="flash_red_eye">Zm. uč. rdečih oči</string>
+	<string name="flash_frontscreen_auto">Sam. zaslonska bliskavica</string>
+    <string name="flash_frontscreen_on">Zaslonska bliskavica je vklopljena</string>
+    <string name="flash_frontscreen_torch">Zaslonska svetilka</string>
+
+	<string name="preference_antibanding">Odstranjevanje pasov</string>
+    <string name="preference_antibanding_summary">Algoritmi za pomoč pri utripanju svetlobe.\n%s</string>
+    <string name="anti_banding_auto">Samodejno</string>
+    <string name="anti_banding_50hz">50 Hz</string>
+    <string name="anti_banding_60hz">60 Hz</string>
+    <string name="anti_banding_off">Izk.</string>
+
+    <string name="preference_ghost_image">Prekrivna slika</string>
+    <string name="preference_ghost_image_summary">Prekrivna slika za pomoč pri uravnavi.\n%s</string>
+    <string name="preference_ghost_image_off">Izk.</string>
+    <string name="preference_ghost_image_last">Nazadje posneta fotografija</string>
+    <string name="preference_ghost_image_selected">Izbrana slika</string>
+
+    <string name="open_files_saf_exception_ghost">Na tej napravi ni bilo mogoče najti pogovornega okna za iskanje datotek.  Možnost prekrivne slike ni podprta</string>
+    <string name="saf_permission_failed_open_image">Te slike ni mogoče odpreti.</string>
+
+    <string name="preference_camera2_photo_video_recording">Dovoli fotografiranje med snemanjem videoposnetka</string>
+    <string name="preference_camera2_photo_video_recording_summary">Dovoli fotografiranje med snemanjem videoposnetka.  Onemogočite to, če naletite na težave pri snemanju videoposnetkov, ko imate na napravi omogočen API Camera2.</string>
+
+    <string name="preference_video_log">Profili slike videoposnetkov</string>
+    <string name="preference_video_log_summary">Nastavite običajni ali difuzni profil za način videoposnetkov\n%s</string>
+    <string name="preference_video_log_off">Privzeti</string>
+    <string name="preference_video_log_fine">Log (podrobno)</string>
+    <string name="preference_video_log_low">Log (nizko)</string>
+    <string name="preference_video_log_medium">Log (srednje)</string>
+    <string name="preference_video_log_strong">Log (močno)</string>
+    <string name="preference_video_log_extra_strong">Log (zelo močno)</string>
+    <string name="video_log">Profil Log</string>
 
     <string name="preference_record_audio_src_camcorder">Kamera</string>
     <string name="preference_record_audio_src_mic">Zunanji mikrofon (če je prisoten)</string>
     <string name="preference_record_audio_src_default">Privzeti vir zvoka</string>
-    <string name="preference_record_audio_src_voice_communication">Optimizirano za glas</string>
+    <string name="preference_record_audio_src_voice_communication">Optimizirano za glasovne klice</string>
+	<string name="preference_record_audio_src_voice_recognition">Optimizirano za prepoznavanje glasu</string>
+    <string name="preference_record_audio_src_unprocessed">Neobdelano</string>
 
     <string name="preference_video_bitrate_default">Privzeta</string>
     <string name="preference_video_bitrate_100000">100 kb/s</string>
@@ -492,6 +577,63 @@
     <string name="preference_video_bitrate_80000000">80 Mb/s</string>
     <string name="preference_video_bitrate_90000000">90 Mb/s</string>
     <string name="preference_video_bitrate_100000000">100 Mb/s</string>
+	<string name="preference_video_bitrate_150000000">150Mbps</string>
+    <string name="preference_video_bitrate_200000000">200Mbps</string>
+
+	<string name="no_burst">brez taporedja</string> <!-- string for burst mode not being supported for a resolution -->
+
+    <string name="preference_show_video_max_amp">Prikaži merilnik ravni zvoka</string>
+    <string name="preference_show_video_max_amp_summary">Ali naj se med snemanjem videoposnetkov na zaslonu prikaže raven zvoka</string>
+
+    <string name="photo_mode_focus_bracketing">{} ostrenja</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode_focus_bracketing_full">Stopnjevanje globine ostrenja</string>
+
+    <string name="focus_bracketing_source_distance">Izvorna razdalja ostrenja</string>
+    <string name="focus_bracketing_target_distance">Ciljna razdalja ostrenja</string>
+
+    <string name="focus_bracketing_add_infinity">Dodaj neskončno razdaljo</string>
+
+    <string name="magnetic_accuracy_title">Smer neba</string>
+    <string name="magnetic_accuracy_info">Kompas vaše naprave je treba umeriti, da se izboljša natančnost.  To lahko storite z gibanjem naprave v obliki številke 8.\n\nTrenutna natančnost:</string>
+
+    <string name="accuracy_unreliable">Nezanesljiva</string>
+    <string name="accuracy_low">Nizka</string>
+    <string name="accuracy_medium">Srednja</string>
+    <string name="accuracy_high">Visoka</string>
+    <string name="accuracy_unknown">Neznano</string>
+
+    <string name="preference_units_distance">Enote razdalje</string>
+    <string name="preference_units_distance_summary">Uporablja se za nadmorsko višino GPS pri žigih na fotografijah in pri podnapisih na videoposnetkih\n%s</string>
+    <string name="preference_units_distance_m">Metri</string>
+    <string name="preference_units_distance_ft">Čevlji</string>
+    <string name="feet_abbreviation">čev.</string> <!-- symbol short for feet -->
+
+    <string name="preference_show_whats_new">Prikaži pogovorno okno novosti</string>
+    <string name="preference_show_whats_new_summary">Ali naj se prikažejo podatki o novih značilnostih in izboljšavah ob posodobitvi programa</string>
+
+    <string name="preference_edge_mode">Algoritem robnega načina</string>
+    <string name="preference_edge_mode_summary">Algoritem, ki naj ga gonilnik fotoaparata uporabi za poudarjanje robov.  Poudarjanje robov izboljša ostrino in podrobnosti zajete slike (ta nastavitev se prezre v načinu zmanjševanja šumov).\n%s</string>
+
+    <string name="preference_screen_processing_settings">Obdelovanje nastavitev …</string>
+
+    <string name="preference_noise_reduction_mode">Algoritem zmanjševanja šumov</string>
+    <string name="preference_noise_reduction_mode_summary">Algoritem, ki naj ga gonilnik fotoaparata uporabi za zmanjševanje šumov.  Algortem za zmanjševanje šumov poizkuša izboljšati kakovost slike z odstranjevanjem odvečnega šuma, ki ga doda postopek zajema, še posebno v temnih pogojih (upoševajte, da to ni povezano z načinom odstranjevanja šuma, v katerem se ta nastavitev pravzaprev prezre).\n%s</string>
+    <string name="noise_reduction_mode_default">Privzeto</string>
+    <string name="noise_reduction_mode_off">Izk.</string>
+    <string name="noise_reduction_mode_minimal">Najmanjše</string>
+    <string name="noise_reduction_mode_fast">Hitro</string>
+    <string name="noise_reduction_mode_high_quality">Visoka kakovost</string>
+
+    <string name="preference_focus_assist">Pomoč pri ostrenju</string>
+    <string name="preference_focus_assist_summary">Ali naj se predogled poveča pri ročnem uravnavanju ostrine\n%s</string>
+    <string name="preference_focus_assist_off">Izk.</string>
+    <string name="preference_focus_assist_2x">2x</string>
+    <string name="preference_focus_assist_4x">4x</string>
+
+    <string name="exposure_compensation_zoom">Povečaj ali pomanjšaj izravnavo osvetlitve</string>
+
+    <string name="previous">Nazaj</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) for "<" button on popup menu -->
+    <string name="next">Naprej</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) for ">" button on popup menu -->
 
     <string name="preference_burst_mode_off">Izk.</string>
     <string name="preference_burst_mode_2x">2x</string>
@@ -509,6 +651,7 @@
     <string name="preference_burst_mode_unlimited">Neomejeno</string>
 
     <string name="preference_burst_interval_no_delay">Brez zakasnitve</string>
+	<string name="preference_burst_interval_0_5s">0,5 s</string>
     <string name="preference_burst_interval_1s">1 s</string>
     <string name="preference_burst_interval_2s">2 s</string>
     <string name="preference_burst_interval_3s">3 s</string>
@@ -532,6 +675,11 @@
     <string name="preference_video_max_filesize_300mb">300 MB</string>
     <string name="preference_video_max_filesize_500mb">500 MB</string>
     <string name="preference_video_max_filesize_1gb">1 GB</string>
+	<string name="preference_video_max_filesize_2gb">2 GB</string>
+    <string name="preference_video_max_filesize_5gb">5 GB</string>
+    <string name="preference_video_max_filesize_9gb">9 GB</string>
+
+	<string name="cancelled_focus_bracketing">Stopnjevanje globine ostrenja je preklicano.</string>
 
     <string name="preference_crop_guide_none">Brez</string>
     <string name="preference_crop_guide_1">1 (1:1)</string>
@@ -541,6 +689,7 @@
     <string name="preference_crop_guide_1_5">1,5 (3:2)</string>
     <string name="preference_crop_guide_1_78">1,78 (16:9)</string>
     <string name="preference_crop_guide_1_85">1,85 (37:20)</string>
+	<string name="preference_crop_guide_2">2 (2:1)</string>
     <string name="preference_crop_guide_2_33">2,33 (21:9)</string>
     <string name="preference_crop_guide_2_35">2,35 (47:20)</string>
     <string name="preference_crop_guide_2_4">2,4 (12:5)</string>
@@ -553,8 +702,163 @@
     <string name="preference_audio_noise_control_sensitivity_m2">-2</string>
     <string name="preference_audio_noise_control_sensitivity_m3">-3 (nizka občutljivost)</string>
 
+	<string name="preference_hdr_contrast_enhancement">Izboljšava kontrasta HDR</string>
+    <string name="preference_hdr_contrast_enhancement_summary">Kdaj naj se uporabi algoritem za izboljšavo kontrasta v načinu HDR.  To lahko izboljša videz v primerih zelo visokega dinamičnega razpona prizora in rezultatom doda "HDR-videz".\n%s</string>
+    <string name="preference_hdr_contrast_enhancement_off">Izk.</string>
+    <string name="preference_hdr_contrast_enhancement_smart">Pametno</string>
+    <string name="preference_hdr_contrast_enhancement_always">Vedno</string>
+
+    <string name="preference_video_output_format">Oblika videposnetkov</string>
+    <string name="preference_video_output_format_summary">Oblika datotek zvoka in videoposnetkov, in kodeki\n%s</string>
+
+    <string name="preference_video_output_format_default">Privzeto</string>
+    <string name="preference_video_output_format_mpeg4_h264">MPEG4 H264</string>
+    <string name="preference_video_output_format_mpeg4_hevc">MPEG4 HEVC</string>
+    <string name="preference_video_output_format_3gpp">3GPP</string>
+    <string name="preference_video_output_format_webm">WebM (zvok ni podprt)</string>
+
+    <string name="preference_screen_settings_manager">Upravitelj nastavitev</string>
+
+    <string name="preference_save_settings">Shrani nastavitve</string>
+    <string name="preference_save_settings_summary">Shrani vse nastavitve Open Camere v datoteko</string>
+    <string name="preference_save_settings_filename">Ime ahranjenih nastavitev</string>
+
+    <string name="preference_restore_settings">Obnovi nastavitve</string>
+    <string name="preference_restore_settings_summary">Obnovi predhodno shranjene nastavitve.  To bo prepisalo vse trenutne nastavitve s shranjenimi!</string>
+    <string name="preference_restore_settings_question">Ta možnost omogoča izbiro ene od datotek z nastavitvami, ki ste jih predhodno shranili.  Upoštevajte, da bo nalaganje datoteke prepisalo vse trenutne nastavitve!</string>
+
+    <string name="saved_settings">Nastavitve so shranjene</string>
+    <string name="save_settings_failed">Shranjevanje nastavitev je spodletelo.</string>
+    <string name="restore_settings_failed">Obnovitev nastavitev je spodletela.</string>
+    <string name="open_files_saf_exception_generic">Na tej napravi ni bilo mogoče najti pogovornega okna za izbiro datotek.  Ta možnost ni podprta.</string>
+
+    <string name="preference_image_format">Oblika slik</string>
+    <string name="preference_image_format_jpeg">JPEG</string>
+    <string name="preference_image_format_webp">WebP</string>
+    <string name="preference_image_format_png">PNG</string>
+
+    <!-- beware of these strings for preference_nr_mode* being too long, otherwise too wide for popup menu -->
+    <string name="preference_nr_mode">NR Način</string>
+    <string name="preference_nr_mode_normal">Običajni</string>
+    <string name="preference_nr_mode_low_light">Nizka svetloba</string>
+
     <string name="preference_ui_placement_left">Up. vmesnik za levičarje</string>
     <string name="preference_ui_placement_right">Up. vmesnik za desničarje</string>
+	<string name="preference_ui_placement_top">Ikone na vrhu (pokončno)</string>
+
+	    <string name="preference_show_face_detection">Prikaži ikono za zaznavane obrazov</string>
+    <string name="preference_show_face_detection_summary">Ali naj se na zaslonu prikaže ikona za omogočanje/onemogočanje zaznavanja obrazov</string>
+    <string name="face_detection_enable">Omogoči zaznavanje obrazov</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="face_detection_disable">Onemogoči zaznavanje obrazov</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="face_detection_enabled">Zaznavanje obrazov je omogočeno.</string>
+    <string name="face_detection_disabled">Zaznavanje obrazov je onemogočeno.</string>
+
+    <string name="preference_show_auto_level">Prikaži ikono za samodejno poravnavo</string>
+    <string name="preference_show_auto_level_summary">Ali naj se na zaslonu prikaže ikona za omogočanje/onemogočanje samodejne poravnave.  Ko je samodejna poravnava omogočena, se bodo fotografije zavrtele, da se samodejno poravnajo z obzorjem.</string>
+    <string name="auto_level_enable">Omogoči samodejno poravnavo</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="auto_level_disable">Onemogoči samodejno poravnavo</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+
+    <string name="preference_show_stamp">Prikaži ikono za žig na fotografijah</string>
+    <string name="preference_show_stamp_summary">Ali naj se na zaslonu prikaže ikona za omogočanje/onemogočanje žiga na fotografijah</string>
+    <string name="stamp_enable">Omogoči žig na fotografijah</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="stamp_disable">Onemogoči žig na fotografijah</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
+    <string name="stamp_enabled">Žig na fotografijah je omogočen.</string>
+    <string name="stamp_disabled">Žig na fotografijah je onemogočen.</string>
+
+    <string name="preference_show_textstamp">Prikaži ikono za žig z besedilom po meri</string>
+    <string name="preference_show_textstamp_summary">Ali naj se na zaslonu prikaže ikona za določanje besedila po meri, ki naj se prikaže v žigu na fotografijah</string>
+
+    <string name="preference_show_white_balance_lock">Prikaži ikono za zaklepanje ravnovesja beline</string>
+    <string name="preference_show_white_balance_lock_summary">Ali naj se na zaslonu prikaže ikona za zaklepanje/odklepanje samodejnega uravnavanja beline</string>
+    <string name="white_balance_lock">Zakleni ravnovesje beline</string>
+    <string name="white_balance_unlock">Odkleni ravnovesje beline</string>
+    <string name="white_balance_locked">Ravnovesje beline je zaklenjeno.</string>
+    <string name="white_balance_unlocked">Ravnovesje beline je odklenjeno.</string>
+
+    <string name="preference_show_exposure_lock">Prikaži ikono za zaklepanje samodejne osvetlitve</string>
+    <string name="preference_show_exposure_lock_summary">Ali naj se na zaslonu prikaže ikona za zaklepanje/odklepanje osvetlitve</string>
+    <string name="exposure_unlock">Odkleni osvetlitev</string>
+
+    <string name="preference_nr_mode_low_light_message">Način nizke svetlobe: držite fotoaparat pri miru</string>
+
+    <string name="photo_mode_panorama">Pano.</string> <!-- keep short, as this shows in the popup menu; probably shouldn't be translated? -->
+    <string name="photo_mode_panorama_full">Panorama</string>
+
+    <string name="preference_screen_remote_control">Oddaljeni nadzor Bluetooth LE …</string>
+    <string name="preference_enable_remote">Omogoči oddaljeni nadzor Bluetooth LE</string>
+    <string name="preference_enable_remote_summary">Omogoči naprave za oddaljeni nadzor Bluetooth LE</string>
+    <string name="preference_remote_type">Vrsta oddaljene naprave</string>
+
+    <string name="ble_not_supported">BLE ni podprt</string>
+    <string name="scan_ble">Poišči naprave BLE</string>
+    <string name="bluetooth_not_supported">Bluetooth ni podprt.</string>
+    <string name="unknown_device">Neznana naprava</string>
+    <string name="preference_remote_disconnect_screen_dim">Zatemni zaslon, če se povezava z oddaljeno napravo prekine</string>
+    <string name="preference_remote_disconnect_screen_dim_summary">Nasvet: pred zagonom Open Camere privzeto svetlost nastavite na najmanjšo raven.</string>
+    <string name="preference_water_type">Za izračunavanje globine uporabi slano vodo</string>
+    <string name="preference_water_type_summary">Izboljša natančnost pri vodotesnih ohišjih, če je izbrana pravilna vrsta vode.</string>
+    <string name="remote_connected">Oddaljena naprava je povezana.</string>
+
+    <string name="preference_stamp_geo_address">Uporabi naslove</string>
+    <!-- preference_stamp_geo_address_summary defined below -->
+    <string name="preference_stamp_geo_address_both">Poleg koordinat GPS prikaži naslove, če jo možno</string>
+    <string name="preference_stamp_geo_address_prefer">Prednost ima naslov pred koordinatami GPS</string>
+    <string name="preference_stamp_geo_address_no">Ne prikaži naslova</string>
+
+    <string name="preference_show_store_location">Prikaži ikono za shranjevanje podakov o lokaciji</string>
+    <string name="preference_show_store_location_summary">Ali naj se na zaslonu prikaže ikona za omogočanje/onemogočanje podatkov o lokaciji (označevanje z zemljepisno lego)</string>
+    <string name="preference_location_enable">Shrani podatke o lokaciji</string>
+    <string name="preference_location_disable">Prenehaj shranjevati podatke o lokaciji</string>
+
+    <string name="preference_histogram">Prikaži histogram</string>
+    <string name="preference_histogram_summary">Ali naj se prikaže histogram barv na zaslonu\n%s</string>
+    <string name="preference_histogram_off">Izk.</string>
+    <string name="preference_histogram_rgb">Barve RGB</string>
+    <string name="preference_histogram_luminance">Svetilnost</string>
+    <string name="preference_histogram_value">Vrednost (največja)</string>
+    <string name="preference_histogram_intensity">Jakost (povprečno)</string>
+    <string name="preference_histogram_lightness">Svetlost (povprečje od najm.-najv.)</string>
+
+    <string name="preference_zebra_stripes">Prikaži zebrine črte</string>
+    <string name="preference_zebra_stripes_summary">Če je ta možnost omogočena, bodo na zaslonu prikazane zebrine črte, kjer je predogled slike preosvetljen.\n%s</string>
+    <string name="preference_zebra_stripes_off">Izk.</string>
+    <string name="preference_zebra_stripes_70pc">70 %</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_80pc">80 %</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_90pc">90 %</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_93pc">93 %</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_95pc">95 %</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_97pc">97 %</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_98pc">98 %</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_99pc">99 %</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_100pc">100 %</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+
+    <string name="preference_focus_peaking">Izboljšava ostrenja</string>
+    <string name="preference_focus_peaking_summary">Če je ta možnost omogočena, bodo na izostrenih robovih prikazani poudarki (orisi).  To je v glavnem uporabno za ročno ostrenje in za pomoč pri določanju, kateri deli slike zo izostreni.\n%s</string>
+    <string name="preference_focus_peaking_off">Izk.</string>
+    <string name="preference_focus_peaking_on">Vkl.</string>
+    <string name="preference_focus_peaking_color">Barva izboljšave ostrenja</string>
+    <string name="preference_focus_peaking_color_summary">Barva za prikaz na izostrenih robovih\n%s</string>
+
+    <string name="remaining">Preostalo</string> <!-- images remaining for "processing" -->
+
+    <string name="preference_preview">Predogled …</string>
+
+    <string name="cycle_flash">Preklop bliskavice</string>
+    <string name="preference_show_cycle_flash">Prikaži ikono za bliskavico</string>
+    <string name="preference_show_cycle_flash_summary">Ali naj se na zaslonu namesto prikaza možnosti bliskavice v pojavnem oknu prikaže ikona za preklop med možnostmi bliskavice.  Upoštevajte, da med uporabo te ikone svetilka ni na voljo.</string>
+
+    <string name="preference_raw_expo_bracketing">Dovoli obliko RAW za stopnjevanje osvetlitve</string>
+    <string name="preference_raw_expo_bracketing_summary">Ali naj se možnost RAW uporabi tudi v načinu stopnjevanja osvetlitve (ali v načinu HDR, kadar je omogočena možnost \"Shrani vse slike za način HDR\").  Če je ta možnost onemogočena, bodo v teh načinih slike shranjene samo v obliki JPEG.</string>
+
+    <string name="preference_raw_focus_bracketing">Dovoli RAW for stopnjevanje globine ostrenja</string>
+    <string name="preference_raw_focus_bracketing_summary">Ali naj se možnost RAW uporabi tudi v načinu stopnjevanja globine ostrenja.  Če je ta možnost onemogočena, bodo v načinih stopnjevanja globine ostrenja shranjene samo slike JPEG.</string>
+
+    <string name="cycle_raw">Preklop načinov RAW</string>
+    <string name="preference_show_cycle_raw">Prikaži ikono RAW</string>
+    <string name="preference_show_cycle_raw_summary">Ali naj se na zaslonu prikaže ikona za preklop med načini RAW</string>
+
+    <string name="bluetooth_current_remote">Trenutna oddaljena naprava:</string>
+    <string name="bluetooth_scan">Išči</string>
 
     <string name="preference_stamp_style_shadowed">Osenčeno besedilo</string>
     <string name="preference_stamp_style_plain">Golo besedilo</string>
@@ -566,9 +870,122 @@
     <string name="preferences_licence">Licenca</string>
     <string name="preferences_app_info_title">Podatki o fotoaparatu</string>
     <string name="preferences_service_terms">Pogoji storitve</string>
+	<string name="preference_stamp_style_background">Besedilo z osenčenim ozadjem</string>
+
+	<string name="image_saving_notification">Shranjevanje slik …</string>
+
+	    <string name="finish_panorama">Dokončaj panoramo</string>
+    <string name="cancel_panorama">Prekliči panoramo</string>
+    <string name="panorama_cancelled">Panorama je preklicana.</string>
+    <string name="failed_to_process_panorama">Ustvarjanje panoramske slike je spodletelo.</string>
+
+    <string name="preference_panorama_crop">Samodejno obreži panoramo</string>
+    <string name="preference_panorama_crop_summary">Obrezovanje nazobčanih robov panoramske slike\n%s</string>
+
+    <string name="panorama_info">Za zajem panoramske slike držite napravo v pokončnem položaju in kliknite za slikanje fotografije, da začnete panoramo.  Nato premaknite napravo levo ali desno, da bel krog na sredini premaknate na modro piko.  Ko se vsaka nova slika zajame, še naprej premikajte napravo, da pokrijete vsako novo modro piko.\n\nKliknite na kljukico, da shranite panoramo, ali križec, da jo prekličete.\n\nUpoštevajte, da traja nekaj časa, da se panoramske fotografije obdelajo in shranijo.</string>
+
+    <string name="preference_panorama_save">Izvirne slike panorame</string>
+    <string name="preference_panorama_save_summary">Ali naj se shranijo izvirne slike v načinu panorame.  To bo podaljšalo čas shranjevanja slik panorame.  Dovoli tudi možnost shranjevanja datoteke XML, ki je uporabna pri poročanju o težavah s panoramo.\n%s</string>
+
+    <string name="preference_panorama_save_no">Ne shrani izvirnih slik</string>
+    <string name="preference_panorama_save_all">Shrani izvirne slike</string>
+    <string name="preference_panorama_save_all_plus_debug">Shrani izvirne slike in razhroščevalni XML</string>
+
+    <string name="camera_id">ID</string> <!-- ID as in camera ID -->
+
+    <string name="exposure_compensation_seekbar">Iskalna vrstica za spremembo izravnave osvetlitve</string>
+
+    <string name="preference_image_format_summary">Izberite obliko datototek za shranjevanje fotografij.  To vpliva na fotografije v \"običajni\" obliki (ne v obliki RAW).  Samo oblika JPEG podpira shranjevanje metapodatkov Exif.  Upoštevajte, da oblika PNG ni popolnoma brezizgubna in se zaradi tega pretvori iz oblike JPEG pri 100 %% kakovosti.\n%s</string>
+
+    <string name="preference_camera_api">API fotoaparata</string>
+    <string name="preference_camera_api_summary">Izberite API Camera2, da omogočite dodatne značilnosti, kot so ročni načini za osvetlitev, ostrino, ravnovesje beline, kot tudi obliko RAW (če jo naprava podpira).  Sprememba API-ja po ponovno zagnala program.\n%s</string>
+    <string name="preference_camera_api_old">Izvirni API fotoaparata</string>
+    <string name="preference_camera_api_camera2">API Camera2</string>
+
+    <string name="preference_audio_control_summary">Posnemite fotografijo/videposnetek, ko naprava zazna zvok.
+        Ko je omogočeno, uporabite zaslonski gumb za mikrofon, da vklopite/izklopite zaznavo zvoka.
+        \n%s</string>
+
+    <!-- beware of string being too long to display! -->
+    <string name="preference_stamp_geo_address_summary">Če je možno, pridobi naslov iz lokacij GPS (za žig na fotografijah ali podnapise v videoposnetkih).
+        Upoštevajte, da če je omogočena, bo naprava preko interneta tretjim osebam poslala podatke o lokaciji, da koordinate
+        GPS pretvori v naslov. Glejte https://developer.android.com/reference/android/location/Geocoder .
+        Ta funkcija ne zagotavlja nobenih zagotovil glede razpoložljivosti ali točnosti. Ni zagotovljeno, da bodo rezultati smiselni ali pravilni.
+        \n%s</string>
+
+    <string name="intro_text">Dotaknite se za izostritev in pritisnite moder gumb za fotoaparat, da posnamete fotografijo.
+        \n\nZa onemogočanje največje svetlosti zaslona glejte Nastavitve/Gr. up. vmesnik na zaslonu/\"Vsili največjo svetlost\".
+        Za shranjevanje na kartico SD na Androidih 5+ glejte Nastavitve/Več nastavitev fotoaparata/\"Storage Access Framework\".
+        Za pomoč kliknite \"Spletna pomoč\" v nastavitvah.
+    </string>
+
+    <string name="preference_select_remote">Izberi oddaljeno napravo</string>
+
+    <string name="preference_video_rec709">REC709</string>
+    <string name="preference_video_srgb">sRGB</string>
+    <string name="preference_video_gamma">Gamma</string>
+    <string name="preference_video_profile_gamma">Vrednost gama videoposnetkov</string>
+    <string name="preference_video_profile_gamma_summary">Vrednost gama, k naj se uporabi v videoposnetkih, če je profil slike videoposnetkov nastavljen na Gama\n%s</string>
+    <string name="preference_video_profile_gamma_1_6">1,6</string>
+    <string name="preference_video_profile_gamma_1_8">1,8</string>
+    <string name="preference_video_profile_gamma_1_9">1,9</string>
+    <string name="preference_video_profile_gamma_2_0">2,0</string>
+    <string name="preference_video_profile_gamma_2_1">2,1</string>
+    <string name="preference_video_profile_gamma_2_2">2,2</string>
+    <string name="preference_video_profile_gamma_2_3">2,3</string>
+    <string name="preference_video_profile_gamma_2_4">2,4</string>
+    <string name="preference_video_profile_gamma_2_6">2,6</string>
+    <string name="preference_video_profile_gamma_2_8">2,8</string>
 
     <string name="preference_immersive_mode_off">Izk.</string>
-    <string name="preference_immersive_mode_navigation">Skrij samo zaslonske gumbe za navidezno krmarjenje</string>
+	<string name="preference_immersive_mode_low_profile">Zatemni samo zaslonnske navidezne gumbe za krmarjenje</string>
+    <string name="preference_immersive_mode_navigation">Skrij samo zaslonske navidezne gumbe za krmarjenje</string>
     <string name="preference_immersive_mode_gui">Skrij gr. up. vmsnik</string>
     <string name="preference_immersive_mode_everything">Skrij vse</string>
+
+	<string name="preference_ghost_image_alpha">Prosojnost prekrivne slike</string>
+    <string name="preference_ghost_image_alpha_summary">Vrednost alfa pri uporabi prekrivne slike.  Nižja vrednost pomeni večjo prosojnost.\n%s</string>
+
+    <string name="preference_zebra_stripes_foreground_color">Ospredna barva zebrinih črt</string>
+    <string name="preference_zebra_stripes_foreground_color_summary">Barva, ki naj se uporabi za osprednje črte med prikazom zebrinih črt.\n%s</string>
+    <string name="preference_zebra_stripes_background_color">Ozadna barva zebrinih črt</string>
+    <string name="preference_zebra_stripes_background_color_summary">Barva, ki naj se uporabi za ozadne črte med prikazom zebrinih črt.\n%s</string>
+
+    <string name="preference_zebra_stripes_color_black">Črna</string>
+    <string name="preference_zebra_stripes_color_red">Rdeča</string>
+    <string name="preference_zebra_stripes_color_orange">Oranžna</string>
+    <string name="preference_zebra_stripes_color_transparent">Prosojna</string>
+    <string name="preference_zebra_stripes_color_white">Bela</string>
+
+    <string name="external_camera">Zunanji fotoaparat</string>
+    <string name="ultrawide">Ultraširoko</string>
+
+    <string name="switch_to_external_camera">Preklopi na zunanji fotoaaprat</string>
+    <string name="switch_to_unknown_camera">Preklopi fotoaparat</string>
+    <string name="switch_multi_camera">Preklopi med več fotoaparati</string>
+    <string name="preference_multi_cam_button">Ikona za več fotoaparatov</string>
+    <string name="preference_multi_cam_button_summary">Če je omogočeno, uporabi ločene gumbe za preklop med sprednjim/zadnjim fotoaparatom in za preklop med več sprednjimi/zadnjimi fotoaparati.  Če je onemogočeno, bo ikona preklapljala med vsemi fotoaparati.</string>
+
+    <string name="preference_show_camera_id">Prikaži ID fotoaparata</string>
+    <string name="preference_show_camera_id_summary">Prikaži ID trenutnega fotoaparata na zaslonu</string>
+
+    <string name="preference_allow_long_press">Dovoli dejanja dolgih pritiskov</string>
+    <string name="preference_allow_long_press_summary">Ali naj se dovolijo dejanja dolgih pritiskov (npr. dolg pritisk na galerijo za spremembo mesta shranjevanja).</string>
+
+    <string name="aperture">Zaslonka</string>
+
+    <string name="error_features_4k">4K UHD</string>
+    <string name="error_features_bitrate">Bitna hitrost</string>
+    <string name="error_features_frame_rate">Hitrost sličic</string>
+    <string name="error_features_slow_motion">Počasni posnetek</string>
+
+    <string name="preference_comment_ypr">Shrani odklon, naklon in nagib</string>
+    <string name="preference_comment_ypr_summary">V uporabniško opombo Exif v fotografiji shrani odklon, naklon in nagib naprave (samo oblika JPEG)</string>
+
+    <string name="array_seekbar_preference_seekbar">Iskalna vrstica za spremembo trenutne vrednosti nastavitve</string>
+
+    <string name="preference_audio_control_none">Brez</string>
+    <string name="preference_audio_control_noise">Glasen zvok</string>
+    <string name="preference_audio_control_voice">Glasovni ukaz: \"cheese\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 01cedf0333ac0079f62c26deb109b4e7c5c5da3e..a7b6bf88159fc3eb303d8b7efbc7963ffc9ece7d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -108,7 +108,6 @@
 
     <string name="preference_save_location">Kaydetme yeri</string>
     <string name="preference_save_location_summary">Fotoğraf/vidyo dosyaları için kayıt klasörü</string>
-    <string name="preference_using_saf">Storage Access Framework kullan</string>
     <string name="preference_using_saf_summary">Fotoğraf ve vidyoları kaydetmek için Storage Access Framework kullan</string>
     <string name="preference_save_photo_prefix">Fotoğraf adlandırma öneki kaydet</string>
     <string name="preference_save_photo_prefix_summary">Fotoğraflarda dosya adlarını kaydetmede kullanılacak önek</string>
diff --git a/app/src/main/res/values-uk/arrays.xml b/app/src/main/res/values-uk/arrays.xml
index fc4ac72938d95b9a3aa1bf23e68698405a4615bd..47994100725a6363f281d15f0ab6df1f9f50f10f 100644
--- a/app/src/main/res/values-uk/arrays.xml
+++ b/app/src/main/res/values-uk/arrays.xml
@@ -242,16 +242,6 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>Немає</item>
-        <item>Низький шум</item>
-        <item>Голосова команда: \"сир\"</item>
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
     <string-array name="preference_save_zulu_time_entries">
         <item>Локальний час</item>
         <item>UTC (Зулу)</item>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 17da6df09db2eb74462db544bdd778b527f8e07f..b6bb6a55220139683a5bc6e2012827681ef5341f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -112,7 +112,6 @@
 
     <string name="preference_save_location">Тека збереження</string>
     <string name="preference_save_location_summary">"Ім'я теки для збереження фото та відео (також може бути повний шлях)"</string>
-    <string name="preference_using_saf">Використовувати Storage Access Framework</string>
     <string name="preference_using_saf_summary">Використовувати Storage Access Framework для збереження фото та відео</string>
     <string name="preference_save_photo_prefix">Префікс для фото</string>
     <string name="preference_save_photo_prefix_summary">Префікс імен файлів для знімків</string>
@@ -517,4 +516,9 @@
     <string name="preference_immersive_mode_navigation">Приховати кнопки навігації</string>
     <string name="preference_immersive_mode_gui">Приховати GUI</string>
     <string name="preference_immersive_mode_everything">Приховати все</string>
+
+    <string name="preference_audio_control_none">Немає</string>
+    <string name="preference_audio_control_noise">Низький шум</string>
+    <string name="preference_audio_control_voice">Голосова команда: \"сир\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
diff --git a/app/src/main/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml
index 1f75cab686e762043e9f913caa961d40168fcbd4..44ce3553278460994b7752b193f0894bc4e2b77b 100644
--- a/app/src/main/res/values-v11/styles.xml
+++ b/app/src/main/res/values-v11/styles.xml
@@ -4,7 +4,7 @@
         Base application theme for API 11+. This theme completely replaces
         AppBaseTheme from res/values/styles.xml on API 11+ devices.
     -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo.NoActionBar.Fullscreen">
+    <style name="AppBaseTheme" parent="@style/Theme.AppCompat.NoActionBar">
         <!-- API 11 theme customizations can go here. -->
     </style>
 
diff --git a/app/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml
index 148064db602b2ad115bd11f7e058abfcd4c4da33..ff6a5c915c3793d60b8c00f2f87cc7b441041e38 100644
--- a/app/src/main/res/values-v14/styles.xml
+++ b/app/src/main/res/values-v14/styles.xml
@@ -5,7 +5,7 @@
         AppBaseTheme from BOTH res/values/styles.xml and
         res/values-v11/styles.xml on API 14+ devices.
     -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo.NoActionBar.Fullscreen">
+    <style name="AppBaseTheme" parent="@style/Theme.AppCompat.NoActionBar">
         <!-- API 14 theme customizations can go here. -->
     </style>
     
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 7629e288caf6da105ce64ea42647727abf403825..d03e6a8877d6605ef9ff7b1446a704b6f65c24f3 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -5,7 +5,7 @@
         AppBaseTheme from BOTH res/values/styles.xml and
         res/values-v11/styles.xml on API 21+ devices.
     -->
-    <style name="AppBaseTheme" parent="android:Theme.Material.NoActionBar.Fullscreen">
+    <style name="AppBaseTheme" parent="@style/Theme.AppCompat.NoActionBar">
         <!-- API 21 theme customizations can go here. -->
         <item name="android:colorAccent">@color/color_default_accent</item>
         <item name="android:imageButtonStyle">@style/image_button</item>
diff --git a/app/src/main/res/values-vi/arrays.xml b/app/src/main/res/values-vi/arrays.xml
index c23edde52ef32de74e3797d28230ad53a6320af0..f845e68db0690210d5305669addbe2b9ac329b82 100644
--- a/app/src/main/res/values-vi/arrays.xml
+++ b/app/src/main/res/values-vi/arrays.xml
@@ -242,16 +242,6 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>Không</item>
-        <item>Tiếng động lớn</item>
-        <item>Tiếng cheese</item> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
     <string-array name="preference_save_zulu_time_entries">
         <item>Giờ địa phương</item>
         <item>UTC (Zulu)</item>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index f338ee4c617c816958654f30ed540c2601d4c6bb..dca3ef9a9b82bfa3732bd99630f1fefc9ee19307 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -111,7 +111,6 @@
     <string name="preference_audio_noise_control_sensitivity_summary">Độ nhạy cho tùy chọn chụp bằng tiếng động lớn</string>
     <string name="preference_save_location">Vị trí lưu</string>
     <string name="preference_save_location_summary">Thư mục lưu tệp tin ảnh/video</string>
-    <string name="preference_using_saf">Sử dụng Khung Truy cập Lưu trữ</string>
     <string name="preference_using_saf_summary">Sử dụng Khung Truy cập Lưu trữ để lưu ảnh và video. Nên kích hoạt để có thể lưu vào thẻ nhớ ngoài.</string>
     <string name="preference_save_photo_prefix">Tiền tố ảnh</string>
     <string name="preference_save_photo_prefix_summary">Đặt tiền tố trong tên tệp khi lưu ảnh</string>
@@ -281,7 +280,7 @@
     <string name="audio_listener_started">Tạo tiếng động lớn</string>
 
     <string name="auto_stabilise_info">Hình ảnh sẽ được điều chỉnh để đạt mức cân bằng.\n\nLưu ý ảnh sẽ có độ phân giải thấp hơn một chút (do phải xoay và cắt xén).</string>
-    <string name="raw_info">Tệp DNG chứa toàn bộ thông tin chưa được nén và xử lý bằng máy ảnh.\n\nLưu ý một số ứng dụng thư viện không hỗ trợ tệp DNG. Hình ảnh DNG có thể chỉnh sửa bằng các ứng dụng như Snapseed hoặc Lightroom.\n\nLưu ý các tùy chọn như Đóng dấu hình ảnh và Chống rung tự động chỉ áp dụng cho tệp JPEG chứ không áp dụng cho tệp DNG.\n\n\n\nTệp DNG chỉ được lưu trong chế độ ảnh Tiêu chuẩn hoặc DRO.</string>
+    <string name="raw_info">Tệp DNG chứa toàn bộ thông tin chưa được nén và xử lý bằng máy ảnh.\n\nLưu ý một số ứng dụng thư viện không hỗ trợ tệp DNG.\n\nLưu ý các tùy chọn như Đóng dấu hình ảnh và Chống rung tự động chỉ áp dụng cho tệp JPEG chứ không áp dụng cho tệp DNG.\n\n\n\nTệp DNG chỉ được lưu trong chế độ ảnh Tiêu chuẩn hoặc DRO.</string>
     <string name="hdr_info">Chế độ HDR rất hữu ích cho các bức ảnh ngược sáng. Nó hoạt động bằng cách chụp nhiều ảnh ở các mức phơi sáng khác nhau và kết hợp chúng để tạo ra bức ảnh cuối cùng.\n\nLưu ý chế độ HDR không phù hợp với các cảnh có chuyển động nhanh, có thể dẫn đến việc tái tạo màu kém chính xác.\n\nChụp ảnh ở chế độ HDR sẽ chậm hơn.</string>
 
     <string name="dont_show_again">Không hiển thị nữa</string>
@@ -303,9 +302,7 @@
     <string name="no_permission">GIẤY PHÉP KHÔNG KHẢ DỤNG</string>
     <string name="permission_rationale_title">Yêu cầu cấp phép</string>
     <string name="permission_rationale_camera">Quyền máy ảnh cần được cấp phép để kích hoạt máy ảnh</string>
-    <string name="permission_rationale_storage">Quyền bộ nhớ cần được cấp phép để lưu ảnh</string>
     <string name="permission_rationale_record_audio">Quyền micrô cần được cấp phép để quay video với âm thanh, cũng như sử dụng các tùy chọn Điều khiển âm thanh</string>
-    <string name="permission_rationale_location">Quyền vị trí cần được cấp phép để gắn thẻ địa lý</string>
 
     <string name="preference_category_photo_debugging">Tùy chọn gỡ lỗi</string>
     <string name="preference_category_video_debugging">Tùy chọn gỡ lỗi</string>
@@ -795,4 +792,9 @@
     <string name="preference_immersive_mode_navigation">Chỉ ẩn các nút điều hướng</string>
     <string name="preference_immersive_mode_gui">Ẩn giao diện người dùng</string>
     <string name="preference_immersive_mode_everything">Ẩn mọi thứ</string>
+
+    <string name="preference_audio_control_none">Không</string>
+    <string name="preference_audio_control_noise">Tiếng động lớn</string>
+    <string name="preference_audio_control_voice">Tiếng cheese</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh-rCN/arrays.xml
index dae98a91f339a5c0fb708ac804e37944e0df5b9c..b5d8a681bf821171202c2b02c2e766dc90a06b05 100644
--- a/app/src/main/res/values-zh-rCN/arrays.xml
+++ b/app/src/main/res/values-zh-rCN/arrays.xml
@@ -242,14 +242,4 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>无</item>
-        <item>大的声音</item>
-        <item>语音命令: \"cheese\"</item>
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e0b043c7e7cb9e6f8e4ddb6b702562542891d2f0..30ab17b705b79c30fb76160b2982042070b2a67a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -18,7 +18,7 @@
     <string name="repeats_to_go">重复做</string> <!--  intentionally starts lower case -->
     <string name="failed_to_reconnect_camera">连接到相机失败</string>
     <string name="video_may_be_corrupted">错误，视频文件可能已经损坏</string>
-    <string name="not_supported">在你的设备上不被支持</string> <!--  intentionally starts lower case -->
+    <string name="not_supported">不支持您的设备</string> <!--  intentionally starts lower case -->
     <string name="video_error_unknown">未知错误，视频挂起</string>
     <string name="video_error_server_died">服务器死亡，视频挂起</string>
     <string name="video_max_duration">视频达到最大时长</string>
@@ -72,7 +72,7 @@
     <string name="metres_abbreviation">m</string> <!-- symbol short for metres -->
     
     <string name="preference_category_camera_effects">相机特效</string>
-    <string name="preference_auto_stabilise">自动稳定</string>
+    <string name="preference_auto_stabilise">自动水平</string>
     <string name="preference_auto_stabilise_summary">图像将被旋转，使它们自动水平(仅照片) (拍照更慢，并且在内存过低的设备上失败)</string>
     <string name="preference_color_effect">应用一个颜色效果</string>
     <string name="preference_color_effect_summary">应用选定的颜色效果到照片</string>
@@ -110,7 +110,6 @@
     <string name="preference_audio_noise_control_sensitivity_summary">使用语音识别时麦克风过滤噪声的阈值</string>
     <string name="preference_save_location">保存位置</string>
     <string name="preference_save_location_summary">用来保存照片/视频文件的文件夹</string>
-    <string name="preference_using_saf">使用存储访问架构</string>
     <string name="preference_using_saf_summary">是否使用存储访问架构保存照片和视频</string>
     <string name="preference_save_photo_prefix">保存照片前缀</string>
     <string name="preference_save_photo_prefix_summary">用于保存照片文件名的前缀</string>
@@ -190,7 +189,7 @@
     <string name="preference_stamp_style">文本样式</string>
     <string name="preference_stamp_style_summary">水印文本的样式\n%s</string>
     <string name="video_quality">视频分辨率</string>
-    <string name="preference_force_video_4k">强制 4K UHD 视频 (实验)</string>
+    <string name="preference_force_video_4k">强制 4K UHD 视频 (仅在部分设备可用)</string>
     <string name="preference_force_video_4k_summary">为后置相机录像启用 3840x2160 分辨率 - 仅当你的设备支持时才能工作，并且如果不支持可能崩溃！</string>
     <string name="preference_video_stabilization">启用视频稳定</string>
     <string name="preference_video_stabilization_summary">视频稳定减少在预览和录像中由于相机移动引起的晃动。</string>
@@ -239,8 +238,8 @@
     <string name="flash_mode">闪光模式</string>
     <string name="trash">删除上一张照片</string>
     <string name="share">共享照片</string>
-    
-    <string name="parent_folder">../ (上层目录)</string>
+
+    <string name="parent_folder">父文件夹</string>
     <string name="new_folder">新建文件夹</string>
     <string name="cant_write_folder">不能写到这个文件夹</string>
     <string name="cant_access_folder">不能访问这个文件夹</string>
@@ -293,7 +292,7 @@
     <string name="preference_video_fps_default">默认</string>
 
     <string name="preference_stamp_dateformat_default">默认</string>
-    <string name="preference_stamp_dateformat_yyyymmdd">yyyy-mm-dd</string>
+    <string name="preference_stamp_dateformat_yyyymmdd">yyyy-mm-dd (ISO 8601)</string>
     <string name="preference_stamp_dateformat_ddmmyyyy">dd/mm/yyyy</string>
     <string name="preference_stamp_dateformat_mmddyyyy">mm/dd/yyyy</string>
     <string name="preference_stamp_dateformat_none">无</string>
@@ -302,12 +301,12 @@
     <string name="flash_auto">自动闪光灯</string>
     <string name="flash_on">开启闪光灯</string>
     <string name="flash_torch">闪光灯常亮</string>
-    <string name="flash_red_eye">红眼</string>
+    <string name="flash_red_eye">防红眼</string>
 
     <string name="preference_record_audio_src_camcorder">摄像机同侧</string>
     <string name="preference_record_audio_src_mic">外部麦克风（如果存在）</string>
     <string name="preference_record_audio_src_default">默认麦克风</string>
-    <string name="preference_record_audio_src_voice_communication">优化语音</string>
+    <string name="preference_record_audio_src_voice_communication">针对语音通话优化</string>
 
     <string name="preference_video_bitrate_default">默认</string>
     <string name="preference_video_bitrate_100000">100kbps</string>
@@ -375,19 +374,19 @@
     <string name="preference_calibrate_level_calibration_reset">重置水平校正</string>
     <string name="noise_reduction_mode_high_quality">高品质</string>
     <string name="noise_reduction_mode_fast">快速</string>
-    <string name="noise_reduction_mode_minimal">小尺寸</string>
+    <string name="noise_reduction_mode_minimal">低限度</string>
     <string name="noise_reduction_mode_default">默认</string>
     <string name="noise_reduction_mode_off">关闭</string>
     <string name="preference_screen_processing_settings">处理设置…</string>
     <string name="preference_noise_reduction_mode">降噪算法</string>
-    <string name="processing">处理…</string>
+    <string name="processing">处理中…</string>
     <string name="preference_raw_no">仅JPEG</string>
     <string name="preference_raw_yes">JPEG和DNG(RAW)</string>
     <string name="preference_raw_only">仅DNG(RAW)</string>
     <string name="preference_fast_burst_n_images">照片数量</string>
     <string name="preference_focus_bracketing_n_images">照片数量</string>
-    <string name="preference_video_capture_rate">速度</string>
-    <string name="preference_video_capture_rate_normal">普通</string>
+    <string name="preference_video_capture_rate">速度优先</string>
+    <string name="preference_video_capture_rate_normal">正常</string>
     <string name="slow_motion_disabled">关闭慢动作</string>
     <string name="slow_motion_enabled">启用慢动作</string>
 
@@ -398,7 +397,7 @@
     <string name="accuracy_low">低</string>
     <string name="accuracy_medium">中</string>
     <string name="accuracy_high">高</string>
-    <string name="accuracy_unknown">位置</string>
+    <string name="accuracy_unknown">未知</string>
     <string name="preference_units_distance">距离单位</string>
     <string name="preference_units_distance_ft">英制</string>
     <string name="preference_units_distance_m">公制</string>
@@ -407,17 +406,17 @@
     <string name="preference_noise_reduction_mode_summary">
         相机驱动程序提供的降噪算法。降噪算法会试图去除相机捕获的噪点（特别是黑暗环境），改善照片质量。
         注意这与降噪照片模式无关，实际上在NR照片模式下会忽略此设置。\n%s</string>
-    <string name="preference_edge_mode">锐化算法（Edge mode）</string>
+    <string name="preference_edge_mode">锐化算法</string>
     <string name="preference_edge_mode_summary">相机驱动程序提供的锐化算法。可以提高捕获图像的清晰度和细节。（在NR拍照模式下忽略此设置）\n%s</string>
     <string name="preference_show_whats_new_summary">是否在应用程序更新后提示新功能和改进的信息</string>
     <string name="auto_stabilise_info">自动水平会自动旋转照片，使他们显示水平.\n\n注意这意味着图像分辨率会略低（因为需要旋转和裁切）。</string>
-    <string name="raw_info">DNG文件包含来自相机的全部未压缩和处理的信息。\n\n注意有些图库无法识别DNG文件。DNG图像可以使用专用编辑器（比如Snapseed和Lightroom）处理.\n\n注意“相片水印”和“自动水平”等处理选项仅适用于JPEG图像，不适用于DNG图像。\n\n\n\n只有标准拍照模式和DR0拍照模式可以保持DNG图像。</string>
+    <string name="raw_info">DNG文件包含来自相机的全部未压缩和处理的信息。\n\n注意有些图库无法识别DNG文件。DNG图像可以使用专用编辑器处理.\n\n注意“相片水印”和“自动水平”等处理选项仅适用于JPEG图像，不适用于DNG图像。\n\n\n\n只有标准拍照模式和DR0拍照模式可以保持DNG图像。</string>
     <string name="hdr_info">HDR模式在亮度变化范围大的环境中非常有用。它的工作原理是在不同曝光下拍摄多张照片，并将它们组合在一起以创建最终图像。\n\n注意HDR模式不使用于快速移动的场景，并且可能会导致色彩还原地不太准确。\n\n在HDR模式拍照速度会慢一些。</string>
     <string name="preference_ghost_image">辅助图像</string>
     <string name="preference_ghost_image_summary">在取景框内显示一张半透明的图片，辅助你对正镜头。\n%s</string>
     <string name="preference_ghost_image_off">关闭</string>
     <string name="preference_ghost_image_last">上一张照片</string>
-    <string name="preference_ghost_image_selected">选一张图片</string>
+    <string name="preference_ghost_image_selected">选定的图片</string>
     <string name="preference_calibrate_level_calibrate">校正</string>
     <string name="preference_show_pitch_lines">显示等分线</string>
     <string name="preference_show_pitch_lines_summary">显示水平等分线</string>
@@ -425,7 +424,7 @@
     <string name="preference_show_geo_direction_lines_summary">显示罗盘方向线</string>
     <string name="video_pause">暂停录像</string>
     <string name="video_resume">继续录像</string>
-    <string name="preference_show_take_photo">拍照按钮</string>
+    <string name="preference_show_take_photo">显示“拍照按钮”</string>
     <string name="preference_show_take_photo_summary">显示拍照、录像按钮。除非你有其他方法（比如硬件快门、使用音量键），否则不应该取消勾选</string>
 
 
@@ -453,9 +452,9 @@
 
 
     <string name="preference_calibrate_level_summary">此选项可以校准设备的加速度计，从而使自动水平和屏幕显示的角度/水平度正常工作</string>
-    <string name="preference_calibrate_level_dialog">请将您的设备放在平坦的水平面上，然后按下“校准”按钮\n\n按下“重置”按钮可以从设备中删除校准数据。</string>
-    <string name="preference_camera2_fast_burst">快速HDR/expo曝光</string>
-    <string name="preference_camera2_fast_burst_summary">允许更快地完成HDR/expo拍照。如果您的设备在使用HDR/expo模式拍照时出现了问题，请禁用此功能。</string>
+    <string name="preference_calibrate_level_dialog">请将您的设备放在平坦的水平面上(横竖屏均可)，然后按下“校准”按钮\n\n按下“重置”按钮可以从设备中删除校准数据。\n\n按下“返回”按钮可取消。</string>
+    <string name="preference_camera2_fast_burst">快速HDR/包围曝光</string>
+    <string name="preference_camera2_fast_burst_summary">允许更快地完成HDR/包围拍照。如果您的设备在使用HDR/包围模式拍照时出现了问题，请禁用此功能。</string>
 
     <string name="open_files_saf_exception_ghost">在设备上没有找到文件选择器，所以不能使用辅助图像功能。</string>
     <string name="saf_permission_failed_open_image">无法打开文件</string>
@@ -465,19 +464,18 @@
 
 
     <string name="preference_video_subtitle">视频字幕</string>
-    <string name="preference_video_subtitle_summary">创建一个纯粹日期和时间的字幕文件(.SET格式)\n如果启用了定位/方向数据，同时也会记录GPS信息.\n%s</string>
+    <string name="preference_video_subtitle_summary">创建一个存储日期和时间的字幕文件(.SET格式)；如果启用了定位/方向数据，同时也会记录GPS信息.\n%s</string>
 
-    <string name="preference_record_audio_src_voice_recognition">针对语音识别进行优化</string>
+    <string name="preference_record_audio_src_voice_recognition">针对语音识别优化</string>
         <string name="camera_error">相机发生了严重错误</string>
 
-    <string name="preference_video_log">记录相机参数</string>
-    <string name="preference_video_log_summary">保存录像的参数到flat(log)\n%s</string>
-    <string name="preference_video_log_off">Off</string>
-    <string name="preference_video_log_low">Low</string>
-    <string name="preference_video_log_medium">Medium</string>
-    <string name="preference_video_log_strong">Strong</string>
-    <string name="preference_video_log_extra_strong">Extra strong</string>
-    <string name="video_log">Log profile</string>
+    <string name="preference_video_log">视频图片配置文件</string>
+    <string name="preference_video_log_summary">为视频模式设定标准或者平铺的图片配置文件\n%s</string>
+    <string name="preference_video_log_low">Log (低)</string>
+    <string name="preference_video_log_medium">Log (中等)</string>
+    <string name="preference_video_log_strong">Log (强)</string>
+    <string name="preference_video_log_extra_strong">Log (超强)</string>
+    <string name="video_log">Log 配置文件</string>
     <string name="left_of_screen">在屏幕左侧</string>
     <string name="right_of_screen">在屏幕右侧</string>
     <string name="top_of_screen">在屏幕顶端</string>
@@ -488,10 +486,10 @@
     <string name="high_speed">高速</string> <!-- in the sense of high speed video frame rates -->
 
 
-    <string name="preference_exif_artist">艺术家(Artist")</string>
-    <string name="preference_exif_artist_summary">存储在艺术家(Artist)标签内的文本（仅限JPEG格式）。默认留空。</string>
-    <string name="preference_exif_copyright">版权(Copyright)</string>
-    <string name="preference_exif_copyright_summary">存储在版权(Copyright)标签内的文本（仅限JPEG格式）。默认留空。</string>
+    <string name="preference_exif_artist">艺术家</string>
+    <string name="preference_exif_artist_summary">存储在艺术家标签内的文本（仅限JPEG格式）。留空代表不保存。</string>
+    <string name="preference_exif_copyright">版权</string>
+    <string name="preference_exif_copyright_summary">存储在版权标签内的文本（仅限JPEG格式）。留空代表不保存。</string>
 
 
     <string name="pause_video">暂停录像</string>
@@ -502,49 +500,49 @@
     <string name="audio_listener_failed">麦克风初始化失败</string>
     <string name="failed_to_process_hdr">HDR照片创建失败</string>
 
-    <string name="white_balance_auto">自动·Auto</string>
-    <string name="white_balance_cloudy">多云·Cloudy</string>
-    <string name="white_balance_daylight">日光·Daylight</string>
-    <string name="white_balance_fluorescent">荧光灯·Fluorescent</string>
-    <string name="white_balance_incandescent">白炽灯·Incandescent</string>
-    <string name="white_balance_shade">阴翳·Shade</string>
-    <string name="white_balance_twilight">星光·Twilight</string>
-    <string name="white_balance_warm">温暖·Warm</string>
-    <string name="white_balance_manual">手动·Manual</string>
-
-    <string name="scene_mode_action">动作·Action</string>
-    <string name="scene_mode_barcode">条码·Barcode</string>
-    <string name="scene_mode_beach">沙滩·Beach</string>
-    <string name="scene_mode_candlelight">烛光·Candlelight</string>
-    <string name="scene_mode_auto">自动·Auto</string>
-    <string name="scene_mode_fireworks">篝火·Fireworks</string>
-    <string name="scene_mode_landscape">横向·Landscape</string>
-    <string name="scene_mode_night">夜晚·Night</string>
-    <string name="scene_mode_night_portrait">夜间人像</string>
-    <string name="scene_mode_party">聚会·Party</string>
-    <string name="scene_mode_portrait">人像·Portrait</string>
-    <string name="scene_mode_snow">雪景·Snow</string>
-    <string name="scene_mode_sports">运动·Sports</string>
+    <string name="white_balance_auto">自动</string>
+    <string name="white_balance_cloudy">阴天</string>
+    <string name="white_balance_daylight">日光</string>
+    <string name="white_balance_fluorescent">荧光灯</string>
+    <string name="white_balance_incandescent">白炽灯</string>
+    <string name="white_balance_shade">阴影</string>
+    <string name="white_balance_twilight">星光</string>
+    <string name="white_balance_warm">温暖</string>
+    <string name="white_balance_manual">手动</string>
+
+    <string name="scene_mode_action">动作</string>
+    <string name="scene_mode_barcode">条码</string>
+    <string name="scene_mode_beach">沙滩</string>
+    <string name="scene_mode_candlelight">烛光</string>
+    <string name="scene_mode_auto">自动</string>
+    <string name="scene_mode_fireworks">烟火</string>
+    <string name="scene_mode_landscape">风景</string>
+    <string name="scene_mode_night">夜景</string>
+    <string name="scene_mode_night_portrait">夜景肖像</string>
+    <string name="scene_mode_party">聚会</string>
+    <string name="scene_mode_portrait">肖像</string>
+    <string name="scene_mode_snow">雪景</string>
+    <string name="scene_mode_sports">运动</string>
     <string name="scene_mode_steady_photo">稳定拍照</string>
-    <string name="scene_mode_sunset">黄昏·Sunset</string>
-    <string name="scene_mode_theatre">剧院·Theatre</string>
-
-    <string name="color_effect_aqua">湖蓝·Aqua</string>
-    <string name="color_effect_blackboard">黑板·Blackboard</string>
-    <string name="color_effect_mono">黑白·Mono</string>
-    <string name="color_effect_negative">负片·Negative</string>
-    <string name="color_effect_none">无·None</string>
-    <string name="color_effect_posterize">反色·Posterize</string>
-    <string name="color_effect_sepia">棕·Sepia</string>
-    <string name="color_effect_solarize">过爆·Solarize</string>
-    <string name="color_effect_whiteboard">白板·Whiteboard</string>
+    <string name="scene_mode_sunset">黄昏</string>
+    <string name="scene_mode_theatre">剧院</string>
+
+    <string name="color_effect_aqua">湖蓝</string>
+    <string name="color_effect_blackboard">黑板</string>
+    <string name="color_effect_mono">黑白</string>
+    <string name="color_effect_negative">负片</string>
+    <string name="color_effect_none">无</string>
+    <string name="color_effect_posterize">反色</string>
+    <string name="color_effect_sepia">棕褐色</string>
+    <string name="color_effect_solarize">过曝</string>
+    <string name="color_effect_whiteboard">白板</string>
 
     <string name="whats_new">新功能：</string>
     <string name="donate">捐赠</string>
 
     <!-- for accessibility, these strings for face detection will typically be spoken, e.g., through Google Talkback -->
-    <string name="face_detected">face</string>
-    <string name="faces_detected">faces</string>
+    <string name="face_detected">人脸</string>
+    <string name="faces_detected">人脸</string>
     <string name="preference_record_audio_src_unprocessed">未处理</string>
 
 
@@ -632,32 +630,30 @@
     <string name="no_permission">没有获得授权</string>
     <string name="permission_rationale_title">需要授权</string>
     <string name="permission_rationale_camera">操作相机需要相机权限</string>
-    <string name="permission_rationale_storage">保存相片需要读写存储器的权限</string>
     <string name="permission_rationale_record_audio">录像和语音控制需要麦克风权限</string>
-    <string name="permission_rationale_location">地理标记需要定位权限</string>
 
     <string name="flash_frontscreen_auto">自动开启屏幕补光</string>
     <string name="flash_frontscreen_on">打开屏幕补光</string>
-    <string name="flash_frontscreen_torch">屏幕高亮</string>
+    <string name="flash_frontscreen_torch">屏幕常亮</string>
 
-    <string name="preference_antibanding">去除条纹</string>
+    <string name="preference_antibanding">去除摩尔纹</string>
     <string name="preference_antibanding_summary">使用算法消除闪烁造成的摩尔纹\n%s</string>
 
-    <string name="anti_banding_auto">Auto</string>
+    <string name="anti_banding_auto">自动</string>
     <string name="anti_banding_50hz">50Hz</string>
     <string name="anti_banding_60hz">60Hz</string>
-    <string name="anti_banding_off">Off</string>
+    <string name="anti_banding_off">关闭</string>
 
 
-    <string name="preference_screen_settings_manager">配置管理</string>
+    <string name="preference_screen_settings_manager">配置管理器</string>
 
-    <string name="preference_save_settings">导出配置</string>
-    <string name="preference_save_settings_summary">导出Open Camera所有选项的设定值一个文件中</string>
+    <string name="preference_save_settings">保存配置</string>
+    <string name="preference_save_settings_summary">保存Open Camera所有选项的至文件中</string>
     <string name="preference_save_settings_filename">保存的文件名</string>
 
     <string name="preference_restore_settings">恢复配置</string>
-    <string name="preference_restore_settings_summary">导入配置文件到Open Camera。注意这会覆盖现在的所有设定值！</string>
-    <string name="preference_restore_settings_question">这个选项允许你选择一个先前导出的配置文件并导入到Open Camera中。需要注意这个文件载入后会覆盖当前所有选项的设定值！</string>
+    <string name="preference_restore_settings_summary">恢复配置文件到Open Camera。注意这会覆盖现在的所有设定值！</string>
+    <string name="preference_restore_settings_question">这个选项允许你选择一个先前保存的配置文件并恢复到Open Camera中。需要注意这个文件载入后会覆盖当前所有选项的设定值！</string>
 
     <string name="preference_video_output_format">视频格式</string>
     <string name="preference_video_output_format_summary">录像的编码和格式\n%s</string>
@@ -668,9 +664,9 @@
     <string name="preference_video_output_format_3gpp">3GPP</string>
     <string name="preference_video_output_format_webm">WebM (不支持音频)</string>
 
-    <string name="saved_settings">导出的配置</string>
-    <string name="save_settings_failed">导出配置失败</string>
-    <string name="restore_settings_failed">导入配置失败</string>
+    <string name="saved_settings">保存的配置</string>
+    <string name="save_settings_failed">保存配置失败</string>
+    <string name="restore_settings_failed">恢复配置失败</string>
     <string name="open_files_saf_exception_generic">这个设备没有可用的文件选择器，不支持这个选项</string>
 
     <string name="preference_image_format">照片格式</string>
@@ -681,8 +677,8 @@
     <string name="preference_hdr_contrast_enhancement">HDR增强对比度</string>
     <string name="preference_hdr_contrast_enhancement_summary">HDR如何使用增强对比度的算法。在动态范围非常大的场景中能够提高成像品质。当然这也可以让照片多出一种HDR的味道。\n%s</string>
     <string name="preference_hdr_contrast_enhancement_off">关闭</string>
-    <string name="preference_hdr_contrast_enhancement_smart">自动</string>
-    <string name="preference_hdr_contrast_enhancement_always">打开</string>
+    <string name="preference_hdr_contrast_enhancement_smart">智能开启</string>
+    <string name="preference_hdr_contrast_enhancement_always">一直开启</string>
 
     <string name="preference_ui_placement_left">功能按钮在左侧</string>
     <string name="preference_ui_placement_right">功能按钮在右侧</string>
@@ -692,8 +688,8 @@
     <string name="preference_show_face_detection_summary">是否在屏幕上显示人脸识别的开关</string>
     <string name="face_detection_enable">打开人脸识别</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
     <string name="face_detection_disable">关闭人脸识别</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
-    <string name="face_detection_enabled">人脸识别已经打开</string>
-    <string name="face_detection_disabled">人脸识别已经关闭</string>
+    <string name="face_detection_enabled">人脸识别已启用</string>
+    <string name="face_detection_disabled">人脸识别已禁用</string>
 
     <string name="preference_show_auto_level">显示自动水平的按钮</string>
     <string name="preference_show_auto_level_summary">是否在屏幕上显示自动水平的开关。开启自动水平后，照片会根据水平面自动旋转裁切。</string>
@@ -704,8 +700,8 @@
     <string name="preference_show_stamp_summary">是否在屏幕上显示照片水印的开关</string>
     <string name="stamp_enable">使用水印</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
     <string name="stamp_disable">禁用水印</string> <!-- for "ContentDescription" (used for accessibility, e.g., Google Talkback) -->
-    <string name="stamp_enabled">水印已经启用</string>
-    <string name="stamp_disabled">水印已经禁用</string>
+    <string name="stamp_enabled">水印已启用</string>
+    <string name="stamp_disabled">水印已禁用</string>
 
 
     <string name="preference_show_textstamp">显示文本水印的按钮</string>
@@ -715,8 +711,8 @@
     <string name="preference_show_white_balance_lock_summary">是否在屏幕上显示白平衡锁定的开关</string>
     <string name="white_balance_lock">锁定白平衡</string>
     <string name="white_balance_unlock">解锁白平衡</string>
-    <string name="white_balance_locked">白平衡已经锁定</string>
-    <string name="white_balance_unlocked">白平衡已经解锁</string>
+    <string name="white_balance_locked">白平衡已锁定</string>
+    <string name="white_balance_unlocked">白平衡已解锁</string>
 
     <string name="preference_show_exposure_lock">显示曝光锁</string>
     <string name="preference_show_exposure_lock_summary">是否在屏幕上显示曝光锁定的开关</string>
@@ -737,7 +733,7 @@
     <string name="preference_stamp_style_background">带背景色的文字</string>
 
     <string name="photo_mode_panorama">全景</string> <!-- keep short, as this shows in the popup menu; probably shouldn't be translated? -->
-    <string name="photo_mode_panorama_full">全景(Panorama)</string>
+    <string name="photo_mode_panorama_full">全景</string>
 
     <string name="preference_screen_remote_control">BLE蓝牙控制设备…</string>
     <string name="preference_enable_remote">启用BLE蓝牙控制</string>
@@ -749,13 +745,11 @@
     <string name="bluetooth_not_supported">不支持蓝牙</string>
     <string name="unknown_device">未知设备</string>
     <string name="preference_remote_disconnect_screen_dim">断开控制时熄屏</string>
-    <string name="preference_remote_disconnect_screen_dim_summary">提示：打开Open Camera前，请把默认亮度跳到最低</string>
+    <string name="preference_remote_disconnect_screen_dim_summary">提示：打开Open Camera前，请把默认亮度调到最低</string>
     <string name="preference_water_type">使用盐水计算深度</string>
-    <string name="preference_water_type_summary">设置正确的水的类型，可以提高水下拍摄的准确性</string>
+    <string name="preference_water_type_summary">设置正确的水下兔笼的类型，可以提高水下拍摄时深度计算的准确性</string>
     <string name="remote_connected">控制器已连接</string>
 
-    <string name="preference_remote_type_kraken">Kraken智能家居</string>
-
     <string name="preference_stamp_geo_address">使用地址</string>
     <string name="preference_stamp_geo_address_both">尽量显示地址和坐标</string>
     <string name="preference_stamp_geo_address_prefer">GPS坐标优先</string>
@@ -770,13 +764,13 @@
     <string name="preference_histogram_summary">是否显示颜色直方图\n%s</string>
     <string name="preference_histogram_off">关闭</string>
     <string name="preference_histogram_rgb">RGB色彩</string>
-    <string name="preference_histogram_luminance">亮度(luminance)</string>
+    <string name="preference_histogram_luminance">亮度</string>
     <string name="preference_histogram_value">值(最大)</string>
-    <string name="preference_histogram_intensity">强度(平均)intensity</string>
-    <string name="preference_histogram_lightness">Lightness (Average of min-max)</string>
+    <string name="preference_histogram_intensity">强度(平均)</string>
+    <string name="preference_histogram_lightness">光亮度 (最小与最大之间的平均值)</string>
 
-    <string name="preference_zebra_stripes">Show zebra stripes</string>
-    <string name="preference_zebra_stripes_summary">If this option is enabled, zebra stripes will be drawn on-screen showing where the camera preview is over exposed.\n%s</string>
+    <string name="preference_zebra_stripes">显示斑马条纹</string>
+    <string name="preference_zebra_stripes_summary">如果启用该选项，将会在相机预览屏幕中在过曝区域绘制斑马条纹。\n%s</string>
     <string name="preference_zebra_stripes_off">关闭</string>
     <string name="preference_zebra_stripes_70pc">70%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
     <string name="preference_zebra_stripes_80pc">80%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
@@ -795,7 +789,7 @@
     <string name="preference_focus_peaking_color">焦点峰值色彩</string>
     <string name="preference_focus_peaking_color_summary">高亮显示对焦的边缘时使用的颜色\n%s</string>
 
-    <string name="remaining">Remaining</string> <!-- images remaining for "processing" -->
+    <string name="remaining">剩余</string> <!-- images remaining for "processing" -->
 
     <string name="preference_preview">成像预览…</string>
 
@@ -807,8 +801,8 @@
     <!--Whether the RAW option should also apply for expo bracketing photo mode (or for HDR mode when \"Save all images for HDR mode\" is enabled). If this option is disabled, only JPEGs will be saved in those photo modes.-->
     <string name="preference_raw_expo_bracketing_summary">RAW模式也使用包围曝光模式。如果禁用，只有拍摄JPEG照片时使用包围曝光。</string>
 
-    <string name="preference_raw_focus_bracketing">允许RAW包围焦距</string>
-    <string name="preference_raw_focus_bracketing_summary">RAW模式也是用包围焦距模式。如果禁用，只有拍摄JPEF照片时使用包围焦距。</string>
+    <string name="preference_raw_focus_bracketing">允许RAW包围对焦</string>
+    <string name="preference_raw_focus_bracketing_summary">RAW模式也是用包围对焦模式。如果禁用，只有拍摄JPEF照片时使用包围对焦。</string>
 
     <string name="cycle_raw">循环RAW的模式</string>
     <string name="preference_show_cycle_raw">显示RAW按钮</string>
@@ -850,4 +844,119 @@
     <string name="preference_immersive_mode_navigation">只隐藏屏幕上的虚拟导航按钮</string>
     <string name="preference_immersive_mode_gui">隐藏图形用户界面</string>
     <string name="preference_immersive_mode_everything">隐藏一切</string>
+    <string name="preference_video_bitrate_150000000">150Mbps</string>
+    <string name="preference_video_bitrate_200000000">200Mbps</string>
+    <string name="preference_focus_bracketing_n_images_entries_2">2</string>
+    <string name="preference_focus_bracketing_n_images_entries_3">3</string>
+    <string name="preference_focus_bracketing_n_images_entries_4">4</string>
+    <string name="preference_focus_bracketing_n_images_entries_5">5</string>
+    <string name="preference_focus_bracketing_n_images_entries_6">6</string>
+    <string name="preference_focus_bracketing_n_images_entries_8">8</string>
+    <string name="preference_focus_bracketing_n_images_entries_10">10</string>
+    <string name="preference_focus_bracketing_n_images_entries_12">12</string>
+    <string name="preference_focus_bracketing_n_images_entries_15">15</string>
+    <string name="preference_focus_bracketing_n_images_entries_20">20</string>
+    <string name="preference_focus_bracketing_n_images_entries_25">25</string>
+    <string name="preference_focus_bracketing_n_images_entries_30">30</string>
+    <string name="preference_focus_bracketing_n_images_entries_40">40</string>
+    <string name="preference_focus_bracketing_n_images_entries_50">50</string>
+    <string name="preference_focus_bracketing_n_images_entries_100">100</string>
+    <string name="preference_focus_bracketing_n_images_entries_150">150</string>
+    <string name="preference_focus_bracketing_n_images_entries_200">200</string>
+    <string name="preference_fast_burst_n_images_entries_2">2</string>
+    <string name="preference_fast_burst_n_images_entries_3">3</string>
+    <string name="preference_fast_burst_n_images_entries_4">4</string>
+    <string name="preference_fast_burst_n_images_entries_5">5</string>
+    <string name="preference_fast_burst_n_images_entries_6">6</string>
+    <string name="preference_fast_burst_n_images_entries_8">8</string>
+    <string name="preference_fast_burst_n_images_entries_10">10</string>
+    <string name="preference_fast_burst_n_images_entries_12">12</string>
+    <string name="preference_fast_burst_n_images_entries_15">15</string>
+    <string name="preference_fast_burst_n_images_entries_20">20</string>
+    <string name="seconds_abbreviation">s</string>
+    <string name="photo_mode_dro">DRO</string>
+    <string name="preference_video_log_off">默认</string>
+    <string name="preference_nr_mode">降噪模式</string>
+    <string name="preference_nr_mode_normal">普通</string>
+    <string name="preference_nr_mode_low_light">低照度</string>
+    <string name="preference_crop_guide_2">2 (2:1)</string>
+    <string name="preference_video_max_filesize_2gb">2GB</string>
+    <string name="preference_video_max_filesize_5gb">5GB</string>
+    <string name="preference_video_max_filesize_9gb">9GB</string>
+    <string name="cancelled_focus_bracketing">包围对焦已取消</string>
+    <string name="preference_burst_interval_0_5s">0.5秒</string>
+    <string name="previous">上一个</string>
+    <string name="next">下一个</string>
+    <string name="feet_abbreviation">ft</string>
+    <string name="preference_video_log_fine">Log (精细)</string>
+    <string name="preference_video_gamma">伽马</string>
+    <string name="preference_video_srgb">sRGB</string>
+    <string name="preference_video_rec709">REC709</string>
+    <string name="preference_select_remote">选择遥控设备</string>
+    <string name="preference_immersive_mode_low_profile">仅暗淡屏幕上的导航按钮</string>
+    <string name="error_features_4k">4K UHD</string>
+    <string name="error_features_bitrate">比特率</string>
+    <string name="error_features_frame_rate">帧率</string>
+    <string name="error_features_slow_motion">慢动作</string>
+    <string name="preference_allow_long_press">允许长按动作</string>
+    <string name="preference_allow_long_press_summary">是否允许长按动作(例如长按图库来改变存储位置)。</string>
+    <string name="preference_show_camera_id">显示相机 ID</string>
+    <string name="preference_show_camera_id_summary">在屏幕上显示当前相机的 ID</string>
+    <string name="aperture">光圈</string>
+    <string name="preference_multi_cam_button">多相机图标</string>
+    <string name="exposure_compensation_seekbar">改变曝光补偿的进度条</string>
+    <string name="preference_image_format_summary">选择保存照片的文件格式。这将影响“标准”(非 RAW)照片。注意 PNG 格式并非真正无损，它是从 JPEG 按 100%% 质量转换而成的。\n%s</string>
+    <string name="preference_camera_api">Camera API</string>
+    <string name="preference_camera_api_summary">选择 Camera2 API 来启用额外功能，比如手动曝光、对焦、白平衡及 RAW(如果设备支持)。改变 API 将重启应用。\n%s</string>
+    <string name="preference_camera_api_old">原始 Camera API</string>
+    <string name="preference_camera_api_camera2">Camera2 API</string>
+    <string name="preference_video_profile_gamma">视频伽马值</string>
+    <string name="preference_video_profile_gamma_summary">如果视频图标预置文件被设定为伽马时的伽马值\n%s</string>
+    <string name="preference_video_profile_gamma_1_6">1.6</string>
+    <string name="preference_video_profile_gamma_1_8">1.8</string>
+    <string name="preference_video_profile_gamma_1_9">1.9</string>
+    <string name="preference_video_profile_gamma_2_0">2.0</string>
+    <string name="preference_video_profile_gamma_2_1">2.1</string>
+    <string name="preference_video_profile_gamma_2_2">2.2</string>
+    <string name="preference_video_profile_gamma_2_3">2.3</string>
+    <string name="preference_video_profile_gamma_2_4">2.4</string>
+    <string name="preference_video_profile_gamma_2_6">2.6</string>
+    <string name="preference_video_profile_gamma_2_8">2.8</string>
+    <string name="preference_ghost_image_alpha">辅助图片透明度</string>
+    <string name="preference_ghost_image_alpha_summary">用于辅助图片的透明度值。较低的值代表更透明，较高的值代表更不透明。\n%s</string>
+    <string name="external_camera">外部相机</string>
+    <string name="ultrawide">超广角</string>
+    <string name="switch_to_external_camera">切换至外部相机</string>
+    <string name="switch_to_unknown_camera">切换相机</string>
+    <string name="switch_multi_camera">在多个相机间切换</string>
+    <string name="array_seekbar_preference_seekbar">改变当前首选项值的进度条</string>
+    <string name="preference_zebra_stripes_foreground_color">斑马条纹前景颜色</string>
+    <string name="preference_zebra_stripes_foreground_color_summary">显示斑马条纹时前景使用的颜色。\n%s</string>
+    <string name="preference_zebra_stripes_background_color">斑马条纹背景颜色</string>
+    <string name="preference_zebra_stripes_background_color_summary">显示斑马条纹时背景使用的颜色。\n%s</string>
+    <string name="preference_zebra_stripes_color_black">黑色</string>
+    <string name="preference_zebra_stripes_color_red">红色</string>
+    <string name="preference_zebra_stripes_color_orange">橙色</string>
+    <string name="preference_zebra_stripes_color_transparent">半透明</string>
+    <string name="preference_zebra_stripes_color_white">白色</string>
+    <string name="preference_multi_cam_button_summary">如果启用，使用分开的按钮在前置/后置相机之间切换，且在多个前置/后置之间切换。如果禁用，切换相机按钮将在所有相机之间循环。</string>
+
+    <!-- beware of string being too long to display! -->
+    <string name="preference_stamp_geo_address_summary">如果可行的话，在标注 GPS 位置时使用一个地址。
+        注意一旦启用，这将要求您的设备传输位置数据至互联网上的第三方来实现将 GPS 坐标转换为地址的操作。
+        参阅 https://developer.android.com/reference/android/location/Geocoder 。
+        此功能不保证可用性或准确性。 结果是最佳猜测，不能保证有意义或正确。
+        \n%s</string>
+
+    <string name="preference_comment_ypr">保存三轴运动信息</string>
+    <string name="preference_comment_ypr_summary">在照片的 Exit 用户备注字段保存设备的三轴运动信息(仅适用于JPEG格式)</string>
+    <string name="preference_audio_control_summary">根据噪点拍照。
+        当启用后，使用屏幕上的麦克风按钮来启动监听。
+        \n%s</string>
+    <string name="intro_text">点击来对焦，然后按下蓝色相机按钮以拍照。要禁用最大屏幕亮度，查阅设置/屏幕GUI/\"强制最大亮度\"选项。要在 Android 5 之后的设备上保存至 SD 卡，查阅设置/更多相机控制/\"Storage Access Framework\"。如需更多帮助，在设置中点击“在线帮助”。</string>
+
+    <string name="preference_audio_control_none">无</string>
+    <string name="preference_audio_control_noise">大的声音</string>
+    <string name="preference_audio_control_voice">语音命令: \"cheese\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml
index 42fb1da33d2e6f64e6ab63dd84f4ee381d86254d..e5f7cf1e9459d97a79769d76d36550ab7c65f233 100644
--- a/app/src/main/res/values-zh-rTW/arrays.xml
+++ b/app/src/main/res/values-zh-rTW/arrays.xml
@@ -2,10 +2,10 @@
 <resources>
     <string-array name="focus_mode_entries">
         <item>自動對焦</item>
-        <item>無限對焦</item>
-        <item>遠景對焦</item>
+        <item>無窮遠</item>
+        <item>微距對焦</item>
         <item>鎖定焦點</item>
-        <item>手工對焦</item>
+        <item>手動對焦</item>
         <item>固定對焦</item>
         <item>EDOF對焦</item>
         <item>持續對焦</item>
@@ -79,12 +79,12 @@
         <item>double</item>
     </string-array>
     <string-array name="preference_volume_keys_entries">
-        <item>對焦 (或開始/停止錄影)</item>
+        <item>拍照（或開始/停止錄影）</item>
         <item>對焦</item>
         <item>放大/縮小</item>
-        <item>更改曝光水準</item>
-        <item>切換防手震開/關</item>
-        <item>更改設備音量</item>
+        <item>變更曝光等級</item>
+        <item>切換自動水平開/關</item>
+        <item>變更裝置音量</item>
         <item>什麼都不做</item>
         </string-array>
     <string-array name="preference_volume_keys_values">
@@ -104,7 +104,7 @@
         <item>0</item>
         <item>180</item>
     </string-array>
-    <string-array name="preference_angle_highlight_color_entries">
+    <string-array name="preference_angle_highlight_color_entries"> <!-- n.b., also used for focus peaking colors -->
         <item>紅</item>
         <item>綠</item>
         <item>藍</item>
@@ -132,7 +132,7 @@
         <item>黃金比例 (4)</item>
         <item>三角形 (1)</item>
         <item>三角形 (2)</item>
-        <item>交錯線</item>
+        <item>對角線</item>
     </string-array>
     <string-array name="preference_grid_values">
         <item>preference_grid_none</item>
@@ -158,8 +158,8 @@
     </string-array>
     <string-array name="preference_stamp_timeformat_entries">
         <item>預設</item>
-        <item>12 時制</item>
-        <item>24 時制</item>
+        <item>十二小時制</item>
+        <item>二十四小時制</item>
         <item>無</item>
     </string-array>
     <string-array name="preference_stamp_timeformat_values">
@@ -242,4 +242,48 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
+    <string-array name="preference_save_zulu_time_entries">
+        <item>本地時間</item>
+        <item>UTC (Zulu)</item>
+    </string-array>
+    <string-array name="preference_save_zulu_time_values">
+        <item>local</item>
+        <item>zulu</item>
+    </string-array>
+    <string-array name="preference_expo_bracketing_n_images_entries">
+        <item>3</item>
+        <item>5</item>
+    </string-array>
+    <string-array name="preference_expo_bracketing_n_images_values">
+        <item>3</item>
+        <item>5</item>
+    </string-array>
+    <string-array name="preference_expo_bracketing_stops_entries">
+        <item>0.5</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+    <string-array name="preference_expo_bracketing_stops_values">
+        <item>0.5</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+    <string-array name="preference_front_camera_mirror_entries">
+        <item>不鏡像</item>
+        <item>照片鏡像</item>
+    </string-array>
+    <string-array name="preference_front_camera_mirror_values">
+        <item>preference_front_camera_mirror_no</item>
+        <item>preference_front_camera_mirror_photo</item>
+    </string-array>
+    <string-array name="preference_video_subtitle_entries">
+        <item>沒有字幕</item>
+        <item>錄製字幕</item>
+    </string-array>
+    <string-array name="preference_video_subtitle_values">
+        <item>preference_video_subtitle_no</item>
+        <item>preference_video_subtitle_yes</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 0d6bf53dea66cc34cb960ba49fb8ed52bd17d8ee..5a759b1c07856f3ed0be89b0b327fd005d726c27 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -60,7 +60,7 @@
     
     <string name="angle">角度</string>
     <string name="direction">方向</string>
-    <string name="failed_to_open_camera_1">打開相機失敗。</string>
+    <string name="failed_to_open_camera_1">開啟相機失敗。</string>
     <string name="failed_to_open_camera_2">相機可能正被</string>
     <string name="failed_to_open_camera_3">其它程式使用？</string>
     <string name="iso">ISO</string>
@@ -76,7 +76,7 @@
     <string name="preference_auto_stabilise">自動水平</string>
     <string name="preference_auto_stabilise_summary">圖片將被旋轉，使它們自動對準(僅照片) (拍照更慢，且可能在記憶體過低的裝置上失敗)</string>
     <string name="preference_color_effect">套用一個顏色效果</string>
-    <string name="preference_color_effect_summary">套用選取的顏色效果到照片</string>
+    <string name="preference_color_effect_summary">將選取的顏色效果套用到照片</string>
     <string name="preference_scene_mode">套用一個場景模式</string>
     <string name="preference_scene_mode_summary">為各種場景優化照片</string>
     <string name="preference_white_balance">設定白平衡</string>
@@ -112,7 +112,6 @@
     <string name="preference_audio_noise_control_sensitivity_summary">音訊（大的聲音）選項的聲音等級敏感度</string>
     <string name="preference_save_location">儲存位置</string>
     <string name="preference_save_location_summary">用來儲存照片/影片檔的資料夾</string>
-    <string name="preference_using_saf">使用 Storage Access Framework</string>
     <string name="preference_using_saf_summary">是否使用 Storage Access Framework 來儲存照片和影片。這個選項應該被啟用來允許儲存到外部 SD 卡。</string>
     <string name="preference_save_photo_prefix">照片檔名前綴</string>
     <string name="preference_save_photo_prefix_summary">用於儲存照片檔名的前置字串</string>
@@ -138,7 +137,7 @@
     <string name="preference_show_zoom_slider_controls">顯示縮放滑桿控制</string>
     <string name="preference_show_zoom_slider_controls_summary">顯示縮放控制的滑桿</string>
     <string name="preference_show_iso">顯示 ISO</string>
-    <string name="preference_show_iso_summary">顯示目前的 ISO 等級。在自動閃光模式，閃光符號也會指示閃光燈何時閃光。（需要 Camera2 API。）</string>
+    <string name="preference_show_iso_summary">顯示目前的 ISO 等級。（需要 Camera2 API。）</string>
     <string name="preference_free_memory">顯示可用記憶體</string>
     <string name="preference_free_memory_summary">在螢幕上顯示剩餘的裝置儲存空間</string>
     <string name="preference_show_angle">顯示角度</string>
@@ -157,8 +156,8 @@
     <string name="grid">格線</string> <!-- short form of Show a grid -->
     <string name="preference_crop_guide">顯示裁切輔助</string>
     <string name="preference_crop_guide_summary">裁切輔助顯示一個矩形來表示指定的長寬比看起來如何 - 如果您計畫以後裁切照片/影片為不同的長寬比很有用。需要所見即所得拍照模式，或處於錄影模式中。\n%s</string>
-    <string name="preference_show_toasts">顯示拍照前提示訊息</string>
-    <string name="preference_show_toasts_summary">是否要在拍照快門前顯示彈出訊息提示</string>
+    <string name="preference_show_toasts">在螢幕上顯示訊息</string>
+    <string name="preference_show_toasts_summary">是否要在螢幕上顯示暫時的資訊訊息</string>
     <string name="preference_thumbnail_animation">顯示縮圖動畫</string>
     <string name="preference_thumbnail_animation_summary">當拍照時顯示移動縮圖動畫</string>
     <string name="preference_take_photo_border">拍照時顯示邊緣</string>
@@ -179,9 +178,9 @@
     <string name="preference_location">儲存位置資料 (地理標記)</string>
     <string name="preference_location_summary">在照片/影片中儲存 GPS 位置資料（對於照片，位置資料只能儲存在 JPEG 和 DNG 格式）</string>
     <string name="preference_gps_direction">儲存羅盤方向</string>
-    <string name="preference_gps_direction_summary">在照片中儲存 GPS 羅盤方向（只有 JPEG 格式）</string>
+    <string name="preference_gps_direction_summary">在照片中儲存 GPS 羅盤方向（只有在 JPEG 格式）</string>
     <string name="preference_require_location">需要位置資料</string>
-    <string name="preference_require_location_summary">如果啟用位置資料，只拍照/錄影如果位置資料可用。</string>
+    <string name="preference_require_location_summary">如果啟用位置資料，只在位置資料可用時拍照/錄影</string>
     <string name="preference_stamp">標記照片</string>
     <string name="preference_stamp_summary">用日期和時間標記照片；如果啟用了位置/方向資料，也標記 GPS 資訊\n%s</string>
     <string name="preference_stamp_dateformat">日期標記格式</string>
@@ -200,12 +199,12 @@
     <string name="video_quality">影片解析度</string>
     <string name="preference_force_video_4k">強制 4K UHD 影片（只能在某些裝置上運作）</string>
     <string name="preference_force_video_4k_summary">為後置相機錄影啟用 3840x2160 解析度 - 僅當您的裝置支援時才能作用，且如果不支援可能當機！</string>
-    <string name="preference_video_stabilization">啟用影片防震</string>
-    <string name="preference_video_stabilization_summary">影片防震減少在預覽和錄影中由於相機移動引起的晃動。</string>
+    <string name="preference_video_stabilization">啟用數位影片防手震</string>
+    <string name="preference_video_stabilization_summary">影片防手震減少在預覽和錄影中由於相機移動引起的晃動。如果您的裝置支援光學防手震 (OIS)，可能不需要這個選項。</string>
     <string name="preference_video_bitrate">影片位元率 (大約)</string>
     <string name="preference_video_bitrate_summary">設定影片的大致位元率 (越高表示越好的品質，但佔用更多磁碟空間；如果位元率不支援可能造成錄影失敗)\n%s</string>
     <string name="preference_video_fps">影片影格率 (大約)</string>
-    <string name="preference_video_fps_summary">設定影片的影格率 (FPS)（大約值，不能保證有用，且如果不支援可能造成錄影失敗）。注意這個設定在慢動作影片會被忽略。\n%s</string>
+    <string name="preference_video_fps_summary">設定影片的影格率 (FPS)（大約值，不能保證有用，且如果不支援可能造成錄影失敗）。請檢查產生的影片來找出真正使用的影格率。注意，這個設定在慢動作影片會被忽略。\n%s</string>
     <string name="preference_video_max_duration">影片最長持續時間</string>
     <string name="preference_video_max_duration_summary">在指定的時間後錄影將停止\n%s</string>
     <string name="preference_video_restart">在最大持續時間後重啟錄影</string>
@@ -217,7 +216,7 @@
     <string name="preference_record_audio">錄音</string>
     <string name="preference_record_audio_summary">錄影時錄音</string>
     <string name="preference_record_audio_src">音源</string>
-    <string name="preference_record_audio_src_summary">用於錄製音訊的麥克風\n%s</string>
+    <string name="preference_record_audio_src_summary">用於錄製音訊的麥克風。請注意，這個選項真正的行為取決於您的裝置如何實作這個選項。\n%s</string>
     <string name="preference_record_audio_channels">音源頻道</string>
     <string name="preference_record_audio_channels_summary">指定使用單聲道或立體聲來錄音 (立體聲只支援某些裝置)</string>
     <string name="preference_video_flash">錄影時閃光</string>
@@ -282,7 +281,7 @@
     <string name="audio_listener_started">發出大的聲音</string>
 
     <string name="auto_stabilise_info">自動水平會自動旋轉照片，使它們顯得水平。\n\n注意這意味著圖片解析度會較低（因為需要旋轉和裁切）。</string>
-    <string name="raw_info">DNG 檔案包含來自相機的全部未壓縮和未處理的資訊。\n\n注意有些圖庫無法識別 DNG 檔案。DNG 圖片可以使用專用編輯器（例如 Snapseed 和 Lightroom）處理。\n\n注意「標記照片」和「自動水平」等處理選項僅適用於非-DNG (JPEG/etc) 圖片 ，不適用於 DNG 圖片。 </string>
+    <string name="raw_info">DNG 檔案包含來自相機的全部未壓縮和未處理的資訊。\n\n注意有些相簿程式無法識別 DNG 檔案。DNG 圖片可以使用專用編輯器處理。\n\n注意「標記照片」和「自動水平」等處理選項僅適用於非 DNG (JPEG 等) 圖片 ，不適用於 DNG 圖片。 </string>
     <string name="hdr_info">HDR 模式在亮度變化範圍大的環境中非常有用。它的工作原理是在不同曝光下拍攝多張照片，並將它們組合在一起以建立最終圖片。\n\n注意 HDR 不適合用於快速移動的場景，而且可能造成顏色較不精確。\n\nHDR 模式拍照比較慢。</string>
 
     <string name="dont_show_again">不要再次顯示</string>
@@ -303,10 +302,9 @@
     <string name="no_permission">權限不可用</string>
     <string name="permission_rationale_title">需要權限</string>
     <string name="permission_rationale_camera">需要相機權限來啟用相機</string>
-    <string name="permission_rationale_storage">需要讀/寫儲存空間權限來儲存照片</string>
     <string name="permission_rationale_record_audio">錄製具有音訊的影片和語音控制需要麥克風權限</string>
     <string name="permission_rationale_location">地理標記需要位置權限（在照片和影片中儲存位置資訊）。
-        連線到藍牙低功耗遠端控制裝置也需要位置權限。</string>
+        連線到藍牙低功耗遠端控制裝置也需要位置權限  (Android 11 or earlier)。</string>
 
     <string name="preference_category_photo_debugging">除錯選項</string>
     <string name="preference_category_video_debugging">除錯選項</string>
@@ -458,9 +456,9 @@
 
     <string name="preference_category_exif_tags">自訂 EXIF 標籤</string>
     <string name="preference_exif_artist">藝術家</string>
-    <string name="preference_exif_artist_summary">儲存在圖片詮釋資料藝術家標籤的文字（只有 JPEG 格式）。（留空代表不儲存）</string>
+    <string name="preference_exif_artist_summary">儲存在圖片詮釋資料藝術家標籤的文字（只有在 JPEG 格式）。（留空代表不儲存）</string>
     <string name="preference_exif_copyright">版權</string>
-    <string name="preference_exif_copyright_summary">儲存在圖片詮釋資料版權標籤的文字（只有 JPEG 格式）。（留空代表不儲存）</string>
+    <string name="preference_exif_copyright_summary">儲存在圖片詮釋資料版權標籤的文字（只有在 JPEG 格式）。（留空代表不儲存）</string>
 
     <string name="processing">處理中…</string>
 
@@ -538,14 +536,14 @@
     <string name="preference_camera2_photo_video_recording">允許在錄影時拍照</string>
     <string name="preference_camera2_photo_video_recording_summary">允許在錄影時拍照。如果您啟用了 Camera2 API 後發現錄製影片有問題，請停用此功能。</string>
 
-    <string name="preference_video_log">影片 flat (log) profile</string>
-    <string name="preference_video_log_summary">影片模式啟用 flat (log) profile\n%s</string>
-    <string name="preference_video_log_off">關閉</string>
-    <string name="preference_video_log_fine">細微</string>
-    <string name="preference_video_log_low">低</string>
-    <string name="preference_video_log_medium">中</string>
-    <string name="preference_video_log_strong">強</string>
-    <string name="preference_video_log_extra_strong">超強</string>
+    <string name="preference_video_log">影片影像設定檔 (picture profile)</string>
+    <string name="preference_video_log_summary">設定影片模式要使用標準或扁平 (flat) 影像設定檔 (picture profile)\n%s</string>
+    <string name="preference_video_log_off">預設</string>
+    <string name="preference_video_log_fine">Log (細微)</string>
+    <string name="preference_video_log_low">Log (低)</string>
+    <string name="preference_video_log_medium">Log (中)</string>
+    <string name="preference_video_log_strong">Log (強)</string>
+    <string name="preference_video_log_extra_strong">Log (超強)</string>
     <string name="video_log">Log profile</string>
 
     <string name="preference_record_audio_src_camcorder">攝影機</string>
@@ -800,8 +798,6 @@
     <string name="preference_water_type_summary">使用水下防水盒時，如果選擇正確的水的類型，可以提高拍攝的準確性。</string>
     <string name="remote_connected">遠端已連線</string>
 
-    <string name="preference_remote_type_kraken">Kraken Smart Housing</string>
-
     <string name="preference_stamp_geo_address">使用地址</string>
     <!-- preference_stamp_geo_address_summary defined below -->
     <string name="preference_stamp_geo_address_both">可以的話，除了 GPS 座標之外也顯示地址</string>
@@ -828,6 +824,11 @@
     <string name="preference_zebra_stripes_70pc">70%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
     <string name="preference_zebra_stripes_80pc">80%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
     <string name="preference_zebra_stripes_90pc">90%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_93pc">93%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_95pc">95%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_97pc">97%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_98pc">98%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
+    <string name="preference_zebra_stripes_99pc">99%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
     <string name="preference_zebra_stripes_100pc">100%</string> <!-- shouldn't escape %, not needed when shown in ListPreference -->
 
     <string name="preference_focus_peaking">峰值對焦</string>
@@ -892,27 +893,88 @@
     <string name="preference_camera_api_old">原本的 camera API</string>
     <string name="preference_camera_api_camera2">Camera2 API</string>
 
-    <string name="preference_audio_control_summary">當偵測到聲音或是或音訊指令時拍照/錄影。
+    <string name="preference_audio_control_summary">檢測到聲音時拍照/錄像。
         當啟用時，使用螢幕上的麥克風按鈕來開始/停止監聽。
-        注意音訊指令選項會使用 Android 語音辨識服務：當使用這個選項時，
-音訊資料可能會可能會被傳送到遠端伺服器來進行語音辨識。
         \n%s</string>
 
+    <!-- beware of string being too long to display! -->
     <string name="preference_stamp_geo_address_summary">可以的話，當標記 GPS 位置時使用地址。
-        這個選項需要網路連線。
         注意如果啟用這個選項，您的裝置需要透過網路將位置資訊到第三方
-        以將 GPS 座標轉換為地址。請參閱 https://developer.android.com/reference/android/location/Geocoder .
+        以將 GPS 座標轉換為地址。請參閱 https://developer.android.com/reference/android/location/Geocoder。
+        此功能不保證可用性或準確性。 結果是最佳猜測，不能保證有意義或正確。
         \n%s</string>
 
     <string name="intro_text">點擊以對焦，按下藍色相機按鈕來拍照。
         \n\n要停用最大螢幕亮度，請到設定/螢幕 GUI/「強制最大亮度」。
-        要在 Android 5+ 儲存到 SD 卡，請到設定/更多相機控制/「使用 Storage Access Framework」。
+        要在 Android 5+ 儲存到 SD 卡，請到設定/更多相機控制/Storage Access Framework」。
         請從設定點選「線上說明」取得更多說明。</string>
 
     <string name="preference_select_remote">選擇遠端裝置</string>
 
+    <string name="preference_video_rec709">REC709</string>
+    <string name="preference_video_srgb">sRGB</string>
+    <string name="preference_video_gamma">Gamma</string>
+
+    <string name="preference_video_profile_gamma">影片 gamma 值</string>
+    <string name="preference_video_profile_gamma_summary">如果影片的影像設定檔 (picture profile) 設定為 Gamma，影片要使用的 gamma 值\n%s</string>
+    <string name="preference_video_profile_gamma_1_6">1.6</string>
+    <string name="preference_video_profile_gamma_1_8">1.8</string>
+    <string name="preference_video_profile_gamma_1_9">1.9</string>
+    <string name="preference_video_profile_gamma_2_0">2.0</string>
+    <string name="preference_video_profile_gamma_2_1">2.1</string>
+    <string name="preference_video_profile_gamma_2_2">2.2</string>
+    <string name="preference_video_profile_gamma_2_3">2.3</string>
+    <string name="preference_video_profile_gamma_2_4">2.4</string>
+    <string name="preference_video_profile_gamma_2_6">2.6</string>
+    <string name="preference_video_profile_gamma_2_8">2.8</string>
+
     <string name="preference_immersive_mode_off">關閉</string>
-    <string name="preference_immersive_mode_navigation">只隱藏螢幕上的虛擬按鈕</string>
+    <string name="preference_immersive_mode_low_profile">只讓螢幕上的虛擬導航鍵變暗</string>
+    <string name="preference_immersive_mode_navigation">隱藏螢幕上的虛擬導航鍵</string>
     <string name="preference_immersive_mode_gui">隱藏圖形化使用者介面</string>
     <string name="preference_immersive_mode_everything">隱藏全部</string>
+
+    <string name="preference_ghost_image_alpha">輔助圖片不透明度</string>
+    <string name="preference_ghost_image_alpha_summary">輔助圖片的 Alpha 值。較低的值代表較透明，較高的值代表較不透明。\n%s</string>
+
+    <string name="preference_zebra_stripes_foreground_color">斑馬條紋前景顏色</string>
+    <string name="preference_zebra_stripes_foreground_color_summary">當顯示斑馬條紋時，前景條紋要使用的顏色。\n%s</string>
+    <string name="preference_zebra_stripes_background_color">斑馬條紋背景顏色</string>
+    <string name="preference_zebra_stripes_background_color_summary">當顯示斑馬條紋時，背景條紋要使用的顏色。\n%s</string>
+
+    <string name="preference_zebra_stripes_color_black">黑色</string>
+    <string name="preference_zebra_stripes_color_red">紅色</string>
+    <string name="preference_zebra_stripes_color_orange">橘色</string>
+    <string name="preference_zebra_stripes_color_transparent">透明</string>
+    <string name="preference_zebra_stripes_color_white">白色</string>
+
+    <string name="external_camera">外部相機</string>
+    <string name="ultrawide">超廣角</string>
+
+    <string name="switch_to_external_camera">切換到外部相機</string>
+    <string name="switch_to_unknown_camera">切換相機</string>
+    <string name="switch_multi_camera">在多個相機之間切換</string>
+    <string name="preference_multi_cam_button">多相機圖示</string>
+    <string name="preference_multi_cam_button_summary">如果啟用，使用不同的按鈕來切換前置相機/後置相機與在多個前置相機/後置相機之間切換。如果停用，切換相機圖示會在所有相機之間循環切換。</string>
+
+    <string name="preference_show_camera_id">顯示相機 ID</string>
+    <string name="preference_show_camera_id_summary">在螢幕上顯示目前的相機 ID</string>
+
+    <string name="preference_allow_long_press">允許長按動作</string>
+    <string name="preference_allow_long_press_summary">是否允許長按動作（例如在相簿上長按來變更儲存位置）。</string>
+
+    <string name="aperture">光圈</string>
+
+    <string name="error_features_4k">4K UHD</string>
+    <string name="error_features_bitrate">位元率</string>
+    <string name="error_features_frame_rate">影格率</string>
+    <string name="error_features_slow_motion">慢動作</string>
+
+    <string name="preference_comment_ypr">儲存偏擺 (yaw)、俯仰 (pitch) 及翻滾 (roll)</string>
+    <string name="preference_comment_ypr_summary">在照片的 Exif user comment 中儲存裝置的偏擺 (yaw)、俯仰 (pitch) 及翻滾 (roll)（只有在 JPEG 格式）</string>
+
+    <string name="preference_audio_control_none">無</string>
+    <string name="preference_audio_control_noise">大的聲音</string>
+    <string name="preference_audio_control_voice">音訊指令：「cheese」</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 8a243ff8bbf440683a78289e82247dc58072642f..655945dcc8fec2fe0bdbe711d8b231c1014bb52a 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -263,16 +263,6 @@
         <item>audio_mono</item>
         <item>audio_stereo</item>
     </string-array>
-    <string-array name="preference_audio_control_entries">
-        <item>None</item>
-        <item>Loud noise</item>
-        <item>Voice command: \"cheese\"</item> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
-    </string-array>
-    <string-array name="preference_audio_control_values">
-        <item>none</item>
-        <item>noise</item>
-        <item>voice</item>
-    </string-array>
     <string-array name="preference_save_zulu_time_entries">
         <item>Local Time</item>
         <item>UTC (Zulu)</item>
@@ -826,22 +816,22 @@
         <item>crop_guide_2.4</item>
     </string-array>
     <string-array name="preference_audio_noise_control_sensitivity_entries">
-        <item>@string/preference_audio_noise_control_sensitivity_3</item>
-        <item>@string/preference_audio_noise_control_sensitivity_2</item>
-        <item>@string/preference_audio_noise_control_sensitivity_1</item>
-        <item>@string/preference_audio_noise_control_sensitivity_0</item>
-        <item>@string/preference_audio_noise_control_sensitivity_m1</item>
-        <item>@string/preference_audio_noise_control_sensitivity_m2</item>
         <item>@string/preference_audio_noise_control_sensitivity_m3</item>
+        <item>@string/preference_audio_noise_control_sensitivity_m2</item>
+        <item>@string/preference_audio_noise_control_sensitivity_m1</item>
+        <item>@string/preference_audio_noise_control_sensitivity_0</item>
+        <item>@string/preference_audio_noise_control_sensitivity_1</item>
+        <item>@string/preference_audio_noise_control_sensitivity_2</item>
+        <item>@string/preference_audio_noise_control_sensitivity_3</item>
     </string-array>
     <string-array name="preference_audio_noise_control_sensitivity_values">
-        <item>3</item>
-        <item>2</item>
-        <item>1</item>
-        <item>0</item>
-        <item>-1</item>
-        <item>-2</item>
         <item>-3</item>
+        <item>-2</item>
+        <item>-1</item>
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
     </string-array>
     <string-array name="preference_video_output_format_entries">
         <item>@string/preference_video_output_format_default</item>
@@ -999,4 +989,12 @@
         <item>#ffffffff</item> <!-- White -->
         <item>#00000000</item> <!-- Transparent -->
     </string-array>
+    <string-array name="preference_audio_control_entries">
+        <item>@string/preference_audio_control_none</item>
+        <item>@string/preference_audio_control_noise</item>
+    </string-array>
+    <string-array name="preference_audio_control_values">
+        <item>none</item>
+        <item>noise</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 17314013669e9a61fc1bf5f70a9f39c05558c18b..659b0d7a9a457358dbeadc1949c6db7b98f240c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,8 +112,8 @@
     <string name="preference_audio_noise_control_sensitivity_summary">Noise level sensitivity for audio (loud noise) option</string>
     <string name="preference_save_location">Save location</string>
     <string name="preference_save_location_summary">Folder to save the photo/video files in</string>
-    <string name="preference_using_saf">Use Storage Access Framework</string>
-    <string name="preference_using_saf_summary">Whether to use Storage Access Framework for saving photos and videos. This should be enabled to allow saving to external SD cards.</string>
+    <string name="preference_using_saf" translatable="false">Storage Access Framework</string> <!-- not translated as it's referenced in the privacy policy, and unclear how this term should be translated -->
+    <string name="preference_using_saf_summary">Whether to use Storage Access Framework for saving photos and videos. This should be enabled to allow saving to external SD cards. On Android 10+ this option must be enabled if you want to save in a folder outside of DCIM.</string>
     <string name="preference_save_photo_prefix">Save photo prefix</string>
     <string name="preference_save_photo_prefix_summary">The prefix to use for the save filenames for photos</string>
     <string name="preference_save_video_prefix">Save video prefix</string>
@@ -138,7 +138,7 @@
     <string name="preference_show_zoom_slider_controls">Show zoom slider control</string>
     <string name="preference_show_zoom_slider_controls_summary">Show the slider for zoom control</string>
     <string name="preference_show_iso">Show ISO</string>
-    <string name="preference_show_iso_summary">Display the current ISO level. In flash auto mode, a flash symbol will also indicate when flash will fire. (Requires Camera2 API.)</string>
+    <string name="preference_show_iso_summary">Display the current ISO level. (Requires Camera2 API.)</string>
     <string name="preference_free_memory">Show free memory</string>
     <string name="preference_free_memory_summary">Display the remaining device storage space on screen</string>
     <string name="preference_show_angle">Show angle</string>
@@ -282,7 +282,7 @@
     <string name="audio_listener_started">Make a loud noise</string>
 
     <string name="auto_stabilise_info">Auto-level will automatically rotate photos so that they appear level.\n\nNote that this means images will come out a slightly lower resolution (due to the rotation and cropping that\'s required).</string>
-    <string name="raw_info">DNG files contain the full uncompressed and unprocessed information from your camera.\n\nNote that some gallery apps don\'t recognise DNG files. DNG images can be used with specialised image editors like Snapseed or Lightroom.\n\nNote that various processing options such as "Stamp photos" and "Auto-level" will only apply to the non-DNG (JPEG/etc) images, and not the DNG images.</string>
+    <string name="raw_info">DNG files contain the full uncompressed and unprocessed information from your camera.\n\nNote that some gallery apps don\'t recognise DNG files. DNG images can be used with specialised image editors.\n\nNote that various processing options such as "Stamp photos" and "Auto-level" will only apply to the non-DNG (JPEG/etc) images, and not the DNG images.</string>
     <string name="hdr_info">HDR mode is useful for shots with a large variation in brightness. It works by taking multiple shots at different exposures, and combining them to create the final image.\n\nNote that HDR is not suitable for scenes with fast movement, and may result in less accurate color reproduction.\n\nTaking photos in HDR mode will be slower.</string>
 
     <string name="dont_show_again">Don\'t show again</string>
@@ -304,10 +304,10 @@
     <string name="no_permission">PERMISSIONS NOT AVAILABLE</string>
     <string name="permission_rationale_title">Permission required</string>
     <string name="permission_rationale_camera">Camera permission is required to enable the camera</string>
-    <string name="permission_rationale_storage">Storage read/write permission is required to save photos</string>
+    <string name="permission_rationale_storage">Storage read/write permission is required to save resultant files such as photos or videos</string>
     <string name="permission_rationale_record_audio">Microphone permission is required to record video with audio, as well as use the \"Audio control\" options</string>
     <string name="permission_rationale_location">Location permission is required for geotagging (storing location data in
-        photos and videos). Location permission is also required for connecting to Bluetooth LE remote control devices.</string>
+        photos and videos, including stamp and subtitles options). Location permission is also required (at least for Android 11 and earlier) for connecting to Bluetooth LE remote control devices.</string>
 
     <string name="preference_category_photo_debugging">Debugging options</string>
     <string name="preference_category_video_debugging">Debugging options</string>
@@ -364,7 +364,7 @@
     <string name="preference_show_geo_direction_lines">Show compass direction lines</string>
     <string name="preference_show_geo_direction_lines_summary">Display compass direction lines</string>
     <string name="preference_video_subtitle">Video subtitles</string>
-    <string name="preference_video_subtitle_summary">Create a subtitles (.SRT) file storing date and time; and also GPS info if location/direction data is enabled\n%s</string>
+    <string name="preference_video_subtitle_summary">Create a subtitles (.SRT) file storing date and time; and also GPS info if location/direction data is enabled. (On Android 11+, this option requires More camera controls/Storage Access Framework to be enabled.)\n%s</string>
 
     <string name="duration_unlimited">Unlimited</string>
     <string name="duration_3s">3 seconds</string>
@@ -740,6 +740,7 @@
     <string name="preference_image_format_webp">WebP</string>
     <string name="preference_image_format_png">PNG</string>
 
+    <!-- beware of these strings for preference_nr_mode* being too long, otherwise too wide for popup menu -->
     <string name="preference_nr_mode">NR Mode</string>
     <string name="preference_nr_mode_normal">Normal</string>
     <string name="preference_nr_mode_low_light">Low light</string>
@@ -801,7 +802,7 @@
     <string name="preference_water_type_summary">For underwater housings, improves accuracy if correct water type is selected.</string>
     <string name="remote_connected">Remote connected</string>
 
-    <string name="preference_remote_type_kraken">Kraken Smart Housing</string>
+    <string name="preference_remote_type_kraken" translatable="false">Kraken</string>
 
     <string name="preference_stamp_geo_address">Use addresses</string>
     <!-- preference_stamp_geo_address_summary defined below -->
@@ -849,7 +850,7 @@
 
     <string name="cycle_flash">Cycle flash</string>
     <string name="preference_show_cycle_flash">Show flash icon</string>
-    <string name="preference_show_cycle_flash_summary">Whether to show an on-screen icon for cycling through the flash options, instead of displaying flash options on the popup menu</string>
+    <string name="preference_show_cycle_flash_summary">Whether to show an on-screen icon for cycling through the flash options, instead of displaying flash options on the popup menu. Note that torch is not available if using this icon.</string>
 
     <string name="preference_raw_expo_bracketing">Allow RAW for expo bracketing</string>
     <string name="preference_raw_expo_bracketing_summary">Whether the RAW option should also apply for expo bracketing photo mode (or for HDR mode when \"Save all images for HDR mode\" is enabled). If this option is disabled, only JPEGs will be saved in those photo modes.</string>
@@ -891,28 +892,27 @@
 
     <string name="exposure_compensation_seekbar">Seekbar to change exposure compensation</string>
 
-    <string name="preference_image_format_summary">Select the file format used for saving photos. This affects \"standard\" (not RAW) photos. Note that PNG format is not truly lossless, instead it is converted from a JPEG at 100%% quality.\n%s</string>
+    <string name="preference_image_format_summary">Select the file format used for saving photos. This affects \"standard\" (not RAW) photos. Only JPEG supports saving Exif metadata. Note that PNG format is not truly lossless, instead it is converted from a JPEG at 100%% quality.\n%s</string>
 
     <string name="preference_camera_api">Camera API</string>
     <string name="preference_camera_api_summary">Select Camera2 API to enable extra features such as manual modes for exposure, focus, white balance, along with RAW (if supported by the device). Changing the API will cause a restart.\n%s</string>
     <string name="preference_camera_api_old">Original camera API</string>
     <string name="preference_camera_api_camera2">Camera2 API</string>
 
-    <string name="preference_audio_control_summary">Take photo/video when a noise is detected, or on voice command.
+    <string name="preference_audio_control_summary">Take photo/video when a noise is detected.
         When enabled, use the on-screen microphone button to start/stop listening.
-        Note the voice command option uses the Android speech recognition service: when using this option, audio data is likely to
-        be sent to remote servers to perform speech recognition.
         \n%s</string>
 
-    <string name="preference_stamp_geo_address_summary">If possible, use an address when stamping GPS locations.
-        This option requires an Internet connection.
-        Note that if enabled, this requires that your device transmits location data across the Internet to a third party
+    <!-- beware of string being too long to display! -->
+    <string name="preference_stamp_geo_address_summary">If possible, obtain address from GPS location (for photo stamp or video subtitles).
+        Note if enabled, this requires your device transmits location data across the Internet to a third party
         in order to convert GPS coordinates to an address. See https://developer.android.com/reference/android/location/Geocoder .
+        This feature provides no guarantees on availability or accuracy. Results are a best guess, and not guaranteed to be meaningful or correct.
         \n%s</string>
 
     <string name="intro_text">Touch to focus, and press the white camera button to take photos.
         \n\nTo disable maximum screen brightness, see Settings/On screen GUI/\"Force maximum brightness\".
-        To save to SD cards on Android 5+, see Settings/More camera controls/\"Use Storage Access Framework\".
+        To save to SD cards on Android 5+, see Settings/More camera controls/\"Storage Access Framework\".
         For more help, click \"Online help\" from Settings.
     </string>
 
@@ -982,34 +982,60 @@
     <string name="preference_comment_ypr">Store yaw, pitch and roll</string>
     <string name="preference_comment_ypr_summary">Store the yaw, pitch and roll of the device in the photo\'s Exif user comment (JPEG format only)</string>
 
+    <string name="array_seekbar_preference_seekbar">Seekbar to change current preference value</string>
+
+    <string name="preference_audio_control_none">None</string>
+    <string name="preference_audio_control_noise">Loud noise</string>
+    <string name="preference_audio_control_voice">Voice command: \"cheese\"</string> <!-- note that cheese shouldn't be translated, as we listen for this no matter what language is being used -->
+
+    <string name="preference_camera2_dummy_capture_hack">Enable dummy capture HDR/expo fix</string>
+    <string name="preference_camera2_dummy_capture_hack_summary">Try enabling this if your device has problems when taking photos with HDR or Expo photo modes (if expo images come out with same exposures). Only relevant if fast HDR/expo option below is also enabled.</string>
+
+    <string name="permission_rationale_bluetooth_scan_connect">Bluetooth scan/connect permissions are required for discovering and connecting to Bluetooth LE remote control devices.</string>
+    <string name="unknown_device_no_permission">Unknown device (bluetooth connect permission not available)</string>
+
+    <string name="photo_mode_x_auto">X-Auto</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode_x_auto_full">Extension: Auto</string>
+    <string name="photo_mode_x_hdr">X-HDR</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode_x_hdr_full">Extension: HDR</string>
+    <string name="photo_mode_x_night">X-Night</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode_x_night_full">Extension: Night</string>
+    <string name="photo_mode_x_bokeh">X-Bokeh</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode_x_bokeh_full">Extension: Bokeh</string>
+    <string name="photo_mode_x_beauty">X-Bty</string> <!-- keep short, as this shows in the popup menu -->
+    <string name="photo_mode_x_beauty_full">Extension: Beauty / Face Retouch</string>
+
     <!-- The following strings should not be translated (and shouldn't be included in language-specific strings.xml), in case they need updating -->
 
     <string name="preference_privacy_policy" translatable="false">Privacy policy</string>
     <string name="preference_privacy_policy_summary" translatable="false">Tap to display privacy policy</string>
     <string name="preference_privacy_policy_online" translatable="false">Online privacy policy</string>
     <string name="preference_privacy_policy_text" translatable="false"> <!-- if changing this, remember to consider if the online privacy policy needs updating -->
-        Open Camera accesses camera sensor and microphone data to fulfil its purpose as a camera.
+        <!-- now interpreted as HTML so that we can have the mailto link, for the contact that's needed for Google Play policies! -->
+        <!-- be careful of rewording/removing bits, as some things here may be required for Google Play policies -->
+        Open Camera is developed by Mark Harman.
+        &lt;br/&gt;Open Camera accesses camera sensor and microphone data to fulfil its purpose as a camera.
         Microphone is also used for the optional \"Audio control\".
-        \nAccess to files is needed to save resultant files such as photos and videos to your device.
-        \nLocation permission is required for the optional geotagging features (for photos and videos,
+        &lt;br/&gt;Access to files is needed (at least for Android 9 and earlier) to save resultant files such as photos and videos to your device.
+        &lt;br/&gt;Location permission is requested in order to deliver the optional geotagging features (for photos and videos,
         including stamp and subtitles options).
         When relevant option(s) are enabled, your device location will be stored in photo/video/subtitle files.
-        Location permission is also required to connect to Bluetooth remote control devices.
-        \nSince Open Camera also uses operating system APIs, you should review relevant privacy policies
+        &lt;br/&gt;Bluetooth permissions are used to allow the optional feature to discover and connect to Bluetooth LE remote control devices;
+        the Bluetooth remote control feature also requires location permission (on Android 11 or earlier) or
+        Nearby Devices permission (on Android 12 or later).
+        &lt;br/&gt;Resultant data such as photos or videos can be shared with
+        other apps if you use the share option in Open Camera, or when Open Camera is called by
+        another app on your device, or when you use the Storage Access Framework option to save
+        to another app or service.
+        &lt;br/&gt;Data handling procedures, data retention and deletion policies: Open Camera
+        does not transmit personal or sensitive information to me.
+        &lt;br/&gt;Since Open Camera also uses operating system APIs, you should review relevant privacy policies
         such as for your device, manufacturer, operating system and/or Google accounts. For example:
-        \n*The optional voice control option uses the Android speech recognition service. When enabled,
-        audio data is likely to be sent to remote servers by Android to perform speech recognition.
-        \n*The \"addresses\" option for photo stamp or video subtitles uses the Android Geocoder API.
-        When enabled, this requires that your device transmits location data across the Internet to a
-        third party (which may depend on what "backend services" are installed on your device).
-        \n*Apps/services such as cloud services on your device may auto-upload photos and videos that are saved on your device.
+        &lt;br/&gt;*Apps/services such as cloud services on your device may auto-upload photos and videos that are saved on your device.
+        &lt;br/&gt;If you have inquiries about my privacy policy, please contact me by email at
+        &lt;a href=\"mailto:mark.harman.apps@gmail.com?subject=Open%20Camera%20privacy%20policy\"&gt;mark.harman.apps@gmail.com&lt;/a&gt;.
     </string>
 
-    <string name="speech_recognizer_extra_info" translatable="false">
-        (Your audio may be sent to remote\n
-        servers by Android to perform speech\n
-        recognition.)</string>
-
     <string name="preference_screen_licences">Open Source licences</string>
     <string name="preference_licence_open_camera">Camera</string>
     <string name="preference_licence_open_camera_text">Camera is © 2013–2019 Mark Harman, released under the GPL v3 or later. Tap here for full licence text.</string>
@@ -1027,23 +1053,14 @@
     <string name="whats_new_text">
         <small>[This dialog is shown when Camera is updated. You can disable it under
             Settings/On screen GUI/Show What\'s New dialog.]</small>
-        \n\n<b>v1.48:</b>\n
+        \n\n<b>v1.50:</b>\n
         <ul>
-            <li>New icon for multiple cameras. If your device has multiple front/back cameras, then
-            the existing icon to switch cameras will switch between front
-            and back camera; the new icon will instead cycle between the multiple front or back cameras.
-            If you prefer the old behaviour, disable
-            Settings/On screen GUI/\"Multiple cameras icon\". (Note, only supported for devices that expose
-            multiple cameras to third party applications.)\n</li>
-            <li>Auto-level feature now shows on-screen rectangle to show the frame of the resultant photo.\n</li>
-            <li>Aperture control, for devices that support this. (Camera2 API only.)\n</li>
-            <li>More custom video profiles.\n</li>
-            <li>New option for alpha value for ghost image option.\n</li>
-            <li>Options for zebra stripe colours.\n</li>
-            <li>Option for storing device\'s current yaw/pitch/roll in Exif user comment.\n</li>
-            <li>Option to disable long press actions.\n</li>
-            <li>Better use of full screen with wide aspect ratios on devices with on-screen navigation buttons.\n</li>
-            <li>Bug fixes and UI improvements.\n</li>
+            <li>Support for Camera Extensions. Selected Android 12 devices now have photo modes such as Night, Bokeh, Beauty. Requires Settings/\"Camera API\" to be set to Camera2 API.\n</li>
+            <li>Allow accessing ultra-wide cameras via zoom e.g. on Pixel 5/6 (when using Camera2 API).\n</li>
+            <li>Removed \"use addresses\" and \"say cheese\" options. Sorry about that, but this is due to new data privacy requirements.\n</li>
+            <li>Fixed HDR on Samsung devices since Android 12.\n</li>
+            <li>Fixes for flash on Camera2 API.\n</li>
+            <li>Various improvements for Android 12.\n</li>
         </ul>
     </string>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 40534502849ad924bbcc7c64770f071764314fa1..e0ab8a0d2790aa5a79ae60ff6243621dac74086e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
         Base application theme, dependent on API level. This theme is replaced
         by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
     -->
-    <style name="AppBaseTheme" parent="android:Theme.NoTitleBar.Fullscreen">
+    <style name="AppBaseTheme" parent="@style/Theme.AppCompat.NoActionBar">
         <!--
             Theme customizations available in newer API levels can go in
             res/values-vXX/styles.xml, while customizations related to
@@ -15,6 +15,10 @@
     <!-- Application theme. -->
     <style name="AppTheme" parent="AppBaseTheme">
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowContentOverlay">@null</item>
     </style>
     
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index d7df2bd87f4bbeaab93cf37fa419c4f278e28cb0..54e183574d39de3de26ac0877bd1829cf7c42218 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -168,7 +168,7 @@
                 android:defaultValue="none"
                 />
 
-            <ListPreference 
+            <net.sourceforge.opencamera.ui.ArraySeekBarPreference
                 android:key="preference_audio_noise_control_sensitivity"
                 android:title="@string/preference_audio_noise_control_sensitivity"
                 android:summary="@string/preference_audio_noise_control_sensitivity_summary"
@@ -207,7 +207,10 @@
                     android:dependency="preference_enable_remote"
                     >
 
-                    <intent android:action="net.sourceforge.opencamera.Remotecontrol.DeviceScanner"/>
+                    <intent
+                        android:targetPackage="foundation.e.camera"
+                        android:targetClass="net.sourceforge.opencamera.remotecontrol.DeviceScanner"
+                        />
 
                 </PreferenceScreen>
 
@@ -250,6 +253,8 @@
                 />
     
             <!--  if we move this to another PreferenceGroup, we should update code to remove this Preference -->
+            <!-- if this is changed to being different to SwitchPreference or we change the key name, consider whether
+                MyPreferenceFragment.setupDependencies() needs updating. -->
             <SwitchPreference
                 android:key="preference_using_saf"
                 android:title="@string/preference_using_saf"
@@ -258,22 +263,20 @@
                 />
 
             <!-- if the default value changes, remember to update code in MyPreferenceFragment.setSummary() -->
-            <EditTextPreference
+            <net.sourceforge.opencamera.ui.MyEditTextPreference
                 android:key="preference_save_photo_prefix"
                 android:title="@string/preference_save_photo_prefix"
                 android:summary="@string/preference_save_photo_prefix_summary"
-                android:dialogTitle="@string/preference_save_photo_prefix"
                 android:dialogMessage="@string/preference_save_photo_prefix_summary"
                 android:inputType="text"
                 android:defaultValue="IMG_"
                 />
 
             <!-- if the default value changes, remember to update code in MyPreferenceFragment.setSummary() -->
-            <EditTextPreference
+            <net.sourceforge.opencamera.ui.MyEditTextPreference
                 android:key="preference_save_video_prefix"
                 android:title="@string/preference_save_video_prefix"
                 android:summary="@string/preference_save_video_prefix_summary"
-                android:dialogTitle="@string/preference_save_video_prefix"
                 android:dialogMessage="@string/preference_save_video_prefix_summary"
                 android:inputType="text"
                 android:defaultValue="VID_"
@@ -292,7 +295,7 @@
                 android:key="preference_show_when_locked"
                 android:title="@string/preference_show_when_locked"
                 android:summary="@string/preference_show_when_locked_summary"
-                android:defaultValue="true"
+                android:defaultValue="false"
                 />
 
            <SwitchPreference
@@ -562,7 +565,7 @@
             android:title="@string/preference_screen_gui"
             android:icon="@drawable/ic_preference_on_screen_gui"
             android:persistent="false">
-    
+
             <!--  if we move this to another PreferenceGroup, we should update code to remove this Preference -->
             <CheckBoxPreference
                 android:key="preference_show_face_detection"
@@ -719,8 +722,8 @@
                 android:summary="%s"
                 android:icon="@drawable/ic_preference_photo_size_select"
                 />
-        
-            <ListPreference 
+
+            <net.sourceforge.opencamera.ui.ArraySeekBarPreference
                 android:key="preference_quality"
                 android:title="@string/preference_quality"
                 android:summary="@string/preference_quality_summary"
@@ -847,22 +850,20 @@
                 >
 
                 <!--suppress AndroidDomInspection --> <!-- stop lint complaining about empty defaultValue -->
-                <EditTextPreference
+                <net.sourceforge.opencamera.ui.MyEditTextPreference
                     android:key="preference_exif_artist"
                     android:title="@string/preference_exif_artist"
                     android:summary="@string/preference_exif_artist_summary"
-                    android:dialogTitle="@string/preference_exif_artist"
                     android:dialogMessage="@string/preference_exif_artist_summary"
                     android:inputType="text"
                     android:defaultValue=""
                     />
 
                 <!--suppress AndroidDomInspection --> <!-- stop lint complaining about empty defaultValue -->
-                <EditTextPreference
+                <net.sourceforge.opencamera.ui.MyEditTextPreference
                     android:key="preference_exif_copyright"
                     android:title="@string/preference_exif_copyright"
                     android:summary="@string/preference_exif_copyright_summary"
-                    android:dialogTitle="@string/preference_exif_copyright"
                     android:dialogMessage="@string/preference_exif_copyright_summary"
                     android:inputType="text"
                     android:defaultValue=""
@@ -912,15 +913,6 @@
                     android:defaultValue="preference_stamp_gpsformat_default"
                     />
 
-                <ListPreference
-                    android:key="preference_stamp_geo_address"
-                    android:title="@string/preference_stamp_geo_address"
-                    android:summary="@string/preference_stamp_geo_address_summary"
-                    android:entries="@array/preference_stamp_geo_address_entries"
-                    android:entryValues="@array/preference_stamp_geo_address_values"
-                    android:defaultValue="preference_stamp_geo_address_no"
-                    />
-
                 <ListPreference
                     android:key="preference_units_distance"
                     android:title="@string/preference_units_distance"
@@ -931,17 +923,16 @@
                     />
 
                 <!--suppress AndroidDomInspection --> <!-- stop lint complaining about empty defaultValue -->
-                <EditTextPreference
+                <net.sourceforge.opencamera.ui.MyEditTextPreference
                     android:key="preference_textstamp"
                     android:title="@string/preference_textstamp"
                     android:summary="@string/preference_textstamp_summary"
-                    android:dialogTitle="@string/preference_textstamp"
                     android:dialogMessage="@string/preference_textstamp_summary"
                     android:inputType="text"
                     android:defaultValue=""
                     />
-    
-                <ListPreference 
+
+                <net.sourceforge.opencamera.ui.ArraySeekBarPreference
                     android:key="preference_stamp_fontsize"
                     android:title="@string/preference_stamp_fontsize"
                     android:summary="@string/preference_stamp_fontsize_summary"
@@ -984,6 +975,14 @@
                     android:defaultValue="false"
                     />
 
+                <!--  if we move this to another PreferenceGroup, we should update code to remove this Preference -->
+                <SwitchPreference
+                    android:key="preference_camera2_dummy_capture_hack"
+                    android:title="@string/preference_camera2_dummy_capture_hack"
+                    android:summary="@string/preference_camera2_dummy_capture_hack_summary"
+                    android:defaultValue="false"
+                    />
+
                 <!--  if we move this to another PreferenceGroup, we should update code to remove this Preference -->
                 <SwitchPreference
                     android:key="preference_camera2_fast_burst"
@@ -1270,22 +1269,22 @@
             android:title="@string/preference_online_help"
             android:summary="@string/preference_online_help_summary"
             android:icon="@drawable/ic_preference_help"
-            />  
+            />
 
         <Preference
-            android:key="preference_donate"  
+            android:key="preference_donate"
             android:title="@string/preference_donate"
             android:summary="@string/preference_donate_summary"
-            />  
+            />
 
         <!--  if we move this to another PreferenceGroup, we should update code for the findPreference() call -->
         <SwitchPreference
-            android:key="preference_use_camera2"  
+            android:key="preference_use_camera2"
             android:title="@string/preference_use_camera2"
             android:summary="@string/preference_use_camera2_summary"
             android:defaultValue="true"
-            />  
-        
+            />
+
         <Preference
             android:icon="@drawable/ic_preference_info"
             android:key="preference_debug_info"
diff --git a/app/src/main/rs/create_mtb.rs b/app/src/main/rs/create_mtb.rs
index 2882d2b2d8bb511430bedf3ee8c06b34bac5f792..52756eae3cb015aebf1a43de20e30bbf13f18a7e 100644
--- a/app/src/main/rs/create_mtb.rs
+++ b/app/src/main/rs/create_mtb.rs
@@ -19,7 +19,7 @@ void __attribute__((kernel)) create_mtb(uchar4 in, uint32_t x, uint32_t y) {
         diff = value - median_value;
     else
         diff = median_value - value;
-    if( diff <= 4 )
+    if( diff <= 4 ) // should be same value as min_diff_c in HDRProcessor.autoAlignment()
         out = 127;
     else if( value <= median_value )
         out = 0;
diff --git a/app/src/main/rs/process_avg.rs b/app/src/main/rs/process_avg.rs
index fcb156538e4f38c0ccda76979287124e46f01c6b..38dd07798d6f72e0cba1a2887d8c0046a2a16400 100644
--- a/app/src/main/rs/process_avg.rs
+++ b/app/src/main/rs/process_avg.rs
@@ -2,7 +2,7 @@
 #pragma rs java_package_name(net.sourceforge.opencamera)
 #pragma rs_fp_relaxed
 
-//rs_allocation bitmap_avg;
+rs_allocation bitmap_orig;
 rs_allocation bitmap_new;
 
 rs_allocation bitmap_align_new;
@@ -58,35 +58,43 @@ float3 __attribute__((kernel)) avg_f(float3 pixel_avg_f, uint32_t x, uint32_t y)
         // smaller value of wiener_C means stronger filter (i.e., less averaging)
 
         // diff based on rgb
-        float3 diff = pixel_avg_f - pixel_new_f;
-        float L = dot(diff, diff);
+        //float3 diff = pixel_avg_f - pixel_new_f;
+        //float L = dot(diff, diff);
 
-        // diff based on neighbourhood
-        /*float L = 0.0f;
-        const int radius = 0;
+        // diff based on neighbourhood [sampling a subset of pixels]
+        // this helps testAvg24, testAvg28, testAvg31, testAvg33, testAvg39
+        float L = 0.0f;
+        const int radius = 2; // must be less than the radius we actually read from below
         if( ix-radius >= 0 && ix+radius < rsAllocationGetDimX(bitmap_new) &&
             iy-radius >= 0 && iy+radius < rsAllocationGetDimY(bitmap_new) &&
             ix+offset_x_new-radius >= 0 && ix+offset_x_new+radius < rsAllocationGetDimX(bitmap_new) &&
             iy+offset_y_new-radius >= 0 && iy+offset_y_new+radius < rsAllocationGetDimY(bitmap_new) ) {
-            for(int cy=iy-radius;cy<=iy+radius;cy++) {
-                for(int cx=ix-radius;cx<=ix+radius;cx++) {
-                    //uchar4 this_pixel_avg = rsGetElementAt_uchar4(bitmap_avg, cx, cy);
-                    float3 this_pixel_avg = rsGetElementAt_float3(bitmap_avg, cx, cy);
-                    uchar4 this_pixel_new = rsGetElementAt_uchar4(bitmap_new, cx+offset_x_new, cy+offset_y_new);
-                    float3 this_diff = this_pixel_avg - convert_float3(this_pixel_new.rgb);
-                    //float3 this_diff = pixel_avg_f - convert_float3(this_pixel_new.rgb);
-                    //float3 this_diff = pixel_avg_f - pixel_new_f;
-                    float this_L = dot(this_diff, this_diff);
-                    L += this_L;
-                }
-            }
-            const int size = 2*radius+1;
-            L /= (size*size);
+
+            const int n_pixels = 5; // number of pixels we read from
+            int ox = ix+offset_x_new;
+            int oy = iy+offset_y_new;
+
+            // average of diffs:
+
+            float3 diff;
+
+            diff = convert_float3(rsGetElementAt_uchar4(bitmap_orig, ix-2, iy-2).rgb) - convert_float3(rsGetElementAt_uchar4(bitmap_new, ox-2, oy-2).rgb);
+            L += dot(diff, diff);
+            diff = convert_float3(rsGetElementAt_uchar4(bitmap_orig, ix+2, iy-2).rgb) - convert_float3(rsGetElementAt_uchar4(bitmap_new, ox+2, oy-2).rgb);
+            L += dot(diff, diff);
+            diff = convert_float3(rsGetElementAt_uchar4(bitmap_orig, ix, iy).rgb) - pixel_new_f;
+            L += dot(diff, diff);
+            diff = convert_float3(rsGetElementAt_uchar4(bitmap_orig, ix-2, iy+2).rgb) - convert_float3(rsGetElementAt_uchar4(bitmap_new, ox-2, oy+2).rgb);
+            L += dot(diff, diff);
+            diff = convert_float3(rsGetElementAt_uchar4(bitmap_orig, ix-2, iy+2).rgb) - convert_float3(rsGetElementAt_uchar4(bitmap_new, ox+2, oy+2).rgb);
+            L += dot(diff, diff);
+
+            L /= n_pixels;
         }
         else {
             float3 diff = pixel_avg_f - pixel_new_f;
             L = dot(diff, diff);
-        }*/
+        }
 
         // diff based on compute_diff (separate pass on scaled down alignment bitmaps)
         //int align_x = x/scale_align_size;
diff --git a/app/src/main/rs/process_hdr.rs b/app/src/main/rs/process_hdr.rs
index 8a82d6653e384b4e17430bd22156b6f1e5740a07..3821de08de39ecb0080e2e027b569786a26ca2c9 100644
--- a/app/src/main/rs/process_hdr.rs
+++ b/app/src/main/rs/process_hdr.rs
@@ -194,8 +194,14 @@ uchar4 __attribute__((kernel)) hdr(uchar4 in, uint32_t x, uint32_t y) {
     }
     else {
         pixels[0] = in;
-        parameter_A[0] = parameter_A[mid_indx];
-        parameter_B[0] = parameter_B[mid_indx];
+        // Reading from the parameter_A1, parameter_B1 instead of the local arrays should be equivalent -
+        // but doing it this way fixes odd bug on some Galaxy devices (e.g., S10e) with Android 12 - HDR photos
+        // would come out black due to corrupt values in the local parameter_A, parameter_B arrays
+        // n.b., doesn't affect hdr_n()
+        //parameter_A[0] = parameter_A[mid_indx];
+        //parameter_B[0] = parameter_B[mid_indx];
+        parameter_A[0] = parameter_A1;
+        parameter_B[0] = parameter_B1;
     }
 
     // middle image is not offset
@@ -206,8 +212,11 @@ uchar4 __attribute__((kernel)) hdr(uchar4 in, uint32_t x, uint32_t y) {
     }
     else {
         pixels[2] = in;
-        parameter_A[2] = parameter_A[mid_indx];
-        parameter_B[2] = parameter_B[mid_indx];
+        // See note above about bug with some Galaxy devices and Android 12
+        //parameter_A[2] = parameter_A[mid_indx];
+        //parameter_B[2] = parameter_B[mid_indx];
+        parameter_A[2] = parameter_A1;
+        parameter_B[2] = parameter_B1;
     }
 
     float3 hdr = (float3){0.0f, 0.0f, 0.0f};
diff --git a/app/src/test/java/net/sourceforge/opencamera/test/UnitTest.java b/app/src/test/java/net/sourceforge/opencamera/test/UnitTest.java
index 17b04cec03694a307a8397d1e9685ec97e8999a2..e7a0d401cf98dc2df66c45abcd5401c3989015e8 100644
--- a/app/src/test/java/net/sourceforge/opencamera/test/UnitTest.java
+++ b/app/src/test/java/net/sourceforge/opencamera/test/UnitTest.java
@@ -2,6 +2,7 @@ package net.sourceforge.opencamera.test;
 
 import android.media.CamcorderProfile;
 
+import net.sourceforge.opencamera.MainActivity;
 import net.sourceforge.opencamera.MyApplicationInterface;
 import net.sourceforge.opencamera.cameracontroller.CameraController;
 import net.sourceforge.opencamera.cameracontroller.CameraController2;
@@ -12,12 +13,15 @@ import net.sourceforge.opencamera.preview.Preview;
 import net.sourceforge.opencamera.preview.VideoQualityHandler;
 import net.sourceforge.opencamera.TextFormatter;
 import net.sourceforge.opencamera.ui.DrawPreview;
+import net.sourceforge.opencamera.ui.MainUI;
+import net.sourceforge.opencamera.ui.PopupView;
 
 import org.junit.Test;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -121,21 +125,22 @@ public class UnitTest {
     public void testTimeString() throws ParseException {
         Log.d(TAG, "testTimeString");
         SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss", Locale.US);
+        // n.b., do case insensitive checks as at one point I saw the text formatter change from upper case to lower case for AM/PM
         Date time1 = sdf.parse("00:00:00");
         assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_none", time1), "" );
-        assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_12hour", time1), "12:00:00 AM" );
+        assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_12hour", time1).toLowerCase(Locale.US), "12:00:00 am" );
         assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_24hour", time1), "00:00:00" );
         Date time2 = sdf.parse("08:15:43");
         assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_none", time2), "" );
-        assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_12hour", time2), "08:15:43 AM" );
+        assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_12hour", time2).toLowerCase(Locale.US), "08:15:43 am" );
         assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_24hour", time2), "08:15:43" );
         Date time3 = sdf.parse("12:00:00");
         assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_none", time3), "" );
-        assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_12hour", time3), "12:00:00 PM" );
+        assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_12hour", time3).toLowerCase(Locale.US), "12:00:00 pm" );
         assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_24hour", time3), "12:00:00" );
         Date time4 = sdf.parse("13:53:06");
         assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_none", time4), "" );
-        assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_12hour", time4), "01:53:06 PM" );
+        assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_12hour", time4).toLowerCase(Locale.US), "01:53:06 pm" );
         assertEquals( TextFormatter.getTimeString("preference_stamp_timeformat_24hour", time4), "13:53:06" );
     }
 
@@ -693,7 +698,8 @@ public class UnitTest {
         // If any of these tests fail due to changes to HDRProcessor, consider that we might want to update the values tested in
         // computeBrightenFactors(), rather than simply updating the expected results, to preserve what the test is meant to test.
 
-        HDRProcessor.BrightenFactors brighten_factors = HDRProcessor.computeBrightenFactors(true,1600, 1000000000L/12, 20, 170);
+        //HDRProcessor.BrightenFactors brighten_factors = HDRProcessor.computeBrightenFactors(true,1600, 1000000000L/12, 20, 170);
+        HDRProcessor.BrightenFactors brighten_factors = HDRProcessor.computeBrightenFactors(true,1600, 1000000000L/12, 42, 170);
         assertEquals(1.5f, brighten_factors.gain, 1.0e-5f);
         assertEquals(8.0f, brighten_factors.low_x, 0.1f);
         assertEquals(255.5f, brighten_factors.mid_x, 1.0e-5f);
@@ -701,7 +707,7 @@ public class UnitTest {
 
         // this checks for stability - we change the inputs so we enter "use piecewise function with gain and gamma", but
         // we should not significantly change the values of gain or low_x, and gamma should be close to 1
-        brighten_factors = HDRProcessor.computeBrightenFactors(true,1600, 1000000000L/12, 20, 171);
+        brighten_factors = HDRProcessor.computeBrightenFactors(true,1600, 1000000000L/12, 42, 171);
         assertEquals(1.5f, brighten_factors.gain, 1.0e-5f);
         assertEquals(8.0f, brighten_factors.low_x, 0.1f);
         assertEquals(136.0f, brighten_factors.mid_x, 0.5f);
@@ -786,4 +792,252 @@ public class UnitTest {
         assertEquals(1.0f/(0.369070f*(0.2f-0.1f) + 0.1f), focus_distances.get(1), 1.0e-5);
         assertEquals(1.0f/0.2f, focus_distances.get(0), 1.0e-5);
     }
+
+    /** Tests MainActivity.processUserSaveLocation() (used for checking save locations when specifying user folders with non-SAF scoped storage).
+     */
+    @Test
+    public void testprocessUserSaveLocation() {
+        assertEquals("OpenCamera", MainActivity.processUserSaveLocation("OpenCamera"));
+
+        assertEquals("OpenCamera", MainActivity.processUserSaveLocation("OpenCamera/"));
+
+        assertEquals("", MainActivity.processUserSaveLocation(""));
+
+        assertEquals("", MainActivity.processUserSaveLocation("/"));
+
+        assertEquals("blah_a/blah_b", MainActivity.processUserSaveLocation("blah_a/blah_b"));
+
+        assertEquals("blah_a/blah_b", MainActivity.processUserSaveLocation("blah_a/blah_b/"));
+
+        assertEquals("blah_a/blah_b", MainActivity.processUserSaveLocation("blah_a//blah_b"));
+
+        assertEquals("blah_a/blah_b", MainActivity.processUserSaveLocation("blah_a///blah_b"));
+
+        assertEquals("blah_a/blah_b/blah_c", MainActivity.processUserSaveLocation("blah_a///blah_b/blah_c//"));
+
+        assertEquals("OpenCamera", MainActivity.processUserSaveLocation("/OpenCamera"));
+
+        assertEquals("OpenCamera", MainActivity.processUserSaveLocation("//OpenCamera"));
+
+        assertEquals("OpenCamera", MainActivity.processUserSaveLocation("///OpenCamera"));
+
+        assertEquals("blah_a/blah_b/blah_c", MainActivity.processUserSaveLocation("/blah_a///blah_b/blah_c//"));
+
+    }
+
+    /** Tests MainActivity.checkSaveLocation() (used for checking save locations when updating to scoped storage).
+     */
+    @Test
+    public void testCheckSaveLocation() {
+        Log.d(TAG, "testCheckSaveLocation");
+
+        // Should be same as Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath()
+        // - needed as Environment is not mocked.
+        final String dcim_path = "/storage/emulated/0/DCIM";
+
+        MainActivity.CheckSaveLocationResult res;
+
+        res = MainActivity.checkSaveLocation("");
+        assertEquals(new MainActivity.CheckSaveLocationResult(true, null), res);
+
+        res = MainActivity.checkSaveLocation("OpenCamera");
+        assertEquals(new MainActivity.CheckSaveLocationResult(true, null), res);
+
+        res = MainActivity.checkSaveLocation("blah_a/blah_b");
+        assertEquals(new MainActivity.CheckSaveLocationResult(true, null), res);
+
+        res = MainActivity.checkSaveLocation("OpenCamera/");
+        assertEquals(new MainActivity.CheckSaveLocationResult(true, null), res);
+
+        res = MainActivity.checkSaveLocation("blah_a/blah_b/");
+        assertEquals(new MainActivity.CheckSaveLocationResult(true, null), res);
+
+        res = MainActivity.checkSaveLocation("/storage/emulated/0/DCIM/OpenCamera/subfolder/", dcim_path);
+        assertEquals(new MainActivity.CheckSaveLocationResult(false, "OpenCamera/subfolder/"), res);
+
+        res = MainActivity.checkSaveLocation("/storage/emulated/0/DCIM/OpenCamera/subfolder", dcim_path);
+        assertEquals(new MainActivity.CheckSaveLocationResult(false, "OpenCamera/subfolder"), res);
+
+        res = MainActivity.checkSaveLocation("/storage/emulated/0/DCIM/OpenCamera/", dcim_path);
+        assertEquals(new MainActivity.CheckSaveLocationResult(false, "OpenCamera/"), res);
+
+        res = MainActivity.checkSaveLocation("/storage/emulated/0/DCIM/OpenCamera", dcim_path);
+        assertEquals(new MainActivity.CheckSaveLocationResult(false, "OpenCamera"), res);
+
+        res = MainActivity.checkSaveLocation("/storage/emulated/0/DCIM/", dcim_path);
+        assertEquals(new MainActivity.CheckSaveLocationResult(false, ""), res);
+
+        res = MainActivity.checkSaveLocation("/storage/emulated/0/DCIM", dcim_path);
+        assertEquals(new MainActivity.CheckSaveLocationResult(false, ""), res);
+
+        res = MainActivity.checkSaveLocation("/storage/emulated/0/Pictures", dcim_path);
+        assertEquals(new MainActivity.CheckSaveLocationResult(false, null), res);
+
+        res = MainActivity.checkSaveLocation("/storage/emulated/0", dcim_path);
+        assertEquals(new MainActivity.CheckSaveLocationResult(false, null), res);
+    }
+
+    @Test
+    public void sortLuminanceInfo() {
+        Log.d(TAG, "sortLuminanceInfo");
+
+        List<HDRProcessor.LuminanceInfo> luminanceInfos = new ArrayList<>();
+        List<HDRProcessor.LuminanceInfo> luminanceInfosSorted;
+
+        //noinspection RedundantOperationOnEmptyContainer
+        luminanceInfos.clear();
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(0, 64, 255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(16, 80, 255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(33, 116, 255, false));
+        luminanceInfosSorted = new ArrayList<>(luminanceInfos);
+        Collections.sort(luminanceInfosSorted);
+        assertEquals(luminanceInfos.size(), luminanceInfosSorted.size());
+        assertEquals(luminanceInfos.get(0), luminanceInfosSorted.get(0));
+        assertEquals(luminanceInfos.get(1), luminanceInfosSorted.get(1));
+        assertEquals(luminanceInfos.get(2), luminanceInfosSorted.get(2));
+
+        luminanceInfos.clear();
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(16, 80,255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(0, 64, 255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(33, 116, 255, false));
+        luminanceInfosSorted = new ArrayList<>(luminanceInfos);
+        Collections.sort(luminanceInfosSorted);
+        assertEquals(luminanceInfos.size(), luminanceInfosSorted.size());
+        assertEquals(luminanceInfos.get(1), luminanceInfosSorted.get(0));
+        assertEquals(luminanceInfos.get(0), luminanceInfosSorted.get(1));
+        assertEquals(luminanceInfos.get(2), luminanceInfosSorted.get(2));
+
+        luminanceInfos.clear();
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(33, 116, 255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(0, 64, 255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(16, 80, 255, false));
+        luminanceInfosSorted = new ArrayList<>(luminanceInfos);
+        Collections.sort(luminanceInfosSorted);
+        assertEquals(luminanceInfos.size(), luminanceInfosSorted.size());
+        assertEquals(luminanceInfos.get(1), luminanceInfosSorted.get(0));
+        assertEquals(luminanceInfos.get(2), luminanceInfosSorted.get(1));
+        assertEquals(luminanceInfos.get(0), luminanceInfosSorted.get(2));
+
+        // case that requires using min value as well as median value
+        luminanceInfos.clear();
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(93, 255, 255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(68, 255, 255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(17, 193, 255, false));
+        luminanceInfosSorted = new ArrayList<>(luminanceInfos);
+        Collections.sort(luminanceInfosSorted);
+        assertEquals(luminanceInfos.size(), luminanceInfosSorted.size());
+        assertEquals(luminanceInfos.get(2), luminanceInfosSorted.get(0));
+        assertEquals(luminanceInfos.get(1), luminanceInfosSorted.get(1));
+        assertEquals(luminanceInfos.get(0), luminanceInfosSorted.get(2));
+
+        // case that should never use min value
+        luminanceInfos.clear();
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(60, 255, 255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(70, 240, 255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(80, 95, 255, false));
+        luminanceInfosSorted = new ArrayList<>(luminanceInfos);
+        Collections.sort(luminanceInfosSorted);
+        assertEquals(luminanceInfos.size(), luminanceInfosSorted.size());
+        assertEquals(luminanceInfos.get(2), luminanceInfosSorted.get(0));
+        assertEquals(luminanceInfos.get(1), luminanceInfosSorted.get(1));
+        assertEquals(luminanceInfos.get(0), luminanceInfosSorted.get(2));
+
+        // case that requires using hi value as well as median and min values
+        luminanceInfos.clear();
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(17, 31, 100, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(34, 127, 255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(93, 255, 255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(68, 255, 255, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(0, 0, 90, false));
+        luminanceInfos.add(new HDRProcessor.LuminanceInfo(0, 0, 80, false));
+        luminanceInfosSorted = new ArrayList<>(luminanceInfos);
+        Collections.sort(luminanceInfosSorted);
+        assertEquals(luminanceInfos.size(), luminanceInfosSorted.size());
+        assertEquals(luminanceInfos.get(5), luminanceInfosSorted.get(0));
+        assertEquals(luminanceInfos.get(4), luminanceInfosSorted.get(1));
+        assertEquals(luminanceInfos.get(0), luminanceInfosSorted.get(2));
+        assertEquals(luminanceInfos.get(1), luminanceInfosSorted.get(3));
+        assertEquals(luminanceInfos.get(3), luminanceInfosSorted.get(4));
+        assertEquals(luminanceInfos.get(2), luminanceInfosSorted.get(5));
+
+    }
+
+    private void roundTripWhiteBalanceTemperature(int temperature) {
+        float [] rggb = CameraController2.convertTemperatureToRggb(temperature);
+        Log.d(TAG, "red: " + rggb[0]);
+        Log.d(TAG, "green even: " + rggb[1]);
+        Log.d(TAG, "green odd: " + rggb[2]);
+        Log.d(TAG, "blue: " + rggb[3]);
+        int new_temperature = CameraController2.convertRggbToTemperature(rggb);
+        assertEquals(temperature, new_temperature);
+    }
+
+    @Test
+    public void whiteBalanceTemperature() {
+        Log.d(TAG, "whiteBalanceTemperature");
+
+        // n.b., round trip won't work for low temperatures due to hitting max gain
+        roundTripWhiteBalanceTemperature(3000);
+        roundTripWhiteBalanceTemperature(4000);
+        roundTripWhiteBalanceTemperature(5000);
+        roundTripWhiteBalanceTemperature(6000);
+        roundTripWhiteBalanceTemperature(6600);
+        roundTripWhiteBalanceTemperature(7000);
+        roundTripWhiteBalanceTemperature(8000);
+        roundTripWhiteBalanceTemperature(9000);
+        roundTripWhiteBalanceTemperature(10000);
+        roundTripWhiteBalanceTemperature(12000);
+        roundTripWhiteBalanceTemperature(15000);
+    }
+
+    @Test
+    public void testNRSceneIsLowLight() {
+        Log.d(TAG, "testNRSceneIsLowLight");
+
+        // Galaxy S10e:
+        assertFalse(HDRProcessor.sceneIsLowLight(1000, 1000000000L/25));
+        assertFalse(HDRProcessor.sceneIsLowLight(1600, 1000000000L/25));
+        assertTrue(HDRProcessor.sceneIsLowLight(3200, 1000000000L/17));
+        assertTrue(HDRProcessor.sceneIsLowLight(800, 1000000000L/5));
+        assertTrue(HDRProcessor.sceneIsLowLight(400, 1000000000L/5));
+
+        // Nokia 8:
+        assertFalse(HDRProcessor.sceneIsLowLight(800, 1000000000L/14));
+        assertFalse(HDRProcessor.sceneIsLowLight(752, 1000000000L/10)); // see testAvg36
+        assertFalse(HDRProcessor.sceneIsLowLight(1044, 1000000000L/10)); // see testAvg23
+        assertTrue(HDRProcessor.sceneIsLowLight(1505, 1000000000L/10)); // see testAvg49
+        assertTrue(HDRProcessor.sceneIsLowLight(1551, 1000000000L/10));
+        assertTrue(HDRProcessor.sceneIsLowLight(1600, 1000000000L/3)); // see testAvg51
+        assertTrue(HDRProcessor.sceneIsLowLight(1600, 1000000000L/11)); // see testHDR51
+
+        // Nexus 6:
+        assertFalse(HDRProcessor.sceneIsLowLight(749, 1000000000L/12)); // see testAvg47
+        assertFalse(HDRProcessor.sceneIsLowLight(1000, 1000000000L/12));
+        assertTrue(HDRProcessor.sceneIsLowLight(1196, 1000000000L/12));
+
+        // misc:
+        assertTrue(HDRProcessor.sceneIsLowLight(1600, 1000000000L/17)); // see testAvg1
+    }
+
+    @Test
+    public void testISOButtonStrings() {
+        Log.d(TAG, "testISOButtonStrings");
+
+        int [] iso_button_values = {50, 100, 200, 400, 800, 1600, 3200, 6400};
+        for(int current_iso=1;current_iso<=10000;current_iso++) {
+            //Log.d(TAG, "current_iso: " + current_iso);
+            int index = -1;
+            for(int i=0;i<iso_button_values.length && index==-1;i++) {
+                if( iso_button_values[i] == current_iso ) {
+                    index = i;
+                }
+            }
+            // should only match the same button!
+            for(int i=0;i<iso_button_values.length;i++) {
+                String button_text = PopupView.getButtonOptionString(false, "ISO", MainUI.ISOToButtonText(iso_button_values[i]));
+                //Log.d(TAG, "    i = " + i + " iso: " + iso_button_values[i] + " : " + button_text);
+                assertEquals(i==index, MainUI.ISOTextEquals(button_text, ""+current_iso));
+            }
+        }
+    }
 }
diff --git a/build.gradle b/build.gradle
index 40261aa712496ace21884b944df56de17bb4d081..7e4f410fd14f73ddd009a9b52f4e464df35e5a7e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,16 +2,16 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:7.2.0'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a6111dc9b85c7e6eafe0f355c80f0636f7a5e0f2..0ba64bae15d878cc28def2f3c023070bf77e6973 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Apr 11 14:09:12 BST 2020
+#Tue Oct 13 22:07:50 BST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
diff --git a/makesrcarchive.bat b/makesrcarchive.bat
index 59d3995b88119d90f003ea379fc402735c24e124..5b1e403fb68068f46d6616ed461b34b6947fb55b 100644
--- a/makesrcarchive.bat
+++ b/makesrcarchive.bat
@@ -9,9 +9,11 @@ copy %src%\.gitignore %dst%
 copy %src%\build.gradle %dst%
 copy %src%\gradlew %dst%
 copy %src%\gradlew.bat %dst%
+copy %src%\gradle.properties %dst%
 copy %src%\makesrcarchive.bat %dst%
 copy %src%\opencamera_source.txt %dst%
 copy %src%\gpl-3.0.txt %dst%
+copy %src%\androidx_LICENSE-2.0.txt %dst%
 copy %src%\google_material_design_icons_LICENSE-2.0.txt %dst%
 copy %src%\settings.gradle %dst%
 
@@ -23,9 +25,7 @@ copy %src%\app\build.gradle %dst%\app\
 mkdir %dst%\gradle
 xcopy %src%\gradle %dst%\gradle /E /Y
 
-REM We copy the inspectionProfiles as this stores which Android inspection warnings/errors we've disabled; although
-REM note this isn't part of the Git repository, due lots of other files in .idea/ that we don't want to be part of the
-REM project.
+REM We copy the inspectionProfiles as this stores which Android inspection warnings/errors we've disabled
 mkdir %dst%\.idea
 mkdir %dst%\.idea\inspectionProfiles
 xcopy %src%\.idea\inspectionProfiles %dst%\.idea\inspectionProfiles /E /Y
diff --git a/opencamera_source.txt b/opencamera_source.txt
index 76102ed62884c1087276ff4a94e6f3e0dd584371..967a8a9920e786c9152383c690c560f0adbedf71 100644
--- a/opencamera_source.txt
+++ b/opencamera_source.txt
@@ -25,9 +25,9 @@ Android inspection warnings/errors
 The file .idea/inspectionProfiles/Project_Default.xml contains settings for Android inpsections (see Editor/Inspections). The following have been disabled:
 
 * AndroidLintUnusedResources - seems to give false information on res/ images, as well as complaining about renderscript files in build folders.
-* AndroidLintLockedOrientationActivity, AndroidLintSourceLockedOrientationActivity - Although it is on my TODO to support portrait and landscape orientations, for now Open Camera handles the orientation of the UI itself for better performance (as is common with many camera applications). Also these errors are categorised under ChromeOS, which for now is unlikely to be a huge part of Open Camera's target market.
-* CharsetObjectCanBeUsed - This seems fundamentally broken, as it'll recommend using StandardCharsets, and then give an error that that's not available before API level 19! E.g., see Charset.forName("UTF-8") in SettingsManager.saveSettings(). Strangely though it doesn't warn about the API level if we replace it in ImageSaver.saveImageNow().
 * BooleanMethodIsAlwaysInverted - Generates too many useless warnings.
+* CharsetObjectCanBeUsed - This seems fundamentally broken, as it'll recommend using StandardCharsets, and then give an error that that's not available before API level 19! E.g., see Charset.forName("UTF-8") in SettingsManager.saveSettings(). Strangely though it doesn't warn about the API level if we replace it in ImageSaver.saveImageNow().
+* CommentedOutCode - Commented out code is usually intentional!
 * ConstantConditions - Unfortunately this seems broken when calling an Android SDK function where only a stub source is available, such that the inspection incorrectly things an exception is thrown. E.g., see calls to TouchUtils.clickView() in MainActivityTest, this inspection thinks that e.g. "i<8" in for loops is always true.
 * EmptyMethod - Sometimes can be useful to explicitly have a subclassed empty method, to show I've intentionally left it empty rather than forgotten to consider it.
 * EmptyStatementBody - These may be intentional.
@@ -39,7 +39,7 @@ The file .idea/inspectionProfiles/Project_Default.xml contains settings for Andr
 The following are enabled, but with modifications:
 
 * UnnecessaryLocalVariable - m_ignoreImmediatelyReturnedVariables is true.
-* unused - parameter="protected", REPORT_PARAMETER_FOR_PUBLIC_METHODS is false (otherwise this complaints about parameters in overriden methods being unused);  method="protected" (in some cases public unused methods may be added for future proofing).
+* unused - parameter="protected", REPORT_PARAMETER_FOR_PUBLIC_METHODS is false (otherwise this complaints about parameters in overridden methods being unused);  method="protected" (in some cases public unused methods may be added for future proofing).
 
 Licence
 =======
@@ -52,4 +52,4 @@ Homepage: http://opencamera.org.uk/
 
 Google Play download: https://play.google.com/store/apps/details?id=net.sourceforge.opencamera
 
-Mark Harman 27 February 2020
+Mark Harman 16 August 2021