From: Marcus Comstedt <redacted>
Date: Sun, 18 May 2014 12:06:33 +0000 (+0200)
Subject: sigrok-cross-android: Add an icon to PulseView
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=6f61b17c770e77aad11377b01ae4b33003c811a7;p=sigrok-util.git

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 1495985..fd2b342 100644
--- 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 76e149b..885b0be 100755
--- 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/