mirror of
https://github.com/DarkFlippers/unleashed-firmware.git
synced 2024-12-19 11:21:39 +03:00
Merge branch 'dev' into leptoptilos
This commit is contained in:
commit
66756853a6
@ -127,7 +127,8 @@ bool subghz_view_transmitter_input(InputEvent* event, void* context) {
|
||||
SubGhzViewTransmitter* subghz_transmitter = context;
|
||||
bool can_be_sent = false;
|
||||
|
||||
if(event->key == InputKeyBack && event->type == InputTypeShort) {
|
||||
if(event->key == InputKeyBack && event->type == InputTypeLong) {
|
||||
// Reset view model
|
||||
with_view_model(
|
||||
subghz_transmitter->view,
|
||||
SubGhzViewTransmitterModel * model,
|
||||
|
@ -415,7 +415,7 @@ bool desktop_api_is_locked(Desktop* instance) {
|
||||
|
||||
void desktop_api_unlock(Desktop* instance) {
|
||||
furi_assert(instance);
|
||||
view_dispatcher_send_custom_event(instance->view_dispatcher, DesktopLockedEventUnlocked);
|
||||
view_dispatcher_send_custom_event(instance->view_dispatcher, DesktopGlobalApiUnlock);
|
||||
}
|
||||
|
||||
FuriPubSub* desktop_api_get_status_pubsub(Desktop* instance) {
|
||||
|
@ -83,6 +83,7 @@ bool desktop_scene_locked_on_event(void* context, SceneManagerEvent event) {
|
||||
if(event.type == SceneManagerEventTypeCustom) {
|
||||
switch(event.event) {
|
||||
case DesktopLockedEventUnlocked:
|
||||
case DesktopGlobalApiUnlock:
|
||||
desktop_unlock(desktop);
|
||||
consumed = true;
|
||||
break;
|
||||
|
@ -126,6 +126,7 @@ bool desktop_scene_pin_input_on_event(void* context, SceneManagerEvent event) {
|
||||
consumed = true;
|
||||
break;
|
||||
case DesktopPinInputEventUnlocked:
|
||||
case DesktopGlobalApiUnlock:
|
||||
desktop_unlock(desktop);
|
||||
consumed = true;
|
||||
break;
|
||||
|
@ -55,4 +55,5 @@ typedef enum {
|
||||
DesktopGlobalBeforeAppStarted,
|
||||
DesktopGlobalAfterAppFinished,
|
||||
DesktopGlobalAutoLock,
|
||||
DesktopGlobalApiUnlock,
|
||||
} DesktopEvent;
|
||||
|
Loading…
Reference in New Issue
Block a user