Merge "EEPROM: add file node from device code" into rvc-qpr-dev
diff --git a/default-permissions.xml b/default-permissions.xml
index a004b7c..23b83b4 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -109,7 +109,7 @@
</exception>
<exception package="com.google.android.apps.scone">
- <!-- NLP Location access to determine proximity to country border -->
+ <!-- Location access to determine proximity to a CBRS network coverage area -->
<permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
<permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="false"/>
<!-- Used to call ActivityTransition API for Smart OOS & Smart PNO -->
diff --git a/device-common.mk b/device-common.mk
index cf36679..2d08848 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -109,7 +109,6 @@
$(LOCAL_PATH)/init.radio.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.radio.sh \
$(LOCAL_PATH)/init.hardware.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).usb.rc \
$(LOCAL_PATH)/init.sensors.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.sensors.sh \
- $(LOCAL_PATH)/init.twoshay.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.twoshay.sh \
$(LOCAL_PATH)/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
$(LOCAL_PATH)/init.ramoops.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ramoops.sh
@@ -336,6 +335,7 @@
persist.vendor.radio.custom_ecc=1 \
persist.vendor.radio.data_ltd_sys_ind=1 \
persist.vendor.radio.videopause.mode=1 \
+ persist.vendor.radio.mt_sms_ack=30 \
persist.vendor.radio.multisim_switch_support=true \
persist.vendor.radio.sib16_support=1 \
persist.vendor.radio.data_con_rprt=true \
@@ -625,6 +625,7 @@
$(LOCAL_PATH)/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
$(LOCAL_PATH)/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \
$(LOCAL_PATH)/media_codecs_omx.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_omx.xml \
+ $(LOCAL_PATH)/video_system_specs.json:$(TARGET_COPY_OUT_VENDOR)/etc/video_system_specs.json \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
@@ -837,13 +838,7 @@
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=1
-
-# ZRAM writeback
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.zram.mark_idle_delay_mins=60 \
- ro.zram.first_wb_delay_mins=180 \
- ro.zram.periodic_wb_delay_hours=24
+ ro.vendor.build.svn=10
# Enable iwlan service logging for debug
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/health/Health.cpp b/health/Health.cpp
index ae34910..664dd7b 100644
--- a/health/Health.cpp
+++ b/health/Health.cpp
@@ -83,7 +83,7 @@
std::ifstream assert_open(const std::string &path) {
std::ifstream stream(path);
if (!stream.is_open()) {
- LOG(FATAL) << "Cannot read " << path;
+ LOG(WARNING) << "Cannot read " << path;
}
return stream;
}
diff --git a/init.hardware.rc b/init.hardware.rc
index 26dd1dd..a003b87 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -280,8 +280,8 @@
# Init sensor specific services
start init-sensors-sh
- # Init twoshay
- start init-twoshay-sh
+ # Start the twoshay touch service
+ start twoshay
# turn off vblank irq immediately after turning off
write /sys/module/drm/parameters/vblankoffdelay -1
@@ -370,6 +370,10 @@
chown system system /mnt/vendor/persist/sensors/registry/factory_data/sns_fac_registry
restorecon_recursive /mnt/vendor/persist/sensors/registry/factory_data
+ # Restore SeLinux Context for preventing temp.json with
+ # incorrect security context
+ restorecon /mnt/vendor/persist/sensors/registry/temp.json
+
chmod 770 /mnt/vendor/persist/audio
chmod 660 /mnt/vendor/persist/audio/audio.cal
chown media audio /mnt/vendor/persist/audio
@@ -799,16 +803,6 @@
on property:persist.vendor.enable_twoshay=1
enable twoshay
-service init-twoshay-sh /vendor/bin/init.twoshay.sh
- class main
- user root
- group root system
- disabled
- oneshot
-
-on property:vendor.twoshay.study_group=1
- enable twoshay
-
# bugreport is triggered by holding down volume down, volume up and power
service bugreport /system/bin/dumpstate -d -p -z
class main
diff --git a/init.power.rc b/init.power.rc
index 7598436..5ab12f5 100644
--- a/init.power.rc
+++ b/init.power.rc
@@ -145,9 +145,6 @@
# Disable console_suspend to get better logging for kernel crashes
write /sys/module/printk/parameters/console_suspend N
- # Enable suspend to idle mode to reduce latency during suspend/resume
- write /sys/power/mem_sleep "s2idle"
-
# If UART is on, enable console_suspend on boot_complete to save power
on property:sys.boot_completed=1 && property:init.svc.console=running
write /sys/module/printk/parameters/console_suspend Y
diff --git a/init.twoshay.sh b/init.twoshay.sh
deleted file mode 100755
index 16a3edc..0000000
--- a/init.twoshay.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/vendor/bin/sh
-
-# Implementation of A/B group selection - See b/161398758
-seedfile=/sys/devices/platform/soc/soc:qcom,dsi-display-primary/panel_info/panel0/serial_number
-sum=$(sha1sum $seedfile)
-result=$(expr $((16#${sum:1:1})) % 2)
-
-setprop vendor.twoshay.study_group $result
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 1075216..974f39d 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -307,16 +307,6 @@
<!-- True if Unprocessed audio source supports the required frequency range and level -->
<bool name="config_supportAudioSourceUnprocessed">true</bool>
- <!-- An array of device capabilities defined by GSMA SGP.22 v2.0, and their corresponding major
- version. -->
- <string-array translatable="false" name="config_telephonyEuiccDeviceCapabilities">
- <item>"gsm,11"</item>
- <item>"utran,11"</item>
- <item>"cdma1x,1"</item>
- <item>"hrpd,3"</item>
- <item>"ehrpd,12"</item>
- <item>"eutran,11"</item>
- </string-array>
<!-- Whether the new Auto Selection Network UI should be shown -->
<bool name="config_enableNewAutoSelectNetworkUI">true</bool>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc030/ic_5g_e_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc030/ic_5g_e_mobiledata.xml
index 7f75979..9577bb7 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc030/ic_5g_e_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc030/ic_5g_e_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="41dp" android:height="15dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="31.05dp" android:height="11.5dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M19.3585 9.45946l2.6848-5.67568h4.5436l-.4956 1.05406h-2.974l-.537 1.13513h2.437l-.5369 1.05406h-2.3958l-.6608 1.37837h3.2631l-.4544 1.05406h-4.874zM12.7772 3.82432c1.1565-1.5 3.3044-1.58108 3.7174-1.58108h.2892c1.1565 0 2.1479-.68919 2.6022-1.662159 0-.04054 0-.081081-.0413-.081081h-2.8501c-2.3544.040541-3.8827.77027-4.9153 1.78378-.6196.64865-.9913 1.25676-1.1153 1.58108-.2478.52703-.4543 1.05406-.57823 1.54055-.33044 1.33783.04131 2.43243.53693 3C11.0423 9.09459 12.075 9.5 13.438 9.5c2.0653 0 3.511-1.01351 3.511-1.01351l2.1479-4.62163c0-.04054 0-.08108-.0413-.08108h-3.2631c-1.0327 0-1.6936.68919-2.0653 1.62163h2.5196l-.8261 1.7027c-.0413.04054-.7848.44594-1.7348.44594-.4131 0-.9914-.12162-1.3631-.48648-.3718-.40541-.4544-1.05406-.2891-1.66216.1652-.64865.413-1.13514.7435-1.58109zM8.39878 4.27026c-.49567-.40541-1.11525-.48649-1.98267-.48649H4.68128l.7022-1.5h2.72616c1.15655 0 2.14786-.68919 2.60226-1.662162 0-.04054 0-.081081-.0413-.081081H4.14431L1.83121 5.40539h4.04793c.82611 0 .99133.44595.82611.93243-.16522.44595-.66089.77027-1.03263.93244-.41306.2027-.99134.32432-1.65222.32432-.53697 0-.99133-.04054-1.61092-.2027-.24783-.08108-.61958-.20271-1.07394-.40541L.509434 8.72972c.950026.44594 2.313106.72972 3.180516.72972.82611 0 1.98267-.16216 2.68486-.4054.66089-.28378 1.19786-.56757 1.65222-1.0946.45436-.52702.82611-1.21621.90872-1.94594.08261-.72973-.20653-1.41892-.53697-1.74324z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc030/ic_5g_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc030/ic_5g_mobiledata.xml
index 7d1644c..68b795a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc030/ic_5g_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc030/ic_5g_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="31.5dp" android:height="15dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="24.15dp" android:height="11.5dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.489.608155c-.2515.493765-.6471.912165-1.1418 1.207735-.49467.29556-1.06868.45645-1.65686.46441H5.80602l-.80845 1.57309h1.83866c.7381-.06189 1.47575.12298 2.08008.52132.23591.20438.41399.45957.51852.74302.10452.28345.13227.58643.0808.8822-.14311.72341-.49148 1.39827-1.00916 1.95496-.47447.50268-1.07724.88672-1.75305 1.11693-.91702.28554-1.87928.42565-2.84642.41445-1.16311-.02438-2.30892-.26687-3.36854-.71291L1.462 6.98001c.36983.16678.75383.30496 1.14811.41315.55703.14675 1.13333.22088 1.71235.22026.60086.01484 1.19761-.09608 1.74603-.32452.46883-.19475.85346-.53033 1.09196-.95272.1951-.46398.01825-.92795-.85897-.92795H1.99535L4.50913.520833h6.91957c.0111-.000103.0222.002427.032.007353.0098.004927.0181.012089.0242.020815.006.008725.0095.01873.0103.029076.0007.010346-.0014.020695-.0062.030078zm1.3236 4.797465c-.1047.27913-.1338.57788-.0849.86993.049.29204.1745.56843.3656.80482.3875.33116.8997.50763 1.426.49134.6541-.00559 1.2969-.15807 1.8738-.44442l.8884-1.72167h-2.6962c.139-.44273.4272-.83242.8223-1.11181.3951-.27939.8763-.43375 1.3729-.44042h3.4836c.0099-.00002.0197.00231.0285.00676.0087.00445.016.01088.0214.01869.0053.0078.0084.01673.009.02596.0006.00922-.0013.01843-.0056.02678L17.9805 8.4723c-1.1188.65827-2.4146 1.01058-3.7391 1.01658-.5808.04128-1.1644-.03266-1.712-.21692-.5476-.18426-1.0468-.47462-1.4642-.85179-.3456-.42459-.5757-.92035-.6707-1.44517-.0951-.52482-.0523-1.06319.1247-1.56938.3402-1.47404 1.2466-2.78269 2.5499-3.68159C14.3724.825134 15.9835.397447 17.6015.520833h3.0093c.0111-.000103.0221.002427.032.007353.0098.004927.0181.012089.0241.020815.0061.008725.0096.01873.0104.029076.0007.010346-.0014.020695-.0062.030078-.2515.493765-.6471.912165-1.1418 1.207735-.4947.29556-1.0687.45645-1.6569.46441h-.2709c-1.0664-.08438-2.1308.18258-3.0065.75405-.8756.57147-1.5067 1.41097-1.7824 2.37127z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc030/ic_5g_plus_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc030/ic_5g_plus_mobiledata.xml
index 671ef91..0c7d770 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc030/ic_5g_plus_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc030/ic_5g_plus_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="43.5dp" android:height="15dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="33.35dp" android:height="11.5dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.6748.608155c-.2556.493765-.6575.912165-1.1602 1.207735-.5027.29556-1.08602.45645-1.68372.46441H5.89992L5.0784 3.85339h1.8684c.75003-.06189 1.49961.12298 2.11371.52132.23973.20438.42069.45957.52691.74302.10621.28345.13441.58643.0821.8822-.14542.72341-.49942 1.39827-1.02548 1.95496-.48214.50268-1.09465.88672-1.78139 1.11693-.93186.28554-1.90968.42565-2.89246.41445-1.18192-.02438-2.34626-.26687-3.423017-.71291l.938477-1.79335c.37581.16678.76602.30496 1.16668.41315.56604.14675 1.15166.22088 1.74004.22026.61057.01484 1.21697-.09608 1.77426-.32452.47642-.19475.86727-.53033 1.10963-.95272.19825-.46398.01854-.92795-.87287-.92795H2.02763L4.58206.520833h7.03144c.0114-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078zm1.345 4.797465c-.1064.27913-.136.57788-.0862.86993.0497.29204.1773.56843.3715.80482.3937.33116.9142.50763 1.449.49134.6647-.00559 1.3179-.15807 1.9041-.44442l.9028-1.72167h-2.7398c.1412-.44273.4341-.83242.8356-1.11181.4015-.27939.8904-.43375 1.395-.44042h3.54c.0101-.00002.0201.00231.0289.00676.0089.00445.0164.01088.0218.01869.0054.0078.0086.01673.0092.02596.0006.00922-.0014.01843-.0057.02678L18.2713 8.4723c-1.1369.65827-2.4537 1.01058-3.7996 1.01658-.5901.04128-1.1832-.03266-1.7397-.21692-.5564-.18426-1.0637-.47462-1.4879-.85179-.3511-.42459-.5849-.92035-.6815-1.44517-.0966-.52482-.0531-1.06319.1267-1.56938.3458-1.47404 1.2668-2.78269 2.5912-3.68159C14.6049.825134 16.242.397447 17.8862.520833h3.0579c.0113-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078-.2556.493765-.6576.912165-1.1603 1.207735-.5026.29556-1.0859.45645-1.6836.46441h-.2753c-1.0837-.08438-2.1653.18258-3.0551.75405-.8898.57147-1.5311 1.41097-1.8113 2.37127zM25.8818 5.79662l1.0041-1.9341h-2.0167l-1.0027 1.9341h-2.3448l-.8044 1.54703h2.3462l-1.0026 1.9328h2.0167l1.0026-1.9328h2.4504l.8029-1.54703h-2.4517z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc150/ic_5g_e_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc150/ic_5g_e_mobiledata.xml
index 0e374cb..9577bb7 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc150/ic_5g_e_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc150/ic_5g_e_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="40.5dp" android:height="15dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="31.05dp" android:height="11.5dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M19.3585 9.45946l2.6848-5.67568h4.5436l-.4956 1.05406h-2.974l-.537 1.13513h2.437l-.5369 1.05406h-2.3958l-.6608 1.37837h3.2631l-.4544 1.05406h-4.874zM12.7772 3.82432c1.1565-1.5 3.3044-1.58108 3.7174-1.58108h.2892c1.1565 0 2.1479-.68919 2.6022-1.662159 0-.04054 0-.081081-.0413-.081081h-2.8501c-2.3544.040541-3.8827.77027-4.9153 1.78378-.6196.64865-.9913 1.25676-1.1153 1.58108-.2478.52703-.4543 1.05406-.57823 1.54055-.33044 1.33783.04131 2.43243.53693 3C11.0423 9.09459 12.075 9.5 13.438 9.5c2.0653 0 3.511-1.01351 3.511-1.01351l2.1479-4.62163c0-.04054 0-.08108-.0413-.08108h-3.2631c-1.0327 0-1.6936.68919-2.0653 1.62163h2.5196l-.8261 1.7027c-.0413.04054-.7848.44594-1.7348.44594-.4131 0-.9914-.12162-1.3631-.48648-.3718-.40541-.4544-1.05406-.2891-1.66216.1652-.64865.413-1.13514.7435-1.58109zM8.39878 4.27026c-.49567-.40541-1.11525-.48649-1.98267-.48649H4.68128l.7022-1.5h2.72616c1.15655 0 2.14786-.68919 2.60226-1.662162 0-.04054 0-.081081-.0413-.081081H4.14431L1.83121 5.40539h4.04793c.82611 0 .99133.44595.82611.93243-.16522.44595-.66089.77027-1.03263.93244-.41306.2027-.99134.32432-1.65222.32432-.53697 0-.99133-.04054-1.61092-.2027-.24783-.08108-.61958-.20271-1.07394-.40541L.509434 8.72972c.950026.44594 2.313106.72972 3.180516.72972.82611 0 1.98267-.16216 2.68486-.4054.66089-.28378 1.19786-.56757 1.65222-1.0946.45436-.52702.82611-1.21621.90872-1.94594.08261-.72973-.20653-1.41892-.53697-1.74324z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc150/ic_5g_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc150/ic_5g_mobiledata.xml
index 7d1644c..68b795a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc150/ic_5g_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc150/ic_5g_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="31.5dp" android:height="15dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="24.15dp" android:height="11.5dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.489.608155c-.2515.493765-.6471.912165-1.1418 1.207735-.49467.29556-1.06868.45645-1.65686.46441H5.80602l-.80845 1.57309h1.83866c.7381-.06189 1.47575.12298 2.08008.52132.23591.20438.41399.45957.51852.74302.10452.28345.13227.58643.0808.8822-.14311.72341-.49148 1.39827-1.00916 1.95496-.47447.50268-1.07724.88672-1.75305 1.11693-.91702.28554-1.87928.42565-2.84642.41445-1.16311-.02438-2.30892-.26687-3.36854-.71291L1.462 6.98001c.36983.16678.75383.30496 1.14811.41315.55703.14675 1.13333.22088 1.71235.22026.60086.01484 1.19761-.09608 1.74603-.32452.46883-.19475.85346-.53033 1.09196-.95272.1951-.46398.01825-.92795-.85897-.92795H1.99535L4.50913.520833h6.91957c.0111-.000103.0222.002427.032.007353.0098.004927.0181.012089.0242.020815.006.008725.0095.01873.0103.029076.0007.010346-.0014.020695-.0062.030078zm1.3236 4.797465c-.1047.27913-.1338.57788-.0849.86993.049.29204.1745.56843.3656.80482.3875.33116.8997.50763 1.426.49134.6541-.00559 1.2969-.15807 1.8738-.44442l.8884-1.72167h-2.6962c.139-.44273.4272-.83242.8223-1.11181.3951-.27939.8763-.43375 1.3729-.44042h3.4836c.0099-.00002.0197.00231.0285.00676.0087.00445.016.01088.0214.01869.0053.0078.0084.01673.009.02596.0006.00922-.0013.01843-.0056.02678L17.9805 8.4723c-1.1188.65827-2.4146 1.01058-3.7391 1.01658-.5808.04128-1.1644-.03266-1.712-.21692-.5476-.18426-1.0468-.47462-1.4642-.85179-.3456-.42459-.5757-.92035-.6707-1.44517-.0951-.52482-.0523-1.06319.1247-1.56938.3402-1.47404 1.2466-2.78269 2.5499-3.68159C14.3724.825134 15.9835.397447 17.6015.520833h3.0093c.0111-.000103.0221.002427.032.007353.0098.004927.0181.012089.0241.020815.0061.008725.0096.01873.0104.029076.0007.010346-.0014.020695-.0062.030078-.2515.493765-.6471.912165-1.1418 1.207735-.4947.29556-1.0687.45645-1.6569.46441h-.2709c-1.0664-.08438-2.1308.18258-3.0065.75405-.8756.57147-1.5067 1.41097-1.7824 2.37127z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc150/ic_5g_plus_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc150/ic_5g_plus_mobiledata.xml
index 671ef91..0c7d770 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc150/ic_5g_plus_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc150/ic_5g_plus_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="43.5dp" android:height="15dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="33.35dp" android:height="11.5dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.6748.608155c-.2556.493765-.6575.912165-1.1602 1.207735-.5027.29556-1.08602.45645-1.68372.46441H5.89992L5.0784 3.85339h1.8684c.75003-.06189 1.49961.12298 2.11371.52132.23973.20438.42069.45957.52691.74302.10621.28345.13441.58643.0821.8822-.14542.72341-.49942 1.39827-1.02548 1.95496-.48214.50268-1.09465.88672-1.78139 1.11693-.93186.28554-1.90968.42565-2.89246.41445-1.18192-.02438-2.34626-.26687-3.423017-.71291l.938477-1.79335c.37581.16678.76602.30496 1.16668.41315.56604.14675 1.15166.22088 1.74004.22026.61057.01484 1.21697-.09608 1.77426-.32452.47642-.19475.86727-.53033 1.10963-.95272.19825-.46398.01854-.92795-.87287-.92795H2.02763L4.58206.520833h7.03144c.0114-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078zm1.345 4.797465c-.1064.27913-.136.57788-.0862.86993.0497.29204.1773.56843.3715.80482.3937.33116.9142.50763 1.449.49134.6647-.00559 1.3179-.15807 1.9041-.44442l.9028-1.72167h-2.7398c.1412-.44273.4341-.83242.8356-1.11181.4015-.27939.8904-.43375 1.395-.44042h3.54c.0101-.00002.0201.00231.0289.00676.0089.00445.0164.01088.0218.01869.0054.0078.0086.01673.0092.02596.0006.00922-.0014.01843-.0057.02678L18.2713 8.4723c-1.1369.65827-2.4537 1.01058-3.7996 1.01658-.5901.04128-1.1832-.03266-1.7397-.21692-.5564-.18426-1.0637-.47462-1.4879-.85179-.3511-.42459-.5849-.92035-.6815-1.44517-.0966-.52482-.0531-1.06319.1267-1.56938.3458-1.47404 1.2668-2.78269 2.5912-3.68159C14.6049.825134 16.242.397447 17.8862.520833h3.0579c.0113-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078-.2556.493765-.6576.912165-1.1603 1.207735-.5026.29556-1.0859.45645-1.6836.46441h-.2753c-1.0837-.08438-2.1653.18258-3.0551.75405-.8898.57147-1.5311 1.41097-1.8113 2.37127zM25.8818 5.79662l1.0041-1.9341h-2.0167l-1.0027 1.9341h-2.3448l-.8044 1.54703h2.3462l-1.0026 1.9328h2.0167l1.0026-1.9328h2.4504l.8029-1.54703h-2.4517z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc170/ic_5g_e_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc170/ic_5g_e_mobiledata.xml
index 0e374cb..9577bb7 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc170/ic_5g_e_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc170/ic_5g_e_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="40.5dp" android:height="15dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="31.05dp" android:height="11.5dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M19.3585 9.45946l2.6848-5.67568h4.5436l-.4956 1.05406h-2.974l-.537 1.13513h2.437l-.5369 1.05406h-2.3958l-.6608 1.37837h3.2631l-.4544 1.05406h-4.874zM12.7772 3.82432c1.1565-1.5 3.3044-1.58108 3.7174-1.58108h.2892c1.1565 0 2.1479-.68919 2.6022-1.662159 0-.04054 0-.081081-.0413-.081081h-2.8501c-2.3544.040541-3.8827.77027-4.9153 1.78378-.6196.64865-.9913 1.25676-1.1153 1.58108-.2478.52703-.4543 1.05406-.57823 1.54055-.33044 1.33783.04131 2.43243.53693 3C11.0423 9.09459 12.075 9.5 13.438 9.5c2.0653 0 3.511-1.01351 3.511-1.01351l2.1479-4.62163c0-.04054 0-.08108-.0413-.08108h-3.2631c-1.0327 0-1.6936.68919-2.0653 1.62163h2.5196l-.8261 1.7027c-.0413.04054-.7848.44594-1.7348.44594-.4131 0-.9914-.12162-1.3631-.48648-.3718-.40541-.4544-1.05406-.2891-1.66216.1652-.64865.413-1.13514.7435-1.58109zM8.39878 4.27026c-.49567-.40541-1.11525-.48649-1.98267-.48649H4.68128l.7022-1.5h2.72616c1.15655 0 2.14786-.68919 2.60226-1.662162 0-.04054 0-.081081-.0413-.081081H4.14431L1.83121 5.40539h4.04793c.82611 0 .99133.44595.82611.93243-.16522.44595-.66089.77027-1.03263.93244-.41306.2027-.99134.32432-1.65222.32432-.53697 0-.99133-.04054-1.61092-.2027-.24783-.08108-.61958-.20271-1.07394-.40541L.509434 8.72972c.950026.44594 2.313106.72972 3.180516.72972.82611 0 1.98267-.16216 2.68486-.4054.66089-.28378 1.19786-.56757 1.65222-1.0946.45436-.52702.82611-1.21621.90872-1.94594.08261-.72973-.20653-1.41892-.53697-1.74324z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc170/ic_5g_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc170/ic_5g_mobiledata.xml
index 7d1644c..68b795a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc170/ic_5g_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc170/ic_5g_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="31.5dp" android:height="15dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="24.15dp" android:height="11.5dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.489.608155c-.2515.493765-.6471.912165-1.1418 1.207735-.49467.29556-1.06868.45645-1.65686.46441H5.80602l-.80845 1.57309h1.83866c.7381-.06189 1.47575.12298 2.08008.52132.23591.20438.41399.45957.51852.74302.10452.28345.13227.58643.0808.8822-.14311.72341-.49148 1.39827-1.00916 1.95496-.47447.50268-1.07724.88672-1.75305 1.11693-.91702.28554-1.87928.42565-2.84642.41445-1.16311-.02438-2.30892-.26687-3.36854-.71291L1.462 6.98001c.36983.16678.75383.30496 1.14811.41315.55703.14675 1.13333.22088 1.71235.22026.60086.01484 1.19761-.09608 1.74603-.32452.46883-.19475.85346-.53033 1.09196-.95272.1951-.46398.01825-.92795-.85897-.92795H1.99535L4.50913.520833h6.91957c.0111-.000103.0222.002427.032.007353.0098.004927.0181.012089.0242.020815.006.008725.0095.01873.0103.029076.0007.010346-.0014.020695-.0062.030078zm1.3236 4.797465c-.1047.27913-.1338.57788-.0849.86993.049.29204.1745.56843.3656.80482.3875.33116.8997.50763 1.426.49134.6541-.00559 1.2969-.15807 1.8738-.44442l.8884-1.72167h-2.6962c.139-.44273.4272-.83242.8223-1.11181.3951-.27939.8763-.43375 1.3729-.44042h3.4836c.0099-.00002.0197.00231.0285.00676.0087.00445.016.01088.0214.01869.0053.0078.0084.01673.009.02596.0006.00922-.0013.01843-.0056.02678L17.9805 8.4723c-1.1188.65827-2.4146 1.01058-3.7391 1.01658-.5808.04128-1.1644-.03266-1.712-.21692-.5476-.18426-1.0468-.47462-1.4642-.85179-.3456-.42459-.5757-.92035-.6707-1.44517-.0951-.52482-.0523-1.06319.1247-1.56938.3402-1.47404 1.2466-2.78269 2.5499-3.68159C14.3724.825134 15.9835.397447 17.6015.520833h3.0093c.0111-.000103.0221.002427.032.007353.0098.004927.0181.012089.0241.020815.0061.008725.0096.01873.0104.029076.0007.010346-.0014.020695-.0062.030078-.2515.493765-.6471.912165-1.1418 1.207735-.4947.29556-1.0687.45645-1.6569.46441h-.2709c-1.0664-.08438-2.1308.18258-3.0065.75405-.8756.57147-1.5067 1.41097-1.7824 2.37127z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc170/ic_5g_plus_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc170/ic_5g_plus_mobiledata.xml
index 671ef91..0c7d770 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc170/ic_5g_plus_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc170/ic_5g_plus_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="43.5dp" android:height="15dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="33.35dp" android:height="11.5dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.6748.608155c-.2556.493765-.6575.912165-1.1602 1.207735-.5027.29556-1.08602.45645-1.68372.46441H5.89992L5.0784 3.85339h1.8684c.75003-.06189 1.49961.12298 2.11371.52132.23973.20438.42069.45957.52691.74302.10621.28345.13441.58643.0821.8822-.14542.72341-.49942 1.39827-1.02548 1.95496-.48214.50268-1.09465.88672-1.78139 1.11693-.93186.28554-1.90968.42565-2.89246.41445-1.18192-.02438-2.34626-.26687-3.423017-.71291l.938477-1.79335c.37581.16678.76602.30496 1.16668.41315.56604.14675 1.15166.22088 1.74004.22026.61057.01484 1.21697-.09608 1.77426-.32452.47642-.19475.86727-.53033 1.10963-.95272.19825-.46398.01854-.92795-.87287-.92795H2.02763L4.58206.520833h7.03144c.0114-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078zm1.345 4.797465c-.1064.27913-.136.57788-.0862.86993.0497.29204.1773.56843.3715.80482.3937.33116.9142.50763 1.449.49134.6647-.00559 1.3179-.15807 1.9041-.44442l.9028-1.72167h-2.7398c.1412-.44273.4341-.83242.8356-1.11181.4015-.27939.8904-.43375 1.395-.44042h3.54c.0101-.00002.0201.00231.0289.00676.0089.00445.0164.01088.0218.01869.0054.0078.0086.01673.0092.02596.0006.00922-.0014.01843-.0057.02678L18.2713 8.4723c-1.1369.65827-2.4537 1.01058-3.7996 1.01658-.5901.04128-1.1832-.03266-1.7397-.21692-.5564-.18426-1.0637-.47462-1.4879-.85179-.3511-.42459-.5849-.92035-.6815-1.44517-.0966-.52482-.0531-1.06319.1267-1.56938.3458-1.47404 1.2668-2.78269 2.5912-3.68159C14.6049.825134 16.242.397447 17.8862.520833h3.0579c.0113-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078-.2556.493765-.6576.912165-1.1603 1.207735-.5026.29556-1.0859.45645-1.6836.46441h-.2753c-1.0837-.08438-2.1653.18258-3.0551.75405-.8898.57147-1.5311 1.41097-1.8113 2.37127zM25.8818 5.79662l1.0041-1.9341h-2.0167l-1.0027 1.9341h-2.3448l-.8044 1.54703h2.3462l-1.0026 1.9328h2.0167l1.0026-1.9328h2.4504l.8029-1.54703h-2.4517z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc280/ic_5g_e_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc280/ic_5g_e_mobiledata.xml
index 0e374cb..9577bb7 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc280/ic_5g_e_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc280/ic_5g_e_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="40.5dp" android:height="15dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="31.05dp" android:height="11.5dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M19.3585 9.45946l2.6848-5.67568h4.5436l-.4956 1.05406h-2.974l-.537 1.13513h2.437l-.5369 1.05406h-2.3958l-.6608 1.37837h3.2631l-.4544 1.05406h-4.874zM12.7772 3.82432c1.1565-1.5 3.3044-1.58108 3.7174-1.58108h.2892c1.1565 0 2.1479-.68919 2.6022-1.662159 0-.04054 0-.081081-.0413-.081081h-2.8501c-2.3544.040541-3.8827.77027-4.9153 1.78378-.6196.64865-.9913 1.25676-1.1153 1.58108-.2478.52703-.4543 1.05406-.57823 1.54055-.33044 1.33783.04131 2.43243.53693 3C11.0423 9.09459 12.075 9.5 13.438 9.5c2.0653 0 3.511-1.01351 3.511-1.01351l2.1479-4.62163c0-.04054 0-.08108-.0413-.08108h-3.2631c-1.0327 0-1.6936.68919-2.0653 1.62163h2.5196l-.8261 1.7027c-.0413.04054-.7848.44594-1.7348.44594-.4131 0-.9914-.12162-1.3631-.48648-.3718-.40541-.4544-1.05406-.2891-1.66216.1652-.64865.413-1.13514.7435-1.58109zM8.39878 4.27026c-.49567-.40541-1.11525-.48649-1.98267-.48649H4.68128l.7022-1.5h2.72616c1.15655 0 2.14786-.68919 2.60226-1.662162 0-.04054 0-.081081-.0413-.081081H4.14431L1.83121 5.40539h4.04793c.82611 0 .99133.44595.82611.93243-.16522.44595-.66089.77027-1.03263.93244-.41306.2027-.99134.32432-1.65222.32432-.53697 0-.99133-.04054-1.61092-.2027-.24783-.08108-.61958-.20271-1.07394-.40541L.509434 8.72972c.950026.44594 2.313106.72972 3.180516.72972.82611 0 1.98267-.16216 2.68486-.4054.66089-.28378 1.19786-.56757 1.65222-1.0946.45436-.52702.82611-1.21621.90872-1.94594.08261-.72973-.20653-1.41892-.53697-1.74324z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc280/ic_5g_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc280/ic_5g_mobiledata.xml
index 7d1644c..68b795a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc280/ic_5g_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc280/ic_5g_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="31.5dp" android:height="15dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="24.15dp" android:height="11.5dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.489.608155c-.2515.493765-.6471.912165-1.1418 1.207735-.49467.29556-1.06868.45645-1.65686.46441H5.80602l-.80845 1.57309h1.83866c.7381-.06189 1.47575.12298 2.08008.52132.23591.20438.41399.45957.51852.74302.10452.28345.13227.58643.0808.8822-.14311.72341-.49148 1.39827-1.00916 1.95496-.47447.50268-1.07724.88672-1.75305 1.11693-.91702.28554-1.87928.42565-2.84642.41445-1.16311-.02438-2.30892-.26687-3.36854-.71291L1.462 6.98001c.36983.16678.75383.30496 1.14811.41315.55703.14675 1.13333.22088 1.71235.22026.60086.01484 1.19761-.09608 1.74603-.32452.46883-.19475.85346-.53033 1.09196-.95272.1951-.46398.01825-.92795-.85897-.92795H1.99535L4.50913.520833h6.91957c.0111-.000103.0222.002427.032.007353.0098.004927.0181.012089.0242.020815.006.008725.0095.01873.0103.029076.0007.010346-.0014.020695-.0062.030078zm1.3236 4.797465c-.1047.27913-.1338.57788-.0849.86993.049.29204.1745.56843.3656.80482.3875.33116.8997.50763 1.426.49134.6541-.00559 1.2969-.15807 1.8738-.44442l.8884-1.72167h-2.6962c.139-.44273.4272-.83242.8223-1.11181.3951-.27939.8763-.43375 1.3729-.44042h3.4836c.0099-.00002.0197.00231.0285.00676.0087.00445.016.01088.0214.01869.0053.0078.0084.01673.009.02596.0006.00922-.0013.01843-.0056.02678L17.9805 8.4723c-1.1188.65827-2.4146 1.01058-3.7391 1.01658-.5808.04128-1.1644-.03266-1.712-.21692-.5476-.18426-1.0468-.47462-1.4642-.85179-.3456-.42459-.5757-.92035-.6707-1.44517-.0951-.52482-.0523-1.06319.1247-1.56938.3402-1.47404 1.2466-2.78269 2.5499-3.68159C14.3724.825134 15.9835.397447 17.6015.520833h3.0093c.0111-.000103.0221.002427.032.007353.0098.004927.0181.012089.0241.020815.0061.008725.0096.01873.0104.029076.0007.010346-.0014.020695-.0062.030078-.2515.493765-.6471.912165-1.1418 1.207735-.4947.29556-1.0687.45645-1.6569.46441h-.2709c-1.0664-.08438-2.1308.18258-3.0065.75405-.8756.57147-1.5067 1.41097-1.7824 2.37127z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc280/ic_5g_plus_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc280/ic_5g_plus_mobiledata.xml
index 671ef91..0c7d770 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc280/ic_5g_plus_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc280/ic_5g_plus_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="43.5dp" android:height="15dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="33.35dp" android:height="11.5dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.6748.608155c-.2556.493765-.6575.912165-1.1602 1.207735-.5027.29556-1.08602.45645-1.68372.46441H5.89992L5.0784 3.85339h1.8684c.75003-.06189 1.49961.12298 2.11371.52132.23973.20438.42069.45957.52691.74302.10621.28345.13441.58643.0821.8822-.14542.72341-.49942 1.39827-1.02548 1.95496-.48214.50268-1.09465.88672-1.78139 1.11693-.93186.28554-1.90968.42565-2.89246.41445-1.18192-.02438-2.34626-.26687-3.423017-.71291l.938477-1.79335c.37581.16678.76602.30496 1.16668.41315.56604.14675 1.15166.22088 1.74004.22026.61057.01484 1.21697-.09608 1.77426-.32452.47642-.19475.86727-.53033 1.10963-.95272.19825-.46398.01854-.92795-.87287-.92795H2.02763L4.58206.520833h7.03144c.0114-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078zm1.345 4.797465c-.1064.27913-.136.57788-.0862.86993.0497.29204.1773.56843.3715.80482.3937.33116.9142.50763 1.449.49134.6647-.00559 1.3179-.15807 1.9041-.44442l.9028-1.72167h-2.7398c.1412-.44273.4341-.83242.8356-1.11181.4015-.27939.8904-.43375 1.395-.44042h3.54c.0101-.00002.0201.00231.0289.00676.0089.00445.0164.01088.0218.01869.0054.0078.0086.01673.0092.02596.0006.00922-.0014.01843-.0057.02678L18.2713 8.4723c-1.1369.65827-2.4537 1.01058-3.7996 1.01658-.5901.04128-1.1832-.03266-1.7397-.21692-.5564-.18426-1.0637-.47462-1.4879-.85179-.3511-.42459-.5849-.92035-.6815-1.44517-.0966-.52482-.0531-1.06319.1267-1.56938.3458-1.47404 1.2668-2.78269 2.5912-3.68159C14.6049.825134 16.242.397447 17.8862.520833h3.0579c.0113-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078-.2556.493765-.6576.912165-1.1603 1.207735-.5026.29556-1.0859.45645-1.6836.46441h-.2753c-1.0837-.08438-2.1653.18258-3.0551.75405-.8898.57147-1.5311 1.41097-1.8113 2.37127zM25.8818 5.79662l1.0041-1.9341h-2.0167l-1.0027 1.9341h-2.3448l-.8044 1.54703h2.3462l-1.0026 1.9328h2.0167l1.0026-1.9328h2.4504l.8029-1.54703h-2.4517z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc410/ic_5g_e_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc410/ic_5g_e_mobiledata.xml
index 0e374cb..9577bb7 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc410/ic_5g_e_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc410/ic_5g_e_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="40.5dp" android:height="15dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="31.05dp" android:height="11.5dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M19.3585 9.45946l2.6848-5.67568h4.5436l-.4956 1.05406h-2.974l-.537 1.13513h2.437l-.5369 1.05406h-2.3958l-.6608 1.37837h3.2631l-.4544 1.05406h-4.874zM12.7772 3.82432c1.1565-1.5 3.3044-1.58108 3.7174-1.58108h.2892c1.1565 0 2.1479-.68919 2.6022-1.662159 0-.04054 0-.081081-.0413-.081081h-2.8501c-2.3544.040541-3.8827.77027-4.9153 1.78378-.6196.64865-.9913 1.25676-1.1153 1.58108-.2478.52703-.4543 1.05406-.57823 1.54055-.33044 1.33783.04131 2.43243.53693 3C11.0423 9.09459 12.075 9.5 13.438 9.5c2.0653 0 3.511-1.01351 3.511-1.01351l2.1479-4.62163c0-.04054 0-.08108-.0413-.08108h-3.2631c-1.0327 0-1.6936.68919-2.0653 1.62163h2.5196l-.8261 1.7027c-.0413.04054-.7848.44594-1.7348.44594-.4131 0-.9914-.12162-1.3631-.48648-.3718-.40541-.4544-1.05406-.2891-1.66216.1652-.64865.413-1.13514.7435-1.58109zM8.39878 4.27026c-.49567-.40541-1.11525-.48649-1.98267-.48649H4.68128l.7022-1.5h2.72616c1.15655 0 2.14786-.68919 2.60226-1.662162 0-.04054 0-.081081-.0413-.081081H4.14431L1.83121 5.40539h4.04793c.82611 0 .99133.44595.82611.93243-.16522.44595-.66089.77027-1.03263.93244-.41306.2027-.99134.32432-1.65222.32432-.53697 0-.99133-.04054-1.61092-.2027-.24783-.08108-.61958-.20271-1.07394-.40541L.509434 8.72972c.950026.44594 2.313106.72972 3.180516.72972.82611 0 1.98267-.16216 2.68486-.4054.66089-.28378 1.19786-.56757 1.65222-1.0946.45436-.52702.82611-1.21621.90872-1.94594.08261-.72973-.20653-1.41892-.53697-1.74324z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc410/ic_5g_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc410/ic_5g_mobiledata.xml
index 7d1644c..68b795a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc410/ic_5g_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc410/ic_5g_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="31.5dp" android:height="15dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="24.15dp" android:height="11.5dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.489.608155c-.2515.493765-.6471.912165-1.1418 1.207735-.49467.29556-1.06868.45645-1.65686.46441H5.80602l-.80845 1.57309h1.83866c.7381-.06189 1.47575.12298 2.08008.52132.23591.20438.41399.45957.51852.74302.10452.28345.13227.58643.0808.8822-.14311.72341-.49148 1.39827-1.00916 1.95496-.47447.50268-1.07724.88672-1.75305 1.11693-.91702.28554-1.87928.42565-2.84642.41445-1.16311-.02438-2.30892-.26687-3.36854-.71291L1.462 6.98001c.36983.16678.75383.30496 1.14811.41315.55703.14675 1.13333.22088 1.71235.22026.60086.01484 1.19761-.09608 1.74603-.32452.46883-.19475.85346-.53033 1.09196-.95272.1951-.46398.01825-.92795-.85897-.92795H1.99535L4.50913.520833h6.91957c.0111-.000103.0222.002427.032.007353.0098.004927.0181.012089.0242.020815.006.008725.0095.01873.0103.029076.0007.010346-.0014.020695-.0062.030078zm1.3236 4.797465c-.1047.27913-.1338.57788-.0849.86993.049.29204.1745.56843.3656.80482.3875.33116.8997.50763 1.426.49134.6541-.00559 1.2969-.15807 1.8738-.44442l.8884-1.72167h-2.6962c.139-.44273.4272-.83242.8223-1.11181.3951-.27939.8763-.43375 1.3729-.44042h3.4836c.0099-.00002.0197.00231.0285.00676.0087.00445.016.01088.0214.01869.0053.0078.0084.01673.009.02596.0006.00922-.0013.01843-.0056.02678L17.9805 8.4723c-1.1188.65827-2.4146 1.01058-3.7391 1.01658-.5808.04128-1.1644-.03266-1.712-.21692-.5476-.18426-1.0468-.47462-1.4642-.85179-.3456-.42459-.5757-.92035-.6707-1.44517-.0951-.52482-.0523-1.06319.1247-1.56938.3402-1.47404 1.2466-2.78269 2.5499-3.68159C14.3724.825134 15.9835.397447 17.6015.520833h3.0093c.0111-.000103.0221.002427.032.007353.0098.004927.0181.012089.0241.020815.0061.008725.0096.01873.0104.029076.0007.010346-.0014.020695-.0062.030078-.2515.493765-.6471.912165-1.1418 1.207735-.4947.29556-1.0687.45645-1.6569.46441h-.2709c-1.0664-.08438-2.1308.18258-3.0065.75405-.8756.57147-1.5067 1.41097-1.7824 2.37127z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc410/ic_5g_plus_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc410/ic_5g_plus_mobiledata.xml
index 671ef91..0c7d770 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc410/ic_5g_plus_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc410/ic_5g_plus_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="43.5dp" android:height="15dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="33.35dp" android:height="11.5dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.6748.608155c-.2556.493765-.6575.912165-1.1602 1.207735-.5027.29556-1.08602.45645-1.68372.46441H5.89992L5.0784 3.85339h1.8684c.75003-.06189 1.49961.12298 2.11371.52132.23973.20438.42069.45957.52691.74302.10621.28345.13441.58643.0821.8822-.14542.72341-.49942 1.39827-1.02548 1.95496-.48214.50268-1.09465.88672-1.78139 1.11693-.93186.28554-1.90968.42565-2.89246.41445-1.18192-.02438-2.34626-.26687-3.423017-.71291l.938477-1.79335c.37581.16678.76602.30496 1.16668.41315.56604.14675 1.15166.22088 1.74004.22026.61057.01484 1.21697-.09608 1.77426-.32452.47642-.19475.86727-.53033 1.10963-.95272.19825-.46398.01854-.92795-.87287-.92795H2.02763L4.58206.520833h7.03144c.0114-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078zm1.345 4.797465c-.1064.27913-.136.57788-.0862.86993.0497.29204.1773.56843.3715.80482.3937.33116.9142.50763 1.449.49134.6647-.00559 1.3179-.15807 1.9041-.44442l.9028-1.72167h-2.7398c.1412-.44273.4341-.83242.8356-1.11181.4015-.27939.8904-.43375 1.395-.44042h3.54c.0101-.00002.0201.00231.0289.00676.0089.00445.0164.01088.0218.01869.0054.0078.0086.01673.0092.02596.0006.00922-.0014.01843-.0057.02678L18.2713 8.4723c-1.1369.65827-2.4537 1.01058-3.7996 1.01658-.5901.04128-1.1832-.03266-1.7397-.21692-.5564-.18426-1.0637-.47462-1.4879-.85179-.3511-.42459-.5849-.92035-.6815-1.44517-.0966-.52482-.0531-1.06319.1267-1.56938.3458-1.47404 1.2668-2.78269 2.5912-3.68159C14.6049.825134 16.242.397447 17.8862.520833h3.0579c.0113-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078-.2556.493765-.6576.912165-1.1603 1.207735-.5026.29556-1.0859.45645-1.6836.46441h-.2753c-1.0837-.08438-2.1653.18258-3.0551.75405-.8898.57147-1.5311 1.41097-1.8113 2.37127zM25.8818 5.79662l1.0041-1.9341h-2.0167l-1.0027 1.9341h-2.3448l-.8044 1.54703h2.3462l-1.0026 1.9328h2.0167l1.0026-1.9328h2.4504l.8029-1.54703h-2.4517z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc560/ic_5g_e_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc560/ic_5g_e_mobiledata.xml
index 0e374cb..9577bb7 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc560/ic_5g_e_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc560/ic_5g_e_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="40.5dp" android:height="15dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="31.05dp" android:height="11.5dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M19.3585 9.45946l2.6848-5.67568h4.5436l-.4956 1.05406h-2.974l-.537 1.13513h2.437l-.5369 1.05406h-2.3958l-.6608 1.37837h3.2631l-.4544 1.05406h-4.874zM12.7772 3.82432c1.1565-1.5 3.3044-1.58108 3.7174-1.58108h.2892c1.1565 0 2.1479-.68919 2.6022-1.662159 0-.04054 0-.081081-.0413-.081081h-2.8501c-2.3544.040541-3.8827.77027-4.9153 1.78378-.6196.64865-.9913 1.25676-1.1153 1.58108-.2478.52703-.4543 1.05406-.57823 1.54055-.33044 1.33783.04131 2.43243.53693 3C11.0423 9.09459 12.075 9.5 13.438 9.5c2.0653 0 3.511-1.01351 3.511-1.01351l2.1479-4.62163c0-.04054 0-.08108-.0413-.08108h-3.2631c-1.0327 0-1.6936.68919-2.0653 1.62163h2.5196l-.8261 1.7027c-.0413.04054-.7848.44594-1.7348.44594-.4131 0-.9914-.12162-1.3631-.48648-.3718-.40541-.4544-1.05406-.2891-1.66216.1652-.64865.413-1.13514.7435-1.58109zM8.39878 4.27026c-.49567-.40541-1.11525-.48649-1.98267-.48649H4.68128l.7022-1.5h2.72616c1.15655 0 2.14786-.68919 2.60226-1.662162 0-.04054 0-.081081-.0413-.081081H4.14431L1.83121 5.40539h4.04793c.82611 0 .99133.44595.82611.93243-.16522.44595-.66089.77027-1.03263.93244-.41306.2027-.99134.32432-1.65222.32432-.53697 0-.99133-.04054-1.61092-.2027-.24783-.08108-.61958-.20271-1.07394-.40541L.509434 8.72972c.950026.44594 2.313106.72972 3.180516.72972.82611 0 1.98267-.16216 2.68486-.4054.66089-.28378 1.19786-.56757 1.65222-1.0946.45436-.52702.82611-1.21621.90872-1.94594.08261-.72973-.20653-1.41892-.53697-1.74324z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc560/ic_5g_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc560/ic_5g_mobiledata.xml
index 7d1644c..68b795a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc560/ic_5g_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc560/ic_5g_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="31.5dp" android:height="15dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="24.15dp" android:height="11.5dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.489.608155c-.2515.493765-.6471.912165-1.1418 1.207735-.49467.29556-1.06868.45645-1.65686.46441H5.80602l-.80845 1.57309h1.83866c.7381-.06189 1.47575.12298 2.08008.52132.23591.20438.41399.45957.51852.74302.10452.28345.13227.58643.0808.8822-.14311.72341-.49148 1.39827-1.00916 1.95496-.47447.50268-1.07724.88672-1.75305 1.11693-.91702.28554-1.87928.42565-2.84642.41445-1.16311-.02438-2.30892-.26687-3.36854-.71291L1.462 6.98001c.36983.16678.75383.30496 1.14811.41315.55703.14675 1.13333.22088 1.71235.22026.60086.01484 1.19761-.09608 1.74603-.32452.46883-.19475.85346-.53033 1.09196-.95272.1951-.46398.01825-.92795-.85897-.92795H1.99535L4.50913.520833h6.91957c.0111-.000103.0222.002427.032.007353.0098.004927.0181.012089.0242.020815.006.008725.0095.01873.0103.029076.0007.010346-.0014.020695-.0062.030078zm1.3236 4.797465c-.1047.27913-.1338.57788-.0849.86993.049.29204.1745.56843.3656.80482.3875.33116.8997.50763 1.426.49134.6541-.00559 1.2969-.15807 1.8738-.44442l.8884-1.72167h-2.6962c.139-.44273.4272-.83242.8223-1.11181.3951-.27939.8763-.43375 1.3729-.44042h3.4836c.0099-.00002.0197.00231.0285.00676.0087.00445.016.01088.0214.01869.0053.0078.0084.01673.009.02596.0006.00922-.0013.01843-.0056.02678L17.9805 8.4723c-1.1188.65827-2.4146 1.01058-3.7391 1.01658-.5808.04128-1.1644-.03266-1.712-.21692-.5476-.18426-1.0468-.47462-1.4642-.85179-.3456-.42459-.5757-.92035-.6707-1.44517-.0951-.52482-.0523-1.06319.1247-1.56938.3402-1.47404 1.2466-2.78269 2.5499-3.68159C14.3724.825134 15.9835.397447 17.6015.520833h3.0093c.0111-.000103.0221.002427.032.007353.0098.004927.0181.012089.0241.020815.0061.008725.0096.01873.0104.029076.0007.010346-.0014.020695-.0062.030078-.2515.493765-.6471.912165-1.1418 1.207735-.4947.29556-1.0687.45645-1.6569.46441h-.2709c-1.0664-.08438-2.1308.18258-3.0065.75405-.8756.57147-1.5067 1.41097-1.7824 2.37127z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc560/ic_5g_plus_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc560/ic_5g_plus_mobiledata.xml
index 671ef91..0c7d770 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc560/ic_5g_plus_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc560/ic_5g_plus_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="43.5dp" android:height="15dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="33.35dp" android:height="11.5dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.6748.608155c-.2556.493765-.6575.912165-1.1602 1.207735-.5027.29556-1.08602.45645-1.68372.46441H5.89992L5.0784 3.85339h1.8684c.75003-.06189 1.49961.12298 2.11371.52132.23973.20438.42069.45957.52691.74302.10621.28345.13441.58643.0821.8822-.14542.72341-.49942 1.39827-1.02548 1.95496-.48214.50268-1.09465.88672-1.78139 1.11693-.93186.28554-1.90968.42565-2.89246.41445-1.18192-.02438-2.34626-.26687-3.423017-.71291l.938477-1.79335c.37581.16678.76602.30496 1.16668.41315.56604.14675 1.15166.22088 1.74004.22026.61057.01484 1.21697-.09608 1.77426-.32452.47642-.19475.86727-.53033 1.10963-.95272.19825-.46398.01854-.92795-.87287-.92795H2.02763L4.58206.520833h7.03144c.0114-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078zm1.345 4.797465c-.1064.27913-.136.57788-.0862.86993.0497.29204.1773.56843.3715.80482.3937.33116.9142.50763 1.449.49134.6647-.00559 1.3179-.15807 1.9041-.44442l.9028-1.72167h-2.7398c.1412-.44273.4341-.83242.8356-1.11181.4015-.27939.8904-.43375 1.395-.44042h3.54c.0101-.00002.0201.00231.0289.00676.0089.00445.0164.01088.0218.01869.0054.0078.0086.01673.0092.02596.0006.00922-.0014.01843-.0057.02678L18.2713 8.4723c-1.1369.65827-2.4537 1.01058-3.7996 1.01658-.5901.04128-1.1832-.03266-1.7397-.21692-.5564-.18426-1.0637-.47462-1.4879-.85179-.3511-.42459-.5849-.92035-.6815-1.44517-.0966-.52482-.0531-1.06319.1267-1.56938.3458-1.47404 1.2668-2.78269 2.5912-3.68159C14.6049.825134 16.242.397447 17.8862.520833h3.0579c.0113-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078-.2556.493765-.6576.912165-1.1603 1.207735-.5026.29556-1.0859.45645-1.6836.46441h-.2753c-1.0837-.08438-2.1653.18258-3.0551.75405-.8898.57147-1.5311 1.41097-1.8113 2.37127zM25.8818 5.79662l1.0041-1.9341h-2.0167l-1.0027 1.9341h-2.3448l-.8044 1.54703h2.3462l-1.0026 1.9328h2.0167l1.0026-1.9328h2.4504l.8029-1.54703h-2.4517z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc950/ic_5g_e_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc950/ic_5g_e_mobiledata.xml
index 0e374cb..9577bb7 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc950/ic_5g_e_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc950/ic_5g_e_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="40.5dp" android:height="15dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="31.05dp" android:height="11.5dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M19.3585 9.45946l2.6848-5.67568h4.5436l-.4956 1.05406h-2.974l-.537 1.13513h2.437l-.5369 1.05406h-2.3958l-.6608 1.37837h3.2631l-.4544 1.05406h-4.874zM12.7772 3.82432c1.1565-1.5 3.3044-1.58108 3.7174-1.58108h.2892c1.1565 0 2.1479-.68919 2.6022-1.662159 0-.04054 0-.081081-.0413-.081081h-2.8501c-2.3544.040541-3.8827.77027-4.9153 1.78378-.6196.64865-.9913 1.25676-1.1153 1.58108-.2478.52703-.4543 1.05406-.57823 1.54055-.33044 1.33783.04131 2.43243.53693 3C11.0423 9.09459 12.075 9.5 13.438 9.5c2.0653 0 3.511-1.01351 3.511-1.01351l2.1479-4.62163c0-.04054 0-.08108-.0413-.08108h-3.2631c-1.0327 0-1.6936.68919-2.0653 1.62163h2.5196l-.8261 1.7027c-.0413.04054-.7848.44594-1.7348.44594-.4131 0-.9914-.12162-1.3631-.48648-.3718-.40541-.4544-1.05406-.2891-1.66216.1652-.64865.413-1.13514.7435-1.58109zM8.39878 4.27026c-.49567-.40541-1.11525-.48649-1.98267-.48649H4.68128l.7022-1.5h2.72616c1.15655 0 2.14786-.68919 2.60226-1.662162 0-.04054 0-.081081-.0413-.081081H4.14431L1.83121 5.40539h4.04793c.82611 0 .99133.44595.82611.93243-.16522.44595-.66089.77027-1.03263.93244-.41306.2027-.99134.32432-1.65222.32432-.53697 0-.99133-.04054-1.61092-.2027-.24783-.08108-.61958-.20271-1.07394-.40541L.509434 8.72972c.950026.44594 2.313106.72972 3.180516.72972.82611 0 1.98267-.16216 2.68486-.4054.66089-.28378 1.19786-.56757 1.65222-1.0946.45436-.52702.82611-1.21621.90872-1.94594.08261-.72973-.20653-1.41892-.53697-1.74324z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc950/ic_5g_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc950/ic_5g_mobiledata.xml
index 7d1644c..68b795a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc950/ic_5g_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc950/ic_5g_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="31.5dp" android:height="15dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="24.15dp" android:height="11.5dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.489.608155c-.2515.493765-.6471.912165-1.1418 1.207735-.49467.29556-1.06868.45645-1.65686.46441H5.80602l-.80845 1.57309h1.83866c.7381-.06189 1.47575.12298 2.08008.52132.23591.20438.41399.45957.51852.74302.10452.28345.13227.58643.0808.8822-.14311.72341-.49148 1.39827-1.00916 1.95496-.47447.50268-1.07724.88672-1.75305 1.11693-.91702.28554-1.87928.42565-2.84642.41445-1.16311-.02438-2.30892-.26687-3.36854-.71291L1.462 6.98001c.36983.16678.75383.30496 1.14811.41315.55703.14675 1.13333.22088 1.71235.22026.60086.01484 1.19761-.09608 1.74603-.32452.46883-.19475.85346-.53033 1.09196-.95272.1951-.46398.01825-.92795-.85897-.92795H1.99535L4.50913.520833h6.91957c.0111-.000103.0222.002427.032.007353.0098.004927.0181.012089.0242.020815.006.008725.0095.01873.0103.029076.0007.010346-.0014.020695-.0062.030078zm1.3236 4.797465c-.1047.27913-.1338.57788-.0849.86993.049.29204.1745.56843.3656.80482.3875.33116.8997.50763 1.426.49134.6541-.00559 1.2969-.15807 1.8738-.44442l.8884-1.72167h-2.6962c.139-.44273.4272-.83242.8223-1.11181.3951-.27939.8763-.43375 1.3729-.44042h3.4836c.0099-.00002.0197.00231.0285.00676.0087.00445.016.01088.0214.01869.0053.0078.0084.01673.009.02596.0006.00922-.0013.01843-.0056.02678L17.9805 8.4723c-1.1188.65827-2.4146 1.01058-3.7391 1.01658-.5808.04128-1.1644-.03266-1.712-.21692-.5476-.18426-1.0468-.47462-1.4642-.85179-.3456-.42459-.5757-.92035-.6707-1.44517-.0951-.52482-.0523-1.06319.1247-1.56938.3402-1.47404 1.2466-2.78269 2.5499-3.68159C14.3724.825134 15.9835.397447 17.6015.520833h3.0093c.0111-.000103.0221.002427.032.007353.0098.004927.0181.012089.0241.020815.0061.008725.0096.01873.0104.029076.0007.010346-.0014.020695-.0062.030078-.2515.493765-.6471.912165-1.1418 1.207735-.4947.29556-1.0687.45645-1.6569.46441h-.2709c-1.0664-.08438-2.1308.18258-3.0065.75405-.8756.57147-1.5067 1.41097-1.7824 2.37127z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc950/ic_5g_plus_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc950/ic_5g_plus_mobiledata.xml
index 671ef91..0c7d770 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc950/ic_5g_plus_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc310-mnc950/ic_5g_plus_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="43.5dp" android:height="15dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="33.35dp" android:height="11.5dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.6748.608155c-.2556.493765-.6575.912165-1.1602 1.207735-.5027.29556-1.08602.45645-1.68372.46441H5.89992L5.0784 3.85339h1.8684c.75003-.06189 1.49961.12298 2.11371.52132.23973.20438.42069.45957.52691.74302.10621.28345.13441.58643.0821.8822-.14542.72341-.49942 1.39827-1.02548 1.95496-.48214.50268-1.09465.88672-1.78139 1.11693-.93186.28554-1.90968.42565-2.89246.41445-1.18192-.02438-2.34626-.26687-3.423017-.71291l.938477-1.79335c.37581.16678.76602.30496 1.16668.41315.56604.14675 1.15166.22088 1.74004.22026.61057.01484 1.21697-.09608 1.77426-.32452.47642-.19475.86727-.53033 1.10963-.95272.19825-.46398.01854-.92795-.87287-.92795H2.02763L4.58206.520833h7.03144c.0114-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078zm1.345 4.797465c-.1064.27913-.136.57788-.0862.86993.0497.29204.1773.56843.3715.80482.3937.33116.9142.50763 1.449.49134.6647-.00559 1.3179-.15807 1.9041-.44442l.9028-1.72167h-2.7398c.1412-.44273.4341-.83242.8356-1.11181.4015-.27939.8904-.43375 1.395-.44042h3.54c.0101-.00002.0201.00231.0289.00676.0089.00445.0164.01088.0218.01869.0054.0078.0086.01673.0092.02596.0006.00922-.0014.01843-.0057.02678L18.2713 8.4723c-1.1369.65827-2.4537 1.01058-3.7996 1.01658-.5901.04128-1.1832-.03266-1.7397-.21692-.5564-.18426-1.0637-.47462-1.4879-.85179-.3511-.42459-.5849-.92035-.6815-1.44517-.0966-.52482-.0531-1.06319.1267-1.56938.3458-1.47404 1.2668-2.78269 2.5912-3.68159C14.6049.825134 16.242.397447 17.8862.520833h3.0579c.0113-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078-.2556.493765-.6576.912165-1.1603 1.207735-.5026.29556-1.0859.45645-1.6836.46441h-.2753c-1.0837-.08438-2.1653.18258-3.0551.75405-.8898.57147-1.5311 1.41097-1.8113 2.37127zM25.8818 5.79662l1.0041-1.9341h-2.0167l-1.0027 1.9341h-2.3448l-.8044 1.54703h2.3462l-1.0026 1.9328h2.0167l1.0026-1.9328h2.4504l.8029-1.54703h-2.4517z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc311-mnc180/ic_5g_e_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc311-mnc180/ic_5g_e_mobiledata.xml
index 0e374cb..9577bb7 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc311-mnc180/ic_5g_e_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc311-mnc180/ic_5g_e_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="40.5dp" android:height="15dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="31.05dp" android:height="11.5dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M19.3585 9.45946l2.6848-5.67568h4.5436l-.4956 1.05406h-2.974l-.537 1.13513h2.437l-.5369 1.05406h-2.3958l-.6608 1.37837h3.2631l-.4544 1.05406h-4.874zM12.7772 3.82432c1.1565-1.5 3.3044-1.58108 3.7174-1.58108h.2892c1.1565 0 2.1479-.68919 2.6022-1.662159 0-.04054 0-.081081-.0413-.081081h-2.8501c-2.3544.040541-3.8827.77027-4.9153 1.78378-.6196.64865-.9913 1.25676-1.1153 1.58108-.2478.52703-.4543 1.05406-.57823 1.54055-.33044 1.33783.04131 2.43243.53693 3C11.0423 9.09459 12.075 9.5 13.438 9.5c2.0653 0 3.511-1.01351 3.511-1.01351l2.1479-4.62163c0-.04054 0-.08108-.0413-.08108h-3.2631c-1.0327 0-1.6936.68919-2.0653 1.62163h2.5196l-.8261 1.7027c-.0413.04054-.7848.44594-1.7348.44594-.4131 0-.9914-.12162-1.3631-.48648-.3718-.40541-.4544-1.05406-.2891-1.66216.1652-.64865.413-1.13514.7435-1.58109zM8.39878 4.27026c-.49567-.40541-1.11525-.48649-1.98267-.48649H4.68128l.7022-1.5h2.72616c1.15655 0 2.14786-.68919 2.60226-1.662162 0-.04054 0-.081081-.0413-.081081H4.14431L1.83121 5.40539h4.04793c.82611 0 .99133.44595.82611.93243-.16522.44595-.66089.77027-1.03263.93244-.41306.2027-.99134.32432-1.65222.32432-.53697 0-.99133-.04054-1.61092-.2027-.24783-.08108-.61958-.20271-1.07394-.40541L.509434 8.72972c.950026.44594 2.313106.72972 3.180516.72972.82611 0 1.98267-.16216 2.68486-.4054.66089-.28378 1.19786-.56757 1.65222-1.0946.45436-.52702.82611-1.21621.90872-1.94594.08261-.72973-.20653-1.41892-.53697-1.74324z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc311-mnc180/ic_5g_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc311-mnc180/ic_5g_mobiledata.xml
index 7d1644c..68b795a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc311-mnc180/ic_5g_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc311-mnc180/ic_5g_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="31.5dp" android:height="15dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="24.15dp" android:height="11.5dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.489.608155c-.2515.493765-.6471.912165-1.1418 1.207735-.49467.29556-1.06868.45645-1.65686.46441H5.80602l-.80845 1.57309h1.83866c.7381-.06189 1.47575.12298 2.08008.52132.23591.20438.41399.45957.51852.74302.10452.28345.13227.58643.0808.8822-.14311.72341-.49148 1.39827-1.00916 1.95496-.47447.50268-1.07724.88672-1.75305 1.11693-.91702.28554-1.87928.42565-2.84642.41445-1.16311-.02438-2.30892-.26687-3.36854-.71291L1.462 6.98001c.36983.16678.75383.30496 1.14811.41315.55703.14675 1.13333.22088 1.71235.22026.60086.01484 1.19761-.09608 1.74603-.32452.46883-.19475.85346-.53033 1.09196-.95272.1951-.46398.01825-.92795-.85897-.92795H1.99535L4.50913.520833h6.91957c.0111-.000103.0222.002427.032.007353.0098.004927.0181.012089.0242.020815.006.008725.0095.01873.0103.029076.0007.010346-.0014.020695-.0062.030078zm1.3236 4.797465c-.1047.27913-.1338.57788-.0849.86993.049.29204.1745.56843.3656.80482.3875.33116.8997.50763 1.426.49134.6541-.00559 1.2969-.15807 1.8738-.44442l.8884-1.72167h-2.6962c.139-.44273.4272-.83242.8223-1.11181.3951-.27939.8763-.43375 1.3729-.44042h3.4836c.0099-.00002.0197.00231.0285.00676.0087.00445.016.01088.0214.01869.0053.0078.0084.01673.009.02596.0006.00922-.0013.01843-.0056.02678L17.9805 8.4723c-1.1188.65827-2.4146 1.01058-3.7391 1.01658-.5808.04128-1.1644-.03266-1.712-.21692-.5476-.18426-1.0468-.47462-1.4642-.85179-.3456-.42459-.5757-.92035-.6707-1.44517-.0951-.52482-.0523-1.06319.1247-1.56938.3402-1.47404 1.2466-2.78269 2.5499-3.68159C14.3724.825134 15.9835.397447 17.6015.520833h3.0093c.0111-.000103.0221.002427.032.007353.0098.004927.0181.012089.0241.020815.0061.008725.0096.01873.0104.029076.0007.010346-.0014.020695-.0062.030078-.2515.493765-.6471.912165-1.1418 1.207735-.4947.29556-1.0687.45645-1.6569.46441h-.2709c-1.0664-.08438-2.1308.18258-3.0065.75405-.8756.57147-1.5067 1.41097-1.7824 2.37127z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc311-mnc180/ic_5g_plus_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc311-mnc180/ic_5g_plus_mobiledata.xml
index 671ef91..0c7d770 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc311-mnc180/ic_5g_plus_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc311-mnc180/ic_5g_plus_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="43.5dp" android:height="15dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="33.35dp" android:height="11.5dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.6748.608155c-.2556.493765-.6575.912165-1.1602 1.207735-.5027.29556-1.08602.45645-1.68372.46441H5.89992L5.0784 3.85339h1.8684c.75003-.06189 1.49961.12298 2.11371.52132.23973.20438.42069.45957.52691.74302.10621.28345.13441.58643.0821.8822-.14542.72341-.49942 1.39827-1.02548 1.95496-.48214.50268-1.09465.88672-1.78139 1.11693-.93186.28554-1.90968.42565-2.89246.41445-1.18192-.02438-2.34626-.26687-3.423017-.71291l.938477-1.79335c.37581.16678.76602.30496 1.16668.41315.56604.14675 1.15166.22088 1.74004.22026.61057.01484 1.21697-.09608 1.77426-.32452.47642-.19475.86727-.53033 1.10963-.95272.19825-.46398.01854-.92795-.87287-.92795H2.02763L4.58206.520833h7.03144c.0114-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078zm1.345 4.797465c-.1064.27913-.136.57788-.0862.86993.0497.29204.1773.56843.3715.80482.3937.33116.9142.50763 1.449.49134.6647-.00559 1.3179-.15807 1.9041-.44442l.9028-1.72167h-2.7398c.1412-.44273.4341-.83242.8356-1.11181.4015-.27939.8904-.43375 1.395-.44042h3.54c.0101-.00002.0201.00231.0289.00676.0089.00445.0164.01088.0218.01869.0054.0078.0086.01673.0092.02596.0006.00922-.0014.01843-.0057.02678L18.2713 8.4723c-1.1369.65827-2.4537 1.01058-3.7996 1.01658-.5901.04128-1.1832-.03266-1.7397-.21692-.5564-.18426-1.0637-.47462-1.4879-.85179-.3511-.42459-.5849-.92035-.6815-1.44517-.0966-.52482-.0531-1.06319.1267-1.56938.3458-1.47404 1.2668-2.78269 2.5912-3.68159C14.6049.825134 16.242.397447 17.8862.520833h3.0579c.0113-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078-.2556.493765-.6576.912165-1.1603 1.207735-.5026.29556-1.0859.45645-1.6836.46441h-.2753c-1.0837-.08438-2.1653.18258-3.0551.75405-.8898.57147-1.5311 1.41097-1.8113 2.37127zM25.8818 5.79662l1.0041-1.9341h-2.0167l-1.0027 1.9341h-2.3448l-.8044 1.54703h2.3462l-1.0026 1.9328h2.0167l1.0026-1.9328h2.4504l.8029-1.54703h-2.4517z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc312-mnc670/ic_5g_e_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc312-mnc670/ic_5g_e_mobiledata.xml
index 0e374cb..9577bb7 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc312-mnc670/ic_5g_e_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc312-mnc670/ic_5g_e_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="40.5dp" android:height="15dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="31.05dp" android:height="11.5dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M19.3585 9.45946l2.6848-5.67568h4.5436l-.4956 1.05406h-2.974l-.537 1.13513h2.437l-.5369 1.05406h-2.3958l-.6608 1.37837h3.2631l-.4544 1.05406h-4.874zM12.7772 3.82432c1.1565-1.5 3.3044-1.58108 3.7174-1.58108h.2892c1.1565 0 2.1479-.68919 2.6022-1.662159 0-.04054 0-.081081-.0413-.081081h-2.8501c-2.3544.040541-3.8827.77027-4.9153 1.78378-.6196.64865-.9913 1.25676-1.1153 1.58108-.2478.52703-.4543 1.05406-.57823 1.54055-.33044 1.33783.04131 2.43243.53693 3C11.0423 9.09459 12.075 9.5 13.438 9.5c2.0653 0 3.511-1.01351 3.511-1.01351l2.1479-4.62163c0-.04054 0-.08108-.0413-.08108h-3.2631c-1.0327 0-1.6936.68919-2.0653 1.62163h2.5196l-.8261 1.7027c-.0413.04054-.7848.44594-1.7348.44594-.4131 0-.9914-.12162-1.3631-.48648-.3718-.40541-.4544-1.05406-.2891-1.66216.1652-.64865.413-1.13514.7435-1.58109zM8.39878 4.27026c-.49567-.40541-1.11525-.48649-1.98267-.48649H4.68128l.7022-1.5h2.72616c1.15655 0 2.14786-.68919 2.60226-1.662162 0-.04054 0-.081081-.0413-.081081H4.14431L1.83121 5.40539h4.04793c.82611 0 .99133.44595.82611.93243-.16522.44595-.66089.77027-1.03263.93244-.41306.2027-.99134.32432-1.65222.32432-.53697 0-.99133-.04054-1.61092-.2027-.24783-.08108-.61958-.20271-1.07394-.40541L.509434 8.72972c.950026.44594 2.313106.72972 3.180516.72972.82611 0 1.98267-.16216 2.68486-.4054.66089-.28378 1.19786-.56757 1.65222-1.0946.45436-.52702.82611-1.21621.90872-1.94594.08261-.72973-.20653-1.41892-.53697-1.74324z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc312-mnc670/ic_5g_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc312-mnc670/ic_5g_mobiledata.xml
index 7d1644c..68b795a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc312-mnc670/ic_5g_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc312-mnc670/ic_5g_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="31.5dp" android:height="15dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="24.15dp" android:height="11.5dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.489.608155c-.2515.493765-.6471.912165-1.1418 1.207735-.49467.29556-1.06868.45645-1.65686.46441H5.80602l-.80845 1.57309h1.83866c.7381-.06189 1.47575.12298 2.08008.52132.23591.20438.41399.45957.51852.74302.10452.28345.13227.58643.0808.8822-.14311.72341-.49148 1.39827-1.00916 1.95496-.47447.50268-1.07724.88672-1.75305 1.11693-.91702.28554-1.87928.42565-2.84642.41445-1.16311-.02438-2.30892-.26687-3.36854-.71291L1.462 6.98001c.36983.16678.75383.30496 1.14811.41315.55703.14675 1.13333.22088 1.71235.22026.60086.01484 1.19761-.09608 1.74603-.32452.46883-.19475.85346-.53033 1.09196-.95272.1951-.46398.01825-.92795-.85897-.92795H1.99535L4.50913.520833h6.91957c.0111-.000103.0222.002427.032.007353.0098.004927.0181.012089.0242.020815.006.008725.0095.01873.0103.029076.0007.010346-.0014.020695-.0062.030078zm1.3236 4.797465c-.1047.27913-.1338.57788-.0849.86993.049.29204.1745.56843.3656.80482.3875.33116.8997.50763 1.426.49134.6541-.00559 1.2969-.15807 1.8738-.44442l.8884-1.72167h-2.6962c.139-.44273.4272-.83242.8223-1.11181.3951-.27939.8763-.43375 1.3729-.44042h3.4836c.0099-.00002.0197.00231.0285.00676.0087.00445.016.01088.0214.01869.0053.0078.0084.01673.009.02596.0006.00922-.0013.01843-.0056.02678L17.9805 8.4723c-1.1188.65827-2.4146 1.01058-3.7391 1.01658-.5808.04128-1.1644-.03266-1.712-.21692-.5476-.18426-1.0468-.47462-1.4642-.85179-.3456-.42459-.5757-.92035-.6707-1.44517-.0951-.52482-.0523-1.06319.1247-1.56938.3402-1.47404 1.2466-2.78269 2.5499-3.68159C14.3724.825134 15.9835.397447 17.6015.520833h3.0093c.0111-.000103.0221.002427.032.007353.0098.004927.0181.012089.0241.020815.0061.008725.0096.01873.0104.029076.0007.010346-.0014.020695-.0062.030078-.2515.493765-.6471.912165-1.1418 1.207735-.4947.29556-1.0687.45645-1.6569.46441h-.2709c-1.0664-.08438-2.1308.18258-3.0065.75405-.8756.57147-1.5067 1.41097-1.7824 2.37127z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc312-mnc670/ic_5g_plus_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc312-mnc670/ic_5g_plus_mobiledata.xml
index 671ef91..0c7d770 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc312-mnc670/ic_5g_plus_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc312-mnc670/ic_5g_plus_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="43.5dp" android:height="15dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="33.35dp" android:height="11.5dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.6748.608155c-.2556.493765-.6575.912165-1.1602 1.207735-.5027.29556-1.08602.45645-1.68372.46441H5.89992L5.0784 3.85339h1.8684c.75003-.06189 1.49961.12298 2.11371.52132.23973.20438.42069.45957.52691.74302.10621.28345.13441.58643.0821.8822-.14542.72341-.49942 1.39827-1.02548 1.95496-.48214.50268-1.09465.88672-1.78139 1.11693-.93186.28554-1.90968.42565-2.89246.41445-1.18192-.02438-2.34626-.26687-3.423017-.71291l.938477-1.79335c.37581.16678.76602.30496 1.16668.41315.56604.14675 1.15166.22088 1.74004.22026.61057.01484 1.21697-.09608 1.77426-.32452.47642-.19475.86727-.53033 1.10963-.95272.19825-.46398.01854-.92795-.87287-.92795H2.02763L4.58206.520833h7.03144c.0114-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078zm1.345 4.797465c-.1064.27913-.136.57788-.0862.86993.0497.29204.1773.56843.3715.80482.3937.33116.9142.50763 1.449.49134.6647-.00559 1.3179-.15807 1.9041-.44442l.9028-1.72167h-2.7398c.1412-.44273.4341-.83242.8356-1.11181.4015-.27939.8904-.43375 1.395-.44042h3.54c.0101-.00002.0201.00231.0289.00676.0089.00445.0164.01088.0218.01869.0054.0078.0086.01673.0092.02596.0006.00922-.0014.01843-.0057.02678L18.2713 8.4723c-1.1369.65827-2.4537 1.01058-3.7996 1.01658-.5901.04128-1.1832-.03266-1.7397-.21692-.5564-.18426-1.0637-.47462-1.4879-.85179-.3511-.42459-.5849-.92035-.6815-1.44517-.0966-.52482-.0531-1.06319.1267-1.56938.3458-1.47404 1.2668-2.78269 2.5912-3.68159C14.6049.825134 16.242.397447 17.8862.520833h3.0579c.0113-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078-.2556.493765-.6576.912165-1.1603 1.207735-.5026.29556-1.0859.45645-1.6836.46441h-.2753c-1.0837-.08438-2.1653.18258-3.0551.75405-.8898.57147-1.5311 1.41097-1.8113 2.37127zM25.8818 5.79662l1.0041-1.9341h-2.0167l-1.0027 1.9341h-2.3448l-.8044 1.54703h2.3462l-1.0026 1.9328h2.0167l1.0026-1.9328h2.4504l.8029-1.54703h-2.4517z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc100/ic_5g_e_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc100/ic_5g_e_mobiledata.xml
index 0e374cb..9577bb7 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc100/ic_5g_e_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc100/ic_5g_e_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="40.5dp" android:height="15dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="31.05dp" android:height="11.5dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M19.3585 9.45946l2.6848-5.67568h4.5436l-.4956 1.05406h-2.974l-.537 1.13513h2.437l-.5369 1.05406h-2.3958l-.6608 1.37837h3.2631l-.4544 1.05406h-4.874zM12.7772 3.82432c1.1565-1.5 3.3044-1.58108 3.7174-1.58108h.2892c1.1565 0 2.1479-.68919 2.6022-1.662159 0-.04054 0-.081081-.0413-.081081h-2.8501c-2.3544.040541-3.8827.77027-4.9153 1.78378-.6196.64865-.9913 1.25676-1.1153 1.58108-.2478.52703-.4543 1.05406-.57823 1.54055-.33044 1.33783.04131 2.43243.53693 3C11.0423 9.09459 12.075 9.5 13.438 9.5c2.0653 0 3.511-1.01351 3.511-1.01351l2.1479-4.62163c0-.04054 0-.08108-.0413-.08108h-3.2631c-1.0327 0-1.6936.68919-2.0653 1.62163h2.5196l-.8261 1.7027c-.0413.04054-.7848.44594-1.7348.44594-.4131 0-.9914-.12162-1.3631-.48648-.3718-.40541-.4544-1.05406-.2891-1.66216.1652-.64865.413-1.13514.7435-1.58109zM8.39878 4.27026c-.49567-.40541-1.11525-.48649-1.98267-.48649H4.68128l.7022-1.5h2.72616c1.15655 0 2.14786-.68919 2.60226-1.662162 0-.04054 0-.081081-.0413-.081081H4.14431L1.83121 5.40539h4.04793c.82611 0 .99133.44595.82611.93243-.16522.44595-.66089.77027-1.03263.93244-.41306.2027-.99134.32432-1.65222.32432-.53697 0-.99133-.04054-1.61092-.2027-.24783-.08108-.61958-.20271-1.07394-.40541L.509434 8.72972c.950026.44594 2.313106.72972 3.180516.72972.82611 0 1.98267-.16216 2.68486-.4054.66089-.28378 1.19786-.56757 1.65222-1.0946.45436-.52702.82611-1.21621.90872-1.94594.08261-.72973-.20653-1.41892-.53697-1.74324z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc100/ic_5g_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc100/ic_5g_mobiledata.xml
index 7d1644c..68b795a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc100/ic_5g_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc100/ic_5g_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="31.5dp" android:height="15dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="24.15dp" android:height="11.5dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.489.608155c-.2515.493765-.6471.912165-1.1418 1.207735-.49467.29556-1.06868.45645-1.65686.46441H5.80602l-.80845 1.57309h1.83866c.7381-.06189 1.47575.12298 2.08008.52132.23591.20438.41399.45957.51852.74302.10452.28345.13227.58643.0808.8822-.14311.72341-.49148 1.39827-1.00916 1.95496-.47447.50268-1.07724.88672-1.75305 1.11693-.91702.28554-1.87928.42565-2.84642.41445-1.16311-.02438-2.30892-.26687-3.36854-.71291L1.462 6.98001c.36983.16678.75383.30496 1.14811.41315.55703.14675 1.13333.22088 1.71235.22026.60086.01484 1.19761-.09608 1.74603-.32452.46883-.19475.85346-.53033 1.09196-.95272.1951-.46398.01825-.92795-.85897-.92795H1.99535L4.50913.520833h6.91957c.0111-.000103.0222.002427.032.007353.0098.004927.0181.012089.0242.020815.006.008725.0095.01873.0103.029076.0007.010346-.0014.020695-.0062.030078zm1.3236 4.797465c-.1047.27913-.1338.57788-.0849.86993.049.29204.1745.56843.3656.80482.3875.33116.8997.50763 1.426.49134.6541-.00559 1.2969-.15807 1.8738-.44442l.8884-1.72167h-2.6962c.139-.44273.4272-.83242.8223-1.11181.3951-.27939.8763-.43375 1.3729-.44042h3.4836c.0099-.00002.0197.00231.0285.00676.0087.00445.016.01088.0214.01869.0053.0078.0084.01673.009.02596.0006.00922-.0013.01843-.0056.02678L17.9805 8.4723c-1.1188.65827-2.4146 1.01058-3.7391 1.01658-.5808.04128-1.1644-.03266-1.712-.21692-.5476-.18426-1.0468-.47462-1.4642-.85179-.3456-.42459-.5757-.92035-.6707-1.44517-.0951-.52482-.0523-1.06319.1247-1.56938.3402-1.47404 1.2466-2.78269 2.5499-3.68159C14.3724.825134 15.9835.397447 17.6015.520833h3.0093c.0111-.000103.0221.002427.032.007353.0098.004927.0181.012089.0241.020815.0061.008725.0096.01873.0104.029076.0007.010346-.0014.020695-.0062.030078-.2515.493765-.6471.912165-1.1418 1.207735-.4947.29556-1.0687.45645-1.6569.46441h-.2709c-1.0664-.08438-2.1308.18258-3.0065.75405-.8756.57147-1.5067 1.41097-1.7824 2.37127z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc100/ic_5g_plus_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc100/ic_5g_plus_mobiledata.xml
index 671ef91..0c7d770 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc100/ic_5g_plus_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc100/ic_5g_plus_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="43.5dp" android:height="15dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="33.35dp" android:height="11.5dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.6748.608155c-.2556.493765-.6575.912165-1.1602 1.207735-.5027.29556-1.08602.45645-1.68372.46441H5.89992L5.0784 3.85339h1.8684c.75003-.06189 1.49961.12298 2.11371.52132.23973.20438.42069.45957.52691.74302.10621.28345.13441.58643.0821.8822-.14542.72341-.49942 1.39827-1.02548 1.95496-.48214.50268-1.09465.88672-1.78139 1.11693-.93186.28554-1.90968.42565-2.89246.41445-1.18192-.02438-2.34626-.26687-3.423017-.71291l.938477-1.79335c.37581.16678.76602.30496 1.16668.41315.56604.14675 1.15166.22088 1.74004.22026.61057.01484 1.21697-.09608 1.77426-.32452.47642-.19475.86727-.53033 1.10963-.95272.19825-.46398.01854-.92795-.87287-.92795H2.02763L4.58206.520833h7.03144c.0114-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078zm1.345 4.797465c-.1064.27913-.136.57788-.0862.86993.0497.29204.1773.56843.3715.80482.3937.33116.9142.50763 1.449.49134.6647-.00559 1.3179-.15807 1.9041-.44442l.9028-1.72167h-2.7398c.1412-.44273.4341-.83242.8356-1.11181.4015-.27939.8904-.43375 1.395-.44042h3.54c.0101-.00002.0201.00231.0289.00676.0089.00445.0164.01088.0218.01869.0054.0078.0086.01673.0092.02596.0006.00922-.0014.01843-.0057.02678L18.2713 8.4723c-1.1369.65827-2.4537 1.01058-3.7996 1.01658-.5901.04128-1.1832-.03266-1.7397-.21692-.5564-.18426-1.0637-.47462-1.4879-.85179-.3511-.42459-.5849-.92035-.6815-1.44517-.0966-.52482-.0531-1.06319.1267-1.56938.3458-1.47404 1.2668-2.78269 2.5912-3.68159C14.6049.825134 16.242.397447 17.8862.520833h3.0579c.0113-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078-.2556.493765-.6576.912165-1.1603 1.207735-.5026.29556-1.0859.45645-1.6836.46441h-.2753c-1.0837-.08438-2.1653.18258-3.0551.75405-.8898.57147-1.5311 1.41097-1.8113 2.37127zM25.8818 5.79662l1.0041-1.9341h-2.0167l-1.0027 1.9341h-2.3448l-.8044 1.54703h2.3462l-1.0026 1.9328h2.0167l1.0026-1.9328h2.4504l.8029-1.54703h-2.4517z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc130/ic_5g_e_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc130/ic_5g_e_mobiledata.xml
index 0e374cb..9577bb7 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc130/ic_5g_e_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc130/ic_5g_e_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="40.5dp" android:height="15dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="31.05dp" android:height="11.5dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M19.3585 9.45946l2.6848-5.67568h4.5436l-.4956 1.05406h-2.974l-.537 1.13513h2.437l-.5369 1.05406h-2.3958l-.6608 1.37837h3.2631l-.4544 1.05406h-4.874zM12.7772 3.82432c1.1565-1.5 3.3044-1.58108 3.7174-1.58108h.2892c1.1565 0 2.1479-.68919 2.6022-1.662159 0-.04054 0-.081081-.0413-.081081h-2.8501c-2.3544.040541-3.8827.77027-4.9153 1.78378-.6196.64865-.9913 1.25676-1.1153 1.58108-.2478.52703-.4543 1.05406-.57823 1.54055-.33044 1.33783.04131 2.43243.53693 3C11.0423 9.09459 12.075 9.5 13.438 9.5c2.0653 0 3.511-1.01351 3.511-1.01351l2.1479-4.62163c0-.04054 0-.08108-.0413-.08108h-3.2631c-1.0327 0-1.6936.68919-2.0653 1.62163h2.5196l-.8261 1.7027c-.0413.04054-.7848.44594-1.7348.44594-.4131 0-.9914-.12162-1.3631-.48648-.3718-.40541-.4544-1.05406-.2891-1.66216.1652-.64865.413-1.13514.7435-1.58109zM8.39878 4.27026c-.49567-.40541-1.11525-.48649-1.98267-.48649H4.68128l.7022-1.5h2.72616c1.15655 0 2.14786-.68919 2.60226-1.662162 0-.04054 0-.081081-.0413-.081081H4.14431L1.83121 5.40539h4.04793c.82611 0 .99133.44595.82611.93243-.16522.44595-.66089.77027-1.03263.93244-.41306.2027-.99134.32432-1.65222.32432-.53697 0-.99133-.04054-1.61092-.2027-.24783-.08108-.61958-.20271-1.07394-.40541L.509434 8.72972c.950026.44594 2.313106.72972 3.180516.72972.82611 0 1.98267-.16216 2.68486-.4054.66089-.28378 1.19786-.56757 1.65222-1.0946.45436-.52702.82611-1.21621.90872-1.94594.08261-.72973-.20653-1.41892-.53697-1.74324z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc130/ic_5g_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc130/ic_5g_mobiledata.xml
index 7d1644c..68b795a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc130/ic_5g_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc130/ic_5g_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="31.5dp" android:height="15dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="24.15dp" android:height="11.5dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.489.608155c-.2515.493765-.6471.912165-1.1418 1.207735-.49467.29556-1.06868.45645-1.65686.46441H5.80602l-.80845 1.57309h1.83866c.7381-.06189 1.47575.12298 2.08008.52132.23591.20438.41399.45957.51852.74302.10452.28345.13227.58643.0808.8822-.14311.72341-.49148 1.39827-1.00916 1.95496-.47447.50268-1.07724.88672-1.75305 1.11693-.91702.28554-1.87928.42565-2.84642.41445-1.16311-.02438-2.30892-.26687-3.36854-.71291L1.462 6.98001c.36983.16678.75383.30496 1.14811.41315.55703.14675 1.13333.22088 1.71235.22026.60086.01484 1.19761-.09608 1.74603-.32452.46883-.19475.85346-.53033 1.09196-.95272.1951-.46398.01825-.92795-.85897-.92795H1.99535L4.50913.520833h6.91957c.0111-.000103.0222.002427.032.007353.0098.004927.0181.012089.0242.020815.006.008725.0095.01873.0103.029076.0007.010346-.0014.020695-.0062.030078zm1.3236 4.797465c-.1047.27913-.1338.57788-.0849.86993.049.29204.1745.56843.3656.80482.3875.33116.8997.50763 1.426.49134.6541-.00559 1.2969-.15807 1.8738-.44442l.8884-1.72167h-2.6962c.139-.44273.4272-.83242.8223-1.11181.3951-.27939.8763-.43375 1.3729-.44042h3.4836c.0099-.00002.0197.00231.0285.00676.0087.00445.016.01088.0214.01869.0053.0078.0084.01673.009.02596.0006.00922-.0013.01843-.0056.02678L17.9805 8.4723c-1.1188.65827-2.4146 1.01058-3.7391 1.01658-.5808.04128-1.1644-.03266-1.712-.21692-.5476-.18426-1.0468-.47462-1.4642-.85179-.3456-.42459-.5757-.92035-.6707-1.44517-.0951-.52482-.0523-1.06319.1247-1.56938.3402-1.47404 1.2466-2.78269 2.5499-3.68159C14.3724.825134 15.9835.397447 17.6015.520833h3.0093c.0111-.000103.0221.002427.032.007353.0098.004927.0181.012089.0241.020815.0061.008725.0096.01873.0104.029076.0007.010346-.0014.020695-.0062.030078-.2515.493765-.6471.912165-1.1418 1.207735-.4947.29556-1.0687.45645-1.6569.46441h-.2709c-1.0664-.08438-2.1308.18258-3.0065.75405-.8756.57147-1.5067 1.41097-1.7824 2.37127z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc130/ic_5g_plus_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc130/ic_5g_plus_mobiledata.xml
index 671ef91..0c7d770 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc130/ic_5g_plus_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc130/ic_5g_plus_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="43.5dp" android:height="15dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="33.35dp" android:height="11.5dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.6748.608155c-.2556.493765-.6575.912165-1.1602 1.207735-.5027.29556-1.08602.45645-1.68372.46441H5.89992L5.0784 3.85339h1.8684c.75003-.06189 1.49961.12298 2.11371.52132.23973.20438.42069.45957.52691.74302.10621.28345.13441.58643.0821.8822-.14542.72341-.49942 1.39827-1.02548 1.95496-.48214.50268-1.09465.88672-1.78139 1.11693-.93186.28554-1.90968.42565-2.89246.41445-1.18192-.02438-2.34626-.26687-3.423017-.71291l.938477-1.79335c.37581.16678.76602.30496 1.16668.41315.56604.14675 1.15166.22088 1.74004.22026.61057.01484 1.21697-.09608 1.77426-.32452.47642-.19475.86727-.53033 1.10963-.95272.19825-.46398.01854-.92795-.87287-.92795H2.02763L4.58206.520833h7.03144c.0114-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078zm1.345 4.797465c-.1064.27913-.136.57788-.0862.86993.0497.29204.1773.56843.3715.80482.3937.33116.9142.50763 1.449.49134.6647-.00559 1.3179-.15807 1.9041-.44442l.9028-1.72167h-2.7398c.1412-.44273.4341-.83242.8356-1.11181.4015-.27939.8904-.43375 1.395-.44042h3.54c.0101-.00002.0201.00231.0289.00676.0089.00445.0164.01088.0218.01869.0054.0078.0086.01673.0092.02596.0006.00922-.0014.01843-.0057.02678L18.2713 8.4723c-1.1369.65827-2.4537 1.01058-3.7996 1.01658-.5901.04128-1.1832-.03266-1.7397-.21692-.5564-.18426-1.0637-.47462-1.4879-.85179-.3511-.42459-.5849-.92035-.6815-1.44517-.0966-.52482-.0531-1.06319.1267-1.56938.3458-1.47404 1.2668-2.78269 2.5912-3.68159C14.6049.825134 16.242.397447 17.8862.520833h3.0579c.0113-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078-.2556.493765-.6576.912165-1.1603 1.207735-.5026.29556-1.0859.45645-1.6836.46441h-.2753c-1.0837-.08438-2.1653.18258-3.0551.75405-.8898.57147-1.5311 1.41097-1.8113 2.37127zM25.8818 5.79662l1.0041-1.9341h-2.0167l-1.0027 1.9341h-2.3448l-.8044 1.54703h2.3462l-1.0026 1.9328h2.0167l1.0026-1.9328h2.4504l.8029-1.54703h-2.4517z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc140/ic_5g_e_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc140/ic_5g_e_mobiledata.xml
index 0e374cb..9577bb7 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc140/ic_5g_e_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc140/ic_5g_e_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="40.5dp" android:height="15dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="31.05dp" android:height="11.5dp" android:viewportWidth="27" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M19.3585 9.45946l2.6848-5.67568h4.5436l-.4956 1.05406h-2.974l-.537 1.13513h2.437l-.5369 1.05406h-2.3958l-.6608 1.37837h3.2631l-.4544 1.05406h-4.874zM12.7772 3.82432c1.1565-1.5 3.3044-1.58108 3.7174-1.58108h.2892c1.1565 0 2.1479-.68919 2.6022-1.662159 0-.04054 0-.081081-.0413-.081081h-2.8501c-2.3544.040541-3.8827.77027-4.9153 1.78378-.6196.64865-.9913 1.25676-1.1153 1.58108-.2478.52703-.4543 1.05406-.57823 1.54055-.33044 1.33783.04131 2.43243.53693 3C11.0423 9.09459 12.075 9.5 13.438 9.5c2.0653 0 3.511-1.01351 3.511-1.01351l2.1479-4.62163c0-.04054 0-.08108-.0413-.08108h-3.2631c-1.0327 0-1.6936.68919-2.0653 1.62163h2.5196l-.8261 1.7027c-.0413.04054-.7848.44594-1.7348.44594-.4131 0-.9914-.12162-1.3631-.48648-.3718-.40541-.4544-1.05406-.2891-1.66216.1652-.64865.413-1.13514.7435-1.58109zM8.39878 4.27026c-.49567-.40541-1.11525-.48649-1.98267-.48649H4.68128l.7022-1.5h2.72616c1.15655 0 2.14786-.68919 2.60226-1.662162 0-.04054 0-.081081-.0413-.081081H4.14431L1.83121 5.40539h4.04793c.82611 0 .99133.44595.82611.93243-.16522.44595-.66089.77027-1.03263.93244-.41306.2027-.99134.32432-1.65222.32432-.53697 0-.99133-.04054-1.61092-.2027-.24783-.08108-.61958-.20271-1.07394-.40541L.509434 8.72972c.950026.44594 2.313106.72972 3.180516.72972.82611 0 1.98267-.16216 2.68486-.4054.66089-.28378 1.19786-.56757 1.65222-1.0946.45436-.52702.82611-1.21621.90872-1.94594.08261-.72973-.20653-1.41892-.53697-1.74324z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc140/ic_5g_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc140/ic_5g_mobiledata.xml
index 7d1644c..68b795a 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc140/ic_5g_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc140/ic_5g_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="31.5dp" android:height="15dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="24.15dp" android:height="11.5dp" android:viewportWidth="21" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.489.608155c-.2515.493765-.6471.912165-1.1418 1.207735-.49467.29556-1.06868.45645-1.65686.46441H5.80602l-.80845 1.57309h1.83866c.7381-.06189 1.47575.12298 2.08008.52132.23591.20438.41399.45957.51852.74302.10452.28345.13227.58643.0808.8822-.14311.72341-.49148 1.39827-1.00916 1.95496-.47447.50268-1.07724.88672-1.75305 1.11693-.91702.28554-1.87928.42565-2.84642.41445-1.16311-.02438-2.30892-.26687-3.36854-.71291L1.462 6.98001c.36983.16678.75383.30496 1.14811.41315.55703.14675 1.13333.22088 1.71235.22026.60086.01484 1.19761-.09608 1.74603-.32452.46883-.19475.85346-.53033 1.09196-.95272.1951-.46398.01825-.92795-.85897-.92795H1.99535L4.50913.520833h6.91957c.0111-.000103.0222.002427.032.007353.0098.004927.0181.012089.0242.020815.006.008725.0095.01873.0103.029076.0007.010346-.0014.020695-.0062.030078zm1.3236 4.797465c-.1047.27913-.1338.57788-.0849.86993.049.29204.1745.56843.3656.80482.3875.33116.8997.50763 1.426.49134.6541-.00559 1.2969-.15807 1.8738-.44442l.8884-1.72167h-2.6962c.139-.44273.4272-.83242.8223-1.11181.3951-.27939.8763-.43375 1.3729-.44042h3.4836c.0099-.00002.0197.00231.0285.00676.0087.00445.016.01088.0214.01869.0053.0078.0084.01673.009.02596.0006.00922-.0013.01843-.0056.02678L17.9805 8.4723c-1.1188.65827-2.4146 1.01058-3.7391 1.01658-.5808.04128-1.1644-.03266-1.712-.21692-.5476-.18426-1.0468-.47462-1.4642-.85179-.3456-.42459-.5757-.92035-.6707-1.44517-.0951-.52482-.0523-1.06319.1247-1.56938.3402-1.47404 1.2466-2.78269 2.5499-3.68159C14.3724.825134 15.9835.397447 17.6015.520833h3.0093c.0111-.000103.0221.002427.032.007353.0098.004927.0181.012089.0241.020815.0061.008725.0096.01873.0104.029076.0007.010346-.0014.020695-.0062.030078-.2515.493765-.6471.912165-1.1418 1.207735-.4947.29556-1.0687.45645-1.6569.46441h-.2709c-1.0664-.08438-2.1308.18258-3.0065.75405-.8756.57147-1.5067 1.41097-1.7824 2.37127z" android:fillColor="#000000"/>
</vector>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc140/ic_5g_plus_mobiledata.xml b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc140/ic_5g_plus_mobiledata.xml
index 671ef91..0c7d770 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc140/ic_5g_plus_mobiledata.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/drawable-mcc313-mnc140/ic_5g_plus_mobiledata.xml
@@ -1,3 +1,3 @@
-<vector android:width="43.5dp" android:height="15dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:width="33.35dp" android:height="11.5dp" android:viewportWidth="29" android:viewportHeight="10" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:pathData="M11.6748.608155c-.2556.493765-.6575.912165-1.1602 1.207735-.5027.29556-1.08602.45645-1.68372.46441H5.89992L5.0784 3.85339h1.8684c.75003-.06189 1.49961.12298 2.11371.52132.23973.20438.42069.45957.52691.74302.10621.28345.13441.58643.0821.8822-.14542.72341-.49942 1.39827-1.02548 1.95496-.48214.50268-1.09465.88672-1.78139 1.11693-.93186.28554-1.90968.42565-2.89246.41445-1.18192-.02438-2.34626-.26687-3.423017-.71291l.938477-1.79335c.37581.16678.76602.30496 1.16668.41315.56604.14675 1.15166.22088 1.74004.22026.61057.01484 1.21697-.09608 1.77426-.32452.47642-.19475.86727-.53033 1.10963-.95272.19825-.46398.01854-.92795-.87287-.92795H2.02763L4.58206.520833h7.03144c.0114-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078zm1.345 4.797465c-.1064.27913-.136.57788-.0862.86993.0497.29204.1773.56843.3715.80482.3937.33116.9142.50763 1.449.49134.6647-.00559 1.3179-.15807 1.9041-.44442l.9028-1.72167h-2.7398c.1412-.44273.4341-.83242.8356-1.11181.4015-.27939.8904-.43375 1.395-.44042h3.54c.0101-.00002.0201.00231.0289.00676.0089.00445.0164.01088.0218.01869.0054.0078.0086.01673.0092.02596.0006.00922-.0014.01843-.0057.02678L18.2713 8.4723c-1.1369.65827-2.4537 1.01058-3.7996 1.01658-.5901.04128-1.1832-.03266-1.7397-.21692-.5564-.18426-1.0637-.47462-1.4879-.85179-.3511-.42459-.5849-.92035-.6815-1.44517-.0966-.52482-.0531-1.06319.1267-1.56938.3458-1.47404 1.2668-2.78269 2.5912-3.68159C14.6049.825134 16.242.397447 17.8862.520833h3.0579c.0113-.000103.0225.002427.0325.007353.01.004927.0185.012089.0246.020815.0061.008725.0097.01873.0105.029076.0007.010346-.0014.020695-.0063.030078-.2556.493765-.6576.912165-1.1603 1.207735-.5026.29556-1.0859.45645-1.6836.46441h-.2753c-1.0837-.08438-2.1653.18258-3.0551.75405-.8898.57147-1.5311 1.41097-1.8113 2.37127zM25.8818 5.79662l1.0041-1.9341h-2.0167l-1.0027 1.9341h-2.3448l-.8044 1.54703h2.3462l-1.0026 1.9328h2.0167l1.0026-1.9328h2.4504l.8029-1.54703h-2.4517z" android:fillColor="#000000"/>
</vector>
diff --git a/powerhint.json b/powerhint.json
index 18088fa..a4495e4 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -1558,6 +1558,36 @@
"Node": "Dex2oatCPUSet",
"Duration": 0,
"Value": "4,5"
+ },
+ {
+ "PowerHint": "THERMAL_skin-therm-monitor_EMERGENCY",
+ "Node": "SkinThermMonitorTzOffset",
+ "Duration": 0,
+ "Value": "0"
+ },
+ {
+ "PowerHint": "THERMAL_skin-therm-monitor_EMERGENCY",
+ "Node": "SkinThermTzOffset",
+ "Duration": 0,
+ "Value": "0"
+ },
+ {
+ "PowerHint": "THERMAL_skin-therm-monitor_EMERGENCY",
+ "Node": "SkinThermCpuTzOffset",
+ "Duration": 0,
+ "Value": "0"
+ },
+ {
+ "PowerHint": "THERMAL_skin-therm-monitor_EMERGENCY",
+ "Node": "CellularEmergencyTzOffset",
+ "Duration": 0,
+ "Value": "0"
+ },
+ {
+ "PowerHint": "THERMAL_skin-therm-monitor_EMERGENCY",
+ "Node": "PanelAudioThermTzOffset",
+ "Duration": 0,
+ "Value": "0"
}
]
diff --git a/powerstats/service.cpp b/powerstats/service.cpp
index e432248..e83c54c 100644
--- a/powerstats/service.cpp
+++ b/powerstats/service.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
#include <pixelpowerstats/GenericStateResidencyDataProvider.h>
#include <pixelpowerstats/PowerStats.h>
#include <pixelpowerstats/WlanStateResidencyDataProvider.h>
+#include <pixelpowerstats/DisplayStateResidencyDataProvider.h>
#include "RailDataProvider.h"
@@ -52,6 +53,7 @@
using android::hardware::google::pixel::powerstats::StateResidencyConfig;
using android::hardware::google::pixel::powerstats::RailDataProvider;
using android::hardware::google::pixel::powerstats::WlanStateResidencyDataProvider;
+using android::hardware::google::pixel::powerstats::DisplayStateResidencyDataProvider;
int main(int /* argc */, char ** /* argv */) {
ALOGI("power.stats service 1.0 is starting.");
@@ -130,6 +132,12 @@
service->addStateResidencyDataProvider(wlanSdp);
}
+ uint32_t displayId = service->addPowerEntity("Display", PowerEntityType::SUBSYSTEM);
+ sp<DisplayStateResidencyDataProvider> displaySdp =
+ new DisplayStateResidencyDataProvider(displayId,
+ "/sys/class/backlight/panel0-backlight/state", {"Off", "LP", "1080x2340@60", "1080x2340@90"});
+ service->addStateResidencyDataProvider(displaySdp);
+
// Add Power Entities that require the Aidl data provider
sp<AidlStateResidencyDataProvider> aidlSdp = new AidlStateResidencyDataProvider();
uint32_t citadelId = service->addPowerEntity("Citadel", PowerEntityType::SUBSYSTEM);
diff --git a/product.prop b/product.prop
index ebee6fe..81171da 100644
--- a/product.prop
+++ b/product.prop
@@ -42,7 +42,6 @@
# system props for perfetto
persist.traced.enable=1
-persist.heapprofd.enable=1
# System prop to turn on CdmaLTEPhone always
telephony.lteOnCdmaDevice=1
diff --git a/video_system_specs.json b/video_system_specs.json
new file mode 100644
index 0000000..440a2d1
--- /dev/null
+++ b/video_system_specs.json
@@ -0,0 +1,8 @@
+{
+ "Video": {
+ "Presets": {
+ "enc_default_bframe_count": 1,
+ "enc_max_mbs_per_sec": 1958400
+ }
+ }
+}
