Merge branch 'main' into rayneo-io-support

This commit is contained in:
James Babcock committed 2026-11-03 14:06:19 -08:00
commit b2b6c5c8d8
36 files changed
+822 -39

No files matched your search

+6
View File
@@ -221,6 +221,12 @@ function describeState(): string {
const charging = battery.headsetCharging ? ", charging" : "";
parts.push(`Headset battery: ${battery.headset}%${charging}.`);
}
if (battery.case !== null) {
// caseCharging is null while the glasses are out of the case: the level is the last one seen.
const detail = battery.caseCharging === null ? " (last reading, glasses not in the case)"
: battery.caseCharging ? ", charging" : "";
parts.push(`Charging case battery: ${battery.case}%${detail}.`);
}
parts.push(`Local time: ${formatDateTime(new Date())}.`);
return parts.join(" ");
}
+6 -1
View File
@@ -65,11 +65,16 @@ async function ensurePermissions(
): Promise<void> {
if (!global.isAndroid) return;
const activity = getActivity();
const missing = permissions.filter((permission) => !isPermissionGranted(permission));
if (missing.length === 0) return;
// Only a request needs an Activity. Checking must not: the glasses session
// outlives it (swiping the app away in Recents destroys the Activity while
// the foreground service keeps the process running), and voice input
// checks the microphone permission on every start.
const activity = getActivity();
await new Promise<void>((resolve, reject) => {
const callback = (args: {
requestCode: number;
+36 -2
View File
@@ -98,13 +98,21 @@ import { createNotificationsAppWindow, NOTIFICATIONS_SURFACE_ID, NOTIFICATIONS_W
import { isInstalledPackagePresent } from "../apps/evenhub/updates";
import { wearerVerificationOptions } from "../apps/microphones/speakers";
import { micSession } from "../apps/microphones/mic-session";
import { glassesDisplayAsleep, glassesDisplayLabel, type GlassesDisplayState } from "./glasses-display-state";
import {
chargingPreviewMessage,
glassesDisplayAsleep,
glassesDisplayDetail,
glassesDisplayLabel,
type GlassesDisplayState,
} from "./glasses-display-state";
import { PreviewDisplayTarget, type DisplayTarget } from "../native/preview-display";
type ConnectionPhase = "disconnected" | "connecting" | "connected" | "charging" | "disconnecting";
export type DashboardSnapshot = {
phase: ConnectionPhase;
/** Last-known battery levels: the glasses, their charging case, the R1 ring and a Wear OS watch. */
batteries: ReturnType<typeof shell.getBatteryLevels>;
status: string;
displayPreview: ImageSource | null;
/**
@@ -340,6 +348,7 @@ class DashboardController {
private offState: (() => void) | null = null;
private offRing: (() => void) | null = null;
private offBattery: (() => void) | null = null;
private offCaseBattery: (() => void) | null = null;
private offSilentMode: (() => void) | null = null;
private offWearState: (() => void) | null = null;
private offPhoneLockState: (() => void) | null = null;
@@ -1191,6 +1200,7 @@ class DashboardController {
alarmReliabilityMessage: this.alarmReliabilityMessage,
previewMode: this.isPreviewDisplayActive(),
evenHubPhoneUi: phoneUiButton(),
batteries: shell.getBatteryLevels(),
};
}
@@ -1208,7 +1218,7 @@ class DashboardController {
*/
private displayPreviewMessage(): string {
if (this.phase === "charging") {
return this.glassesDisplayLabel();
return chargingPreviewMessage(this.glassesDisplayState());
}
if (this.silentMode && this.phase === "connected") {
// Say how to leave it. Silent mode is entered and exited only by the
@@ -1240,17 +1250,25 @@ class DashboardController {
return glassesDisplayLabel(this.glassesDisplayState());
}
/** The smaller line the watch face shows under that one, or "" (the case level while charging). */
glassesDisplayDetail(): string {
return glassesDisplayDetail(this.glassesDisplayState());
}
/** Whether that line reads "Display off" (the watch face adds a wake hint under it). */
glassesDisplayAsleep(): boolean {
return glassesDisplayAsleep(this.glassesDisplayState());
}
private glassesDisplayState(): GlassesDisplayState {
const batteries = shell.getBatteryLevels();
return {
phase: this.phase,
silentMode: this.silentMode,
screenOn: shell.isScreenOn(),
battery: this.lastHeadsetBattery,
caseBattery: batteries.case,
caseCharging: batteries.caseCharging,
foregroundTitle: shell.getForegroundApp()?.title ?? null,
previewMode: this.isPreviewDisplayActive(),
};
@@ -1662,6 +1680,17 @@ class DashboardController {
// the watch state, so refresh both consumers on every report.
this.emit();
});
this.offCaseBattery = communicator.onCaseState((state) => {
// The level is kept when a reading has none (the glasses left the case)
// and across disconnects: the case only reports while the glasses are
// docked and only drains while charging them, so the last level holds.
// Whether the case is on USB is only known while they are docked.
shell.setBatteryLevels({
...(state.battery !== null ? { case: state.battery } : {}),
caseCharging: state.docked ? state.charging : null,
});
this.emit();
});
this.offEvenAppConflict = communicator.onEvenAppConflict((message) => {
this.refreshEvenAppStatus();
if (!this.evenNotificationActive) {
@@ -1782,6 +1811,8 @@ class DashboardController {
this.offRing = null;
this.offBattery?.();
this.offBattery = null;
this.offCaseBattery?.();
this.offCaseBattery = null;
this.offSilentMode?.();
this.offSilentMode = null;
this.offWearState?.();
@@ -1894,6 +1925,8 @@ class DashboardController {
this.offRing = null;
this.offBattery?.();
this.offBattery = null;
this.offCaseBattery?.();
this.offCaseBattery = null;
this.offSilentMode?.();
this.offSilentMode = null;
this.offWearState?.();
@@ -2301,6 +2334,7 @@ class DashboardController {
.catch((error) => {
this.appendLog(`voice permission failed: ${this.formatError(error)}`);
if (!hasMicrophonePermission()) voiceControlBridge.reportPermissionDenied();
else voiceControlBridge.reportStartFailed(this.formatError(error));
});
}
+55
View File
@@ -3,6 +3,13 @@ export type GlassesDisplayState = {
silentMode: boolean;
screenOn: boolean;
battery: number | null;
/**
* The charging case's last-known level, and whether it is on USB (null
* while the glasses are out of the case). Shown only while charging, when
* the glasses are docked and the case reading is live.
*/
caseBattery: number | null;
caseCharging: boolean | null;
foregroundTitle: string | null;
/** The headless preview display is standing in for a connection (preview-only mode). */
previewMode: boolean;
@@ -29,6 +36,20 @@ export function glassesDisplayLabel(state: GlassesDisplayState): string {
return state.foregroundTitle || "Launcher";
}
/**
* The smaller line under that label on the watch face, or "": the case
* level while the glasses charge in it.
*/
export function glassesDisplayDetail(state: GlassesDisplayState): string {
if (state.phase !== "charging") return "";
return validBatteryLevel(state.caseBattery) ? batteryEntry("Case", state.caseBattery, state.caseCharging) : "";
}
/** The phone mirror's stand-in while charging: the label and its detail on one line. */
export function chargingPreviewMessage(state: GlassesDisplayState): string {
return [glassesDisplayLabel(state), glassesDisplayDetail(state)].filter(Boolean).join(" · ");
}
/**
* True when the label reads "Display off": the screen is dark but the glasses
* (or the preview standing in for them) would light it on a wake gesture.
@@ -46,6 +67,40 @@ export function chargingDisplayLabel(battery: number | null): string {
return validBatteryLevel(battery) ? `Charging · G2 ${battery}%` : "Charging";
}
/** The shell's last-known battery levels (ShellChromeState["battery"]), as far as the phone shows them. */
export type BatteryLevels = {
headset: number | null;
headsetCharging: boolean | null;
case: number | null;
caseCharging: boolean | null;
ring: number | null;
ringCharging: boolean | null;
};
/**
* The phone Settings tab's battery row: each device whose level is known,
* e.g. "G2 100% · Case 98% ⚡ · R1 72%" (⚡ = charging), or "" when none
* is. Levels are the last known ones (the case only reports while the glasses
* are docked), so ⚡ appears only while it is live: G2 and Case only with a
* link to the glasses (`glassesLinked`: connected or charging), and Case only
* while they are docked (caseCharging is null otherwise).
*/
export function formatBatteryLine(levels: BatteryLevels, glassesLinked: boolean): string {
const devices: Array<[string, number | null, boolean | null]> = [
["G2", levels.headset, glassesLinked && levels.headsetCharging],
["Case", levels.case, glassesLinked && levels.caseCharging],
["R1", levels.ring, levels.ringCharging],
];
return devices
.filter((device): device is [string, number, boolean | null] => validBatteryLevel(device[1]))
.map(([label, level, charging]) => batteryEntry(label, level, charging))
.join(" · ");
}
function batteryEntry(label: string, level: number, charging: boolean | null): string {
return `${label} ${level}%${charging ? " ⚡" : ""}`;
}
function validBatteryLevel(battery: number | null): battery is number {
return battery !== null && Number.isInteger(battery) && battery >= 0 && battery <= 100;
}
+7
View File
@@ -883,6 +883,13 @@ export class IosPreviewController {
if (this.active) this.onConnectionState({ ...this.state })
this.requestShellRender()
}),
communicator.onCaseState(state => {
if (this.communicator !== communicator) return
// As on Android: keep the last level when a reading has none (out of the case);
// the case's own charging is only known while the glasses are docked.
shell.setBatteryLevels({ ...(state.battery !== null ? { case: state.battery } : {}),
caseCharging: state.docked ? state.charging : null })
}),
communicator.onFirmwareInfo(info => {
if (this.communicator !== communicator) return
this.logBluetooth(`Firmware: L=${info.leftVersion || '?'} R=${info.rightVersion || '?'}` +
+2
View File
@@ -263,6 +263,8 @@ export class WearRemote {
listening: voiceActivity.isActive(),
battery: state.lastHeadsetBattery,
charging: state.phase === "charging" || battery.headsetCharging === true,
caseBattery: battery.case,
caseCharging: battery.caseCharging,
silentMode: state.silentMode,
foreground: foreground ? { appId: foreground.appId, title: foreground.title } : null,
windows: shell.getWindows().map((window) => ({
+21
View File
@@ -43,6 +43,9 @@ export type HeadsetBatteryState = {
ringChargingStatus?: number;
};
/** See the Android communicator's CaseBatteryState. */
export type CaseBatteryState = { battery: number | null; charging: boolean; docked: boolean };
export type FrameMetrics = {
paintMs: number;
transmitMs: number;
@@ -121,6 +124,9 @@ class SessionListener extends NSObject {
onBatteryStateHeadsetBatteryHeadsetChargingRingBatteryRingCharging(headsetBattery: number, headsetCharging: number, ringBattery: number, ringCharging: number): void {
this.bridge.handleBatteryState(Number(headsetBattery), Number(headsetCharging), Number(ringBattery), Number(ringCharging));
}
onCaseStateCaseBatteryCaseChargingCaseDocked(caseBattery: number, caseCharging: number, caseDocked: boolean): void {
this.bridge.handleCaseState(Number(caseBattery), Number(caseCharging), Boolean(caseDocked));
}
onSilentModeSilent(silent: boolean): void { this.bridge.handleSilentMode(Boolean(silent)); }
onWearStateWearing(wearing: boolean): void { this.bridge.handleWearState(Boolean(wearing)); }
onPhoneLockStateLocked(locked: boolean): void { this.bridge.handlePhoneLockState(Boolean(locked)); }
@@ -216,6 +222,7 @@ export class FaceclawCommunicatorBridge {
private readonly stateListeners = new Set<(state: CommunicatorState) => void>();
private readonly ringListeners = new Set<(event: RawInputEvent) => void>();
private readonly batteryListeners = new Set<(state: HeadsetBatteryState) => void>();
private readonly caseListeners = new Set<(state: CaseBatteryState) => void>();
private readonly silentModeListeners = new Set<(silent: boolean) => void>();
private readonly wearStateListeners = new Set<(wearing: boolean) => void>();
private readonly phoneLockStateListeners = new Set<(locked: boolean) => void>();
@@ -288,6 +295,15 @@ export class FaceclawCommunicatorBridge {
this.emitAsync(this.batteryListeners, { battery, chargingStatus, ringBattery, ringChargingStatus });
}
/** @internal */
handleCaseState(battery: number, charging: number, docked: boolean): void {
this.emitAsync(this.caseListeners, {
battery: Number.isInteger(battery) && battery >= 0 && battery <= 100 ? battery : null,
charging: charging > 0,
docked,
});
}
/** @internal */
handleSilentMode(silent: boolean): void { this.emitAsync(this.silentModeListeners, silent); }
@@ -379,6 +395,11 @@ export class FaceclawCommunicatorBridge {
return () => this.batteryListeners.delete(listener);
}
onCaseState(listener: (state: CaseBatteryState) => void): () => void {
this.caseListeners.add(listener);
return () => this.caseListeners.delete(listener);
}
onSilentMode(listener: (silent: boolean) => void): () => void {
this.silentModeListeners.add(listener);
return () => this.silentModeListeners.delete(listener);
+25
View File
@@ -30,6 +30,13 @@ export type HeadsetBatteryState = {
ringChargingStatus?: number;
};
/**
* A charging-case reading, as the glasses relay it. battery is 0..100, or null when the reading
* has none (the glasses are out of the case). charging (the case is on USB) is only known while
* docked.
*/
export type CaseBatteryState = { battery: number | null; charging: boolean; docked: boolean };
export type FrameMetrics = {
paintMs: number;
transmitMs: number;
@@ -152,6 +159,7 @@ export class FaceclawCommunicatorBridge {
private readonly stateListeners = new Set<(state: CommunicatorState) => void>();
private readonly ringListeners = new Set<(event: RawInputEvent) => void>();
private readonly batteryListeners = new Set<(state: HeadsetBatteryState) => void>();
private readonly caseListeners = new Set<(state: CaseBatteryState) => void>();
private readonly silentModeListeners = new Set<(silent: boolean) => void>();
private readonly wearStateListeners = new Set<(wearing: boolean) => void>();
private readonly phoneLockStateListeners = new Set<(locked: boolean) => void>();
@@ -217,6 +225,14 @@ export class FaceclawCommunicatorBridge {
};
this.emitAsync(this.batteryListeners, state);
},
onCaseState: (caseBattery: number, caseCharging: number, caseDocked: boolean) => {
const battery = Number(caseBattery);
this.emitAsync(this.caseListeners, {
battery: Number.isInteger(battery) && battery >= 0 && battery <= 100 ? battery : null,
charging: Number(caseCharging) > 0,
docked: Boolean(caseDocked),
});
},
onSilentMode: (silent: boolean) => {
this.emitAsync(this.silentModeListeners, Boolean(silent));
},
@@ -337,6 +353,15 @@ export class FaceclawCommunicatorBridge {
return () => this.batteryListeners.delete(listener);
}
/**
* Charging-case readings: read at session start and on docking, then pushed by the glasses
* on every change, including leaving the case.
*/
onCaseState(listener: (state: CaseBatteryState) => void): () => void {
this.caseListeners.add(listener);
return () => this.caseListeners.delete(listener);
}
/**
* Silent mode, toggled on the glasses by long-pressing both touchpads. While
* it is on the firmware ignores all input and blanks the display.
+8
View File
@@ -199,6 +199,14 @@ export class FaceclawVoiceControlBridge {
);
}
/**
* Capture could not be started for a reason other than a denied permission.
* Without this the dialog keeps showing the idle "Voice control stopped."
*/
reportStartFailed(reason: string): void {
this.setStatus("Voice input couldn't start.", reason);
}
/** Begin push-to-talk capture (momentary; released with stopPushToTalk). */
startPushToTalk(options: PushToTalkOptions): void {
this.acquireCapture("ptt", options);
+11 -2
View File
@@ -10,6 +10,8 @@ import { sampleBleTraffic } from '../native/ble-traffic'
import { onAnySettingChanged, mirrorTouchSetting, showBleBandwidthSetting } from '../ui/dashboard-settings'
import { loadDeviceAddresses } from '../g2/device-addresses'
import { deviceAddressError } from '../g2/ios-peripheral-identity'
import { formatBatteryLine } from '../g2/glasses-display-state'
import { shell } from '../ui/shell/shell'
export function createMainPage(): Page {
const page = new Page()
@@ -70,6 +72,10 @@ export function createMainPage(): Page {
keyboardPanel.bindingContext = keyboardModel
GridLayout.setRow(keyboardPanel, 1); root.addChild(keyboardPanel)
let focusTimer: ReturnType<typeof setTimeout> | null = null
// The Settings tab's battery row. iOS reports charging sessions as
// connected, so "connected" is the whole live-link condition here.
let glassesLinked = false
const refreshBatteryLine = () => { model.batteryLine = formatBatteryLine(shell.getBatteryLevels(), glassesLinked) }
const keyboardField = () => keyboardPanel.getViewById<TextView>('keyboardInputField')
const controller = new IosPreviewController((image, label) => {
mirror.imageSource = image; model.set('padFocusLine', label)
@@ -79,6 +85,7 @@ export function createMainPage(): Page {
state.text = ({ connected: 'Connected', disconnected: 'Preview', connecting: 'Connecting',
retrying: 'Reconnecting', disconnecting: 'Disconnecting', error: 'Failed' })[connection.phase]
warning.visibility = connection.firmwareWarning ? 'visible' : 'collapse'
glassesLinked = connection.phase === 'connected'; refreshBatteryLine()
}, session => {
keyboardModel.setSession(session)
controls.visibility = session ? 'collapse' : 'visible'
@@ -256,6 +263,7 @@ export function createMainPage(): Page {
const resume = () => { foreground = true; controller.resume(); syncBandwidth() }
let keyboardObserver: any = null
let offSettings: (() => void) | null = null
let offBattery: (() => void) | null = null
page.on('loaded', () => {
if (!keyboardObserver) keyboardObserver = NSNotificationCenter.defaultCenter.addObserverForNameObjectQueueUsingBlock(
UIKeyboardWillChangeFrameNotification, null, NSOperationQueue.mainQueue, notification => {
@@ -266,14 +274,15 @@ export function createMainPage(): Page {
})
Application.on(Application.suspendEvent, pause); Application.on(Application.resumeEvent, resume)
offSettings?.(); offSettings = onAnySettingChanged(() => { model.refreshDisplayControls(); syncBandwidth() })
model.refreshDisplayControls(); resume()
offBattery?.(); offBattery = shell.onBatteryLevelsChanged(refreshBatteryLine)
model.refreshDisplayControls(); refreshBatteryLine(); resume()
if (!isPreviewOnlyMode() && !isAutoReconnectSuppressed() && !deviceAddressError(loadDeviceAddresses())) void controller.connect()
})
page.on('unloaded', () => {
if (keyboardObserver) NSNotificationCenter.defaultCenter.removeObserver(keyboardObserver)
keyboardObserver = null
root.paddingBottom = 0
pause(); offSettings?.(); offSettings = null
pause(); offSettings?.(); offSettings = null; offBattery?.(); offBattery = null
Application.off(Application.suspendEvent, pause); Application.off(Application.resumeEvent, resume)
})
return page
+11
View File
@@ -15,6 +15,7 @@ import {
type View,
} from "@nativescript/core";
import { dashboardController, type MirrorTouchKind } from "../g2/dashboard-controller";
import { formatBatteryLine } from "../g2/glasses-display-state";
import {
mirrorTouchSetting,
onAnySettingChanged,
@@ -93,6 +94,10 @@ export class MainViewModel extends RemoteControlsViewModel {
this.displayPreview = snapshot.displayPreview;
this.displayPreviewMessage = snapshot.displayPreviewMessage;
this.phase = snapshot.phase;
this.batteryLine = formatBatteryLine(
snapshot.batteries,
snapshot.phase === "connected" || snapshot.phase === "charging",
);
this.activeTextSettingId = snapshot.activeTextSettingId;
this.activeTextEditorTitle = snapshot.activeTextEditorTitle;
this.activeTextSettingTitle = snapshot.activeTextSettingTitle;
@@ -1071,10 +1076,16 @@ export class MainViewModel extends RemoteControlsViewModel {
return dashboardController.glassesDisplayAsleep();
}
override get padDetailLine(): string {
return dashboardController.glassesDisplayDetail();
}
private refreshPadFocusLine(): void {
this.notifyPropertyChange("padFocusLine", this.padFocusLine);
this.notifyPropertyChange("padFocusClass", this.padFocusClass);
this.notifyPropertyChange("padWakeHintVisibility", this.padWakeHintVisibility);
this.notifyPropertyChange("padDetailLine", this.padDetailLine);
this.notifyPropertyChange("padDetailVisibility", this.padDetailVisibility);
}
async onPadTap(): Promise<void> {
+31 -1
View File
@@ -8,6 +8,7 @@ let lastControlsTab: ControlsTab = 'watch';
/** Shared state and actions for remote-controls.xml; transport stays in the host. */
export class RemoteControlsViewModel extends Observable {
private _controlsTab: ControlsTab = lastControlsTab;
private _batteryLine = "";
get settingsTabVisibility(): "visible" | "collapse" {
return this._controlsTab === "settings" ? "visible" : "collapse";
@@ -50,6 +51,19 @@ export class RemoteControlsViewModel extends Observable {
return this.padDisplayAsleep ? "visible" : "collapse";
}
/**
* A smaller line under the watch face's status line, or "" to hide it: the
* charging case's level while the glasses charge in it. The host overrides
* this and notifies padDetailLine and padDetailVisibility when it changes.
*/
get padDetailLine(): string {
return "";
}
get padDetailVisibility(): "visible" | "collapse" {
return this.padDetailLine ? "visible" : "collapse";
}
onSettingsTabTap(): void {
this.setControlsTab("settings");
}
@@ -76,7 +90,23 @@ export class RemoteControlsViewModel extends Observable {
this.notifyPropertyChange("ringTabClass", this.ringTabClass);
}
// ---- display mode and brightness, on the Settings tab ----
// ---- display mode, brightness and battery levels, on the Settings tab ----
/** The Settings tab's battery row (formatBatteryLine), or "" to hide it; set by the host. */
get batteryLine(): string {
return this._batteryLine;
}
set batteryLine(value: string) {
if (this._batteryLine === value) return;
this._batteryLine = value;
this.notifyPropertyChange("batteryLine", value);
this.notifyPropertyChange("batteryLineVisibility", this.batteryLineVisibility);
}
get batteryLineVisibility(): "visible" | "collapse" {
return this._batteryLine ? "visible" : "collapse";
}
get displayModeLabel(): string {
return displayLayoutSetting.displayValue() + " ▾";
+9
View File
@@ -91,6 +91,9 @@
font-size: 13;
margin-right: 2;
}
.settings-battery-line {
font-size: 14;
}
.touchpad {
height: 230;
background-color: #1f1f1f;
@@ -113,6 +116,12 @@
color: #6a6a6a;
margin-top: 4;
}
/* The charging case's level under "Charging · G2 n%". */
.pad-detail {
font-size: 15;
color: #b0b0b0;
margin-top: 4;
}
.action-row {
margin-top: 6;
}
+16 -7
View File
@@ -1,10 +1,10 @@
<!--
The phone's controller for the glasses, as a three-tab area below the mirror:
Settings (screen size + brightness), Watch (the simulated watch face: same
scheme as the watch pad - tap = select, double-tap or two fingers = back,
hold = menu, swipes navigate), and Ring (a touchpad on the ring's own
scheme: vertical swipes scroll, tap/double-tap/hold = click/double-click/
long-press). Tap-then-hold on either pad is the G2 system-menu gesture. The
Settings (display mode, brightness and battery levels), Watch (the
simulated watch face: same scheme as the watch pad - tap = select,
double-tap or two fingers = back, hold = menu, swipes navigate), and Ring
(a touchpad on the ring's own scheme: vertical swipes scroll,
tap/double-tap/hold = click/double-click/long-press). Tap-then-hold on either pad is the G2 system-menu gesture. The
narrow mic and keyboard buttons at the tab bar's right edge fire the
wakeword / open the keyboard dialog without changing the selected tab. Used
by main-page.xml in both orientations; binds to the page's MainViewModel,
@@ -49,15 +49,24 @@
<Switch checked="{{ brightnessAuto }}" checkedChange="{{ onBrightnessAutoChange }}" />
</StackLayout>
</GridLayout>
<!-- Last-known levels of the glasses, their charging case and the R1;
collapsed until one is known. Last so its appearing doesn't move
the controls above. -->
<GridLayout rows="auto" columns="auto,*" class="settings-row" visibility="{{ batteryLineVisibility }}">
<Label col="0" text="Battery" class="settings-row-label" verticalAlignment="center" />
<Label col="1" text="{{ batteryLine }}" textWrap="true" class="settings-battery-line" verticalAlignment="center" />
</GridLayout>
</StackLayout>
<!-- Watch tab: centered in the leftover height, capped at the 1.5:1 face
aspect (watchFaceWidth = min(available, 1.5 x face height). The star
rows center the status line, plus the wake hint under it while the
display is off (a double-tap is the only gesture that wakes it). -->
<GridLayout visibility="{{ watchTabVisibility }}" width="{{ watchFaceWidth }}" height="{{ watchFaceHeight }}" rows="*,auto,auto,*" horizontalAlignment="center" verticalAlignment="center" class="touchpad" android:tap="{{ onPadTap }}" android:doubleTap="{{ onPadDoubleTap }}" android:longPress="{{ onPadLongPress }}" android:swipe="{{ onPadSwipe }}" touch="{{ onPadTouch }}">
display is off (a double-tap is the only gesture that wakes it), or
the charging case's level while the glasses charge in it. -->
<GridLayout visibility="{{ watchTabVisibility }}" width="{{ watchFaceWidth }}" height="{{ watchFaceHeight }}" rows="*,auto,auto,auto,*" horizontalAlignment="center" verticalAlignment="center" class="touchpad" android:tap="{{ onPadTap }}" android:doubleTap="{{ onPadDoubleTap }}" android:longPress="{{ onPadLongPress }}" android:swipe="{{ onPadSwipe }}" touch="{{ onPadTouch }}">
<Label row="1" isUserInteractionEnabled="false" text="{{ padFocusLine }}" class="{{ padFocusClass }}" horizontalAlignment="center" />
<Label row="2" isUserInteractionEnabled="false" text="●● wake" visibility="{{ padWakeHintVisibility }}" class="pad-wake-hint" horizontalAlignment="center" />
<Label row="3" isUserInteractionEnabled="false" text="{{ padDetailLine }}" visibility="{{ padDetailVisibility }}" class="pad-detail" horizontalAlignment="center" />
</GridLayout>
<!-- Ring tab: a touchpad on the ring's own scheme. Vertical swipes only
+8
View File
@@ -491,6 +491,14 @@ export type ShellChromeState = {
/** The Wear OS watch (app/g2/wear-remote.ts); null when no watch is reachable. */
watch: number | null;
watchCharging: boolean | null;
/**
* The glasses' charging case, last known (it only reports while the
* glasses are docked); null until it does. caseCharging is null while the
* glasses are out of the case, where they can't see whether it is on USB.
* Shown on the phone, not here.
*/
case: number | null;
caseCharging: boolean | null;
};
/** App-provided tray images, drawn between notification icons and batteries. */
trayIcons: ShellChromeTrayIcon[];
+1
View File
@@ -463,6 +463,7 @@ class Shell {
private lastInput: InputEvent | null = null;
private battery: ShellChromeState["battery"] = {
headset: null, headsetCharging: null, ring: null, ringCharging: null, watch: null, watchCharging: null,
case: null, caseCharging: null,
};
private readonly batteryListeners = new Set<() => void>();
private attention = new Map<string, boolean>();