Compare commits

..
20 changed files with 191 additions and 352 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) }
} }
+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()),
+47 -3
View File
@@ -121,6 +121,7 @@ export type DashboardSnapshot = {
* glasses, and this says which harmless thing is actually going on. * glasses, and this says which harmless thing is actually going on.
*/ */
displayPreviewMessage: string; displayPreviewMessage: string;
silentModeFeedback: string;
activeTextSettingId: string | null; activeTextSettingId: string | null;
activeTextEditorTitle: string; activeTextEditorTitle: string;
activeTextSettingTitle: string; activeTextSettingTitle: string;
@@ -294,6 +295,9 @@ class DashboardController {
/** The screen area displayPreview shows (Preview scaling), or null for the whole panel. */ /** The screen area displayPreview shows (Preview scaling), or null for the whole panel. */
private displayPreviewCrop: ScreenRect | null = null; private displayPreviewCrop: ScreenRect | null = null;
private silentMode = false; private silentMode = false;
private silentModeFeedback = "";
private silentModeFeedbackGeneration = 0;
private silentModeFeedbackTimer: ReturnType<typeof setTimeout> | null = null;
// Brightness value last pushed to the glasses; see pushBrightness. // Brightness value last pushed to the glasses; see pushBrightness.
private lastPushedBrightness: string | null = null; private lastPushedBrightness: string | null = null;
// Last battery level the glasses reported, kept across disconnects so a // Last battery level the glasses reported, kept across disconnects so a
@@ -1142,6 +1146,7 @@ class DashboardController {
status: this.status, status: this.status,
displayPreview: this.displayPreview, displayPreview: this.displayPreview,
displayPreviewMessage: this.displayPreviewMessage(), displayPreviewMessage: this.displayPreviewMessage(),
silentModeFeedback: this.silentModeFeedback,
activeTextSettingId: primaryTextSetting?.id ?? null, activeTextSettingId: primaryTextSetting?.id ?? null,
activeTextEditorTitle: this.activeTextEditorTitle, activeTextEditorTitle: this.activeTextEditorTitle,
activeTextSettingTitle: primaryTextSetting?.editorTitle ?? "", activeTextSettingTitle: primaryTextSetting?.editorTitle ?? "",
@@ -1181,6 +1186,43 @@ class DashboardController {
* charging and silent mode both make the display unavailable while BLE stays * charging and silent mode both make the display unavailable while BLE stays
* up, and a battery that just ran out simply stops answering. * up, and a battery that just ran out simply stops answering.
*/ */
private handleSilentMode(silent: boolean): void {
if (this.silentMode === silent) return;
this.silentMode = silent;
const generation = ++this.silentModeFeedbackGeneration;
if (this.silentModeFeedbackTimer !== null) clearTimeout(this.silentModeFeedbackTimer);
this.silentModeFeedbackTimer = null;
this.silentModeFeedback = silent
? "Silent mode enabled — hold both touchpads to exit"
: "Silent mode disabled";
if (!silent) {
void this.showSilentModeExit(generation).catch(error => {
this.appendLog(`silent-mode exit feedback failed: ${this.formatError(error)}`);
});
this.silentModeFeedbackTimer = setTimeout(() => {
this.silentModeFeedbackTimer = null;
this.silentModeFeedback = "";
this.emit();
}, 5000);
}
this.emit();
}
private async showSilentModeExit(generation: number): Promise<void> {
if (this.phase !== "connected" || this.silentMode || this.glassesLocked) return;
// The firmware powered the lenses down, and Faceclaw may have gone to
// sleep/suspended EvenHub meanwhile. Reusing the ordinary wake barrier is
// essential: rendering an alert into the retained surface alone is invisible.
this.cancelEvenHubSuspendTimer();
shell.wake("sidebar");
const ready = await this.ensureEvenHubSessionActive();
if (!ready || generation !== this.silentModeFeedbackGeneration || this.silentMode ||
this.phase !== "connected" || this.glassesLocked) return;
shell.showAlert("Silent mode disabled");
shell.foregroundWindow()?.requestRender();
this.requestShellRender();
}
private displayPreviewMessage(): string { private displayPreviewMessage(): string {
if (this.phase === "charging") { if (this.phase === "charging") {
return chargingPreviewMessage(this.glassesDisplayState()); return chargingPreviewMessage(this.glassesDisplayState());
@@ -1604,9 +1646,7 @@ class DashboardController {
}); });
}); });
this.offSilentMode = communicator.onSilentMode((silent) => { this.offSilentMode = communicator.onSilentMode((silent) => {
if (this.silentMode === silent) return; this.handleSilentMode(silent);
this.silentMode = silent;
this.emit();
}); });
this.offWearState = communicator.onWearState((wearing) => { this.offWearState = communicator.onWearState((wearing) => {
this.handleWearState(wearing); this.handleWearState(wearing);
@@ -2984,6 +3024,10 @@ class DashboardController {
// Kept across "connecting": silent mode blocks app launches, so it can // Kept across "connecting": silent mode blocks app launches, so it can
// itself cause the reconnect churn, and Java re-reports it either way. // itself cause the reconnect churn, and Java re-reports it either way.
this.silentMode = false; this.silentMode = false;
this.silentModeFeedbackGeneration++;
if (this.silentModeFeedbackTimer !== null) clearTimeout(this.silentModeFeedbackTimer);
this.silentModeFeedbackTimer = null;
this.silentModeFeedback = "";
} }
this.emit(); this.emit();
} }
+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,
}))));
}
+3
View File
@@ -74,6 +74,9 @@
class="ble-bandwidth-indicator" class="ble-bandwidth-indicator"
horizontalAlignment="center" horizontalAlignment="center"
verticalAlignment="bottom" /> verticalAlignment="bottom" />
<Label text="{{ silentModeFeedback }}" visibility="{{ silentModeFeedbackVisibility }}"
textWrap="true" horizontalAlignment="center" verticalAlignment="top"
margin="12" padding="12" backgroundColor="#333333" color="white" borderRadius="8" />
<ScrollView <ScrollView
class="warnings-modal" class="warnings-modal"
visibility="{{ warningsModalVisibility }}" visibility="{{ warningsModalVisibility }}"
+13
View File
@@ -37,6 +37,7 @@ export class MainViewModel extends RemoteControlsViewModel {
private _status = "Disconnected."; private _status = "Disconnected.";
private _displayPreview: ImageSource | null = null; private _displayPreview: ImageSource | null = null;
private _displayPreviewMessage = ""; private _displayPreviewMessage = "";
private _silentModeFeedback = "";
private _layoutOrientation: LayoutOrientation = this.readLayoutOrientation(); private _layoutOrientation: LayoutOrientation = this.readLayoutOrientation();
private _landscapePreviewWidth = 0; private _landscapePreviewWidth = 0;
private _landscapePreviewHeight = 0; private _landscapePreviewHeight = 0;
@@ -90,6 +91,7 @@ export class MainViewModel extends RemoteControlsViewModel {
this.previewMode = snapshot.previewMode; this.previewMode = snapshot.previewMode;
this.displayPreview = snapshot.displayPreview; this.displayPreview = snapshot.displayPreview;
this.displayPreviewMessage = snapshot.displayPreviewMessage; this.displayPreviewMessage = snapshot.displayPreviewMessage;
this.silentModeFeedback = snapshot.silentModeFeedback ?? "";
this.phase = snapshot.phase; this.phase = snapshot.phase;
this.batteryLine = formatBatteryLine( this.batteryLine = formatBatteryLine(
snapshot.batteries, snapshot.batteries,
@@ -216,6 +218,17 @@ export class MainViewModel extends RemoteControlsViewModel {
} }
} }
get silentModeFeedback(): string { return this._silentModeFeedback; }
set silentModeFeedback(value: string) {
if (this._silentModeFeedback === value) return;
this._silentModeFeedback = value;
this.notifyPropertyChange("silentModeFeedback", value);
this.notifyPropertyChange("silentModeFeedbackVisibility", this.silentModeFeedbackVisibility);
}
get silentModeFeedbackVisibility(): "visible" | "collapse" {
return this._silentModeFeedback ? "visible" : "collapse";
}
get hasDisplayPreview(): boolean { get hasDisplayPreview(): boolean {
return this._displayPreview !== null; return this._displayPreview !== null;
} }
+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++) {
@@ -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.
+11
View File
@@ -0,0 +1,11 @@
# Silent-mode feedback
The firmware blanks the lenses and stops ordinary input while silent mode is active. App code cannot display an activation popup on lenses that the firmware has switched off. The phone now shows a persistent enabled banner with the exit gesture, and a five-second disabled banner on exit. On exit, unlocked glasses wake through the normal screen/EvenHub barrier before the alert popup is rendered. This also handles the shell falling asleep during a long silent period. Locked glasses keep the phone feedback without being woken. A generation check suppresses stale notices after re-entry or disconnect. Duplicate state reports do not repeat feedback, stale timers are cancelled, and disconnect clears the notice.
Silent-off firmware pushes are not reliable. The existing fallback read used the five-minute battery cadence. While silent mode is known to be on, settings are now polled every two seconds when the session is ready and the message queues are idle. Normal battery cadence and shutdown guards are retained. This bounds ordinary missing-push recovery without assuming a touch gesture always means silent mode ended.
Independent JavaScript suite: 1065 passed, 2 skipped. TypeScript and changed-source lint passed. Controller tests cover enabled/disabled notices, duplicates, timer cancellation, disconnect and sleeping-display recovery, locked displays, wake-barrier failure and stale async completion. A Kotlin session test checks the two-second silent cadence, normal cadence and shutdown guard. Kotlin compilation and hardware checks are tracked with the combined integration validation.
Hardware validation remains pending: both transitions via the temple gesture, missing exit push, phone background/foreground, lenses that are awake/asleep/locked, reconnect and charging. No firmware was flashed.
Follow-up after device-log inspection: both silent transitions arrived, but the exit could occur after the normal idle timeout. Exit now cancels pending suspension, wakes the shell, awaits the existing EvenHub/screen wake barrier and only then shows the notice. It resets idle activity through the ordinary wake path. Re-entry, disconnect, locking or a failed resume suppress stale asynchronous notices. Activation still turns the lenses off in firmware; phone feedback does not claim a lens-side activation popup.
@@ -37,6 +37,8 @@ class ConnectionOptions {
const val HEARTBEAT_FAILURE_DEADLINE_MS = 10_000 const val HEARTBEAT_FAILURE_DEADLINE_MS = 10_000
const val HEARTBEAT_READY_MS = 4_000 const val HEARTBEAT_READY_MS = 4_000
const val HEARTBEAT_URGENT_MS = 6_000 const val HEARTBEAT_URGENT_MS = 6_000
// Silent-off pushes are not reliable; promptly re-read the state while silent.
const val SILENT_MODE_POLL_MS = 2_000
const val BATTERY_REFRESH_INTERVAL_MS = 5 * 60_000 const val BATTERY_REFRESH_INTERVAL_MS = 5 * 60_000
const val BATTERY_INPUT_QUIET_MS = 5_000 const val BATTERY_INPUT_QUIET_MS = 5_000
// Poll cadence while in charging mode; also bounds how quickly we notice // Poll cadence while in charging mode; also bounds how quickly we notice
@@ -1041,8 +1041,9 @@ internal fun GlassesSessionCore.shouldPollBatteryLocked(now: Long): Boolean {
&& sessionReady && sessionReady
&& pendingMessages.isEmpty() && pendingMessages.isEmpty()
&& inFlightMessages.isEmpty() && inFlightMessages.isEmpty()
&& now - lastConnectionOrInputAtMs >= ConnectionOptions.BATTERY_INPUT_QUIET_MS && (silentMode == 1 || now - lastConnectionOrInputAtMs >= ConnectionOptions.BATTERY_INPUT_QUIET_MS)
&& (lastBatteryRefreshAtMs == 0L || now - lastBatteryRefreshAtMs >= ConnectionOptions.BATTERY_REFRESH_INTERVAL_MS) && (lastBatteryRefreshAtMs == 0L || now - lastBatteryRefreshAtMs >=
if (silentMode == 1) ConnectionOptions.SILENT_MODE_POLL_MS else ConnectionOptions.BATTERY_REFRESH_INTERVAL_MS)
} }
internal fun GlassesSessionCore.createBatteryQueryMessageLocked(): OutboundMessage { internal fun GlassesSessionCore.createBatteryQueryMessageLocked(): OutboundMessage {
-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' }]);
});
+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);
});
@@ -316,6 +316,24 @@ private class Session {
} }
class GlassesSessionCoreTest { class GlassesSessionCoreTest {
@Test fun silentModePollsPromptlyWithoutChangingNormalBatteryCadence() {
val s = Session()
val core = s.core
core.monitor.withLock {
core.sessionReady = true
core.silentMode = 1
core.lastBatteryRefreshAtMs = 8_000L
core.lastConnectionOrInputAtMs = 10_000L
assertFalse(core.shouldPollBatteryLocked(9_999L))
assertTrue(core.shouldPollBatteryLocked(10_000L))
core.silentMode = 0
assertFalse(core.shouldPollBatteryLocked(10_000L))
assertTrue(core.shouldPollBatteryLocked(308_000L))
core.shutdownRequested = true
assertFalse(core.shouldPollBatteryLocked(608_000L))
}
}
@Test fun brightnessConfigPrecedesFirstFrameAndSleepWakeFollowsComposites() { @Test fun brightnessConfigPrecedesFirstFrameAndSleepWakeFollowsComposites() {
val s = Session() val s = Session()
s.core.configureBrightness(false, 70, 2, 100, "0:0,1000:100", 280) s.core.configureBrightness(false, 70, 2, 100, "0:0,1000:100", 280)
-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);
});
+67
View File
@@ -0,0 +1,67 @@
const test = require('node:test');
const assert = require('node:assert/strict');
const fs = require('node:fs');
const vm = require('node:vm');
const ts = require('typescript');
function fixture() {
const source = ts.createSourceFile('controller.ts', fs.readFileSync('app/g2/dashboard-controller.ts', 'utf8'), ts.ScriptTarget.Latest, true);
const cls = source.statements.find(n => ts.isClassDeclaration(n) && n.name?.text === 'DashboardController');
const methods = cls.members.filter(n => ['handleSilentMode', 'showSilentModeExit', 'setPhase'].includes(n.name?.getText(source)));
const alerts = [], timers = new Map(); let next = 0, on = true, wakes = 0;
const context = { exports: {}, setTimeout: fn => { timers.set(++next, fn); return next; }, clearTimeout: id => timers.delete(id),
updateGlassesPresence() {}, shell: { isScreenOn: () => on, wake: () => { on = true; wakes++; }, showAlert: text => alerts.push(text),
foregroundWindow: () => ({ requestRender() {} }), setBatteryLevels() {}, getBatteryLevels: () => ({}) } };
vm.runInNewContext(ts.transpileModule(`export class Controller { ${methods.map(n => n.getText(source)).join('\n')} }`, {
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
}).outputText, context);
const c = new context.exports.Controller();
Object.assign(c, { silentMode: false, silentModeFeedback: '', silentModeFeedbackTimer: null, silentModeFeedbackGeneration: 0, phase: 'connected', emit() {},
cancelEvenHubSuspendTimer() {}, ensureEvenHubSessionActive: async () => true, requestShellRender() {},
appendLog() {}, formatError: error => String(error) });
return { c, alerts, timers, wakes: () => wakes, dark: () => { on = false; }, expire() { const callbacks = [...timers.values()]; timers.clear(); callbacks.forEach(fn => fn()); } };
}
test('silent activation remains visible on phone; exit waits for the display wake barrier', async () => {
const h = fixture(); h.c.handleSilentMode(false);
assert.equal(h.c.silentModeFeedback, '');
h.c.handleSilentMode(true);
assert.match(h.c.silentModeFeedback, /enabled/); assert.equal(h.timers.size, 0); assert.equal(h.alerts.length, 0);
h.c.handleSilentMode(false);
assert.equal(h.c.silentModeFeedback, 'Silent mode disabled');
await new Promise(setImmediate);
assert.deepEqual(h.alerts, ['Silent mode disabled']);
h.expire(); assert.equal(h.c.silentModeFeedback, '');
});
test('repeated state reports do not duplicate feedback; an old timer cannot clear a new activation', async () => {
const h = fixture(); h.c.handleSilentMode(true); h.c.handleSilentMode(false);
h.c.handleSilentMode(false); await new Promise(setImmediate); assert.equal(h.alerts.length, 1);
h.c.handleSilentMode(true); h.expire();
assert.match(h.c.silentModeFeedback, /enabled/);
});
test('silent exit wakes a sleeping display before showing feedback but leaves locked glasses alone', async () => {
for (const locked of [false, true]) {
const h = fixture(); h.c.glassesLocked = locked; h.dark();
h.c.handleSilentMode(true); h.c.handleSilentMode(false); await new Promise(setImmediate);
assert.equal(h.wakes(), locked ? 0 : 1);
assert.equal(h.alerts.length, locked ? 0 : 1);
assert.equal(h.c.silentModeFeedback, 'Silent mode disabled');
}
});
test('an unavailable session, re-entry into silence or disconnect suppresses a stale exit popup', async () => {
for (const state of ['not-ready', 'silent', 'disconnected']) {
const h = fixture(); let finish;
h.c.ensureEvenHubSessionActive = () => new Promise(resolve => { finish = resolve; });
h.c.handleSilentMode(true); h.c.handleSilentMode(false);
assert.equal(h.alerts.length, 0);
if (state === 'silent') h.c.handleSilentMode(true);
if (state === 'disconnected') h.c.setPhase('disconnected');
finish(state !== 'not-ready'); await new Promise(setImmediate);
assert.equal(h.alerts.length, 0);
}
});
test('disconnect clears feedback and any pending timer without announcing a silent exit', () => {
const h = fixture(); h.c.handleSilentMode(true); h.c.handleSilentMode(false);
h.c.setPhase('disconnected');
assert.equal(h.c.silentModeFeedback, ''); assert.equal(h.timers.size, 0);
h.expire(); assert.equal(h.c.silentModeFeedback, '');
});