-
-
Notifications
You must be signed in to change notification settings - Fork 58
ADFA-4500: Fix plugin dialogs and toasts crashing in floating windows #1771
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Daniel-ADFA
wants to merge
8
commits into
stage
Choose a base branch
from
fix/ADFA-4500-floating-dialog-window-type
base: stage
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
494fe94
style: spotless reformat OverlayLayoutParams, no functional change
alome007 3bbb6f5
ADFA-4500: Add PluginWindows for dialogs and toasts from a floating w…
alome007 7489a3b
ADFA-4500: Show plugin crash dialogs above floating windows
alome007 43b6500
ADFA-4500: Restore Material widget inflation in floating windows
alome007 7858329
ADFA-4500: Correct the docked-behaviour wording on PluginWindows
alome007 37b61cd
ADFA-4500: Dismiss plugin overlay dialogs with their window, and repo…
alome007 85300ef
ADFA-4500: Stop a raised crash dialog outliving the floating windows
alome007 baa3cf2
Merge branch 'stage' into fix/ADFA-4500-floating-dialog-window-type
Daniel-ADFA File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
floating-window/src/main/java/com/itsaky/androidide/floating/window/OverlayDialogs.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package com.itsaky.androidide.floating.window | ||
|
|
||
| import android.app.Dialog | ||
| import com.itsaky.androidide.floating.model.DockingManager | ||
| import com.itsaky.androidide.floating.permission.OverlayPermission | ||
|
|
||
| /** | ||
| * Shows a host [Dialog] above any floating overlay windows. | ||
| * | ||
| * Floating windows are [android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY], which | ||
| * the platform always stacks above an activity's own windows. An activity dialog therefore renders | ||
| * *behind* them, and because an overlay is a separate window the dialog's modality does not extend | ||
| * to it: tapping the overlay never surfaces the dialog. Raising the dialog to the same window type | ||
| * puts it back on top, where its modality is visible. | ||
| * | ||
| * The platform attaches no app token to a system-type window, so a raised dialog outlives the | ||
| * activity that created it. Callers must dismiss it themselves when the activity goes away. | ||
| */ | ||
| object OverlayDialogs { | ||
| /** | ||
| * Shows [dialog], raising it above the floating windows when any are open. Leaves an ordinary | ||
| * activity dialog untouched when nothing is floating. | ||
| * | ||
| * @return `true` when the dialog was raised, and so carries no app token and outlives the | ||
| * activity. Only a raised dialog needs the caller to dismiss it; an untouched one is an | ||
| * ordinary activity dialog the platform tears down. | ||
| */ | ||
| fun show(dialog: Dialog): Boolean { | ||
| val raise = | ||
| DockingManager.windows.value.isNotEmpty() && | ||
| OverlayPermission.canDrawOverlays(dialog.context) | ||
| if (raise) { | ||
| dialog.window?.setType(OverlayLayoutParams.overlayType) | ||
| } | ||
| dialog.show() | ||
| return raise | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.