Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c37beaab authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Merge remote-tracking branch 'oc/master' into fix-camera-for-q

parents c07bb72d 7932c1f3
Loading
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -8,7 +8,10 @@ _other/
_saved/

.gradle/
.idea/

.idea/*
!.idea/inspectionProfiles

build/
app/release/
gfx/
+40 −0
Original line number Diff line number Diff line
<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="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" />
    </inspection_tool>
    <inspection_tool class="EmptyMethod" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="EmptyStatementBody" enabled="false" level="WARNING" enabled_by_default="false">
      <option name="m_reportEmptyBlocks" value="true" />
    </inspection_tool>
    <inspection_tool class="PointlessBooleanExpression" enabled="false" level="WARNING" enabled_by_default="false">
      <option name="m_ignoreExpressionsContainingConstants" value="true" />
    </inspection_tool>
    <inspection_tool class="SameParameterValue" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="TrivialIf" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="UnnecessaryLocalVariable" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="m_ignoreImmediatelyReturnedVariables" value="true" />
      <option name="m_ignoreAnnotatedVariables" value="false" />
    </inspection_tool>
    <inspection_tool class="UnusedReturnValue" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="unused" enabled="true" level="WARNING" enabled_by_default="true" method="protected" parameter="protected">
      <option name="LOCAL_VARIABLE" value="true" />
      <option name="FIELD" value="true" />
      <option name="METHOD" value="true" />
      <option name="CLASS" value="true" />
      <option name="PARAMETER" value="true" />
      <option name="REPORT_PARAMETER_FOR_PUBLIC_METHODS" value="false" />
      <option name="ADD_MAINS_TO_ENTRIES" value="true" />
      <option name="ADD_APPLET_TO_ENTRIES" value="true" />
      <option name="ADD_SERVLET_TO_ENTRIES" value="true" />
      <option name="ADD_NONJAVA_TO_ENTRIES" value="true" />
    </inspection_tool>
  </profile>
</component>
 No newline at end of file

_docs/.htaccess

0 → 100644
+3 −0
Original line number Diff line number Diff line
RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} !https
RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
+1.68 KiB
Loading image diff...
+6 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
        "message":"This website uses cookies, including for Google Analytics and to display ads",
        "dismiss":"Got it!",
        "learnMore":"More info",
        "link":"http://opencamera.org.uk/privacy_oc.html",
        "link":"privacy_oc.html",
        "theme":"dark-bottom"};
</script>

@@ -51,15 +51,17 @@
<ul>
<li>App icon by Adam Lapinski.</li>
<li>Improvements/help for video frame rates (including high speed) by George Joseph.</li>
<li>Support for the video picture profiles implementation and custom Log profiles JTVideo, JTLog and JTLog2 design by JT Haapala.</li>
<li>Smart Housing Bluetooth LE support by Edouard Lafargue</li>
<li>Improved selfie stick button support by Lau Keat Hwa.</li>
<li>Option to storing yaw/pitch/roll in Exif user comment by Joshua.</li>
<li>Option for filenames to be based on UTC (Zulu) time by David Pletcher ( lpm_sourceforge AT cathedralcanyon DOT net , https://www.cathedralcanyon.net ).</li>
<li>Support for manual ISO for old camera API on Asus Zenphone 2 Z00A and Z008 by Fl&aacute;vio Keglevich ( fkeglevich AT gmail DOT com ).</li>
<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 Traditional translation by You-Cheng Hsieh ( yochenhsieh AT gmail DOT com ).</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>
@@ -67,12 +69,12 @@
<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>Japanese translation by Mitsuse.</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>
<!-- Portugese translation by johnny, says no need to credit -->
<li>Russian translation by maksnogin ( maksnogin AT gmail DOT com ), Grigorii Chirkov and Dmitry Vahnin aka JSBmanD<!--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<!--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>
@@ -87,7 +89,6 @@
<p><a href="privacy_oc.html">Open Camera Privacy Policy.</a></p>
<p>This website uses icons from third party sources, see <a href="index.html#licence">licences.</a></p>
<p><a href="http://sourceforge.net/p/opencamera/">Open Camera on Sourceforge.</a></p>
<p><a href="http://mark-h.users.sourceforge.net/">More of my Free software.</a></p>
<hr>

</body>
Loading