Notifications in the bottom bar are focusable

This commit is contained in:
James Babcock committed 2026-10-03 01:15:42 -07:00
1 parent 96e155ebb0
commit 71fade31f9
9 files changed
+476 -52

No files matched your search

+5 -2
View File
@@ -36,8 +36,11 @@ function bell(): GrayImage {
return image
}
export function readActiveNotificationIcons(maxIcons: number, _allowStale: boolean) {
const sources = new Set(readActiveNotifications(ALL_NOTIFICATIONS).map(n => n.packageName))
return {icons: Array.from(sources).slice(0,Math.max(0,maxIcons)).map(() => bell()),stale:false}
// One icon per source, standing for its first notification.
const sources = new Map<string, string>()
for (const n of readActiveNotifications(ALL_NOTIFICATIONS)) if (!sources.has(n.packageName)) sources.set(n.packageName, n.key)
const keys = Array.from(sources.values()).slice(0,Math.max(0,maxIcons))
return {icons: keys.map(() => bell()),keys,stale:false}
}
export function readNotificationIconByKey(key: string, _allowStale: boolean) {
return {icon: readActiveNotifications(ALL_NOTIFICATIONS).some(n => n.key === key) ? bell() : null,stale:false}
+18 -4
View File
@@ -4,6 +4,7 @@ import { toUint8Array } from "../util/array-util";
import { rememberNotificationSources } from "./notification-sources";
declare const com: any;
declare const java: any;
const ICON_SIZE = 24;
/** Ask the native listener for every active source, including those below the list's display limit. */
@@ -17,6 +18,7 @@ export const ALL_NOTIFICATIONS = 0x7fffffff;
const ICON_CACHE_MS = 60_000;
let cachedIcons: GrayImage[] = [];
let cachedKeys: string[] = [];
let cachedAtMs = 0;
const keyedIconCache = new Map<string, { icon: GrayImage | null; atMs: number }>();
const KEYED_ICON_CACHE_MAX = 128;
@@ -33,6 +35,11 @@ export type { AndroidNotification, AndroidNotificationAction } from "./notificat
export type NotificationIconsResult = {
icons: GrayImage[];
/**
* The notification each icon stands for, by key, in step with icons: the
* member of its group (which gets one icon) the icon was taken from.
*/
keys: string[];
/** True when the icons came from an expired (or empty) cache under allowStale. */
stale: boolean;
};
@@ -46,23 +53,25 @@ export type NotificationIconsResult = {
* on what is in the tray.
*/
export function readActiveNotificationIcons(maxIcons: number, allowStale: boolean): NotificationIconsResult {
if (!global.isAndroid || maxIcons <= 0) return { icons: [], stale: false };
if (!global.isAndroid || maxIcons <= 0) return { icons: [], keys: [], stale: false };
const now = Date.now();
if (cachedAtMs > 0 && now - cachedAtMs < ICON_CACHE_MS) {
logCurrent("notification icons served from cache");
return { icons: cachedIcons.map(icon => icon.clone()), stale: false };
return { icons: cachedIcons.map(icon => icon.clone()), keys: cachedKeys.slice(), stale: false };
}
if (allowStale) {
logCurrent("notification icons served stale");
return { icons: cachedIcons.map(icon => icon.clone()), stale: true };
return { icons: cachedIcons.map(icon => icon.clone()), keys: cachedKeys.slice(), stale: true };
}
const keyList = new java.util.ArrayList();
const bytes = spanCurrent("fetch-notification-icons", () =>
toUint8Array(
com.faceclaw.app.FaceclawMediaNotificationListenerService.getActiveNotificationIconGrays(
ICON_SIZE,
maxIcons,
keyList,
),
),
);
@@ -74,10 +83,15 @@ export function readActiveNotificationIcons(maxIcons: number, allowStale: boolea
icon.pixels.set(bytes.subarray(index * iconByteLength, (index + 1) * iconByteLength));
icons.push(icon);
}
const keys: string[] = [];
for (let index = 0; index < iconCount; index++) {
keys.push(index < keyList.size() ? String(keyList.get(index)) : "");
}
cachedIcons = icons;
cachedKeys = keys;
cachedAtMs = now;
return { icons: icons.map(icon => icon.clone()), stale: false };
return { icons: icons.map(icon => icon.clone()), keys: keys.slice(), stale: false };
}
export type NotificationIconResult = {