Merge branch 'fix_icon_and_translations'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ca67335..abcb95a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,8 @@
<application
android:allowBackup="true"
android:label="@string/app_name"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ android:icon="@mipmap/ic_launcher_settings">
<activity android:name="com.fairphone.psensor.UpdateFinalizerActivity"
android:enabled="false"
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_settings.png b/app/src/main/res/mipmap-hdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..252e6b4
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_settings.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_settings.png b/app/src/main/res/mipmap-mdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..d2ecee9
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_settings.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_settings.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..fa8c813
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_settings.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..3fa69e9
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_settings.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..72946b7
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4e89569..0a0539e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -14,18 +14,18 @@
<string name="cancel">Abbrechen</string>
<string name="dontshowagain">Diese Meldung künftig nicht mehr zeigen.</string>
<string name="greating">Näherungssensorkalibrierung</string>
- <string name="msg_block">Decke den Sensorbereich komplett mit deinem Finger ab (der Sensorbereich ist im obigen Bild hervorgehoben) und drücke gleichzeitig auf OK.</string>
- <string name="msg_cal">Kalibrieren...</string>
+ <string name="msg_block">Decke den Sensorbereich komplett mit deinem Finger ab (der Sensorbereich ist im obigen Bild hervorgehoben) und drücke gleichzeitig auf Weiter.</string>
+ <string name="msg_cal">Kalibrieren…</string>
<string name="msg_calibration_success"><![CDATA[Kalibrierung erfolgreich. Drücke auf "OK & Neustart" um die Kalibrierung abzuschließen und dein Fairphone neu zu starten.]]></string>
<string name="reboot"><![CDATA[OK & Neustart]]></string>
<string name="msg_fail">Fehler</string>
<string name="msg_fail_block">Hier ging was schief. Bitte probier es noch einmal. Achte darauf den Sensorbereich komplett abzudecken.</string>
<string name="msg_fail_cal">Kalibrierung fehlgeschlagen. Bitte überprüfe das Gerät und versuch es noch einmal.</string>
<string name="msg_fail_unlock">Hier ging was schief. Bitte probier es noch einmal. Stelle sicher, dass der Sensorbereich frei und der Bildschirm sauber sind.</string>
- <string name="msg_fail_write_sns">Ein unerwartetes Problem mit Rechten ist aufgetreten...</string>
- <string name="msg_reading">Lesen...</string>
+ <string name="msg_fail_write_sns">Ein unerwartetes Problem mit Rechten ist aufgetreten…</string>
+ <string name="msg_reading">Lesen…</string>
<string name="msg_step_success">Fertig</string>
- <string name="msg_unblock">Entferne deinen Finger vom Sensorbereich und drücke danach auf OK.</string>
+ <string name="msg_unblock">Entferne deinen Finger vom Sensorbereich und drücke danach auf Weiter.</string>
<string name="name_exit">Schließen</string>
<string name="name_read">OK</string>
<string name="next">Weiter</string>
@@ -37,4 +37,4 @@
<string name="step_3">Schritt 3</string>
<string name="unblock_value">Wert wenn frei:</string>
<string name="NotificationTitle">Näherungssensorkalibrierung</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0134ac7..aeaf6f2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -6,17 +6,17 @@
<string name="Text"><![CDATA[ <p>Fairphone OS te da la opción de calibrar el sensor de proximidad - esto mejorará el funcionamiento del sensor mientras haces una llamada (la pantalla se encenderá cuando terminas la llamada).</p> <p>Te recomendamos calibrar el sensor de proximidad ahora para tener el mejor funcionamiento - es fácil y rápido!</p>]]></string>
<string name="activity_calibration">Calibración</string>
<string name="activity_diagnostics">Diagnóstico</string>
- <string name="msg_block">Cubre el area del sensor de proximidad con el dedo (el area a cubrir esta indicada en la imagen superior), luego pulsa OK.</string>
+ <string name="msg_block">Cubre el área del sensor de proximidad con el dedo (el área a cubrir esta indicada en la imagen superior), luego pulsa Próximo.</string>
<string name="msg_cal">Calibrando…</string>
<string name="msg_calibration_success"><![CDATA[Calibración lista! Pulsa OK para finalizar el proceso y reiniciar tu Fairphone.]]></string>
<string name="msg_step_success">Listo</string>
<string name="msg_fail">Fallido</string>
- <string name="msg_fail_block">Ha habido un error; por favor inténtalo de nuevo. Asegúrate de cubrir el area del sensor completamente. </string>
+ <string name="msg_fail_block">Ha habido un error; por favor inténtalo de nuevo. Asegúrate de cubrir el área del sensor completamente. </string>
<string name="msg_fail_cal">Calibración fallida. Comprueba el teléfono e inténtalo de nuevo.</string>
<string name="msg_fail_unlock">Algo ha fallado. Por favor inténtalo de nuevo. Asegúrate de que el sensor de proximidad no está cubierto y la pantalla esta limpia.</string>
- <string name="msg_fail_write_sns">Problema inesperado de permisos...</string>
- <string name="msg_reading">En proceso...</string>
- <string name="msg_unblock">Retira el dedo del sensor y pulsa OK.</string>
+ <string name="msg_fail_write_sns">Problema inesperado de permisos…</string>
+ <string name="msg_reading">En proceso…</string>
+ <string name="msg_unblock">Retira el dedo del sensor y pulsa Próximo.</string>
<string name="name_exit">Salir</string>
<string name="name_read">OK</string>
<string name="next">Próximo</string>
@@ -36,5 +36,5 @@
<string name="ask_really_dont_show_title">¿Estás seguro?</string>
<string name="ask_really_dont_show_text"><![CDATA[Calibrar el sensor de proximidad es fácil y mejorará tu experiencia cuando llames. <it>Puedes calibrar el sensor de proximidad en otro momento en Ajustes → Mantenimiento → Herramienta Sensor de Proximidad</it>.]]></string>
<string name="block_value">Valor de bloqueo:</string>
- <string name="Heading">Una cosa más...</string>
+ <string name="Heading">Una cosa más…</string>
</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 326d011..6840658 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -12,7 +12,7 @@
<string name="block_value">Valeur à l\'état «bloqué» :</string>
<string name="dontshowagain">Ne plus afficher cet écran.</string>
<string name="greating">Calibration du capteur de proximité</string>
- <string name="msg_block">Recouvrez la zone du capteur entièrement avec votre doigt (la zone à couvrir est illustrée par l\'image ci-dessus), puis utilisez le bouton OK.</string>
+ <string name="msg_block">Recouvrez la zone du capteur entièrement avec votre doigt (la zone à couvrir est illustrée par l\'image ci-dessus), puis utilisez le bouton Suivant.</string>
<string name="msg_cal">Calibration en cours…</string>
<string name="msg_calibration_success"><![CDATA[Calibration terminée ! Utilisez le bouton OK & Redémarrer pour finaliser la procédure et redémarrer votre Fairphone.]]></string>
<string name="msg_fail">Échec</string>
@@ -22,7 +22,7 @@
<string name="msg_fail_write_sns">Erreur exceptionnelle de permission…</string>
<string name="msg_reading">Lecture en cours…</string>
<string name="msg_step_success">Succès</string>
- <string name="msg_unblock">Enlevez votre doigt de la zone du capteur puis utilisez le bouton OK.</string>
+ <string name="msg_unblock">Enlevez votre doigt de la zone du capteur puis utilisez le bouton Suivant.</string>
<string name="name_exit">Quitter</string>
<string name="name_read">OK</string>
<string name="next">Suivant</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index da12f74..7ce0bce 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -12,7 +12,7 @@
<string name="cancel">Annuleer</string>
<string name="dontshowagain">Dit scherm niet meer tonen.</string>
<string name="greating">Afstandssensor kalibratie</string>
- <string name="msg_block">Bedek de sensor volledig met je vinger (het sensor gebied is weergegeven in de afbeelding hierboven) en druk vervolgens op de OK knop.</string>
+ <string name="msg_block">Bedek de sensor volledig met je vinger (het sensor gebied is weergegeven in de afbeelding hierboven) en druk vervolgens op de Volgende knop.</string>
<string name="msg_cal">Kalibreren…</string>
<string name="msg_calibration_success"><![CDATA[Kalibratie succesvol! Druk op de OK & Herstart knop om de kalibratie af te ronden en je Fairphone te herstarten.]]></string>
<string name="Text"><![CDATA[ <p>Fairphone OS geeft je nu de mogelijkheid om de afstandssensor te kalibreren - dit verbetert het gedrag van de sensor tijdens een telefoongesprek (scherm uit/aan).</p> <p>We raden je aan de afstandssensor te kaliberen - dit is eenvoudig en zo gepiept!</p>]]></string>
@@ -23,7 +23,7 @@
<string name="msg_fail_write_sns">Er is onverwacht een permissie probleem opgetreden…</string>
<string name="msg_reading">Controleren…</string>
<string name="msg_step_success">Succesvol</string>
- <string name="msg_unblock">Verwijder je vinger van de sensor en druk op de OK knop.</string>
+ <string name="msg_unblock">Verwijder je vinger van de sensor en druk op de Volgende knop.</string>
<string name="name_exit">Sluit</string>
<string name="name_read">OK</string>
<string name="next">Volgende</string>
@@ -37,4 +37,4 @@
<string name="sensor_value">Sensor waarde:</string>
<string name="ask_really_dont_show_text"><![CDATA[Het kalibreren van de afstandssensor is eenvoudig en verbetert het scherm gedrag tijdens een telefoongesprek (scherm uit/aan). <it>Je kunt de afstandssensor op een later tijdstip kalibreren onder Instellingen → Onderhoud → Afstandssensor gereedschap</it>.]]></string>
<string name="NotificationTitle">Afstandssensor kalibratie</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a3dd27a..dad194c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,10 +6,10 @@
<string name="activity_diagnostics">Diagnostics</string>
<string name="activity_calibration">Calibration</string>
- <string name="msg_block">Cover the sensor area completely with your finger (the sensor area is shown in the image above), then press the OK button.</string>
- <string name="msg_reading">Checking...</string>
- <string name="msg_unblock">Remove your finger from the sensor area and press the OK button.</string>
- <string name="msg_cal">Calibrating...</string>
+ <string name="msg_block">Cover the sensor area completely with your finger (the sensor area is shown in the image above), then press the Next button.</string>
+ <string name="msg_reading">Checking…</string>
+ <string name="msg_unblock">Remove your finger from the sensor area and press the Next button.</string>
+ <string name="msg_cal">Calibrating…</string>
<string name="msg_calibration_success"><![CDATA[Calibration successful! Press the OK & Reboot button to finalize the calibration process and to reboot your Fairphone.]]></string>
<string name="msg_step_success">Successful</string>
<string name="msg_fail">Unsuccessful</string>
@@ -30,7 +30,7 @@
<string name="step_2">Step 2</string>
<string name="step_3">Step 3</string>
- <string name="Heading">One more thing...</string>
+ <string name="Heading">One more thing…</string>
<string name="greating">Proximity sensor calibration</string>
<string name="Text"><![CDATA[ <p>Fairphone OS now gives you the option to calibrate the proximity sensor - this improves the sensor behavior while making a call (screen going off/on).</p> <p>We recommend to calibrate the proximity sensor now to get the best experience - it\'s easy and done in a second!</p>]]></string>
<string name="next">Next</string>
