Skip to content

fix(overlay): keep feed overlay non-focusable to allow launcher keyboard input #59

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.

Sign up for GitHub

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
johanneswilm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(overlay): keep feed overlay non-focusable to allow launcher keyboard input #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions app/src/main/java/com/saulhdev/feeder/manager/service/OverlayView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ class OverlayView(val context: Context) :

themeHolder = OverlayThemeHolder(this)

// Start fully transparent so the overlay never covers the launcher/folders
// while it is closed (for example, before the first onScroll callback arrives).
val bgColor = themeHolder.currentTheme.get(CardTheme.Colors.OVERLAY_BG.ordinal)
getWindow().setBackgroundDrawable(ColorDrawable((bgColor and 0x00ffffff)))

initRecyclerView()
initHeader()
refreshNotifications()
Expand Down Expand Up @@ -329,8 +334,10 @@ class OverlayView(val context: Context) :
super.onScroll(f)

val bgColor = themeHolder.currentTheme.get(CardTheme.Colors.OVERLAY_BG.ordinal)
val color =
(prefs.overlayTransparency.getValue() * 255.0f).toInt() shl 24 or (bgColor and 0x00ffffff)
// When the panel is closed (progress 0) the overlay must be fully transparent
// so it does not cover the launcher/folders.
val alpha = if (f <= 0f) 0f else prefs.overlayTransparency.getValue()
val color = (alpha * 255.0f).toInt() shl 24 or (bgColor and 0x00ffffff)
getWindow().setBackgroundDrawable(ColorDrawable(color))
}

Expand Down
7 changes: 5 additions & 2 deletions google-gsa/src/main/java/com/google/android/libraries/gsa/d/a/OverlayController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,12 @@ public boolean isOpen() {

public void setVisible(boolean visible) {
if (visible) {
window.clearFlags(24); // FLAG_NOT_TOUCHABLE | FLAG_NOT_FOCUSABLE
// Make the overlay touchable so the feed can be interacted with,
// but keep it non-focusable so the launcher/IME target never moves
// away from the launcher window.
window.clearFlags(16); // FLAG_NOT_TOUCHABLE
} else {
window.addFlags(24);
window.addFlags(16); // FLAG_NOT_TOUCHABLE
}
}

Expand Down
11 changes: 9 additions & 2 deletions google-gsa/src/main/java/com/google/android/libraries/gsa/d/a/OverlayControllerCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,18 @@ private void setupOverlayController(OverlayController controller, Bundle args, L

layoutParams.width = LayoutParams.MATCH_PARENT;
layoutParams.height = LayoutParams.MATCH_PARENT;
layoutParams.flags |= 8650752;
// Start fully transparent, non-focusable and non-touchable so the overlay
// never briefly covers the launcher while it is being attached.
layoutParams.flags |= 8650752
| LayoutParams.FLAG_NOT_FOCUSABLE
| LayoutParams.FLAG_NOT_TOUCHABLE;
layoutParams.alpha = 0f;
layoutParams.dimAmount = 0f;
layoutParams.gravity = 3;
layoutParams.type = 4;
layoutParams.softInputMode = LayoutParams.SOFT_INPUT_STATE_VISIBLE;
// Don't override the launcher window's soft-input behaviour; otherwise
// the app-drawer search box can't show its own keyboard.
layoutParams.softInputMode = LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED;

controller.window.setAttributes(layoutParams);
controller.window.clearFlags(1048576);
Expand Down