camera: Rework overlay handling

* extract-utils cant handle overlays yet
2023-12-30 22:04:07 +09:00
parent 1613d3a03c
commit f5825a4b37
42 changed files with 40 additions and 4 deletions
@@ -6,7 +6,8 @@

 # Overlays
 PRODUCT_PACKAGES += \
-    MiuiCameraOverlay
+    MiuiCameraOverlayIcon \
+    MiuiCameraOverlayLeicaed

 # Permissions
 PRODUCT_COPY_FILES += \
@@ -5,6 +5,6 @@
 //

 runtime_resource_overlay {
-    name: "MiuiCameraOverlay",
+    name: "MiuiCameraOverlayIcon",
    product_specific: true,
 }
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.aospa.camera.overlay">
+    package="com.android.camera.overlay.icon">

    <overlay
        android:isStatic="true"
@@ -0,0 +1,10 @@
+//
+// Copyright (C) 2023 Paranoid Android
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "MiuiCameraOverlayLeicaed",
+    product_specific: true,
+}
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.camera.overlay.leicaed">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="1"
+        android:targetPackage="com.android.camera"/>
+</manifest>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="64.0dip" android:width="64.0dip" android:viewportWidth="64.0" android:viewportHeight="64.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffe4040f" android:pathData="M32,64C49.6719,64 64,49.6707 64,32.0113C64,14.3293 49.6719,0 32,0C14.3236,0 0,14.3293 0,32.0113C0,49.6707 14.3236,64 32,64Z" android:fillType="evenOdd" />
+    <path android:fillColor="#fffffffe" android:pathData="M50.0142,34.5936C49.0526,34.5936 49.0526,33.5381 49.0526,33.2317C49.0526,32.4222 49.6854,29.2131 51.4297,29.2131C52.1632,29.2131 52.5568,29.8348 52.5568,30.2955C52.5568,30.3917 52.114,34.5936 50.0142,34.5936ZM25.4577,29.1346C25.9832,29.1636 26.3365,29.5416 26.3186,29.9217C26.2314,32.4062 23.1745,32.0193 23.1745,32.0193C23.1745,32.0193 23.6731,29.025 25.4577,29.1346ZM57.4518,33.7143C57.4518,33.7143 56.6266,34.3047 56.0407,34.3047C55.5957,34.3047 55.3519,33.9335 55.3519,33.5287C55.3519,32.6119 56.7876,28.0946 56.7876,28.0946L53.2767,28.1416L53.0933,28.7521C53.0933,28.7521 52.5812,27.7167 50.7385,27.7167C47.165,27.7167 45.206,30.7982 45.121,32.6119C45.1054,33.0054 45.1009,33.0591 45.1009,33.0591C45.0181,33.1553 43.7547,34.5932 42.2049,34.5932C40.9638,34.5932 40.7581,33.5556 40.7581,32.8914C40.7581,32.1691 41.3574,29.3223 43.048,29.3223C43.9693,29.3223 44.5329,30.1207 44.5329,30.1207L45.0293,28.4927C45.0293,28.4927 44.2444,27.8799 42.641,27.8754C39.186,27.871 36.8267,30.4673 36.744,32.8042C36.7283,33.1508 36.7149,33.2671 36.7194,33.285C36.6053,33.4281 35.7533,34.4053 34.6486,34.4053C33.8927,34.4053 33.8927,33.8194 33.8927,33.5556C33.8927,33.2 35.3866,28.1147 35.3866,28.1147L31.4821,28.1751L30.0889,33.1105C30.0889,33.1105 27.9488,34.6625 24.9566,34.875C23.4136,34.9801 22.8814,34.0431 22.8814,33.4907C22.8814,33.2671 22.8814,33.2671 22.8814,33.2671C22.8814,33.2671 23.5098,33.3051 23.9816,33.3051C24.3484,33.3051 28.9081,32.992 28.9081,30.1989C28.9081,28.6067 27.3159,27.9984 25.2966,27.9984C21.5709,27.9984 18.959,30.3085 18.959,33.0502C18.959,35.5548 21.0991,36.6282 23.8564,36.6282C26.9827,36.6282 30.0352,34.7162 30.0352,34.7162C30.0352,34.7162 30.2051,36.6282 32.674,36.6282C35.2211,36.6282 37.2158,34.7162 37.2158,34.7162C37.2158,34.7162 38.325,36.5566 40.8587,36.5566C43.4483,36.5566 45.4363,34.4635 45.4363,34.4635C45.4363,34.4635 46.1296,36.4381 48.6946,36.4381C50.7005,36.4381 51.7739,35.1232 51.7739,35.1232C51.7739,35.1232 52.3464,36.4381 54.0929,36.4381C56.2241,36.4381 57.823,34.9353 57.823,34.9353L57.4518,33.7143Z" android:fillType="evenOdd" />
+    <path android:fillColor="#fffffffe" android:pathData="M7.7647,38.4354C6.7785,38.4645 6.1367,37.8115 6.1367,37.4425C6.1367,36.6285 7.1318,36.5033 7.7647,36.548C9.2943,36.6285 10.6092,37.1518 10.6092,37.1518C10.6092,37.1518 9.0573,38.3929 7.7647,38.4354ZM22.3271,19.4339C23.4765,19.4339 23.8567,20.3664 23.7605,21.205C23.2015,26.1247 18.313,27.2518 18.313,27.2518C18.313,27.2518 19.5273,19.4339 22.3271,19.4339ZM58.1566,37.051C58.1566,37.051 49.9539,39.9112 34.2979,39.7166C23.5012,39.5891 15.2695,36.398 15.2695,36.398C15.2695,36.398 15.5356,35.877 15.7101,35.5281C16.7924,33.3231 18.0693,28.8439 18.0693,28.8439C18.0693,28.8439 25.4892,26.7731 25.4892,20.8828C25.4892,19.0155 23.7561,17.8169 22.0432,17.7431C16.0634,17.5128 14.4041,26.0329 14.0373,27.482C14.015,27.5871 14.006,27.6162 14.006,27.6162C12.1589,27.3657 11.119,26.9878 11.119,26.9878L10.6964,28.1373C11.942,28.7276 13.7533,28.9199 13.7533,28.9199C13.3955,31.2054 11.6222,35.5281 11.6222,35.5281C11.6222,35.5281 9.9852,34.9869 7.9525,34.9869C5.3159,34.9869 4.4102,36.2437 4.3454,37.0264C4.1709,39.0636 6.7292,40.0185 8.516,40.0185C12.0023,40.0185 13.8137,38.1356 13.8137,38.1356C13.8137,38.1356 23.6197,41.8388 33.8484,41.8388C47.2369,41.8388 58.5255,38.2765 58.5255,38.2765L58.1566,37.051Z" android:fillType="evenOdd" />
+    <path android:fillColor="#fffffffe" android:pathData="M34.2061,23.486C32.9628,23.486 32.0459,23.9936 32.0459,25.1609C32.0459,26.3372 33.1059,26.6615 34.2061,26.6615C35.3131,26.6615 36.3216,26.1404 36.3216,24.9418C36.3216,23.7342 35.1073,23.486 34.2061,23.486Z" android:fillType="evenOdd" />
+</vector>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="64.0dip" android:width="64.0dip" android:viewportWidth="64.0" android:viewportHeight="64.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffd12a27" android:pathData="M32,64C49.6719,64 64,49.6707 64,32.0113C64,14.3293 49.6719,0 32,0C14.3236,0 0,14.3293 0,32.0113C0,49.6707 14.3236,64 32,64Z" android:fillType="evenOdd" />
+    <path android:fillColor="#fffffffe" android:pathData="M50.0142,34.5936C49.0526,34.5936 49.0526,33.5381 49.0526,33.2317C49.0526,32.4222 49.6854,29.2131 51.4297,29.2131C52.1632,29.2131 52.5568,29.8348 52.5568,30.2955C52.5568,30.3917 52.114,34.5936 50.0142,34.5936ZM25.4577,29.1346C25.9832,29.1636 26.3365,29.5416 26.3186,29.9217C26.2314,32.4062 23.1745,32.0193 23.1745,32.0193C23.1745,32.0193 23.6731,29.025 25.4577,29.1346ZM57.4518,33.7143C57.4518,33.7143 56.6266,34.3047 56.0407,34.3047C55.5957,34.3047 55.3519,33.9335 55.3519,33.5287C55.3519,32.6119 56.7876,28.0946 56.7876,28.0946L53.2767,28.1416L53.0933,28.7521C53.0933,28.7521 52.5812,27.7167 50.7385,27.7167C47.165,27.7167 45.206,30.7982 45.121,32.6119C45.1054,33.0054 45.1009,33.0591 45.1009,33.0591C45.0181,33.1553 43.7547,34.5932 42.2049,34.5932C40.9638,34.5932 40.7581,33.5556 40.7581,32.8914C40.7581,32.1691 41.3574,29.3223 43.048,29.3223C43.9693,29.3223 44.5329,30.1207 44.5329,30.1207L45.0293,28.4927C45.0293,28.4927 44.2444,27.8799 42.641,27.8754C39.186,27.871 36.8267,30.4673 36.744,32.8042C36.7283,33.1508 36.7149,33.2671 36.7194,33.285C36.6053,33.4281 35.7533,34.4053 34.6486,34.4053C33.8927,34.4053 33.8927,33.8194 33.8927,33.5556C33.8927,33.2 35.3866,28.1147 35.3866,28.1147L31.4821,28.1751L30.0889,33.1105C30.0889,33.1105 27.9488,34.6625 24.9566,34.875C23.4136,34.9801 22.8814,34.0431 22.8814,33.4907C22.8814,33.2671 22.8814,33.2671 22.8814,33.2671C22.8814,33.2671 23.5098,33.3051 23.9816,33.3051C24.3484,33.3051 28.9081,32.992 28.9081,30.1989C28.9081,28.6067 27.3159,27.9984 25.2966,27.9984C21.5709,27.9984 18.959,30.3085 18.959,33.0502C18.959,35.5548 21.0991,36.6282 23.8564,36.6282C26.9827,36.6282 30.0352,34.7162 30.0352,34.7162C30.0352,34.7162 30.2051,36.6282 32.674,36.6282C35.2211,36.6282 37.2158,34.7162 37.2158,34.7162C37.2158,34.7162 38.325,36.5566 40.8587,36.5566C43.4483,36.5566 45.4363,34.4635 45.4363,34.4635C45.4363,34.4635 46.1296,36.4381 48.6946,36.4381C50.7005,36.4381 51.7739,35.1232 51.7739,35.1232C51.7739,35.1232 52.3464,36.4381 54.0929,36.4381C56.2241,36.4381 57.823,34.9353 57.823,34.9353L57.4518,33.7143Z" android:fillType="evenOdd" />
+    <path android:fillColor="#fffffffe" android:pathData="M7.7647,38.4354C6.7785,38.4645 6.1367,37.8115 6.1367,37.4425C6.1367,36.6285 7.1318,36.5033 7.7647,36.548C9.2943,36.6285 10.6092,37.1518 10.6092,37.1518C10.6092,37.1518 9.0573,38.3929 7.7647,38.4354ZM22.3271,19.4339C23.4765,19.4339 23.8567,20.3664 23.7605,21.205C23.2015,26.1247 18.313,27.2518 18.313,27.2518C18.313,27.2518 19.5273,19.4339 22.3271,19.4339ZM58.1566,37.051C58.1566,37.051 49.9539,39.9112 34.2979,39.7166C23.5012,39.5891 15.2695,36.398 15.2695,36.398C15.2695,36.398 15.5356,35.877 15.7101,35.5281C16.7924,33.3231 18.0693,28.8439 18.0693,28.8439C18.0693,28.8439 25.4892,26.7731 25.4892,20.8828C25.4892,19.0155 23.7561,17.8169 22.0432,17.7431C16.0634,17.5128 14.4041,26.0329 14.0373,27.482C14.015,27.5871 14.006,27.6162 14.006,27.6162C12.1589,27.3657 11.119,26.9878 11.119,26.9878L10.6964,28.1373C11.942,28.7276 13.7533,28.9199 13.7533,28.9199C13.3955,31.2054 11.6222,35.5281 11.6222,35.5281C11.6222,35.5281 9.9852,34.9869 7.9525,34.9869C5.3159,34.9869 4.4102,36.2437 4.3454,37.0264C4.1709,39.0636 6.7292,40.0185 8.516,40.0185C12.0023,40.0185 13.8137,38.1356 13.8137,38.1356C13.8137,38.1356 23.6197,41.8388 33.8484,41.8388C47.2369,41.8388 58.5255,38.2765 58.5255,38.2765L58.1566,37.051Z" android:fillType="evenOdd" />
+    <path android:fillColor="#fffffffe" android:pathData="M34.2061,23.486C32.9628,23.486 32.0459,23.9936 32.0459,25.1609C32.0459,26.3372 33.1059,26.6615 34.2061,26.6615C35.3131,26.6615 36.3216,26.1404 36.3216,24.9418C36.3216,23.7342 35.1073,23.486 34.2061,23.486Z" android:fillType="evenOdd" />
+</vector>
@@ -1,5 +1,4 @@
 # Unpinned blobs from fuxi_global-user 13 TKQ1.221114.001 V816.0.1.0.UMCMIXM release-keys
-product/overlay/MiuiCameraOverlayLeicaed/MiuiCameraOverlayLeicaed.apk
 product/priv-app/MiuiCamera/MiuiCamera.apk:system/priv-app/MiuiCamera/MiuiCamera.apk;OVERRIDES=Aperture,Camera,Camera2,GoogleCameraGo
 system/lib64/libgui.so:system/lib64/libgui-xiaomi.so
 system_ext/lib64/libcamera_algoup_jni.xiaomi.so:system/lib64/libcamera_algoup_jni.xiaomi.so