Compare commits

..
16 changed files with 347 additions and 162 deletions

No files matched your search

@@ -504,6 +504,18 @@ 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) }
} }
@@ -29,8 +29,3 @@ add_subdirectory(${LLAMA_CPP_SOURCE_DIR} llama.cpp-build EXCLUDE_FROM_ALL)
add_library(faceclaw_llama SHARED faceclaw_llama.cpp) add_library(faceclaw_llama SHARED faceclaw_llama.cpp)
target_link_libraries(faceclaw_llama PRIVATE llama android log) target_link_libraries(faceclaw_llama PRIVATE llama android log)
# NDK r27 defaults to 4 KiB. Align both LOAD segments and RELRO boundaries
# for Android devices using 16 KiB pages, including debug APKs.
target_link_options(faceclaw_llama PRIVATE
"-Wl,-z,max-page-size=16384"
"-Wl,-z,common-page-size=16384")
+10 -1
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 { onAndroidNotificationsChanged } from "../../native/notification-icons"; import { ALL_NOTIFICATIONS, dismissAllNotifications, onAndroidNotificationsChanged, readActiveNotifications } from "../../native/notification-icons";
import { import {
createInProcessWindow, createInProcessWindow,
YieldAtRootLayer, YieldAtRootLayer,
@@ -32,6 +32,15 @@ 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()),
+17 -2
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 } from './notification-sources' import { rememberNotificationSources, shouldShowNotificationOnGlasses } 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,8 +24,23 @@ 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) }
} }
@@ -44,7 +59,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 readActiveNotifications(ALL_NOTIFICATIONS)) if (!sources.has(n.packageName)) sources.set(n.packageName, n) for (const n of readVisibleNotifications(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}
} }
+23 -2
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 } from "./notification-sources"; import { rememberNotificationSources, shouldShowNotificationOnGlasses } 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,6 +21,7 @@ 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;
@@ -95,6 +96,7 @@ 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;
@@ -103,7 +105,12 @@ 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 {
return { icons: cachedIcons.slice(0, maxIcons).map(icon => icon.clone()), keys: cachedKeys.slice(0, maxIcons), stale }; // Reapply preferences even to a warm/stale cache: toggles take effect immediately.
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 = {
@@ -318,6 +325,13 @@ 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();
@@ -337,6 +351,13 @@ 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);
} }
+30 -5
View File
@@ -1,6 +1,16 @@
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;
@@ -8,8 +18,15 @@ 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 [];
@@ -17,7 +34,7 @@ export function readNotificationSources(): NotificationSource[] {
.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: source.showOnGlasses !== false, showOnGlasses: typeof source.showOnGlasses === "boolean" ? source.showOnGlasses : undefined,
})); }));
} catch { } catch {
return []; return [];
@@ -25,7 +42,7 @@ export function readNotificationSources(): NotificationSource[] {
} }
export function rememberNotificationSources(notifications: { packageName: string; appName: string }[]): void { export function rememberNotificationSources(notifications: { packageName: string; appName: string }[]): void {
const sources = new Map(readNotificationSources().map((source) => [source.packageName, source])); const sources = new Map(readSavedSources().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;
@@ -35,7 +52,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 ?? true, showOnGlasses: previous?.showOnGlasses,
}); });
changed = true; changed = true;
} }
@@ -44,12 +61,13 @@ 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 ?? true; return readNotificationSources().find((source) => source.packageName === packageName)?.showOnGlasses
?? 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(readNotificationSources().map((item) => [item.packageName, item])); const sources = new Map(readSavedSources().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,
@@ -57,3 +75,10 @@ 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,
}))));
}
+20 -8
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 { readNotificationSources, setNotificationSourceEnabled, shouldShowNotificationOnGlasses } from "../native/notification-sources"; import { newNotificationAppsEnabledByDefault, setNewNotificationAppsEnabledByDefault, setAllNotificationSourcesEnabled, 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,14 +11,26 @@ 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;
/** The package behind each current row, parallel to the menu's items. */ /** Stable row keys, including controls, 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[] = sources.map((source) => ({ const items: MenuItem[] = [{
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 }) => {
@@ -26,11 +38,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 (!items.length) items.push({ label: "No notification sources discovered yet.", disabled: true, onSelect: () => {} }); if (!sources.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;
const index = sources.findIndex((source) => source.packageName === selectedPackage); this.packages = ["default", "enable-all", "disable-all", ...sources.map((source) => `source:${source.packageName}`)];
this.packages = sources.map((source) => source.packageName); const index = selectedPackage === undefined ? 0 : this.packages.indexOf(selectedPackage);
const width = ctx.stack.getBaseSize().width; const width = ctx.stack.getBaseSize().width;
if (!this.menu || width !== this.menuWidth) { if (!this.menu || width !== this.menuWidth) {
@@ -38,7 +50,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 popups on glasses", footer: "On = show notifications 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,
readActiveNotifications, readVisibleNotifications,
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 = readActiveNotifications(MAX_NOTIFICATIONS); const notifications = readVisibleNotifications(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 = readActiveNotifications(MAX_NOTIFICATIONS); const notifications = readVisibleNotifications(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 = readActiveNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey); const notification = readVisibleNotifications(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 = readActiveNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey); const notification = readVisibleNotifications(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 (!readActiveNotifications(ALL_NOTIFICATIONS).some((active) => active.key === this.notificationKey)) { if (!readVisibleNotifications(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: "Turn off popups", run: (runCtx) => { { label: "Hide on glasses", 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 = `Turn off notification popups from ${source.appName || source.packageName}? You can turn them back on in the Notifications app's Notification filter.`; 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 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++) {
-33
View File
@@ -1,33 +0,0 @@
# Android 16 KiB page compatibility
The initial debug APK triggered Android's page-size compatibility warning.
Its `libfaceclaw_llama.so` LOAD segments were aligned to 4096 bytes. The other
six packaged arm64 libraries were aligned to 16384 bytes, and APK ZIP alignment
already passed `zipalign -c -P 16 4`.
The llama JNI shared library now links with both `max-page-size=16384` and
`common-page-size=16384`, matching the LC3 JNI library. This changes the native
binary layout rather than hiding the compatibility warning or disabling debug.
Gradle already tracks CMakeLists.txt as an input, and Ninja reconfigures and
relinks existing builds after this change.
Reproduce the regression and artifact checks inside `devenv shell`:
```sh
python3 -m unittest discover -s tests -p test_apk_pages.py
bash build.sh
python3 scripts/check-apk-pages.py platforms/android/app/build/outputs/apk/debug/app-debug.apk
"$ANDROID_HOME/build-tools/35.0.1/zipalign" -c -P 16 4 platforms/android/app/build/outputs/apk/debug/app-debug.apk
```
The checker rejects the initial APK and reports its misaligned llama library.
Five unit tests cover 4 KiB rejection, 16 KiB acceptance, RELRO boundaries and
invalid ELF program headers. APK checks inspect all arm64/x86_64 shared libraries.
Reference: [Android's 16 KiB guidance](https://developer.android.com/guide/practices/page-sizes).
Static alignment and successful installation do not prove every native code
path works on-device; voice/LLM features still require functional testing.
The rebuilt APK passes all seven native-library checks, ZIP alignment and APK
signature verification. The connected Pixel 10 Pro Fold reports `getconf
PAGE_SIZE` = 4096; actual execution with 16 KiB pages remains untested.
@@ -0,0 +1,20 @@
# 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
@@ -0,0 +1,35 @@
# 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.
-57
View File
@@ -1,57 +0,0 @@
#!/usr/bin/env python3
"""Check ELF64 LOAD/RELRO alignment in an APK; pair with zipalign -c -P 16 4."""
import argparse
import struct
import zipfile
PAGE = 16384
def alignment_errors(data):
if len(data) < 64 or data[:4] != b"\x7fELF" or data[4] != 2 or data[5] not in (1, 2):
return ["expected an ELF64 library"]
endian = "<" if data[5] == 1 else ">"
offset = struct.unpack_from(endian + "Q", data, 32)[0]
size, count = struct.unpack_from(endian + "HH", data, 54)
if size < 56 or offset + size * count > len(data):
return ["invalid program headers"]
headers = [struct.unpack_from(endian + "IIQQQQQQ", data, offset + i * size) for i in range(count)]
errors = []
loads = [h for h in headers if h[0] == 1]
if not loads:
errors.append("no LOAD segments")
for h in loads:
if h[7] < PAGE or h[7] % PAGE or (h[3] - h[2]) % PAGE:
errors.append(f"LOAD alignment {h[7]} is incompatible with 16 KiB pages")
for h in headers:
if h[0] != 0x6474E552:
continue
end = h[3] + h[6]
# A RELRO ending within a writable LOAD may protect unrelated writable
# data on a 16 KiB device. A separate LOAD after RELRO is also safe.
if end % PAGE and any(p[1] & 2 and p[3] <= h[3] and end < p[3] + p[6] for p in loads):
errors.append("RELRO ends inside writable LOAD without 16 KiB alignment")
return errors
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument("apk")
args = parser.parse_args()
checked = 0
failed = False
with zipfile.ZipFile(args.apk) as archive:
for name in archive.namelist():
if not name.startswith(("lib/arm64-v8a/", "lib/x86_64/")) or not name.endswith(".so"):
continue
checked += 1
errors = alignment_errors(archive.read(name))
failed |= bool(errors)
print(f"{'FAIL' if errors else 'OK'} {name}" + (": " + "; ".join(errors) if errors else ""))
if not checked:
parser.error("no 64-bit native libraries found")
return int(failed)
if __name__ == "__main__":
raise SystemExit(main())
+69
View File
@@ -0,0 +1,69 @@
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' }]);
});
+9 -1
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() {} }, './notification-sources': { rememberNotificationSources() {}, shouldShowNotificationOnGlasses: packageName => packageName !== "muted" },
}); });
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,3 +106,11 @@ 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,6 +70,7 @@ 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 }),
}; };
@@ -165,6 +166,7 @@ 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' }]);
@@ -177,6 +179,68 @@ 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);
@@ -254,3 +318,33 @@ 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);
});
-40
View File
@@ -1,40 +0,0 @@
import importlib.util
from pathlib import Path
import struct
import unittest
spec = importlib.util.spec_from_file_location("apk_pages", Path(__file__).parents[1] / "scripts/check-apk-pages.py")
checker = importlib.util.module_from_spec(spec)
spec.loader.exec_module(checker)
def elf(alignment=16384, relro_end=16384, writable_end=32768):
data = bytearray(64 + 2 * 56)
data[:6] = b"\x7fELF\x02\x01"
struct.pack_into("<Q", data, 32, 64)
struct.pack_into("<HH", data, 54, 56, 2)
struct.pack_into("<IIQQQQQQ", data, 64, 1, 6, 0, 0, 0, writable_end, writable_end, alignment)
struct.pack_into("<IIQQQQQQ", data, 120, 0x6474E552, 4, 0, 0, 0, relro_end, relro_end, 1)
return data
class AlignmentTests(unittest.TestCase):
def test_rejects_4k_loads(self):
self.assertTrue(checker.alignment_errors(elf(alignment=4096)))
def test_accepts_16k_loads_and_relro(self):
self.assertEqual([], checker.alignment_errors(elf()))
def test_rejects_relro_protecting_writable_data(self):
self.assertTrue(checker.alignment_errors(elf(relro_end=4096)))
def test_accepts_relro_at_end_of_writable_load(self):
self.assertEqual([], checker.alignment_errors(elf(relro_end=4096, writable_end=4096)))
def test_rejects_invalid_headers(self):
self.assertTrue(checker.alignment_errors(b"not ELF"))
self.assertTrue(checker.alignment_errors(elf()[:70]))
if __name__ == "__main__":
unittest.main()