From 786ff4f4ca2374bdd9177f2e24b503d43e7a3b93 Mon Sep 17 00:00:00 2001
From: liyujie <2352380935@qq.com>
Date: Thu, 28 Aug 2025 12:04:21 +0000
Subject: [PATCH] [4/4]解决USB摄像头打开相机预览界面绿屏
---
android/packages/apps/Camera2/res/values/arrays.xml | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/android/packages/apps/Camera2/res/values/arrays.xml b/android/packages/apps/Camera2/res/values/arrays.xml
old mode 100755
new mode 100644
index e67efb4..7c83922
--- a/android/packages/apps/Camera2/res/values/arrays.xml
+++ b/android/packages/apps/Camera2/res/values/arrays.xml
@@ -190,28 +190,48 @@
<item>@drawable/ic_switch_camera_external</item>
</array>
- <array name="camera_id_icons_without_external" translatable="false">
- <item>@drawable/ic_switch_camera_back</item>
- <item>@drawable/ic_switch_camera_front</item>
- </array>
-
<array name="camera_id_icons_with_external" translatable="false">
<item>@drawable/ic_switch_camera_back</item>
<item>@drawable/ic_switch_camera_front</item>
<item>@drawable/ic_switch_camera_external</item>
</array>
- <array name="camera_id_icons_with_front_external" translatable="false">
+ <array name="camera_id_icons_with_double_external" translatable="false">
+ <item>@drawable/ic_switch_camera_back</item>
+ <item>@drawable/ic_switch_camera_front</item>
+ <item>@drawable/ic_switch_camera_external</item>
+ <item>@drawable/ic_switch_camera_external</item>
+ </array>
+
+ <array name="camera_id_icons_external_double" translatable="false">
+ <item>@drawable/ic_switch_camera_external</item>
+ <item>@drawable/ic_switch_camera_external</item>
+ </array>
+
+ <array name="camera_id_icon_back_with_external" translatable="false">
<item>@drawable/ic_switch_camera_back</item>
<item>@drawable/ic_switch_camera_external</item>
</array>
- <array name="camera_id_icons_with_back_external" translatable="false">
+ <array name="camera_id_icon_back_with_double_external" translatable="false">
+ <item>@drawable/ic_switch_camera_back</item>
+ <item>@drawable/ic_switch_camera_external</item>
+ <item>@drawable/ic_switch_camera_external</item>
+ </array>
+
+ <array name="camera_id_icon_front" translatable="false">
<item>@drawable/ic_switch_camera_front</item>
<item>@drawable/ic_switch_camera_external</item>
</array>
- <array name="camera_id_icons_with_only_external" translatable="false">
+ <array name="camera_id_icon_front_with_external" translatable="false">
+ <item>@drawable/ic_switch_camera_front</item>
+ <item>@drawable/ic_switch_camera_external</item>
+ </array>
+
+ <array name="camera_id_icon_front_with_double_external" translatable="false">
+ <item>@drawable/ic_switch_camera_front</item>
+ <item>@drawable/ic_switch_camera_external</item>
<item>@drawable/ic_switch_camera_external</item>
</array>
@@ -220,7 +240,6 @@
<item>@string/camera_id_front_desc</item>
<item>@string/camera_id_external_desc</item>
</array>
-
<array name="camera_id_largeicons" translatable="false">
<item>@drawable/ic_switch_camera_back</item>
--
Gitblit v1.6.2