Compare commits

..
27 changed files with 597 additions and 375 deletions

No files matched your search

@@ -504,18 +504,6 @@ class FaceclawMediaNotificationListenerService : NotificationListenerService() {
} }
} }
@JvmStatic
fun dismissAllNotifications(): Boolean {
val service = activeService ?: return false
return try {
service.cancelAllNotifications()
true
} catch (t: Throwable) {
Log.w(TAG, "failed to dismiss all notifications", t)
false
}
}
private fun emitNotificationPosted(key: String?) { private fun emitNotificationPosted(key: String?) {
emitNotificationEvent(key) { listener, eventKey -> listener.onNotificationPosted(eventKey) } emitNotificationEvent(key) { listener, eventKey -> listener.onNotificationPosted(eventKey) }
} }
+20 -11
View File
@@ -4,7 +4,7 @@
* makes the content area exactly the 576x288 surface EvenHub apps expect. * makes the content area exactly the 576x288 surface EvenHub apps expect.
*/ */
import { GrayImage } from "../../graphics/image"; import { GrayImage } from "../../graphics/image";
import { EVENHUB_SCREEN_WIDTH } from "./compositor"; import { EVENHUB_SCREEN_WIDTH, EVENHUB_SCREEN_HEIGHT } from "./compositor";
import { directionalFallback, isDirectionalInput, type InputEvent } from "../../ui/gestures"; import { directionalFallback, isDirectionalInput, type InputEvent } from "../../ui/gestures";
import { type Layer, type LayerContext } from "../../ui/layers"; import { type Layer, type LayerContext } from "../../ui/layers";
import { import {
@@ -24,22 +24,27 @@ class EvenHubAppLayer implements Layer {
* extension's source field should see that they came from the watch. * extension's source field should see that they came from the watch.
*/ */
readonly acceptsDirectional = true; readonly acceptsDirectional = true;
private tallCanvas = false;
constructor(private readonly session: EvenHubSession) {} constructor(private readonly session: EvenHubSession) {}
setTallCanvas(tall: boolean): void {
this.tallCanvas = tall;
}
paint(ctx: LayerContext): GrayImage { paint(ctx: LayerContext): GrayImage {
const size = ctx.stack.getBaseSize(); const size = ctx.stack.getBaseSize();
// EvenHub apps lay out for the stock 576-wide surface. In the Full // Host full screen hides chrome; it does not enlarge the stock app canvas.
// Screen display mode the window is 640 wide; paint at stock width and // Only the app's explicit Faceclaw extended-layout request opts into height.
// centre it rather than leaving all the slack on the right. const canvas = { width: EVENHUB_SCREEN_WIDTH, height: this.tallCanvas ? size.height : EVENHUB_SCREEN_HEIGHT };
if (size.width > EVENHUB_SCREEN_WIDTH) { const content = this.session.paint(canvas, ctx.stack.isFocused());
const content = this.session.paint({ width: EVENHUB_SCREEN_WIDTH, height: size.height }, ctx.stack.isFocused()); if (size.width === canvas.width && size.height === canvas.height) return content;
const image = new GrayImage(size.width, size.height, 0); const image = new GrayImage(size.width, size.height, 0);
content.composeInto(image, Math.floor((size.width - EVENHUB_SCREEN_WIDTH) / 2), 0); // Clip text to its logical canvas before placing it in the larger host window.
image.bitBlt(content.withDrawsBaked(), Math.max(0, Math.floor((size.width - canvas.width) / 2)),
Math.max(0, Math.floor((size.height - canvas.height) / 2)));
return image; return image;
} }
return this.session.paint(size, ctx.stack.isFocused());
}
handleInput(event: InputEvent): void { handleInput(event: InputEvent): void {
// Everything goes to the app; the menu gestures never reach here (the // Everything goes to the app; the menu gestures never reach here (the
@@ -60,6 +65,7 @@ export function createEvenHubWindow(
requestShellRender: () => void, requestShellRender: () => void,
): InProcessWindow { ): InProcessWindow {
const fallbackIcon = windowIcon("package", session.manifest.name.charAt(0).toUpperCase() || "E"); const fallbackIcon = windowIcon("package", session.manifest.name.charAt(0).toUpperCase() || "E");
const appLayer = new EvenHubAppLayer(session);
const created = createInProcessWindow({ const created = createInProcessWindow({
appId, appId,
windowId, windowId,
@@ -91,7 +97,7 @@ export function createEvenHubWindow(
{ label: "Show phone UI", onSelect: (ctx: LayerContext) => { ctx.stack.pop(); onShowPhone(); } }, { label: "Show phone UI", onSelect: (ctx: LayerContext) => { ctx.stack.pop(); onShowPhone(); } },
], ],
actions: options.actions, actions: options.actions,
baseLayer: new EvenHubAppLayer(session), baseLayer: appLayer,
submitFrame: options.submitFrame, submitFrame: options.submitFrame,
setSurfaceVisible: options.setSurfaceVisible, setSurfaceVisible: options.setSurfaceVisible,
removeSurface: options.removeSurface, removeSurface: options.removeSurface,
@@ -109,7 +115,10 @@ export function createEvenHubWindow(
pushOverlay: (layer) => created.stack.push(layer), pushOverlay: (layer) => created.stack.push(layer),
// The extended layout uses the full 576x452 app area ("max"); stock apps // The extended layout uses the full 576x452 app area ("max"); stock apps
// stay in the 576x288 band ("medium"). // stay in the 576x288 band ("medium").
setTallCanvas: (tall) => created.setHeightMode(tall ? "max" : "medium"), setTallCanvas: (tall) => {
appLayer.setTallCanvas(tall);
created.setHeightMode(tall ? "max" : "medium");
},
setAttention: (attention) => shell.setWindowAttention(windowId, attention), setAttention: (attention) => shell.setWindowAttention(windowId, attention),
// Only while the app listens for text: otherwise the shell's Type Into App // Only while the app listens for text: otherwise the shell's Type Into App
// destinations (voice dialog, phone keyboard, watch) would send into a void. // destinations (voice dialog, phone keyboard, watch) would send into a void.
+1 -10
View File
@@ -1,6 +1,6 @@
import { NotificationsListLayer } from "../../ui/notifications"; import { NotificationsListLayer } from "../../ui/notifications";
import { NotificationFilterLayer } from "../../ui/notification-filter"; import { NotificationFilterLayer } from "../../ui/notification-filter";
import { ALL_NOTIFICATIONS, dismissAllNotifications, onAndroidNotificationsChanged, readActiveNotifications } from "../../native/notification-icons"; import { onAndroidNotificationsChanged } from "../../native/notification-icons";
import { import {
createInProcessWindow, createInProcessWindow,
YieldAtRootLayer, YieldAtRootLayer,
@@ -32,15 +32,6 @@ export function createNotificationsAppWindow(options: InProcessAppOptions): InPr
ctx.stack.pop(); ctx.stack.pop();
ctx.stack.push(new NotificationFilterLayer()); ctx.stack.push(new NotificationFilterLayer());
}, },
}, {
label: "Dismiss all notifications",
description: "Dismiss notifications on the phone and glasses. System-protected notifications may remain.",
disabled: () => readActiveNotifications(ALL_NOTIFICATIONS).length === 0,
onSelect: (ctx) => {
ctx.stack.pop();
dismissAllNotifications();
created.requestRender();
},
}], }],
actions: options.actions, actions: options.actions,
baseLayer: new YieldAtRootLayer(new NotificationsListLayer()), baseLayer: new YieldAtRootLayer(new NotificationsListLayer()),
+2
View File
@@ -451,6 +451,8 @@ class DashboardController {
openNotificationsWindow: () => openNotificationsWindow: () =>
this.openInProcessAppInBackground(NOTIFICATIONS_WINDOW_ID, NOTIFICATIONS_SURFACE_ID, createNotificationsAppWindow), this.openInProcessAppInBackground(NOTIFICATIONS_WINDOW_ID, NOTIFICATIONS_SURFACE_ID, createNotificationsAppWindow),
onSwitcherBarHeightChanged: () => this.applySwitcherBarHeight(), onSwitcherBarHeightChanged: () => this.applySwitcherBarHeight(),
onWindowLayoutChanged: () => this.applySwitcherBarHeight(),
isLocked: () => this.glassesLocked,
onScreenStateChanged: (on) => { onScreenStateChanged: (on) => {
// Any wake of the regular UI replaces a showing Glanceboard. // Any wake of the regular UI replaces a showing Glanceboard.
if (on) this.glance.dismiss(); if (on) this.glance.dismiss();
+6
View File
@@ -221,6 +221,12 @@ export class IosPreviewController {
shell.foregroundWindow()?.requestRender() shell.foregroundWindow()?.requestRender()
this.requestShellRender() this.requestShellRender()
}, },
onWindowLayoutChanged: () => {
this.relayout()
shell.foregroundWindow()?.requestRender()
this.requestShellRender()
},
isLocked: () => this.glassesLocked,
onScreenStateChanged: on => { onScreenStateChanged: on => {
if (on) this.glance.dismiss() if (on) this.glance.dismiss()
// A wake unblanks only once the next shell render has staged an awake // A wake unblanks only once the next shell render has staged an awake
+2 -17
View File
@@ -2,7 +2,7 @@ import type { GrayImage } from '../graphics/image'
import { pebbleIcon } from '../graphics/pebble-icons' import { pebbleIcon } from '../graphics/pebble-icons'
import { AncsClient, ANCS_CONNECT_MESSAGE, type AncsState } from '../g2/ancs-client' import { AncsClient, ANCS_CONNECT_MESSAGE, type AncsState } from '../g2/ancs-client'
import { notificationAppIcon, notificationCategoryIcon } from './notification-app-icons' import { notificationAppIcon, notificationCategoryIcon } from './notification-app-icons'
import { rememberNotificationSources, shouldShowNotificationOnGlasses } from './notification-sources' import { rememberNotificationSources } from './notification-sources'
import type { AndroidNotification } from './notification-types' import type { AndroidNotification } from './notification-types'
export type { AndroidNotification, AndroidNotificationAction } from './notification-types' export type { AndroidNotification, AndroidNotificationAction } from './notification-types'
export type { NotificationIconsResult, NotificationIconResult, NotificationImageResult } from './notification-icons' export type { NotificationIconsResult, NotificationIconResult, NotificationImageResult } from './notification-icons'
@@ -24,23 +24,8 @@ export function onIosNotificationPopup(listener: (key: string) => void): () => v
export function iosNotificationMessage(): string { return active?.statusMessage ?? ANCS_CONNECT_MESSAGE } export function iosNotificationMessage(): string { return active?.statusMessage ?? ANCS_CONNECT_MESSAGE }
export function iosNotificationState(): AncsState { return active?.state ?? 'disconnected' } export function iosNotificationState(): AncsState { return active?.state ?? 'disconnected' }
export function readActiveNotifications(maxNotifications = 50) { return active?.read(maxNotifications) ?? [] } export function readActiveNotifications(maxNotifications = 50) { return active?.read(maxNotifications) ?? [] }
export function readVisibleNotifications(maxNotifications = 50) {
return readActiveNotifications(ALL_NOTIFICATIONS)
.filter(notification => shouldShowNotificationOnGlasses(notification.packageName))
.slice(0, Math.max(0, maxNotifications))
}
export function invokeNotificationAction(key: string, index: number): boolean { return active?.action(key,index) ?? false } export function invokeNotificationAction(key: string, index: number): boolean { return active?.action(key,index) ?? false }
export function dismissNotification(key: string): boolean { return active?.dismiss(key) ?? false } export function dismissNotification(key: string): boolean { return active?.dismiss(key) ?? false }
export function dismissAllNotifications(): boolean {
const client = active
if (!client) return false
// Snapshot: removals may arrive while dismissal requests are being sent.
let accepted = true
for (const notification of [...client.read(ALL_NOTIFICATIONS)]) {
if (!client.dismiss(notification.key)) accepted = false
}
return accepted
}
export function onAndroidNotificationPosted(listener: (key: string) => void): () => void { export function onAndroidNotificationPosted(listener: (key: string) => void): () => void {
listeners.add(listener); return () => { listeners.delete(listener) } listeners.add(listener); return () => { listeners.delete(listener) }
} }
@@ -59,7 +44,7 @@ function notificationIcon(notification: AndroidNotification): GrayImage {
export function readActiveNotificationIcons(maxIcons: number, _allowStale: boolean) { export function readActiveNotificationIcons(maxIcons: number, _allowStale: boolean) {
// One icon per source, standing for its first notification. // One icon per source, standing for its first notification.
const sources = new Map<string, AndroidNotification>() const sources = new Map<string, AndroidNotification>()
for (const n of readVisibleNotifications(ALL_NOTIFICATIONS)) if (!sources.has(n.packageName)) sources.set(n.packageName, n) for (const n of readActiveNotifications(ALL_NOTIFICATIONS)) if (!sources.has(n.packageName)) sources.set(n.packageName, n)
const shown = Array.from(sources.values()).slice(0,Math.max(0,maxIcons)) const shown = Array.from(sources.values()).slice(0,Math.max(0,maxIcons))
return {icons: shown.map(notificationIcon),keys: shown.map(n => n.key),stale:false} return {icons: shown.map(notificationIcon),keys: shown.map(n => n.key),stale:false}
} }
+2 -23
View File
@@ -1,7 +1,7 @@
import { GrayImage } from "../graphics/image"; import { GrayImage } from "../graphics/image";
import { logCurrent, spanCurrent } from "./frame-timings"; import { logCurrent, spanCurrent } from "./frame-timings";
import { toUint8Array } from "../util/array-util"; import { toUint8Array } from "../util/array-util";
import { rememberNotificationSources, shouldShowNotificationOnGlasses } from "./notification-sources"; import { rememberNotificationSources } from "./notification-sources";
import { PHOTO_TONE, grayImageFromPacket } from "./image-files"; import { PHOTO_TONE, grayImageFromPacket } from "./image-files";
import { NOTIFICATION_ICON_SIZE } from "./notification-types"; import { NOTIFICATION_ICON_SIZE } from "./notification-types";
@@ -21,7 +21,6 @@ const ICON_CACHE_MS = 60_000;
let cachedIcons: GrayImage[] = []; let cachedIcons: GrayImage[] = [];
let cachedKeys: string[] = []; let cachedKeys: string[] = [];
let cachedPackages = new Map<string, string>();
let cachedAtMs = 0; let cachedAtMs = 0;
const keyedIconCache = new Map<string, { icon: GrayImage | null; atMs: number }>(); const keyedIconCache = new Map<string, { icon: GrayImage | null; atMs: number }>();
const KEYED_ICON_CACHE_MAX = 128; const KEYED_ICON_CACHE_MAX = 128;
@@ -96,7 +95,6 @@ export function readActiveNotificationIcons(maxIcons: number, allowStale: boolea
keys.push(index < keyList.size() ? String(keyList.get(index)) : ""); keys.push(index < keyList.size() ? String(keyList.get(index)) : "");
} }
cachedPackages = new Map(readActiveNotifications(ALL_NOTIFICATIONS).map(n => [n.key, n.packageName]));
cachedIcons = icons; cachedIcons = icons;
cachedKeys = keys; cachedKeys = keys;
cachedAtMs = now; cachedAtMs = now;
@@ -105,12 +103,7 @@ export function readActiveNotificationIcons(maxIcons: number, allowStale: boolea
/** Copies of the first maxIcons cached icons, with their keys. */ /** Copies of the first maxIcons cached icons, with their keys. */
function cachedIconsResult(maxIcons: number, stale: boolean): NotificationIconsResult { function cachedIconsResult(maxIcons: number, stale: boolean): NotificationIconsResult {
// Reapply preferences even to a warm/stale cache: toggles take effect immediately. return { icons: cachedIcons.slice(0, maxIcons).map(icon => icon.clone()), keys: cachedKeys.slice(0, maxIcons), stale };
const indices = cachedKeys.map((_, index) => index).filter(index => {
const packageName = cachedPackages.get(cachedKeys[index]!);
return packageName !== undefined && shouldShowNotificationOnGlasses(packageName);
}).slice(0, maxIcons);
return { icons: indices.map(index => cachedIcons[index]!.clone()), keys: indices.map(index => cachedKeys[index]!), stale };
} }
export type NotificationIconResult = { export type NotificationIconResult = {
@@ -325,13 +318,6 @@ export function readActiveNotifications(maxNotifications = 50): AndroidNotificat
} }
} }
/** Glasses display only; discover all sources and filter before the display limit. */
export function readVisibleNotifications(maxNotifications = 50): AndroidNotification[] {
return readActiveNotifications(ALL_NOTIFICATIONS)
.filter(notification => shouldShowNotificationOnGlasses(notification.packageName))
.slice(0, Math.max(0, maxNotifications));
}
export function invokeNotificationAction(notificationKey: string, actionIndex: number): boolean { export function invokeNotificationAction(notificationKey: string, actionIndex: number): boolean {
if (!global.isAndroid || !notificationKey) return false; if (!global.isAndroid || !notificationKey) return false;
invalidateIconCaches(); invalidateIconCaches();
@@ -351,13 +337,6 @@ export function dismissNotification(notificationKey: string): boolean {
); );
} }
/** Explicit user action: dismiss on the phone as well as on the glasses. */
export function dismissAllNotifications(): boolean {
if (!global.isAndroid) return false;
invalidateIconCaches();
return Boolean(com.faceclaw.app.FaceclawMediaNotificationListenerService.dismissAllNotifications());
}
export function onAndroidNotificationPosted(listener: (notificationKey: string) => void): () => void { export function onAndroidNotificationPosted(listener: (notificationKey: string) => void): () => void {
return addNotificationListener(notificationPostedListeners, listener); return addNotificationListener(notificationPostedListeners, listener);
} }
+5 -30
View File
@@ -1,16 +1,6 @@
import { getStringSetting, setStringSetting } from "./settings-store"; import { getStringSetting, setStringSetting } from "./settings-store";
const SOURCES_KEY = "notifications.sources"; const SOURCES_KEY = "notifications.sources";
const DEFAULT_KEY = "notifications.newAppsEnabledByDefault";
/** Unset preserves the behavior of existing installations. */
export function newNotificationAppsEnabledByDefault(): boolean {
return getStringSetting(DEFAULT_KEY, "true") !== "false";
}
export function setNewNotificationAppsEnabledByDefault(enabled: boolean): void {
setStringSetting(DEFAULT_KEY, String(enabled));
}
export type NotificationSource = { export type NotificationSource = {
packageName: string; packageName: string;
@@ -18,15 +8,8 @@ export type NotificationSource = {
showOnGlasses: boolean; showOnGlasses: boolean;
}; };
type SavedSource = Omit<NotificationSource, "showOnGlasses"> & { showOnGlasses?: boolean };
/** Sources outlive their active notifications so a muted app can always be re-enabled. */ /** Sources outlive their active notifications so a muted app can always be re-enabled. */
export function readNotificationSources(): NotificationSource[] { export function readNotificationSources(): NotificationSource[] {
const enabled = newNotificationAppsEnabledByDefault();
return readSavedSources().map((source) => ({ ...source, showOnGlasses: source.showOnGlasses ?? enabled }));
}
function readSavedSources(): SavedSource[] {
try { try {
const parsed = JSON.parse(getStringSetting(SOURCES_KEY, "[]")); const parsed = JSON.parse(getStringSetting(SOURCES_KEY, "[]"));
if (!Array.isArray(parsed)) return []; if (!Array.isArray(parsed)) return [];
@@ -34,7 +17,7 @@ function readSavedSources(): SavedSource[] {
.map((source) => ({ .map((source) => ({
packageName: source.packageName, packageName: source.packageName,
appName: typeof source.appName === "string" && source.appName ? source.appName : source.packageName, appName: typeof source.appName === "string" && source.appName ? source.appName : source.packageName,
showOnGlasses: typeof source.showOnGlasses === "boolean" ? source.showOnGlasses : undefined, showOnGlasses: source.showOnGlasses !== false,
})); }));
} catch { } catch {
return []; return [];
@@ -42,7 +25,7 @@ function readSavedSources(): SavedSource[] {
} }
export function rememberNotificationSources(notifications: { packageName: string; appName: string }[]): void { export function rememberNotificationSources(notifications: { packageName: string; appName: string }[]): void {
const sources = new Map(readSavedSources().map((source) => [source.packageName, source])); const sources = new Map(readNotificationSources().map((source) => [source.packageName, source]));
let changed = false; let changed = false;
for (const notification of notifications) { for (const notification of notifications) {
if (!notification.packageName) continue; if (!notification.packageName) continue;
@@ -52,7 +35,7 @@ export function rememberNotificationSources(notifications: { packageName: string
sources.set(notification.packageName, { sources.set(notification.packageName, {
packageName: notification.packageName, packageName: notification.packageName,
appName, appName,
showOnGlasses: previous?.showOnGlasses, showOnGlasses: previous?.showOnGlasses ?? true,
}); });
changed = true; changed = true;
} }
@@ -61,13 +44,12 @@ export function rememberNotificationSources(notifications: { packageName: string
} }
export function shouldShowNotificationOnGlasses(packageName: string): boolean { export function shouldShowNotificationOnGlasses(packageName: string): boolean {
return readNotificationSources().find((source) => source.packageName === packageName)?.showOnGlasses return readNotificationSources().find((source) => source.packageName === packageName)?.showOnGlasses ?? true;
?? newNotificationAppsEnabledByDefault();
} }
export function setNotificationSourceEnabled(source: { packageName: string; appName: string }, enabled: boolean): void { export function setNotificationSourceEnabled(source: { packageName: string; appName: string }, enabled: boolean): void {
if (!source.packageName) return; if (!source.packageName) return;
const sources = new Map(readSavedSources().map((item) => [item.packageName, item])); const sources = new Map(readNotificationSources().map((item) => [item.packageName, item]));
sources.set(source.packageName, { sources.set(source.packageName, {
packageName: source.packageName, packageName: source.packageName,
appName: source.appName || source.packageName, appName: source.appName || source.packageName,
@@ -75,10 +57,3 @@ export function setNotificationSourceEnabled(source: { packageName: string; appN
}); });
setStringSetting(SOURCES_KEY, JSON.stringify(Array.from(sources.values()))); setStringSetting(SOURCES_KEY, JSON.stringify(Array.from(sources.values())));
} }
/** Set explicit choices only for sources already discovered; leave the future default alone. */
export function setAllNotificationSourcesEnabled(enabled: boolean): void {
setStringSetting(SOURCES_KEY, JSON.stringify(readSavedSources().map((source) => ({
...source, showOnGlasses: enabled,
}))));
}
+33
View File
@@ -148,6 +148,39 @@ export class ConfigSettingBoolean<TId extends string = string> extends ConfigSet
} }
} }
const appFullscreenSettings = new Map<string, ConfigSettingBoolean>();
/** A user choice independent of an app's own temporary immersive mode. */
export function appFullscreenSetting(appId: string): ConfigSettingBoolean {
let setting = appFullscreenSettings.get(appId);
if (!setting) {
setting = new ConfigSettingBoolean({
id: `app-fullscreen-${appId}`, label: "Full screen",
storageKey: `display.fullscreen.${appId}`, defaultValue: false,
reportInAnalytics: false,
});
appFullscreenSettings.set(appId, setting);
}
return setting;
}
const appKeepAwakeSettings = new Map<string, ConfigSettingBoolean>();
/** Independent of full screen; applies only while this app is visible. */
export function appKeepAwakeSetting(appId: string): ConfigSettingBoolean {
let setting = appKeepAwakeSettings.get(appId);
if (!setting) {
setting = new ConfigSettingBoolean({
id: `app-keep-awake-${appId}`, label: "Keep screen awake",
description: "Prevent automatic sleep while this app is visible, in any display mode.",
storageKey: `display.keepAwake.${appId}`, defaultValue: false,
reportInAnalytics: false,
});
appKeepAwakeSettings.set(appId, setting);
}
return setting;
}
type ConfigSettingEnumOptions<TValue extends string, TId extends string> = ConfigSettingOptions<TValue, TId> & { type ConfigSettingEnumOptions<TValue extends string, TId extends string> = ConfigSettingOptions<TValue, TId> & {
values: readonly TValue[]; values: readonly TValue[];
normalize?: (value: string | null | undefined) => TValue; normalize?: (value: string | null | undefined) => TValue;
+8 -20
View File
@@ -2,7 +2,7 @@ import { getDefaultSmallFont } from "../graphics/ui-fonts";
import { GrayImage } from "../graphics/image"; import { GrayImage } from "../graphics/image";
import { truncateText } from "../graphics/textwrap"; import { truncateText } from "../graphics/textwrap";
import { ALL_NOTIFICATIONS, readActiveNotifications } from "../native/notification-icons"; import { ALL_NOTIFICATIONS, readActiveNotifications } from "../native/notification-icons";
import { newNotificationAppsEnabledByDefault, setNewNotificationAppsEnabledByDefault, setAllNotificationSourcesEnabled, readNotificationSources, setNotificationSourceEnabled, shouldShowNotificationOnGlasses } from "../native/notification-sources"; import { readNotificationSources, setNotificationSourceEnabled, shouldShowNotificationOnGlasses } from "../native/notification-sources";
import { type InputEvent } from "./gestures"; import { type InputEvent } from "./gestures";
import { type Layer, type LayerContext, type PaintBelow } from "./layers"; import { type Layer, type LayerContext, type PaintBelow } from "./layers";
import { drawToggleMenuItem, MenuLayer, type MenuItem } from "./menu"; import { drawToggleMenuItem, MenuLayer, type MenuItem } from "./menu";
@@ -11,26 +11,14 @@ import { drawToggleMenuItem, MenuLayer, type MenuItem } from "./menu";
export class NotificationFilterLayer implements Layer { export class NotificationFilterLayer implements Layer {
private menu: MenuLayer | null = null; private menu: MenuLayer | null = null;
private menuWidth = 0; private menuWidth = 0;
/** Stable row keys, including controls, parallel to the menu's items. */ /** The package behind each current row, parallel to the menu's items. */
private packages: string[] = []; private packages: string[] = [];
private currentMenu(ctx: LayerContext): MenuLayer { private currentMenu(ctx: LayerContext): MenuLayer {
readActiveNotifications(ALL_NOTIFICATIONS); readActiveNotifications(ALL_NOTIFICATIONS);
const sources = readNotificationSources().sort((a, b) => const sources = readNotificationSources().sort((a, b) =>
a.appName.localeCompare(b.appName) || a.packageName.localeCompare(b.packageName)); a.appName.localeCompare(b.appName) || a.packageName.localeCompare(b.packageName));
const items: MenuItem[] = [{ const items: MenuItem[] = sources.map((source) => ({
label: "New apps enabled by default",
onSelect: () => setNewNotificationAppsEnabledByDefault(!newNotificationAppsEnabledByDefault()),
render: ({ image, x, y, width, selected }) => {
const font = getDefaultSmallFont();
drawToggleMenuItem(image, font, x, y, width,
truncateText(font, "New apps enabled by default", width - 48), newNotificationAppsEnabledByDefault(), selected);
},
}, {
label: "Enable all", onSelect: () => setAllNotificationSourcesEnabled(true),
}, {
label: "Disable all", onSelect: () => setAllNotificationSourcesEnabled(false),
}, ...sources.map<MenuItem>((source) => ({
label: source.appName, label: source.appName,
onSelect: () => setNotificationSourceEnabled(source, !shouldShowNotificationOnGlasses(source.packageName)), onSelect: () => setNotificationSourceEnabled(source, !shouldShowNotificationOnGlasses(source.packageName)),
render: ({ image, x, y, width, selected }) => { render: ({ image, x, y, width, selected }) => {
@@ -38,11 +26,11 @@ export class NotificationFilterLayer implements Layer {
drawToggleMenuItem(image, font, x, y, width, truncateText(font, source.appName, width - 48), drawToggleMenuItem(image, font, x, y, width, truncateText(font, source.appName, width - 48),
shouldShowNotificationOnGlasses(source.packageName), selected); shouldShowNotificationOnGlasses(source.packageName), selected);
}, },
}))]; }));
if (!sources.length) items.push({ label: "No notification sources discovered yet.", disabled: true, onSelect: () => {} }); if (!items.length) items.push({ label: "No notification sources discovered yet.", disabled: true, onSelect: () => {} });
const selectedPackage = this.menu?.selectedIndex != null ? this.packages[this.menu.selectedIndex] : undefined; const selectedPackage = this.menu?.selectedIndex != null ? this.packages[this.menu.selectedIndex] : undefined;
this.packages = ["default", "enable-all", "disable-all", ...sources.map((source) => `source:${source.packageName}`)]; const index = sources.findIndex((source) => source.packageName === selectedPackage);
const index = selectedPackage === undefined ? 0 : this.packages.indexOf(selectedPackage); this.packages = sources.map((source) => source.packageName);
const width = ctx.stack.getBaseSize().width; const width = ctx.stack.getBaseSize().width;
if (!this.menu || width !== this.menuWidth) { if (!this.menu || width !== this.menuWidth) {
@@ -50,7 +38,7 @@ export class NotificationFilterLayer implements Layer {
this.menu = new MenuLayer("Notification filter", items, { this.menu = new MenuLayer("Notification filter", items, {
x: 8, y: 8, width: width - 16, x: 8, y: 8, width: width - 16,
opaque: true, showBorder: false, opaque: true, showBorder: false,
footer: "On = show notifications on glasses", footer: "On = show popups on glasses",
}).selectItem(Math.max(0, index)); }).selectItem(Math.max(0, index));
} else { } else {
this.menu.setItems(items, index >= 0 ? index : undefined); this.menu.setItems(items, index >= 0 ? index : undefined);
+8 -8
View File
@@ -8,7 +8,7 @@ import {
ALL_NOTIFICATIONS, ALL_NOTIFICATIONS,
dismissNotification, dismissNotification,
invokeNotificationAction, invokeNotificationAction,
readVisibleNotifications, readActiveNotifications,
readNotificationCustomView, readNotificationCustomView,
readNotificationIconByKey, readNotificationIconByKey,
readNotificationLargeIcon, readNotificationLargeIcon,
@@ -141,7 +141,7 @@ export class NotificationsListLayer implements Layer {
const image = new GrayImage(width, height, 0); const image = new GrayImage(width, height, 0);
const cardWidth = width - 2 * CARD_X; const cardWidth = width - 2 * CARD_X;
const cardTextWidth = cardWidth - CARD_TEXT_X - 14; const cardTextWidth = cardWidth - CARD_TEXT_X - 14;
const notifications = readVisibleNotifications(MAX_NOTIFICATIONS); const notifications = readActiveNotifications(MAX_NOTIFICATIONS);
const selectedIndex = this.resolveSelectedIndex(notifications); const selectedIndex = this.resolveSelectedIndex(notifications);
const layouts = notifications.map((notification, index) => const layouts = notifications.map((notification, index) =>
buildNotificationCardLayout(font, notification, index === selectedIndex, cardTextWidth), buildNotificationCardLayout(font, notification, index === selectedIndex, cardTextWidth),
@@ -185,7 +185,7 @@ export class NotificationsListLayer implements Layer {
} }
handleInput(event: InputEvent, ctx: LayerContext): void { handleInput(event: InputEvent, ctx: LayerContext): void {
const notifications = readVisibleNotifications(MAX_NOTIFICATIONS); const notifications = readActiveNotifications(MAX_NOTIFICATIONS);
const selectedIndex = this.resolveSelectedIndex(notifications); const selectedIndex = this.resolveSelectedIndex(notifications);
if (event.type === "double-click") { if (event.type === "double-click") {
// At the app's root this is intercepted by the yield wrapper; reached // At the app's root this is intercepted by the yield wrapper; reached
@@ -252,7 +252,7 @@ export class SingleNotificationLayer implements Layer {
const font = getDefaultSmallFont(); const font = getDefaultSmallFont();
const { width, height } = ctx.stack.getBaseSize(); const { width, height } = ctx.stack.getBaseSize();
const image = new GrayImage(width, height, 0); const image = new GrayImage(width, height, 0);
const notification = readVisibleNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey); const notification = readActiveNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey);
if (!notification) { if (!notification) {
return this.closeUnavailableNotification(ctx, paintBelow); return this.closeUnavailableNotification(ctx, paintBelow);
@@ -273,7 +273,7 @@ export class SingleNotificationLayer implements Layer {
else await menu.handleInput(event); else await menu.handleInput(event);
return; return;
} }
const notification = readVisibleNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey); const notification = readActiveNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey);
if (!notification) { if (!notification) {
this.closeUnavailableNotification(ctx); this.closeUnavailableNotification(ctx);
return; return;
@@ -297,7 +297,7 @@ export class SingleNotificationLayer implements Layer {
this.close(ctx); this.close(ctx);
} else if (item.kind === "action") { } else if (item.kind === "action") {
invokeNotificationAction(this.notificationKey, item.action.index); invokeNotificationAction(this.notificationKey, item.action.index);
if (!readVisibleNotifications(ALL_NOTIFICATIONS).some((active) => active.key === this.notificationKey)) { if (!readActiveNotifications(ALL_NOTIFICATIONS).some((active) => active.key === this.notificationKey)) {
this.closeUnavailableNotification(ctx); this.closeUnavailableNotification(ctx);
} }
} else if (item.kind === "dismiss") { } else if (item.kind === "dismiss") {
@@ -310,7 +310,7 @@ export class SingleNotificationLayer implements Layer {
menu: new Menu<ConfirmationItem>({ menu: new Menu<ConfirmationItem>({
items: [ items: [
{ label: "Cancel", run: (runCtx) => this.close(runCtx) }, { label: "Cancel", run: (runCtx) => this.close(runCtx) },
{ label: "Hide on glasses", run: (runCtx) => { { label: "Turn off popups", run: (runCtx) => {
setNotificationSourceEnabled(notification, false); setNotificationSourceEnabled(notification, false);
this.close(runCtx); this.close(runCtx);
} }, } },
@@ -341,7 +341,7 @@ export class SingleNotificationLayer implements Layer {
}; };
menu.paint(image, menuBox, ctx.stack.isFocused()); menu.paint(image, menuBox, ctx.stack.isFocused());
const top = menuBox.y + menuBox.height + CONFIRM_PROMPT_GAP; const top = menuBox.y + menuBox.height + CONFIRM_PROMPT_GAP;
const prompt = `Hide notifications on glasses from ${source.appName || source.packageName}? You can turn them back on in the Notifications app's Notification filter.`; const prompt = `Turn off notification popups from ${source.appName || source.packageName}? You can turn them back on in the Notifications app's Notification filter.`;
const lines = wrapText(font, prompt, width - 2 * CONFIRM_X); const lines = wrapText(font, prompt, width - 2 * CONFIRM_X);
const maxLines = Math.max(1, Math.floor((height - top - 12) / lineStep(font))); const maxLines = Math.max(1, Math.floor((height - top - 12) / lineStep(font)));
for (let index = 0; index < Math.min(lines.length, maxLines); index++) { for (let index = 0; index < Math.min(lines.length, maxLines); index++) {
+2 -1
View File
@@ -1,6 +1,7 @@
import { G2_LENS_HEIGHT, G2_LENS_WIDTH } from "../../graphics/image"; import { G2_LENS_HEIGHT, G2_LENS_WIDTH } from "../../graphics/image";
import { import {
appSwitcherPositionSetting, appSwitcherPositionSetting,
appFullscreenSetting,
type AppSwitcherPosition, type AppSwitcherPosition,
displayLayoutSetting, displayLayoutSetting,
type DisplayLayout, type DisplayLayout,
@@ -118,7 +119,7 @@ export function setAppImmersive(appId: string, immersive: boolean): boolean {
} }
export function isImmersive(appId?: string): boolean { export function isImmersive(appId?: string): boolean {
return appId !== undefined && immersiveApps.has(appId); return appId !== undefined && (immersiveApps.has(appId) || appFullscreenSetting(appId).get());
} }
/** Whether an app's windows span the panel's whole width: Full Screen, or immersive. */ /** Whether an app's windows span the panel's whole width: Full Screen, or immersive. */
+66 -13
View File
@@ -31,6 +31,9 @@ import type { AssistantContext } from "../../assistant/types";
import { SingleNotificationLayer } from "../notifications"; import { SingleNotificationLayer } from "../notifications";
import { import {
anthropicApiKeySetting, anthropicApiKeySetting,
appFullscreenSetting,
appKeepAwakeSetting,
toggleSettingMenuItem,
assistantHermesKeySetting, assistantHermesKeySetting,
assistantHermesUrlSetting, assistantHermesUrlSetting,
assistantBackendSetting, assistantBackendSetting,
@@ -94,7 +97,8 @@ import type { AppSwitcherPosition } from "../dashboard-settings";
* Input flow: every event enters via receiveInput. The shell consumes * Input flow: every event enters via receiveInput. The shell consumes
* everything while the sidebar or a shell overlay has focus and forwards the * everything while the sidebar or a shell overlay has focus and forwards the
* rest to the focused window. Long-press opens the shell-owned system menu * rest to the focused window. Long-press opens the shell-owned system menu
* (Focus app switcher, Voice input, Brightness, Close window, Debug) without reaching the * (Focus app switcher, Voice input, Brightness, Close current app, Close all apps,
* Debug) without reaching the
* app, so the shell keeps working when a window's handler hangs; a window * app, so the shell keeps working when a window's handler hangs; a window
* that claims long-press for a move of its own gets it forwarded instead, and * that claims long-press for a move of its own gets it forwarded instead, and
* holding the press past the escape threshold still opens the system menu. * holding the press past the escape threshold still opens the system menu.
@@ -109,7 +113,7 @@ export type ShellWindow = {
title: string; title: string;
/** Compositor surface this window renders to; configured at connect / launch. */ /** Compositor surface this window renders to; configured at connect / launch. */
surfaceId: string; surfaceId: string;
/** Whether the system menu offers Close window (the launcher is pinned). */ /** Whether the system menu can close this window (the launcher is pinned). */
closeable: boolean; closeable: boolean;
/** /**
* True when tap-then-hold currently opens the window's own context menu * True when tap-then-hold currently opens the window's own context menu
@@ -222,6 +226,10 @@ export type ShellConfig = {
* after the shell paint that found it. * after the shell paint that found it.
*/ */
onSwitcherBarHeightChanged?: () => void; onSwitcherBarHeightChanged?: () => void;
/** A per-app full-screen choice changed the viewport and compositor geometry. */
onWindowLayoutChanged?: () => void;
/** An app's keep-awake preference must not keep the lock screen awake. */
isLocked?: () => boolean;
/** /**
* The Notifications app's window, opened in the background (neither * The Notifications app's window, opened in the background (neither
* foregrounded nor focused) unless it is open already, for the switcher * foregrounded nor focused) unless it is open already, for the switcher
@@ -655,6 +663,12 @@ class Shell {
if (window) this.closeWindow(window.windowId); if (window) this.closeWindow(window.windowId);
} }
/** Snapshot ids: close callbacks may remove themselves or other windows. */
closeAllWindows(): void {
const ids = this.windows.filter(window => window.closeable).map(window => window.windowId);
for (const id of ids) this.closeWindow(id);
}
getWindows(): readonly ShellWindow[] { getWindows(): readonly ShellWindow[] {
return this.windows; return this.windows;
} }
@@ -866,7 +880,9 @@ class Shell {
// A foreground window that is playing video holds it off the same way. // A foreground window that is playing video holds it off the same way.
const foreground = this.foregroundWindow(); const foreground = this.foregroundWindow();
if (this.activeVoiceLayer || this.activeKeyboardLayer || this.assistantSession?.isTurnActive() || if (this.activeVoiceLayer || this.activeKeyboardLayer || this.assistantSession?.isTurnActive() ||
foreground?.isVoiceCapturing?.() || foreground?.keepsScreenOn?.()) { foreground?.isVoiceCapturing?.() || foreground?.keepsScreenOn?.() ||
(foreground?.closeable && !this.config.isLocked?.() &&
appKeepAwakeSetting(foreground.appId).get())) {
this.lastInputAtMs = nowMs; this.lastInputAtMs = nowMs;
return false; return false;
} }
@@ -1073,6 +1089,12 @@ class Shell {
if (this.activeVoiceLayer || !this.stack.isAtBase()) { if (this.activeVoiceLayer || !this.stack.isAtBase()) {
return { shell: true, window: false }; return { shell: true, window: false };
} }
// The switcher owns its menu even when the selected app uses a hold
// for a game move or voice capture.
if (this.focus === "sidebar") {
this.openEscapeMenu();
return { shell: true, window: false };
}
const window = this.foregroundWindow(); const window = this.foregroundWindow();
if (!window) { if (!window) {
return { shell: true, window: false }; return { shell: true, window: false };
@@ -1082,10 +1104,6 @@ class Shell {
return { shell: true, window: false }; return { shell: true, window: false };
} }
if (!window.holdToTalk) this.startEscapeMenuTimer(); if (!window.holdToTalk) this.startEscapeMenuTimer();
if (this.focus === "sidebar") {
this.focus = "window";
window.onFocus?.(this.lastInput);
}
// The window owns frameId from here (render or explicit finish). // The window owns frameId from here (render or explicit finish).
await window.handleInput(event, frameId); await window.handleInput(event, frameId);
return { shell: true, window: true }; return { shell: true, window: true };
@@ -1096,6 +1114,10 @@ class Shell {
// first), which answers with its own menu or asks for the system menu // first), which answers with its own menu or asks for the system menu
// when it has none. // when it has none.
if (event.type === "short-then-long-press") { if (event.type === "short-then-long-press") {
if (this.focus === "sidebar" && !this.activeVoiceLayer && this.stack.isAtBase()) {
this.openEscapeMenu();
return { shell: true, window: false };
}
const window = this.foregroundWindow(); const window = this.foregroundWindow();
if (window?.holdToTalk) { if (window?.holdToTalk) {
this.openEscapeMenu(); this.openEscapeMenu();
@@ -1913,7 +1935,7 @@ class Shell {
/** /**
* The system/escape menu: the entries every window shares (Focus app * The system/escape menu: the entries every window shares (Focus app
* switcher, Voice input, Brightness, Close window) plus Debug. Shell-owned and * switcher, Voice input, Brightness, Close current app, Close all apps) plus Debug. Shell-owned and
* shell-drawn (never the app's), so an unresponsive app can always be * shell-drawn (never the app's), so an unresponsive app can always be
* closed. It opens for long-press (over the app's own menu too), after an * closed. It opens for long-press (over the app's own menu too), after an
* extended hold in a window that claims long-press, and on a window's * extended hold in a window that claims long-press, and on a window's
@@ -1926,18 +1948,17 @@ class Shell {
const items: MenuItem[] = []; const items: MenuItem[] = [];
if (foreground.closeable) { if (foreground.closeable) {
items.push({ items.push({
label: "Close window", label: "Close current app",
onSelect: (ctx) => { onSelect: (ctx) => {
// Pop the menu first (its onRemoved returns focus to the sidebar), // Pop the menu first (its onRemoved returns focus to the sidebar),
// then close the window the menu was opened over. // then close the window the menu was opened over.
ctx.stack.pop(); ctx.stack.pop();
this.closeForegroundWindow(); this.closeWindow(foreground.windowId);
}, },
}); });
} }
// Close window sits first but the menu opens on Focus app switcher, so a // Prefer closing the current app; pinned windows fall back to the switcher.
// reflexive tap never closes the window. const initialSelection = 0;
const initialSelection = items.length;
items.push( items.push(
{ {
// Defocus the app (hand focus to the sidebar) without closing it: the // Defocus the app (hand focus to the sidebar) without closing it: the
@@ -1959,6 +1980,38 @@ class Shell {
}, },
}]), }]),
); );
items.push({
label: "Close all apps",
disabled: () => !this.windows.some(window => window.closeable),
onSelect: (ctx) => {
ctx.stack.pop();
this.closeAllWindows();
},
});
if (foreground.closeable) {
const fullscreen = appFullscreenSetting(foreground.appId);
items.push({
label: fullscreen.get() ? "Exit full screen" : "Enter full screen",
description: "Use the whole display for this app.",
onSelect: (ctx) => {
ctx.stack.pop();
if (!this.windows.some(window => window.windowId === foreground.windowId)) return;
fullscreen.set(!fullscreen.get());
this.noteUserActivity();
this.config.onWindowLayoutChanged?.();
this.focusWindow(foreground.windowId);
this.config.requestShellRender();
},
});
items.push(toggleSettingMenuItem(appKeepAwakeSetting(foreground.appId), {
onChange: (ctx) => {
ctx.stack.pop();
this.noteUserActivity();
this.focusWindow(foreground.windowId);
this.config.requestShellRender();
},
}));
}
if (brightnessSetting.get() !== "auto") { if (brightnessSetting.get() !== "auto") {
items.push({ items.push({
label: "Brightness", label: "Brightness",
+1 -1
View File
@@ -9,7 +9,7 @@ import type { WorkerAppReply } from "./shell/worker-window";
* The window context menu, opened by tap-then-hold: an app's own menu, * The window context menu, opened by tap-then-hold: an app's own menu,
* holding its app-specific actions. The shell's system menu (long-press) * holding its app-specific actions. The shell's system menu (long-press)
* carries the entries every window shares — Focus app switcher, Voice input, * carries the entries every window shares — Focus app switcher, Voice input,
* Close window — so an app with nothing of its own to offer has no menu of * Close current app, Close all apps — so an app with nothing of its own to offer has no menu of
* its own: tap-then-hold then opens the system menu in its place, so both * its own: tap-then-hold then opens the system menu in its place, so both
* gestures land on the same menu. The system menu is also the safety net: * gestures land on the same menu. The system menu is also the safety net:
* shell-owned, so an unresponsive app can always be closed (a window that * shell-owned, so an unresponsive app can always be closed (a window that
+36
View File
@@ -0,0 +1,36 @@
# Per-app full screen and keep awake
Long-press opens the system menu. Closeable apps offer Enter full screen / Exit
full screen. The choice persists per app through the existing settings store,
independently of global display layout and app-controlled immersive mode.
Full screen fills the 640x480 panel, hides chrome while the app has focus, and
resizes existing in-process and worker windows without restarting the app.
The switcher remains accessible through the system menu.
Stock EvenHub apps retain their logical 576x288 canvas in every host display
mode, including full screen. Content is centered at native pixel scale and
clipped to that canvas; extra space does not change wrapping or layout.
Only an app's explicit Faceclaw extended-layout request enables a taller canvas.
Regression tests compare the complete stock raster against its centered
full-screen placement, including text crossing the logical canvas boundary.
Keep screen awake is a separate On/Off switch immediately after the full-screen
action in the system menu. It defaults off and persists per app independently
of full screen. Existing full-screen preferences remain unchanged and do not
implicitly enable keep awake.
Automatic idle sleep is suspended only while an app with Keep screen awake
enabled is in the foreground, in any display mode. A background app does not
hold the display awake. Full screen alone does not suppress idle sleep.
The lock screen and explicit sleep still work. The inactivity countdown starts
fresh after disabling keep awake or leaving a kept-awake app. Existing automatic
holds for voice capture, assistant turns and video playback remain in effect.
Software regressions cover geometry with every switcher position, preserving
other display settings and persistence after reload, captured menu targets,
exit, independent keep-awake persistence, foreground/background idle behavior,
lock timeout and manual sleep.
On glasses, verify entry/exit from both in-process apps and worker apps,
reflow, state retention, idle timeout, app switching, lock/off-head behavior,
and reconnection. These hardware checks remain pending. No firmware change.
+34
View File
@@ -0,0 +1,34 @@
# App switcher close menu
Feature branch: `feat/app-controls`, based on `main` so it can be
reviewed independently. The combined build lives on `build/all-features`.
With the app switcher focused, long-press or tap-then-hold opens the existing
shell-owned System menu. “Close current app” closes the selected window when it
is closeable. It is absent for the pinned launcher (the large application grid).
“Close all apps” closes every closeable window, including background windows and
multiple windows belonging to one app. Pinned windows remain available.
Both actions reuse the shell's normal close/cleanup path. The menu closes before
the windows do, and focus returns to the switcher. It selects “Close current app” by default when available, otherwise “Focus app switcher”. With no closeable windows, “Close all apps” is disabled.
No new preferences or persistence format are introduced.
Software: `tests/app-switcher-menu.test.cjs` covers both gestures, apps claiming
holds/hold-to-talk, launcher exclusion, captured close targets, cancellation,
default selection, multiple windows, reentrant removal, callback errors and
screen-off behavior. Existing in-app gesture routing remains unchanged.
Manual validation on glasses remains pending:
1. Open several apps, focus the app switcher, and open the menu with both gestures.
2. Close the selected app; verify its surface disappears and other apps remain.
3. Select the large application grid; verify “Close current app” is absent.
4. Use “Close all apps”; verify the launcher remains usable and apps can reopen.
5. Repeat for left/right/bottom/popup switcher positions and with a running game,
a hold-to-talk app and an app exposing multiple windows.
6. Check cancel/back closes nothing; confirming the initial selection closes the current app when available. Check both
menu gestures still work normally when focus is inside an app.
Closing windows retains each app's existing lifecycle semantics; it does not
uninstall apps or reset their preferences. Existing app-specific shutdown behavior
(such as a remote terminal connection) is the same as closing its window normally.
@@ -1,20 +0,0 @@
# Dismiss all notifications
The Notifications app menu offers Dismiss all notifications, disabled when the
list is empty. This explicit action dismisses notifications on the phone too;
popup filtering and source/default preferences remain independent.
Android uses NotificationListenerService.cancelAllNotifications, so dismissal
is not limited to the 50 items displayed by the list and Android controls which
notifications are removable. The normal removal callbacks update the list and
popups. Missing listener access returns false without changing preferences.
iOS uses the existing ANCS dismissal operation on a snapshot of all known keys;
notifications without a negative action may remain.
Software tests cover menu action/disabled state, more than 50 notifications,
native bridge dispatch, disconnected access and ANCS bulk dismissal.
On a device, verify the permission-granted/revoked cases, protected or ongoing
notifications, notification groups, and consistency with the phone's tray.
Hardware validation remains pending.
Reference: https://developer.android.com/reference/android/service/notification/NotificationListenerService#cancelAllNotifications()
-35
View File
@@ -1,35 +0,0 @@
# Notification filter validation
Software: `npm test` and `bash lint.sh app/native/notification-sources.ts app/ui/notification-filter.ts`.
The notification suite covers legacy preferences, reloads of the settings store,
discovery, default changes without overwriting exceptions, both bulk actions,
empty lists, stable menu selection and popup suppression before wake.
Hardware validation (pending; no glasses tested):
1. On an existing installation, check that enabled and muted applications retain
their behavior before touching the new default.
2. Turn “New apps enabled by default” off; restart the app. Send a notification
from a previously unknown package: it must appear in the filter and on the
phone, without waking the glasses or showing a glasses popup.
3. Enable that package individually; send another notification and check its popup.
4. Change the default in both directions; verify individual exceptions survive.
5. Use “Disable all”, then discover another package: it follows the default.
Repeat with “Enable all” while the default is off.
6. Restart and repeat notifications from enabled and disabled sources. Check that
bulk actions and filtering never dismiss notifications on the phone.
The same source preferences now filter glasses popups, the Notifications list,
and the notification tray/status icons. Filtering happens before display limits;
source discovery and the phone notification lifecycle remain unfiltered.
Cached tray icons reapply the current preferences on each read, including stale
reads, so a changed toggle cannot leave a muted icon visible.
Additional software coverage: Android list limits and warm/stale icon caches,
Disable all / re-enable without a new post, and iOS list/tray filtering.
Additional hardware validation (pending): with mixed enabled/disabled sources,
check the list and status bar together. Toggle a source while its notification
is already active, then Disable all and Enable all. Verify immediate removal /
restoration without a new notification, including after restart, and verify
notifications remain available in the phone notification shade.
+4
View File
@@ -267,6 +267,9 @@ function shellEnv({ wakeAction = 'voice-input', skipConfirmation = false } = {})
} }
const voiceDialogs = []; const voiceDialogs = [];
const settings = { wakeWordActionSetting: { get: () => wakeAction }, brightnessSetting: { get: () => 'auto' }, const settings = { wakeWordActionSetting: { get: () => wakeAction }, brightnessSetting: { get: () => 'auto' },
appFullscreenSetting: () => ({ get: () => false }),
appKeepAwakeSetting: () => ({ label: 'Keep screen awake', get: () => false }),
toggleSettingMenuItem: setting => ({ label: setting.label }),
assistantSkipConfirmationSetting: { get: () => skipConfirmation } }; assistantSkipConfirmationSetting: { get: () => skipConfirmation } };
const { shell, rawInputEventToInputEvent } = load('app/ui/shell/shell.ts', { const { shell, rawInputEventToInputEvent } = load('app/ui/shell/shell.ts', {
'../../graphics/shell-scene': { encodeShellScene: () => new Uint8Array([0, 0]) }, '../../graphics/shell-scene': { encodeShellScene: () => new Uint8Array([0, 0]) },
@@ -370,6 +373,7 @@ test('ordinary apps retain long-press system menu and games retain the escape ti
assert.deepEqual(env.input, []); assert.deepEqual(env.input, []);
env.shell.stack.clearToBase(); env.shell.stack.clearToBase();
env.app.window.claimsLongPress = () => true; env.app.window.claimsLongPress = () => true;
env.shell.focusWindow('ai-chat');
await env.shell.receiveInput(env.event('long-press')); await env.shell.receiveInput(env.event('long-press'));
assert.notEqual(env.shell.escapeMenuTimer, null); assert.notEqual(env.shell.escapeMenuTimer, null);
await env.shell.receiveInput(env.event('long-press-release')); await env.shell.receiveInput(env.event('long-press-release'));
+21
View File
@@ -15,6 +15,8 @@ function geometry() {
appSwitcherPositionSetting: 'left', uiDepthSetting: '0', statusBarPositionSetting: 'top', appSwitcherPositionSetting: 'left', uiDepthSetting: '0', statusBarPositionSetting: 'top',
statusBarVisibilitySetting: 'always', windowBorderSetting: true, statusBarVisibilitySetting: 'always', windowBorderSetting: true,
}).map(([name, value]) => [name, { value, get() { return this.value; } }])); }).map(([name, value]) => [name, { value, get() { return this.value; } }]));
const fullscreen = new Map();
settings.appFullscreenSetting = id => ({ get: () => fullscreen.get(id) ?? false, set: value => fullscreen.set(id, value) });
const context = { exports: {}, require: (name) => { const context = { exports: {}, require: (name) => {
if (name === '../../graphics/image') return { G2_LENS_WIDTH: 640, G2_LENS_HEIGHT: 480 }; if (name === '../../graphics/image') return { G2_LENS_WIDTH: 640, G2_LENS_HEIGHT: 480 };
assert.equal(name, '../dashboard-settings'); assert.equal(name, '../dashboard-settings');
@@ -27,6 +29,25 @@ function geometry() {
const LAYOUTS = ['band-top', 'band-high', 'band-middle', 'band-low', 'band-bottom', 'tall', 'fullscreen']; const LAYOUTS = ['band-top', 'band-high', 'band-middle', 'band-low', 'band-bottom', 'tall', 'fullscreen'];
test('user full screen spans the panel with any switcher and survives app immersive cleanup', () => {
const g = geometry();
const previous = g.rect('min', 'test');
for (const position of ['left', 'right', 'bottom', 'popup']) {
g.settings.appSwitcherPositionSetting.value = position;
g.settings.appFullscreenSetting('test').set(true);
assert.deepEqual(g.rect('min', 'test'), { x: 0, y: 0, width: 640, height: 480 });
assert.equal(g.sidebarStripVisible('window', 'test'), false);
assert.equal(g.sidebarStripVisible('sidebar', 'test'), true);
g.setAppImmersive('test', true);
g.setAppImmersive('test', false);
assert.equal(g.isImmersive('test'), true);
assert.equal(g.isImmersive('other'), false);
}
g.settings.appSwitcherPositionSetting.value = 'left';
g.settings.appFullscreenSetting('test').set(false);
assert.deepEqual(g.rect('min', 'test'), previous);
});
test('defaults preserve normal windows, EvenHub height and tall terminal sessions', () => { test('defaults preserve normal windows, EvenHub height and tall terminal sessions', () => {
const g = geometry(); const g = geometry();
assert.deepEqual(g.rect('min', 'navigate'), { x: 64, y: 124, width: 576, height: 260 }); assert.deepEqual(g.rect('min', 'navigate'), { x: 64, y: 124, width: 576, height: 260 });
+227
View File
@@ -0,0 +1,227 @@
const test = require('node:test');
const assert = require('node:assert/strict');
const fs = require('node:fs');
const path = require('node:path');
const vm = require('node:vm');
const ts = require('typescript');
function fixture(options = {}) {
const source = ts.createSourceFile('shell.ts', fs.readFileSync(path.join(__dirname, '../app/ui/shell/shell.ts'), 'utf8'), ts.ScriptTarget.Latest, true);
const shellClass = source.statements.find(node => ts.isClassDeclaration(node) && node.name.text === 'Shell');
const names = new Set(['routeInput', 'openEscapeMenu', 'closeAllWindows', 'closeWindow', 'removeWindow',
'foregroundWindow', 'noteWindowVisible', 'mostRecentWindowIndex', 'yieldFocusToSidebar', 'applyScreenTimeout']);
const methods = shellClass.members.filter(node => names.has(node.name?.getText(source)));
assert.equal(methods.length, names.size);
const overlay = source.statements.find(node => ts.isClassDeclaration(node) && node.name.text === 'ShellOverlayMenuLayer');
class MenuLayer {
constructor(title, items) { this.title = title; this.items = items; }
selectItem(index) { this.selectedIndex = index; }
}
const fullscreen = new Map();
const keepAwake = new Map();
const context = {
exports: {}, MenuLayer, console: { warn: () => {} },
appViewportRect: () => ({ x: 0, y: 0, width: 576 }), CONTEXT_MENU_DIM: 0.5,
brightnessSetting: { get: () => 'auto' }, gestureHints: () => 'App menu',
GESTURE_SHORT_THEN_LONG_PRESS: 'tap-hold', makeInputEvent: event => event,
isWatchInput: event => event.source === 'watch', isDirectionalInput: () => false,
appFullscreenSetting: id => ({ get: () => fullscreen.get(id) ?? false, set: value => fullscreen.set(id, value) }),
appKeepAwakeSetting: id => ({ label: 'Keep screen awake', get: () => keepAwake.get(id) ?? false, set: value => keepAwake.set(id, value) }),
toggleSettingMenuItem: (setting, options) => ({ label: setting.label, onSelect(ctx) {
setting.set(!setting.get()); options.onChange(ctx);
} }),
};
vm.runInNewContext(ts.transpileModule(`${overlay.getText(source)}\nexport class Shell { ${methods.map(node => node.getText(source)).join('\n')} }`, {
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
}).outputText, context);
const s = new context.exports.Shell();
const closed = [], delivered = [], warnings = [], renders = [];
context.console.warn = message => warnings.push(message);
const window = (id, closeable = true, extra = {}) => ({
appId: id, windowId: id, closeable,
handleInput: async event => delivered.push([id, event.type]),
requestRender: () => renders.push(id),
close: () => closed.push(id),
...extra,
});
const launcher = window('launcher', false);
const app = window('current', true, options.app);
const background = window('background');
const layers = [];
s.stack = {
isAtBase: () => !layers.length,
push: layer => layers.push(layer),
pop: () => layers.pop()?.onRemoved?.(),
popIfTop: predicate => { if (!layers.length || !predicate(layers.at(-1))) return false; s.stack.pop(); return true; },
handleInput: async event => { if (event.type === 'double-click') s.stack.pop(); },
};
Object.assign(s, {
windows: [launcher, app, background], selectedIndex: 1, focus: 'sidebar', screenOn: true,
mruWindowIds: ['current', 'background', 'launcher'], attention: new Map(),
config: { voiceInputEnabled: false, requestShellRender() {}, onWindowsChanged() {} },
cancelEscapeMenuTimer() {}, startEscapeMenuTimer() { s.escapeStarted = true; },
lastInput: null,
lastInputAtMs: 0,
noteUserActivity() { this.lastInputAtMs = 100; },
focusWindow(id) { this.selectedIndex = this.windows.findIndex(w => w.windowId === id); this.focus = 'window'; },
sleep() { this.screenOn = false; },
});
const input = type => s.routeInput({ type, source: 'ring', timestampMs: 100 }, 1);
const menu = () => layers.at(-1);
const choose = label => {
const item = menu().items.find(item => item.label === label);
assert.ok(item, label);
item.onSelect({ stack: s.stack });
};
return { s, input, menu, choose, closed, delivered, warnings, renders, launcher, app, background, window, fullscreen, keepAwake };
}
test('full screen targets the captured app without inhibiting idle sleep', async () => {
const h = fixture();
h.s.config.getScreenTimeoutMs = () => 1000;
let relayouts = 0;
h.s.config.onWindowLayoutChanged = () => relayouts++;
await h.input('long-press');
h.s.selectedIndex = 2;
h.choose('Enter full screen');
assert.equal(h.fullscreen.get('current'), true);
assert.equal(h.s.foregroundWindow().windowId, 'current');
assert.equal(h.s.focus, 'window');
assert.equal(relayouts, 1);
assert.equal(h.s.applyScreenTimeout(5000), true);
h.s.screenOn = true;
h.s.focusWindow('current');
await h.input('long-press');
h.choose('Exit full screen');
assert.equal(h.fullscreen.get('current'), false);
assert.equal(relayouts, 2);
assert.equal(h.s.applyScreenTimeout(7000), true);
});
test('keep awake is independent of full screen and applies only to the visible app', async () => {
const h = fixture();
h.s.config.getScreenTimeoutMs = () => 1000;
await h.input('long-press');
const labels = h.menu().items.map(item => item.label);
assert.equal(labels.indexOf('Keep screen awake'), labels.indexOf('Enter full screen') + 1);
h.s.selectedIndex = 2;
h.choose('Keep screen awake');
assert.equal(h.keepAwake.get('current'), true);
assert.equal(h.fullscreen.get('current'), undefined);
assert.equal(h.s.foregroundWindow().windowId, 'current');
assert.equal(h.s.applyScreenTimeout(5000), false);
h.s.focusWindow('background');
assert.equal(h.s.applyScreenTimeout(5500), false);
assert.equal(h.s.applyScreenTimeout(6000), true);
h.s.screenOn = true;
h.s.focusWindow('current');
await h.input('long-press'); h.choose('Enter full screen');
assert.equal(h.s.applyScreenTimeout(7000), false);
await h.input('long-press'); h.choose('Exit full screen');
assert.equal(h.keepAwake.get('current'), true);
assert.equal(h.s.applyScreenTimeout(8000), false);
await h.input('long-press'); h.choose('Keep screen awake');
assert.equal(h.keepAwake.get('current'), false);
assert.equal(h.s.applyScreenTimeout(9000), true);
});
test('keep awake does not suppress lock timeout or manual sleep, and options are absent for the launcher', async () => {
const h = fixture();
h.fullscreen.set('current', true);
h.keepAwake.set('current', true);
h.s.config.getScreenTimeoutMs = () => 1000;
h.s.config.isLocked = () => true;
assert.equal(h.s.applyScreenTimeout(5000), true);
h.s.screenOn = true;
h.s.config.isLocked = () => false;
h.s.sleep();
assert.equal(h.s.screenOn, false);
h.s.screenOn = true;
h.s.selectedIndex = 0;
await h.input('long-press');
assert.ok(!h.menu().items.some(item => /full screen/.test(item.label)));
assert.ok(!h.menu().items.some(item => item.label === 'Keep screen awake'));
});
test('switcher opens its menu on hold or tap-hold even for an app claiming holds or hold-to-talk', async () => {
for (const type of ['long-press', 'short-then-long-press']) {
for (const app of [{}, { claimsLongPress: () => true }, { holdToTalk: true }]) {
const h = fixture({ app });
await h.input(type);
assert.ok(h.menu());
assert.ok(h.menu().items.some(item => item.label === 'Close current app'));
assert.ok(h.menu().items.some(item => item.label === 'Close all apps'));
assert.equal(h.menu().items[h.menu().selectedIndex].label, 'Close current app');
assert.deepEqual(h.delivered, [['current', 'system-menu-opened']]);
assert.equal(h.s.escapeStarted, undefined);
assert.equal(h.s.focus, 'sidebar');
}
}
});
test('close current app closes the captured window and preserves the launcher and background windows', async () => {
const h = fixture();
await h.input('long-press');
h.s.selectedIndex = 2; // An asynchronous focus change must not redirect the close action.
h.menu().items[h.menu().selectedIndex].onSelect({ stack: h.s.stack });
assert.deepEqual(h.closed, ['current']);
assert.deepEqual(h.s.windows.map(w => w.windowId), ['launcher', 'background']);
assert.equal(h.s.focus, 'sidebar');
assert.equal(h.menu(), undefined);
});
test('launcher offers close all but never close current; close all leaves only the launcher', async () => {
const h = fixture();
h.s.selectedIndex = 0;
await h.input('short-then-long-press');
assert.ok(!h.menu().items.some(item => item.label === 'Close current app'));
assert.equal(h.menu().items[h.menu().selectedIndex].label, 'Focus app switcher');
h.choose('Close all apps');
assert.deepEqual(h.closed, ['current', 'background']);
assert.deepEqual(h.s.windows.map(w => w.windowId), ['launcher']);
assert.equal(h.s.selectedIndex, 0);
assert.equal(h.s.focus, 'sidebar');
await h.input('long-press');
assert.equal(h.menu().items.find(item => item.label === 'Close all apps').disabled(), true);
});
test('close all uses normal cleanup despite reentrant removal, multiple windows per app and throwing callbacks', () => {
const h = fixture();
h.s.windows.push(h.window('another', true, { appId: 'current' }), h.window('pinned', false));
h.app.close = () => { h.closed.push('current'); h.s.removeWindow('current'); };
h.background.close = () => { h.closed.push('background'); throw new Error('failed cleanup'); };
h.s.closeAllWindows();
assert.deepEqual(h.closed, ['current', 'background', 'another']);
assert.deepEqual(h.s.windows.map(w => w.windowId), ['launcher', 'pinned']);
assert.equal(h.warnings.length, 1);
assert.equal(h.s.foregroundWindow().windowId, 'launcher');
});
test('focusing switcher and cancelling do not close apps; an open overlay never receives a second menu', async () => {
const h = fixture();
await h.input('long-press');
h.choose('Focus app switcher');
assert.deepEqual(h.closed, []);
await h.input('long-press');
const menu = h.menu();
await h.input('long-press');
assert.equal(h.menu(), menu);
await h.input('double-click');
assert.equal(h.menu(), undefined);
assert.deepEqual(h.closed, []);
});
test('in-app hold actions and app menus keep their existing routing; asleep switcher stays asleep', async () => {
for (const [app, type] of [[{ claimsLongPress: () => true }, 'long-press'], [{ holdToTalk: true }, 'long-press'], [{}, 'short-then-long-press']]) {
const h = fixture({ app });
h.s.focus = 'window';
await h.input(type);
assert.deepEqual(h.delivered, [['current', type]]);
assert.equal(h.menu(), undefined);
}
const h = fixture();
h.s.screenOn = false;
await h.input('long-press');
assert.equal(h.menu(), undefined);
assert.deepEqual(h.closed, []);
});
+8 -2
View File
@@ -39,6 +39,9 @@ const menu = load('app/ui/menu.ts', {
function fixture(initial = '50', viewport = { x: 64, y: 124, width: 576, height: 260 }) { function fixture(initial = '50', viewport = { x: 64, y: 124, width: 576, height: 260 }) {
let value = initial, writes = 0, closed = 0; let value = initial, writes = 0, closed = 0;
const settings = { const settings = {
appFullscreenSetting: () => ({ get: () => false }),
appKeepAwakeSetting: () => ({ label: 'Keep screen awake', get: () => false }),
toggleSettingMenuItem: setting => ({ label: setting.label }),
brightnessSetting: { get: () => value, set: (next) => { value = next; writes++; } }, brightnessSetting: { get: () => value, set: (next) => { value = next; writes++; } },
brightnessSettingToLevel: (value) => value === 'auto' ? null : Number(value), brightnessSettingToLevel: (value) => value === 'auto' ? null : Number(value),
}; };
@@ -120,13 +123,16 @@ test('system menu hides brightness in Auto and opens its picker between Voice in
shell.openSystemMenu('test'); shell.openSystemMenu('test');
let opened = shell.stack.layers.at(-1); let opened = shell.stack.layers.at(-1);
assert.deepEqual(Array.from(opened.items, (item) => item.label), assert.deepEqual(Array.from(opened.items, (item) => item.label),
['Close window', 'Focus app switcher', 'Voice input', 'Debug']); ['Close current app', 'Focus app switcher', 'Voice input', 'Close all apps', 'Enter full screen', 'Keep screen awake', 'Debug']);
shell.stack.clearToBase(); shell.stack.clearToBase();
f.settings.brightnessSetting.set('40'); f.settings.brightnessSetting.set('40');
shell.openSystemMenu('test'); shell.openSystemMenu('test');
opened = shell.stack.layers.at(-1); opened = shell.stack.layers.at(-1);
assert.deepEqual(Array.from(opened.items, (item) => item.label), assert.deepEqual(Array.from(opened.items, (item) => item.label),
['Close window', 'Focus app switcher', 'Voice input', 'Brightness', 'Debug']); ['Close current app', 'Focus app switcher', 'Voice input', 'Close all apps', 'Enter full screen', 'Keep screen awake', 'Brightness', 'Debug']);
await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' }));
await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' }));
await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' }));
await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' })); await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' }));
await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' })); await shell.stack.handleInput(gestures.makeInputEvent({ type: 'scroll-down' }));
await shell.stack.handleInput(gestures.makeInputEvent({ type: 'click', source: 'ring' })); await shell.stack.handleInput(gestures.makeInputEvent({ type: 'click', source: 'ring' }));
-69
View File
@@ -1,69 +0,0 @@
const test = require('node:test');
const assert = require('node:assert/strict');
const { loader } = require('./helpers/load-typescript.cjs');
test('Notifications menu dismisses all, including beyond the visible list, and leaves filters untouched', () => {
let options, active = Array.from({ length: 80 }, (_, i) => ({ key: String(i) }));
let dismissals = 0, renders = 0, pops = 0;
const load = loader({}, {
'../../ui/notifications': { NotificationsListLayer: class {} },
'../../ui/notification-filter': { NotificationFilterLayer: class {} },
'../../native/notification-icons': {
ALL_NOTIFICATIONS: 0x7fffffff,
readActiveNotifications(max) { assert.equal(max, 0x7fffffff); return active; },
dismissAllNotifications() { dismissals++; active = []; return true; },
onAndroidNotificationsChanged: () => () => {},
},
'../../ui/shell/in-process-window': {
YieldAtRootLayer: class {},
createInProcessWindow(value) { options = value; return { requestRender() { renders++; } }; },
},
});
load('app/apps/notifications/notifications-app.ts').createNotificationsAppWindow({});
const items = options.menuItems();
assert.equal(items[0].label, 'Notification filter');
const action = items.find(x => x.label === 'Dismiss all notifications');
assert.equal(action.disabled(), false);
assert.equal(dismissals, 0);
action.onSelect({ stack: { pop() { pops++; } } });
assert.equal(dismissals, 1);
assert.equal(pops, 1);
assert.equal(renders, 1);
assert.equal(action.disabled(), true);
});
test('Android bulk action uses the native listener and propagates unavailable access', () => {
let calls = 0, allowed = false;
const load = loader({ global: { isAndroid: true }, com: { faceclaw: { app: {
FaceclawMediaNotificationListenerService: { dismissAllNotifications() { calls++; return allowed; } },
} } } }, {
'../graphics/image': {}, './frame-timings': {}, '../util/array-util': {},
'./notification-sources': {}, './image-files': { PHOTO_TONE: { gamma: 1 } }, './notification-types': { NOTIFICATION_ICON_SIZE: 24 },
});
const api = load('app/native/notification-icons.ts');
assert.equal(api.dismissAllNotifications(), false);
allowed = true;
assert.equal(api.dismissAllNotifications(), true);
assert.equal(calls, 2);
});
test('iOS snapshots all ANCS keys and continues when a notification cannot be dismissed', () => {
const load = loader({}, {
'../graphics/pebble-icons': {}, '../g2/ancs-client': {}, './notification-app-icons': {}, './notification-sources': {},
});
const api = load('app/native/notification-icons.ios.ts');
assert.equal(api.dismissAllNotifications(), false);
const active = Array.from({ length: 80 }, (_, i) => ({ key: String(i) })), attempted = [];
api.bindIosNotifications({
read(max) { assert.equal(max, api.ALL_NOTIFICATIONS); return active; },
dismiss(key) {
attempted.push(key);
if (key === '1') return false;
active.splice(active.findIndex(x => x.key === key), 1);
return true;
},
});
assert.equal(api.dismissAllNotifications(), false);
assert.equal(attempted.length, 80);
assert.deepEqual(active, [{ key: '1' }]);
});
+29
View File
@@ -64,3 +64,32 @@ test('Full Screen is offered only with a bottom or popup app switcher', () => {
assert.deepEqual(Array.from(api.DISPLAY_LAYOUT_VALUES, (value) => api.displayLayoutLabel(value)), assert.deepEqual(Array.from(api.DISPLAY_LAYOUT_VALUES, (value) => api.displayLayoutLabel(value)),
['Band · Top', 'Band · High', 'Band · Middle', 'Band · Low', 'Band · Bottom', 'Tall', 'Full Screen']); ['Band · Top', 'Band · High', 'Band · Middle', 'Band · Low', 'Band · Bottom', 'Tall', 'Full Screen']);
}); });
test('per-app full screen defaults off, persists across restart and preserves display preferences', () => {
const store = new Map([['display.layout', 'band-low'], ['terminal.displayLayout', 'tall']]);
const prefs = settingsFixture(store);
assert.equal(prefs.appFullscreenSetting('terminal').get(), false);
prefs.appFullscreenSetting('terminal').set(true);
const restarted = settingsFixture(store);
assert.equal(restarted.appFullscreenSetting('terminal').get(), true);
assert.equal(restarted.appFullscreenSetting('other').get(), false);
restarted.appFullscreenSetting('terminal').set(false);
assert.equal(restarted.displayLayoutSetting.get(), 'band-low');
assert.equal(store.get('terminal.displayLayout'), 'tall');
});
test('keep awake persists per app independently of full screen, including existing full-screen choices', () => {
const store = new Map([['display.fullscreen.terminal', true]]);
let prefs = settingsFixture(store);
assert.equal(prefs.appFullscreenSetting('terminal').get(), true);
assert.equal(prefs.appKeepAwakeSetting('terminal').get(), false);
prefs.appKeepAwakeSetting('terminal').set(true);
prefs = settingsFixture(store);
assert.equal(prefs.appKeepAwakeSetting('terminal').get(), true);
assert.equal(prefs.appKeepAwakeSetting('other').get(), false);
prefs.appFullscreenSetting('terminal').set(false);
assert.equal(prefs.appKeepAwakeSetting('terminal').get(), true);
prefs.appKeepAwakeSetting('terminal').set(false);
prefs = settingsFixture(store);
assert.equal(prefs.appKeepAwakeSetting('terminal').get(), false);
});
+81
View File
@@ -0,0 +1,81 @@
const test = require('node:test');
const assert = require('node:assert/strict');
const { loader } = require('./helpers/load-typescript.cjs');
const { GrayImage } = require('../.test-build/app/graphics/image.js');
function fixture() {
let options, hooks;
const paints = [], heights = [];
const session = {
manifest: { name: 'Test', packageId: 'test.app' },
renderWindowIcon() {}, contextMenuItems: () => [], keepsScreenOn: () => false,
attachWindow(value) { hooks = value; },
paint(size, focused) {
paints.push({ ...size, focused });
const image = new GrayImage(size.width, size.height);
image.setPixel(0, 0, 255);
image.setPixel(size.width - 1, size.height - 1, 120);
// Deliberately overflow a deferred text run: stock clips it at 576x288.
image.drawFwText({ bakeFwTextRun(target, run, dx, dy) {
target.fillRect(run.x + dx, run.y + dy, 20, 20, run.value);
} }, 570, 280, 200, [{}]);
return image;
},
};
const load = loader({}, {
'../../graphics/image': { GrayImage },
'./compositor': { EVENHUB_SCREEN_WIDTH: 576, EVENHUB_SCREEN_HEIGHT: 288 },
'../../ui/gestures': {}, '../../ui/shell/shell': { shell: {} }, './session': {},
'../../ui/shell/chrome-layer': { windowIcon: () => () => null, makeImageWindowIcon: () => () => null },
'./installed-apps': {},
'../../ui/shell/in-process-window': { createInProcessWindow(value) {
options = value;
return { window: {}, stack: {}, requestRender() {}, setHeightMode(mode) { heights.push(mode); } };
} },
});
load('app/apps/evenhub/evenhub-window.ts').createEvenHubWindow('test', 'test', session, {}, () => {}, () => {});
return { paints, heights, hooks: () => hooks,
paint(width, height, focused = true) {
return options.baseLayer.paint({ stack: { getBaseSize: () => ({ width, height }), isFocused: () => focused } });
},
};
}
test('stock EvenHub canvas remains 576x288 through full-screen entry, resize and exit', () => {
const f = fixture();
for (const [width, height] of [[576, 288], [640, 480], [576, 452], [640, 480], [576, 288]]) {
const image = f.paint(width, height);
assert.deepEqual(f.paints.at(-1), { width: 576, height: 288, focused: true });
assert.equal(image.width, width);
assert.equal(image.height, height);
}
});
test('full screen centers stock pixels at native scale and clips overflowing text to the stock canvas', () => {
const f = fixture();
const stock = f.paint(576, 288).withDrawsBaked();
const full = f.paint(640, 480).withDrawsBaked();
for (let y = 0; y < 480; y++) {
for (let x = 0; x < 640; x++) {
const expected = x >= 32 && x < 608 && y >= 96 && y < 384 ? stock.getPixel(x - 32, y - 96) : 0;
assert.equal(full.getPixel(x, y), expected);
}
}
});
test('only an explicit extended-layout request opts into the taller canvas', () => {
const f = fixture();
f.paint(640, 480, false);
assert.deepEqual(f.paints.at(-1), { width: 576, height: 288, focused: false });
f.hooks().setTallCanvas(true);
assert.deepEqual(f.heights, ['max']);
f.paint(576, 452);
assert.equal(f.paints.at(-1).height, 452);
f.paint(640, 480);
assert.equal(f.paints.at(-1).width, 576);
assert.equal(f.paints.at(-1).height, 480);
f.hooks().setTallCanvas(false);
f.paint(640, 480);
assert.deepEqual(f.heights, ['max', 'medium']);
assert.equal(f.paints.at(-1).height, 288);
});
+1 -9
View File
@@ -9,7 +9,7 @@ const generator = require('../scripts/generate-pebble-icons.cjs');
function setup(notifications) { function setup(notifications) {
const load = loader({}, { const load = loader({}, {
'../g2/ancs-client': { AncsClient: class {}, ANCS_CONNECT_MESSAGE: '' }, '../g2/ancs-client': { AncsClient: class {}, ANCS_CONNECT_MESSAGE: '' },
'./notification-sources': { rememberNotificationSources() {}, shouldShowNotificationOnGlasses: packageName => packageName !== "muted" }, './notification-sources': { rememberNotificationSources() {} },
}); });
const icons = load('app/native/notification-icons.ios.ts'); const icons = load('app/native/notification-icons.ios.ts');
icons.bindIosNotifications({ read: () => notifications }); icons.bindIosNotifications({ read: () => notifications });
@@ -106,11 +106,3 @@ test('the icon generator inverts Pebble art: black ink lights up, white fills hi
const decoded = loader({}, { './pebble-icons-data': loader({}, {})(dataFile) })('app/graphics/pebble-icons.ts').pebbleIcon('probe'); const decoded = loader({}, { './pebble-icons-data': loader({}, {})(dataFile) })('app/graphics/pebble-icons.ts').pebbleIcon('probe');
assert.deepEqual([...decoded.pixels], [...pixels]); assert.deepEqual([...decoded.pixels], [...pixels]);
}); });
test('muted sources are hidden before list and icon limits without removing phone notifications', () => {
const notifications = [notification('hidden', 'muted', '0'), notification('shown', 'allowed', '0')];
const { icons } = setup(notifications);
assert.deepEqual([...icons.readVisibleNotifications(1)].map(n => n.key), ['shown']);
assert.deepEqual([...icons.readActiveNotificationIcons(1, false).keys], ['shown']);
assert.equal(icons.readActiveNotifications(10).length, 2);
});
-94
View File
@@ -70,7 +70,6 @@ function ui(fontSize = 12) {
const native = { const native = {
ALL_NOTIFICATIONS: 0x7fffffff, ALL_NOTIFICATIONS: 0x7fffffff,
readActiveNotifications: () => { prefs.rememberNotificationSources(active); return active; }, readActiveNotifications: () => { prefs.rememberNotificationSources(active); return active; },
readVisibleNotifications: () => { prefs.rememberNotificationSources(active); return active.filter(n => prefs.shouldShowNotificationOnGlasses(n.packageName)); },
dismissNotification: () => { dismissals++; active = []; return true; }, dismissNotification: () => { dismissals++; active = []; return true; },
readNotificationIconByKey: () => ({ icon: null, stale: false }), readNotificationIconByKey: () => ({ icon: null, stale: false }),
}; };
@@ -166,7 +165,6 @@ test('cancel and back dismiss the popup without changing source preferences', as
test('filter toggles persist after notifications disappear and discovers new sources while open', async () => { test('filter toggles persist after notifications disappear and discovers new sources while open', async () => {
const app = ui(); const app = ui();
app.paint(app.filter); app.paint(app.filter);
for (let i = 0; i < 3; i++) await app.input(app.filter, 'scroll-down');
await app.input(app.filter, 'click'); await app.input(app.filter, 'click');
assert.equal(app.prefs.shouldShowNotificationOnGlasses(mail.packageName), false); assert.equal(app.prefs.shouldShowNotificationOnGlasses(mail.packageName), false);
app.active([{ packageName: 'com.alpha', appName: 'Alpha' }]); app.active([{ packageName: 'com.alpha', appName: 'Alpha' }]);
@@ -179,68 +177,6 @@ test('filter toggles persist after notifications disappear and discovers new sou
assert.equal(app.prefs.shouldShowNotificationOnGlasses('com.alpha'), true); assert.equal(app.prefs.shouldShowNotificationOnGlasses('com.alpha'), true);
}); });
test('default persists without overwriting explicit choices, including legacy saved sources', () => {
const settings = new Map([['notifications.sources', JSON.stringify([
{ ...mail, showOnGlasses: true },
{ packageName: 'muted', appName: 'Muted', showOnGlasses: false },
])]]);
let prefs = store(settings);
prefs.rememberNotificationSources([{ packageName: 'discovered', appName: 'Discovered' }]);
prefs.setNewNotificationAppsEnabledByDefault(false);
prefs = store(settings);
assert.equal(prefs.newNotificationAppsEnabledByDefault(), false);
assert.equal(prefs.shouldShowNotificationOnGlasses(mail.packageName), true);
assert.equal(prefs.shouldShowNotificationOnGlasses('muted'), false);
assert.equal(prefs.shouldShowNotificationOnGlasses('discovered'), false);
assert.equal(prefs.shouldShowNotificationOnGlasses('future'), false);
prefs.rememberNotificationSources([{ packageName: 'future', appName: 'Future' }]);
prefs.setNotificationSourceEnabled({ packageName: 'future', appName: 'Future' }, true);
prefs.setNewNotificationAppsEnabledByDefault(true);
prefs.setNewNotificationAppsEnabledByDefault(false);
assert.equal(store(settings).shouldShowNotificationOnGlasses('future'), true);
});
test('bulk choices persist for known sources without changing the default for future sources', () => {
const settings = new Map();
let prefs = store(settings);
prefs.rememberNotificationSources([mail]);
prefs.setAllNotificationSourcesEnabled(false);
prefs = store(settings);
assert.equal(prefs.shouldShowNotificationOnGlasses(mail.packageName), false);
assert.equal(prefs.shouldShowNotificationOnGlasses('future'), true);
prefs.setNewNotificationAppsEnabledByDefault(false);
prefs.setAllNotificationSourcesEnabled(true);
prefs = store(settings);
assert.equal(prefs.shouldShowNotificationOnGlasses(mail.packageName), true);
assert.equal(prefs.shouldShowNotificationOnGlasses('future'), false);
prefs.rememberNotificationSources([{ packageName: 'future', appName: 'Future' }]);
assert.equal(prefs.shouldShowNotificationOnGlasses('future'), false);
prefs.setAllNotificationSourcesEnabled(false);
assert.ok(prefs.readNotificationSources().every(source => !source.showOnGlasses));
});
test('filter controls work with an empty list and keep selection as sources arrive', async () => {
const app = ui();
app.active([]);
const labels = app.paint(app.filter).texts.map(({ text }) => text);
assert.ok(labels.includes('New apps enabled by default'));
assert.ok(labels.includes('Enable all'));
assert.ok(labels.includes('Disable all'));
await app.input(app.filter, 'click');
assert.equal(app.prefs.newNotificationAppsEnabledByDefault(), false);
app.active([mail]);
app.paint(app.filter);
assert.equal(app.prefs.shouldShowNotificationOnGlasses(mail.packageName), false);
await app.input(app.filter, 'scroll-down');
await app.input(app.filter, 'click');
assert.equal(app.prefs.shouldShowNotificationOnGlasses(mail.packageName), true);
assert.equal(app.prefs.newNotificationAppsEnabledByDefault(), false);
await app.input(app.filter, 'scroll-down');
await app.input(app.filter, 'click');
assert.equal(app.prefs.shouldShowNotificationOnGlasses(mail.packageName), false);
assert.equal(app.dismissals(), 0);
});
test('popup action wraps fully and stays visible with small and large fonts', async () => { test('popup action wraps fully and stays visible with small and large fonts', async () => {
for (const size of [12, 20]) { for (const size of [12, 20]) {
const app = ui(size); const app = ui(size);
@@ -318,33 +254,3 @@ test('controller filters before waking or opening a popup, and still refreshes t
elapse(); elapse();
assert.equal(popups, 1); assert.equal(popups, 1);
}); });
test('Android display filters before limits and reapplies preferences to cached tray icons', () => {
const prefs = store();
const active = [{ ...mail, key: 'hidden' }, { packageName: 'allowed', appName: 'Allowed', key: 'shown' }];
const file = ts.createSourceFile('icons.ts', source('app/native/notification-icons.ts'), ts.ScriptTarget.Latest, true);
const functions = file.statements.filter(node => ts.isFunctionDeclaration(node) &&
['readVisibleNotifications', 'cachedIconsResult'].includes(node.name?.text)).map(node => node.getText(file));
const { readVisibleNotifications, cachedIconsResult } = evaluate(functions.join('\n') + '\nexport { cachedIconsResult };', null, {
ALL_NOTIFICATIONS: 0x7fffffff,
readActiveNotifications: () => { prefs.rememberNotificationSources(active); return active; },
shouldShowNotificationOnGlasses: prefs.shouldShowNotificationOnGlasses,
cachedKeys: ['hidden', 'shown'],
cachedPackages: new Map(active.map(n => [n.key, n.packageName])),
cachedIcons: [{ clone: () => 'mail-icon' }, { clone: () => 'allowed-icon' }],
});
prefs.setNotificationSourceEnabled(mail, false);
assert.deepEqual(Array.from(readVisibleNotifications(1), n => n.key), ['shown']);
for (const stale of [false, true]) {
const result = cachedIconsResult(1, stale);
assert.deepEqual(Array.from(result.keys), ['shown']);
assert.deepEqual(Array.from(result.icons), ['allowed-icon']);
assert.equal(result.stale, stale);
}
prefs.setAllNotificationSourcesEnabled(false);
assert.equal(cachedIconsResult(10, false).keys.length, 0);
assert.equal(readVisibleNotifications(50).length, 0);
prefs.setNotificationSourceEnabled(mail, true);
assert.deepEqual(Array.from(cachedIconsResult(1, false).keys), ['hidden']);
assert.equal(active.length, 2);
});