Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jay 2020-01-10 19:29:39 -08:00
commit 601bb177ff
3 changed files with 3 additions and 0 deletions

1
.gitattributes vendored
View File

@ -4,6 +4,7 @@
# Windows forced line-endings # Windows forced line-endings
/.idea/* text eol=crlf /.idea/* text eol=crlf
*.webp binary
*.png binary *.png binary
*.jpg binary *.jpg binary
*.jpeg binary *.jpeg binary

View File

@ -18,6 +18,7 @@
android:name=".App" android:name=".App"
android:allowBackup="true" android:allowBackup="true"
android:fullBackupContent="@xml/backup_rules" android:fullBackupContent="@xml/backup_rules"
android:hasFragileUserData="true"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"

View File

@ -143,6 +143,7 @@
</style> </style>
<style name="Theme.Splash" parent="Theme.Tachiyomi"> <style name="Theme.Splash" parent="Theme.Tachiyomi">
<item name="android:windowBackground">@drawable/splash_background</item> <item name="android:windowBackground">@drawable/splash_background</item>
<item name="android:navigationBarColor">@color/colorPrimary</item>
</style> </style>