[automerger skipped] Merge Android 13 QPR1 am: 743a407744 -s ours am: 263909922f -s ours
am skip reason: Merged-In I5b7c5038e18c1364cb04b6933655e444c6b9033c with SHA-1 59bb74264f is already in history
Original change: https://android-review.googlesource.com/c/device/google/coral/+/2338066
Change-Id: I2f6a2a51096344654cdf12eff9bf9b4a9544dd41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/coral/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml b/coral/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
index 7cee0e6..2a67f23 100644
--- a/coral/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
+++ b/coral/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
@@ -12,12 +12,14 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="226px"
- android:height="226px"
- android:viewportWidth="226.0"
- android:viewportHeight="226.0">
+ android:width="45dp"
+ android:height="45dp"
+ android:viewportWidth="45"
+ android:viewportHeight="45">
<path
android:fillColor="#000000"
- android:pathData="m 0,0 h 226 c 0,0 -52.27192,1.0726108 -61.23,1.1719867 -8.95806,0.099376 -21.1853,0.2041158 -30.15844,0.7514371 -8.97314,0.5473213 -12.69853,1.0467407 -19.42891,2.0830807 C 108.45226,5.0428448 102.2913,6.3340499 94.933458,8.677661 87.575619,11.021272 81.490894,13.052137 71.300726,18.392016 61.110557,23.731896 49.309178,31.589928 41.310844,39.449342 33.31251,47.308756 25.812243,56.991282 20.03697,67.20707 14.261697,77.422858 10.399991,88.852909 7.0517259,100.1815 c -1.809715,6.12301 -2.6301304,11.62553 -3.5037396,17.74012 -0.00371,0.0259 -0.00815,0.0517 -0.011098,0.0777 -0.6735214,5.94798 -0.9536095,8.53719 -1.5016437,17.89509 -0.5480342,9.3579 -1.10418729,27.421 -1.27377139,38.26441 L 0,226 Z" />
+ android:pathData="M45,0H0v45C0,15.5,15.5,0,45,0z" />
+
</vector>
+
diff --git a/default-permissions.xml b/default-permissions.xml
index 6f4dec7..b36e45d 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -153,4 +153,9 @@
<!-- Notifications -->
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
</exception>
+ <exception
+ package="com.google.android.euicc">
+ <!-- Notifications -->
+ <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
+ </exception>
</exceptions>
diff --git a/device.mk b/device.mk
index 6c63804..5b5232e 100644
--- a/device.mk
+++ b/device.mk
@@ -973,7 +973,7 @@
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=64
+ ro.vendor.build.svn=65
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
diff --git a/flame/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml b/flame/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
index 1709f50..d23b718 100644
--- a/flame/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
+++ b/flame/overlay/frameworks/base/packages/SystemUI/res/drawable/rounded.xml
@@ -12,12 +12,14 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="176px"
- android:height="176px"
- android:viewportWidth="176.0"
- android:viewportHeight="176.0">
+ android:width="48dp"
+ android:height="48dp"
+ android:viewportWidth="48"
+ android:viewportHeight="48">
<path
android:fillColor="#000000"
- android:pathData="M 0,0 h 176 c 0,0 -41.80985,1.1811025 -47.30898,1.4679924 -5.49913,0.2868899 -11.03264,0.529424 -14.80238,0.7907218 C 110.1189,2.520012 105.56609,2.9305126 100.31472,3.5044417 95.71113,4.0075741 91.783454,4.7255034 86.292893,5.795495 80.802331,6.8654867 76.860386,7.8252084 70.93934,9.8838835 65.018294,11.942558 56.74931,15.819731 52.25,18.416053 c -4.49931,2.596322 -5.891653,3.789325 -8.943718,6.107722 -3.052065,2.318397 -6.42853,5.085773 -9.150032,7.851225 -1.36219,1.384188 -4.312937,4.354097 -6.769293,7.233011 -2.451166,2.872831 -4.81174,6.253015 -6.64335,8.970257 C 15.521332,56.325652 12.242354,64.091419 10.418362,69.161754 8.5943696,74.232089 7.5119098,78.803782 6.371114,83.32052 5.2303182,87.837258 4.2150777,93.315427 3.5030057,98.449319 2.7909337,103.58321 2.5888564,109.52729 2.1691942,114.78662 1.7459101,120.09134 1.6016524,128.15059 1.2565168,135.11916 0.77900803,144.76045 0,176 0,176 Z" />
+ android:pathData="M48,0H0v48C0,15,15,0,48,0z" />
+
</vector>
+
