Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_p…

…ackages_apps_Aperture into udc-qpr2 Change-Id: Ifac8942aebc68290bdf4d85ce658028600a67f78 Signed-off-by: Leonardo Ledda <[email protected]>
statix-leddaz · May 1, 2024 · b78281b · b78281b
2 parents e65f900 + cf3e6b1
commit b78281b
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 5 deletions.
diff --git a/app/src/main/java/org/lineageos/aperture/ui/CameraModeSelectorLayout.kt b/app/src/main/java/org/lineageos/aperture/ui/CameraModeSelectorLayout.kt
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2023 The LineageOS Project
+ * SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -124,6 +124,7 @@ class CameraModeSelectorLayout @JvmOverloads constructor(
         val inSingleCaptureMode = cameraViewModel?.inSingleCaptureMode?.value ?: return
         val cameraState = cameraViewModel?.cameraState?.value ?: return
 
+        cameraModeHighlightButton.isInvisible = cameraState.isRecordingVideo || inSingleCaptureMode
         cameraToButton.forEach {
             it.value.isInvisible = cameraState.isRecordingVideo || inSingleCaptureMode
         }

diff --git a/app/src/main/res/layout/capture_preview_layout.xml b/app/src/main/res/layout/capture_preview_layout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <org.lineageos.aperture.ui.CapturePreviewLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -28,7 +28,8 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/cancelButton"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@android:color/white" />
 
         <ImageButton
             android:id="@+id/cancelButton"
@@ -41,7 +42,9 @@
             app:layout_constraintEnd_toStartOf="@+id/confirmButton"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@android:color/white"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
@@ -35,7 +35,7 @@
     <string name="app_permissions_toast">İstifadəçi tərəfindən verilməyən icazələr.</string>
     <string name="camcorder_unsupported_toast">Heç bir kamera videoyazını dəstəkləmir.</string>
     <string name="qr_copy_description">Lövhəyə kopyala</string>
-    <string name="qr_icon_description">Nişan</string>
+    <string name="qr_icon_description">İkon</string>
     <string name="qr_share_description">Paylaş</string>
     <string name="qr_no_app_available_for_action">Bu əməliyyatı ələ alacaq tətbiq yoxdur</string>
     <string name="qr_address_title">Kontakt əlavə et</string>

diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
@@ -59,6 +59,7 @@
     <string name="photo_capture_mode_title">Modd cipio</string>
     <string name="photo_capture_mode_maximize_quality">Ansawdd gorau</string>
     <string name="photo_capture_mode_minimize_latency">Cuddni lleiaf</string>
+    <string name="video_stabilization_title">Galluogi sefydlogi fideo</string>
     <string name="processing_title">Prosesu</string>
     <string name="edge_mode_default">Rhagosodedig</string>
     <string name="edge_mode_off">I ffwrdd</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -37,9 +37,33 @@
     <string name="qr_copy_description">In die Zwischenablage kopieren</string>
     <string name="qr_icon_description">Symbol</string>
     <string name="qr_share_description">Teilen</string>
+    <string name="qr_no_app_available_for_action">Keine App für diese Aktion verfügbar</string>
+    <string name="qr_address_title">Kontakt hinzufügen</string>
+    <string name="qr_address_content_description">Kontakt hinzufügen</string>
+    <string name="qr_calendar_title">Termin zum Kalender hinzufügen</string>
+    <string name="qr_calendar_content_description">Diesen Termin in den Kalender eintragen</string>
     <string name="qr_dpp_description">Dieses Gerät konfigurieren</string>
+    <string name="qr_email_title">Neue E-Mail senden</string>
+    <string name="qr_email_content_description">Neue E-Mail an die angegebenen E-Mail-Adressen erstellen</string>
+    <string name="qr_fido_title">Passkey verwenden</string>
+    <string name="qr_fido_content_description">Diesen FIDO-QR-Code verwenden</string>
+    <string name="qr_geo_title">Standort öffnen</string>
+    <string name="qr_geo_content_description">Diesen Standort öffnen</string>
+    <string name="qr_isbn_title">Diese ISBN suchen</string>
+    <string name="qr_isbn_content_description">Nach dieser ISBN auf isbnsearch.org suchen</string>
+    <string name="qr_product_title">Produkt suchen</string>
+    <string name="qr_product_content_description">Nach dem Barcode dieser Produkt-ID suchen</string>
+    <string name="qr_sms_title">Neue SMS senden</string>
+    <string name="qr_sms_content_description">Neue SMS an die angegebenen Empfänger senden</string>
+    <string name="qr_tel_title">Telefonnummer anrufen</string>
+    <string name="qr_tel_content_description">Diese Telefonnummer anrufen</string>
     <string name="qr_text">Text</string>
+    <string name="qr_uri_title">URL öffnen</string>
+    <string name="qr_uri_content_description">Diese URL mit der entsprechenden App öffnen, wenn dies unterstützt wird</string>
+    <string name="qr_vin_title">VIN suchen</string>
+    <string name="qr_vin_content_description">Diese Fahrzeug-Identifikationsnummer (VIN) suchen</string>
     <string name="qr_wifi_title">Mit diesem WLAN-Netzwerk verbinden</string>
+    <string name="qr_wifi_content_description">Dieses WLAN-Netzwerk zu der Liste der bekannten Netzwerke hinzufügen und das Gerät damit verbinden</string>
     <string name="title_activity_settings">Einstellungen</string>
     <string name="general_header">Allgemein</string>
     <string name="photos_header">Fotos</string>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -69,7 +69,9 @@
     <string name="photos_header">写真</string>
     <string name="video_header">ビデオ</string>
     <string name="advanced_header">詳細設定</string>
+    <string name="bright_screen_title">画面を明るくする</string>
     <string name="bright_screen_summary" formatted="false">明るさを100%に固定</string>
+    <string name="shutter_sound_summary">撮影j時に音を鳴らします</string>
     <string name="volume_buttons_action_title">音量ボタンの動作</string>
     <string name="enable_zsl_title">利用可能な場合は ZSL を有効にする</string>
     <string name="enable_zsl_summary">カメラが対応している場合、ゼロシャッターラグモードを使用します。このモードでは写真のエフェクトは無効になります。このモードは実験的であることに注意してください。</string>

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
@@ -101,6 +101,7 @@
     <string name="noise_reduction_mode_fast">빠르게</string>
     <string name="noise_reduction_mode_high_quality">고품질</string>
     <string name="noise_reduction_mode_minimal">최소</string>
+    <string name="shading_mode_title">비네트 보정</string>
     <string name="shading_mode_default">기본값</string>
     <string name="shading_mode_off">끔</string>
     <string name="shading_mode_fast">빠름</string>