forked from Blendman974/faceclaw
feat: per-app full screen with idle sleep inhibition
This commit is contained in:
11 files changed
+162
-6
No files matched your search
@@ -9,7 +9,7 @@ function fixture(options = {}) {
|
||||
const source = ts.createSourceFile('shell.ts', fs.readFileSync(path.join(__dirname, '../app/ui/shell/shell.ts'), 'utf8'), ts.ScriptTarget.Latest, true);
|
||||
const shellClass = source.statements.find(node => ts.isClassDeclaration(node) && node.name.text === 'Shell');
|
||||
const names = new Set(['routeInput', 'openEscapeMenu', 'closeAllWindows', 'closeWindow', 'removeWindow',
|
||||
'foregroundWindow', 'noteWindowVisible', 'mostRecentWindowIndex', 'yieldFocusToSidebar']);
|
||||
'foregroundWindow', 'noteWindowVisible', 'mostRecentWindowIndex', 'yieldFocusToSidebar', 'applyScreenTimeout']);
|
||||
const methods = shellClass.members.filter(node => names.has(node.name?.getText(source)));
|
||||
assert.equal(methods.length, names.size);
|
||||
const overlay = source.statements.find(node => ts.isClassDeclaration(node) && node.name.text === 'ShellOverlayMenuLayer');
|
||||
@@ -17,12 +17,15 @@ function fixture(options = {}) {
|
||||
constructor(title, items) { this.title = title; this.items = items; }
|
||||
selectItem(index) { this.selectedIndex = index; }
|
||||
}
|
||||
const fullscreen = new Map();
|
||||
const context = {
|
||||
exports: {}, MenuLayer, console: { warn: () => {} },
|
||||
appViewportRect: () => ({ x: 0, y: 0, width: 576 }), CONTEXT_MENU_DIM: 0.5,
|
||||
brightnessSetting: { get: () => 'auto' }, gestureHints: () => 'App menu',
|
||||
GESTURE_SHORT_THEN_LONG_PRESS: 'tap-hold', makeInputEvent: event => event,
|
||||
isWatchInput: event => event.source === 'watch', isDirectionalInput: () => false,
|
||||
appFullscreenSetting: id => ({ get: () => fullscreen.get(id) ?? false, set: value => fullscreen.set(id, value) }),
|
||||
isImmersive: id => fullscreen.get(id) ?? false, displayLayout: () => 'band-middle',
|
||||
};
|
||||
vm.runInNewContext(ts.transpileModule(`${overlay.getText(source)}\nexport class Shell { ${methods.map(node => node.getText(source)).join('\n')} }`, {
|
||||
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
|
||||
@@ -54,6 +57,10 @@ function fixture(options = {}) {
|
||||
config: { voiceInputEnabled: false, requestShellRender() {}, onWindowsChanged() {} },
|
||||
cancelEscapeMenuTimer() {}, startEscapeMenuTimer() { s.escapeStarted = true; },
|
||||
lastInput: null,
|
||||
lastInputAtMs: 0,
|
||||
noteUserActivity() { this.lastInputAtMs = 100; },
|
||||
focusWindow(id) { this.selectedIndex = this.windows.findIndex(w => w.windowId === id); this.focus = 'window'; },
|
||||
sleep() { this.screenOn = false; },
|
||||
});
|
||||
const input = type => s.routeInput({ type, source: 'ring', timestampMs: 100 }, 1);
|
||||
const menu = () => layers.at(-1);
|
||||
@@ -62,9 +69,50 @@ function fixture(options = {}) {
|
||||
assert.ok(item, label);
|
||||
item.onSelect({ stack: s.stack });
|
||||
};
|
||||
return { s, input, menu, choose, closed, delivered, warnings, renders, launcher, app, background, window };
|
||||
return { s, input, menu, choose, closed, delivered, warnings, renders, launcher, app, background, window, fullscreen };
|
||||
}
|
||||
|
||||
test('full screen targets the captured app and keeps only the visible app awake', async () => {
|
||||
const h = fixture();
|
||||
h.s.config.getScreenTimeoutMs = () => 1000;
|
||||
let relayouts = 0;
|
||||
h.s.config.onWindowLayoutChanged = () => relayouts++;
|
||||
await h.input('long-press');
|
||||
h.s.selectedIndex = 2;
|
||||
h.choose('Enter full screen');
|
||||
assert.equal(h.fullscreen.get('current'), true);
|
||||
assert.equal(h.s.foregroundWindow().windowId, 'current');
|
||||
assert.equal(h.s.focus, 'window');
|
||||
assert.equal(relayouts, 1);
|
||||
assert.equal(h.s.applyScreenTimeout(5000), false);
|
||||
h.s.focusWindow('background');
|
||||
assert.equal(h.s.applyScreenTimeout(5500), false);
|
||||
assert.equal(h.s.applyScreenTimeout(6000), true);
|
||||
h.s.screenOn = true;
|
||||
h.s.focusWindow('current');
|
||||
await h.input('long-press');
|
||||
h.choose('Exit full screen');
|
||||
assert.equal(h.fullscreen.get('current'), false);
|
||||
assert.equal(relayouts, 2);
|
||||
assert.equal(h.s.applyScreenTimeout(7000), true);
|
||||
});
|
||||
|
||||
test('full screen does not suppress lock timeout or manual sleep, and is absent for the launcher', async () => {
|
||||
const h = fixture();
|
||||
h.fullscreen.set('current', true);
|
||||
h.s.config.getScreenTimeoutMs = () => 1000;
|
||||
h.s.config.isLocked = () => true;
|
||||
assert.equal(h.s.applyScreenTimeout(5000), true);
|
||||
h.s.screenOn = true;
|
||||
h.s.config.isLocked = () => false;
|
||||
h.s.sleep();
|
||||
assert.equal(h.s.screenOn, false);
|
||||
h.s.screenOn = true;
|
||||
h.s.selectedIndex = 0;
|
||||
await h.input('long-press');
|
||||
assert.ok(!h.menu().items.some(item => /full screen/.test(item.label)));
|
||||
});
|
||||
|
||||
test('switcher opens its menu on hold or tap-hold even for an app claiming holds or hold-to-talk', async () => {
|
||||
for (const type of ['long-press', 'short-then-long-press']) {
|
||||
for (const app of [{}, { claimsLongPress: () => true }, { holdToTalk: true }]) {
|
||||
|
||||
Reference in new issue
Block a user