forked from Blendman974/faceclaw
feat: separate per-app keep awake from full screen
This commit is contained in:
7 files changed
+105
-21
No files matched your search
@@ -18,6 +18,7 @@ function fixture(options = {}) {
|
||||
selectItem(index) { this.selectedIndex = index; }
|
||||
}
|
||||
const fullscreen = new Map();
|
||||
const keepAwake = new Map();
|
||||
const context = {
|
||||
exports: {}, MenuLayer, console: { warn: () => {} },
|
||||
appViewportRect: () => ({ x: 0, y: 0, width: 576 }), CONTEXT_MENU_DIM: 0.5,
|
||||
@@ -25,7 +26,10 @@ function fixture(options = {}) {
|
||||
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',
|
||||
appKeepAwakeSetting: id => ({ label: 'Keep screen awake', get: () => keepAwake.get(id) ?? false, set: value => keepAwake.set(id, value) }),
|
||||
toggleSettingMenuItem: (setting, options) => ({ label: setting.label, onSelect(ctx) {
|
||||
setting.set(!setting.get()); options.onChange(ctx);
|
||||
} }),
|
||||
};
|
||||
vm.runInNewContext(ts.transpileModule(`${overlay.getText(source)}\nexport class Shell { ${methods.map(node => node.getText(source)).join('\n')} }`, {
|
||||
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
|
||||
@@ -69,10 +73,10 @@ 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, fullscreen };
|
||||
return { s, input, menu, choose, closed, delivered, warnings, renders, launcher, app, background, window, fullscreen, keepAwake };
|
||||
}
|
||||
|
||||
test('full screen targets the captured app and keeps only the visible app awake', async () => {
|
||||
test('full screen targets the captured app without inhibiting idle sleep', async () => {
|
||||
const h = fixture();
|
||||
h.s.config.getScreenTimeoutMs = () => 1000;
|
||||
let relayouts = 0;
|
||||
@@ -84,10 +88,7 @@ test('full screen targets the captured app and keeps only the visible app awake'
|
||||
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);
|
||||
assert.equal(h.s.applyScreenTimeout(5000), true);
|
||||
h.s.screenOn = true;
|
||||
h.s.focusWindow('current');
|
||||
await h.input('long-press');
|
||||
@@ -97,9 +98,37 @@ test('full screen targets the captured app and keeps only the visible app awake'
|
||||
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 () => {
|
||||
test('keep awake is independent of full screen and applies only to the visible app', async () => {
|
||||
const h = fixture();
|
||||
h.s.config.getScreenTimeoutMs = () => 1000;
|
||||
await h.input('long-press');
|
||||
const labels = h.menu().items.map(item => item.label);
|
||||
assert.equal(labels.indexOf('Keep screen awake'), labels.indexOf('Enter full screen') + 1);
|
||||
h.s.selectedIndex = 2;
|
||||
h.choose('Keep screen awake');
|
||||
assert.equal(h.keepAwake.get('current'), true);
|
||||
assert.equal(h.fullscreen.get('current'), undefined);
|
||||
assert.equal(h.s.foregroundWindow().windowId, 'current');
|
||||
assert.equal(h.s.applyScreenTimeout(5000), false);
|
||||
h.s.focusWindow('background');
|
||||
assert.equal(h.s.applyScreenTimeout(5500), false);
|
||||
assert.equal(h.s.applyScreenTimeout(6000), true);
|
||||
h.s.screenOn = true;
|
||||
h.s.focusWindow('current');
|
||||
await h.input('long-press'); h.choose('Enter full screen');
|
||||
assert.equal(h.s.applyScreenTimeout(7000), false);
|
||||
await h.input('long-press'); h.choose('Exit full screen');
|
||||
assert.equal(h.keepAwake.get('current'), true);
|
||||
assert.equal(h.s.applyScreenTimeout(8000), false);
|
||||
await h.input('long-press'); h.choose('Keep screen awake');
|
||||
assert.equal(h.keepAwake.get('current'), false);
|
||||
assert.equal(h.s.applyScreenTimeout(9000), true);
|
||||
});
|
||||
|
||||
test('keep awake does not suppress lock timeout or manual sleep, and options are absent for the launcher', async () => {
|
||||
const h = fixture();
|
||||
h.fullscreen.set('current', true);
|
||||
h.keepAwake.set('current', true);
|
||||
h.s.config.getScreenTimeoutMs = () => 1000;
|
||||
h.s.config.isLocked = () => true;
|
||||
assert.equal(h.s.applyScreenTimeout(5000), true);
|
||||
@@ -111,6 +140,7 @@ test('full screen does not suppress lock timeout or manual sleep, and is absent
|
||||
h.s.selectedIndex = 0;
|
||||
await h.input('long-press');
|
||||
assert.ok(!h.menu().items.some(item => /full screen/.test(item.label)));
|
||||
assert.ok(!h.menu().items.some(item => item.label === 'Keep screen awake'));
|
||||
});
|
||||
|
||||
test('switcher opens its menu on hold or tap-hold even for an app claiming holds or hold-to-talk', async () => {
|
||||
|
||||
Reference in new issue
Block a user