sigrok-cross-android: Add an icon to PulseView

diff --git a/cross-compile/android/pulseview-java.patch b/cross-compile/android/pulseview-java.patch
index 1495985075e4ab37e50af8c97029b6386f025036..fd2b342cafbc51f1851ad617cbce993396b6b984 100644 (file)
--- a/cross-compile/android/pulseview-java.patch
+++ b/cross-compile/android/pulseview-java.patch
@@ -5,8 +5,9 @@ index 0564a8d..0356f33 100644
 @@ -1,5 +1,5 @@
  <?xml version='1.0' encoding='utf-8'?>
 -<manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
+-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name">
 +<manifest package="org.sigrok.pulseview" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
-     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name">
++    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name" android:icon="@drawable/logo">
          <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
                    android:name="org.qtproject.qt5.android.bindings.QtActivity"
 @@ -9,21 +9,21 @@

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 76e149b64388a1872f4d43752627af66f3b61ab2..885b0be723578053d2f511dcaa573a35e0f2854c 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -320,6 +320,8 @@ cmake $CM -DANDROID_STL_PATH=${ANDROID_NDK}/sources/cxx-stl .
 make $PARALLEL
 cp -r "$PREFIX"/src/android/java .
 cp -r libs java/
+mkdir -p java/res/drawable
+cp icons/sigrok-logo-notext.png java/res/drawable/logo.png
 cd java
 patch -p2 < ../../../pulseview-java.patch
 cp "$PREFIX"/jar/QtAndroid-bundled.jar libs/