From 238a26aee359bc7ed60eefebad624a445c7ec383 Mon Sep 17 00:00:00 2001
From: Simon Fels <morphis@gravedo.de>
Date: Fri, 18 May 2018 14:20:24 +0200
Subject: [PATCH] Install desktop item for the Android Settings app

---
 data/anbox.desktop            | 7 -------
 data/desktop/settings.desktop | 7 +++++++
 scripts/app-settings.sh       | 6 ++++++
 snap/snapcraft.yaml           | 7 +++++++
 4 files changed, 20 insertions(+), 7 deletions(-)
 delete mode 100644 data/anbox.desktop
 create mode 100644 data/desktop/settings.desktop
 create mode 100755 scripts/app-settings.sh

diff --git a/data/anbox.desktop b/data/anbox.desktop
deleted file mode 100644
index cac4f5e..0000000
--- a/data/anbox.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Anbox
-Exec=anbox run --rootfs=android-rootfs
-Icon=anbox
-Terminal=false
-Type=Application
-X-Ubuntu-Touch=true
diff --git a/data/desktop/settings.desktop b/data/desktop/settings.desktop
new file mode 100644
index 0000000..dd12255
--- /dev/null
+++ b/data/desktop/settings.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Exec=anbox.app-settings
+Terminal=false
+Type=Application
+Name=Android Settings
+GenericName=Android Settings
diff --git a/scripts/app-settings.sh b/scripts/app-settings.sh
new file mode 100755
index 0000000..78a5fa4
--- /dev/null
+++ b/scripts/app-settings.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+PACKAGE=com.android.settings
+
+exec $SNAP/bin/anbox-wrapper.sh launch \
+	--package="$PACKAGE"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7717b4d..c823118 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -37,6 +37,10 @@ apps:
   collect-bug-info:
     command: bin/collect-bug-info.sh
 
+  app-settings:
+    command: desktop-launch $SNAP/bin/app-settings.sh
+    desktop: desktop/settings.desktop
+
 parts:
   android:
     plugin: dump
@@ -136,17 +140,20 @@ parts:
       container-manager.sh: bin/container-manager.sh
       anbox-bridge.sh: bin/anbox-bridge.sh
       collect-bug-info.sh: bin/collect-bug-info.sh
+      app-settings.sh: bin/app-settings.sh
     prime:
       - bin/anbox-bridge.sh
       - bin/anbox-wrapper.sh
       - bin/container-manager.sh
       - bin/collect-bug-info.sh
+      - bin/app-*.sh
 
   anbox-data:
     plugin: dump
     source: data
     prime:
       - glvnd
+      - desktop
 
   anbox:
     plugin: cmake