From ac90578e03cf7a45348299108f6620830811a1ae Mon Sep 17 00:00:00 2001 From: Thomas Brugman <145768128+Githubguy132010@users.noreply.github.com> Date: Wed, 19 Feb 2025 09:04:42 +0100 Subject: [PATCH 1/6] Add KWin Wayland session instructions to Waydroid-only sessions documentation Fixes #52 Add instructions for KWin Wayland to the Waydroid-only session documentation. * Add a new section for KWin Wayland in `faq/setting-up-waydroid-only-sessions.md`. * Include instructions for creating `/usr/bin/kwin-waydroid.sh`. * Include instructions for creating `/usr/share/wayland-sessions/kwin.desktop`. --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/waydroid/docs/issues/52?shareId=XXXX-XXXX-XXXX-XXXX). --- faq/setting-up-waydroid-only-sessions.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/faq/setting-up-waydroid-only-sessions.md b/faq/setting-up-waydroid-only-sessions.md index 9eb3f1c..9b26bbc 100644 --- a/faq/setting-up-waydroid-only-sessions.md +++ b/faq/setting-up-waydroid-only-sessions.md @@ -88,3 +88,24 @@ Comment=Android OS in a container Exec=/usr/bin/wayfire-session.sh Type=Application ``` + +### KWin Wayland + +`/usr/bin/kwin-waydroid.sh` contents: + +``` +#!/bin/sh +kwin_wayland & +sleep 5 +waydroid show-full-ui +``` + +`/usr/share/wayland-sessions/kwin.desktop` contents: + +``` +[Desktop Entry] +Name=WayDroid on KWin +Comment=Android OS in a container +Exec=/usr/bin/kwin-waydroid.sh +Type=Application +``` From 8a6262e552b3bf3b8a705f6df71bcb50b5e02a57 Mon Sep 17 00:00:00 2001 From: Thomas Brugman <145768128+Githubguy132010@users.noreply.github.com> Date: Sat, 22 Feb 2025 11:30:53 +0000 Subject: [PATCH 2/6] Update Waydroid session script to use 'kwin_wayland --exit-with-session' for improved session management --- faq/setting-up-waydroid-only-sessions.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/faq/setting-up-waydroid-only-sessions.md b/faq/setting-up-waydroid-only-sessions.md index 9b26bbc..a31786a 100644 --- a/faq/setting-up-waydroid-only-sessions.md +++ b/faq/setting-up-waydroid-only-sessions.md @@ -95,9 +95,7 @@ Type=Application ``` #!/bin/sh -kwin_wayland & -sleep 5 -waydroid show-full-ui +kwin_wayland --exit-with-session && waydroid session start ``` `/usr/share/wayland-sessions/kwin.desktop` contents: From 25d33debbda106f91af3552e9a9789de202bb9b0 Mon Sep 17 00:00:00 2001 From: Thomas Brugman <145768128+Githubguy132010@users.noreply.github.com> Date: Sat, 22 Feb 2025 11:40:03 +0000 Subject: [PATCH 3/6] Fix waydroid session start command syntax in KWin Wayland session script --- faq/setting-up-waydroid-only-sessions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faq/setting-up-waydroid-only-sessions.md b/faq/setting-up-waydroid-only-sessions.md index a31786a..c1aa1fa 100644 --- a/faq/setting-up-waydroid-only-sessions.md +++ b/faq/setting-up-waydroid-only-sessions.md @@ -95,7 +95,7 @@ Type=Application ``` #!/bin/sh -kwin_wayland --exit-with-session && waydroid session start +kwin_wayland --exit-with-session "waydroid session start" ``` `/usr/share/wayland-sessions/kwin.desktop` contents: From 10676795eef83596bd3aa04da2274c98587a8350 Mon Sep 17 00:00:00 2001 From: Thomas Brugman <145768128+Githubguy132010@users.noreply.github.com> Date: Sat, 22 Feb 2025 11:42:05 +0000 Subject: [PATCH 4/6] Rename KWin session desktop file for Waydroid to improve clarity --- faq/setting-up-waydroid-only-sessions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faq/setting-up-waydroid-only-sessions.md b/faq/setting-up-waydroid-only-sessions.md index c1aa1fa..3aee5aa 100644 --- a/faq/setting-up-waydroid-only-sessions.md +++ b/faq/setting-up-waydroid-only-sessions.md @@ -98,7 +98,7 @@ Type=Application kwin_wayland --exit-with-session "waydroid session start" ``` -`/usr/share/wayland-sessions/kwin.desktop` contents: +`/usr/share/wayland-sessions/kwin-waydroid.desktop` contents: ``` [Desktop Entry] From 271b254ace9db3a27701a19e45dd10fe9f9a26a7 Mon Sep 17 00:00:00 2001 From: Thomas Brugman <145768128+Githubguy132010@users.noreply.github.com> Date: Sat, 22 Feb 2025 11:49:36 +0000 Subject: [PATCH 5/6] Update KWin Wayland session script to launch WayDroid UI directly --- faq/setting-up-waydroid-only-sessions.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/faq/setting-up-waydroid-only-sessions.md b/faq/setting-up-waydroid-only-sessions.md index 3aee5aa..8678cd0 100644 --- a/faq/setting-up-waydroid-only-sessions.md +++ b/faq/setting-up-waydroid-only-sessions.md @@ -91,19 +91,12 @@ Type=Application ### KWin Wayland -`/usr/bin/kwin-waydroid.sh` contents: - -``` -#!/bin/sh -kwin_wayland --exit-with-session "waydroid session start" -``` - `/usr/share/wayland-sessions/kwin-waydroid.desktop` contents: ``` [Desktop Entry] Name=WayDroid on KWin Comment=Android OS in a container -Exec=/usr/bin/kwin-waydroid.sh +Exec=kwin_wayland --exit-with-session "waydroid-show-full-ui" Type=Application ``` From f8f10e3aca47097e34342a6cf88a0141db520719 Mon Sep 17 00:00:00 2001 From: Thomas Brugman <145768128+Githubguy132010@users.noreply.github.com> Date: Sat, 22 Feb 2025 12:36:08 +0000 Subject: [PATCH 6/6] Fix syntax in WayDroid KWin session command to ensure proper execution --- faq/setting-up-waydroid-only-sessions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faq/setting-up-waydroid-only-sessions.md b/faq/setting-up-waydroid-only-sessions.md index 8678cd0..0b91f8d 100644 --- a/faq/setting-up-waydroid-only-sessions.md +++ b/faq/setting-up-waydroid-only-sessions.md @@ -97,6 +97,6 @@ Type=Application [Desktop Entry] Name=WayDroid on KWin Comment=Android OS in a container -Exec=kwin_wayland --exit-with-session "waydroid-show-full-ui" +Exec=kwin_wayland --exit-with-session "waydroid show-full-ui" Type=Application ```