Merge remote-tracking branch 'origin/master'

tj

2025-04-25 93775e1f3d79a1e11b839abbf24201dafcd9e646

1
2
3
4
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <stroke android:width="1dp" android:color="#DDDDDD"/>
    <corners android:radius="4dp"/>
</shape>