forked from Blendman974/faceclaw
Putting on the glasses auto-wakes the screen
This commit is contained in:
1 parent
77bda86ede
commit
48a2bd1757
2 files changed
+25
-1
No files matched your search
@@ -149,6 +149,9 @@ const SHELL_REFRESH_INTERVAL_MS = 60_000;
|
|||||||
// schedules a refresh), so this just covers anything that slips through.
|
// schedules a refresh), so this just covers anything that slips through.
|
||||||
const PREVIEW_INTERVAL_MS = 1_000;
|
const PREVIEW_INTERVAL_MS = 1_000;
|
||||||
const SCREEN_TIMEOUT_CHECK_MS = 1_000;
|
const SCREEN_TIMEOUT_CHECK_MS = 1_000;
|
||||||
|
// The lock screen is a short notice, not something to read at leisure; it
|
||||||
|
// ignores the screen-timeout setting (including "never").
|
||||||
|
const LOCK_SCREEN_TIMEOUT_MS = 15_000;
|
||||||
const EVENHUB_SCREEN_OFF_SUSPEND_DELAY_MS = 5_000;
|
const EVENHUB_SCREEN_OFF_SUSPEND_DELAY_MS = 5_000;
|
||||||
const EVENHUB_WAKE_READY_TIMEOUT_MS = 4_500;
|
const EVENHUB_WAKE_READY_TIMEOUT_MS = 4_500;
|
||||||
const FOREGROUND_NOTIFICATION_MIN_UPDATE_MS = 30_000;
|
const FOREGROUND_NOTIFICATION_MIN_UPDATE_MS = 30_000;
|
||||||
@@ -365,7 +368,8 @@ class DashboardController {
|
|||||||
// surface, so their repaints go through the shell render path.
|
// surface, so their repaints go through the shell render path.
|
||||||
requestRender: () => this.requestShellRender(),
|
requestRender: () => this.requestShellRender(),
|
||||||
},
|
},
|
||||||
getScreenTimeoutMs: () => screenTimeoutSettingToMs(screenTimeoutSetting.get()),
|
getScreenTimeoutMs: () =>
|
||||||
|
this.glassesLocked ? LOCK_SCREEN_TIMEOUT_MS : screenTimeoutSettingToMs(screenTimeoutSetting.get()),
|
||||||
requestShellRender: () => this.requestShellRender(),
|
requestShellRender: () => this.requestShellRender(),
|
||||||
prepareVoiceCapture: () => this.prepareVoiceCapture(),
|
prepareVoiceCapture: () => this.prepareVoiceCapture(),
|
||||||
onKeyboardInputChanged: (session) => {
|
onKeyboardInputChanged: (session) => {
|
||||||
@@ -626,6 +630,9 @@ class DashboardController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private handleWearState(wearing: boolean): void {
|
private handleWearState(wearing: boolean): void {
|
||||||
|
// Only an observed OFF_HEAD -> ON_HEAD transition counts as putting the
|
||||||
|
// glasses on; the first snapshot of a session (null) is just the status.
|
||||||
|
const putOn = wearing && this.glassesWorn === false;
|
||||||
this.glassesWorn = wearing;
|
this.glassesWorn = wearing;
|
||||||
updateGlassesPresence({ worn: wearing });
|
updateGlassesPresence({ worn: wearing });
|
||||||
this.appendLog(wearing ? "glasses wear state: ON_HEAD" : "glasses wear state: OFF_HEAD");
|
this.appendLog(wearing ? "glasses wear state: ON_HEAD" : "glasses wear state: OFF_HEAD");
|
||||||
@@ -633,6 +640,19 @@ class DashboardController {
|
|||||||
if (!wearing && this.phoneLocked && lockScreenEnabledSetting.get()) {
|
if (!wearing && this.phoneLocked && lockScreenEnabledSetting.get()) {
|
||||||
this.setGlassesLocked(true, "glasses removed while phone locked");
|
this.setGlassesLocked(true, "glasses removed while phone locked");
|
||||||
}
|
}
|
||||||
|
if (putOn) this.wakeForGlassesPutOn();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Putting the glasses on wakes the screen, like a double-tap would. While
|
||||||
|
* locked that shows the lock-screen notice (which then times out on its
|
||||||
|
* own short timer); otherwise it lands on the sidebar as a normal wake.
|
||||||
|
*/
|
||||||
|
private wakeForGlassesPutOn(): void {
|
||||||
|
if (this.phase !== "connected" || !this.communicator || shell.isScreenOn()) return;
|
||||||
|
// wake() -> onScreenStateChanged(true) dismisses a showing Glanceboard,
|
||||||
|
// runs the EvenHub wake barrier and repaints the shell.
|
||||||
|
if (shell.wake("sidebar")) this.appendLog("screen woken: glasses put on");
|
||||||
}
|
}
|
||||||
|
|
||||||
private handlePhoneLockState(locked: boolean): void {
|
private handlePhoneLockState(locked: boolean): void {
|
||||||
|
|||||||
@@ -362,9 +362,13 @@ export class IosPreviewController {
|
|||||||
// Sample false to catch a notification missed during suspension. Do not
|
// Sample false to catch a notification missed during suspension. Do not
|
||||||
// sample true here: WillBecomeUnavailable precedes the property transition.
|
// sample true here: WillBecomeUnavailable precedes the property transition.
|
||||||
if (!UIApplication.sharedApplication.protectedDataAvailable) this.handlePhoneLockState(true)
|
if (!UIApplication.sharedApplication.protectedDataAvailable) this.handlePhoneLockState(true)
|
||||||
|
// Putting the glasses on (an observed OFF_HEAD -> ON_HEAD transition, not
|
||||||
|
// a session's first snapshot) wakes the screen, to the lock notice if locked.
|
||||||
|
const putOn = wearing && this.glassesWorn === false
|
||||||
this.glassesWorn = wearing
|
this.glassesWorn = wearing
|
||||||
this.logBluetooth(`Glasses wear state: ${wearing ? 'ON_HEAD' : 'OFF_HEAD'}`)
|
this.logBluetooth(`Glasses wear state: ${wearing ? 'ON_HEAD' : 'OFF_HEAD'}`)
|
||||||
if (!wearing && this.phoneLocked && this.lockEnabled) this.setGlassesLocked(true)
|
if (!wearing && this.phoneLocked && this.lockEnabled) this.setGlassesLocked(true)
|
||||||
|
if (putOn && this.runtimeRunning && !shell.isScreenOn()) shell.wake('sidebar')
|
||||||
}
|
}
|
||||||
private setGlassesLocked(locked: boolean): void {
|
private setGlassesLocked(locked: boolean): void {
|
||||||
if (locked === this.glassesLocked) return
|
if (locked === this.glassesLocked) return
|
||||||
|
|||||||
Reference in new issue
Block a user