summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2014-01-16 00:26:45 +0100
committerThomas Martitz <kugel@rockbox.org>2014-01-16 00:26:45 +0100
commita6483344f6936f9f4daf657410f2873bf0247be5 (patch)
tree8fa44ce5d2c2c74f0a3195f76ee2ca52cee85e31
parent98591a2815d878af8dbbd47ef7143c16654a8bba (diff)
downloadrockbox-a6483344f6936f9f4daf657410f2873bf0247be5.tar.gz
rockbox-a6483344f6936f9f4daf657410f2873bf0247be5.tar.bz2
rockbox-a6483344f6936f9f4daf657410f2873bf0247be5.zip
usb screen: Push the usb screen onto the activity stack. This enables %cs tag support for it.
Change-Id: Icecb72007aa3aba501c702e1aa65c801fcbc3857
-rw-r--r--apps/gui/usb_screen.c4
-rw-r--r--apps/misc.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index 200abafcc4..dc75f81a71 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -40,6 +40,7 @@
#include "usb_screen.h"
#include "skin_engine/skin_engine.h"
#include "playlist.h"
+#include "misc.h"
#ifdef HAVE_LCD_BITMAP
#include "bitmaps/usblogo.h"
@@ -249,6 +250,8 @@ void gui_usb_screen_run(bool early_usb)
touchscreen_set_mode(TOUCHSCREEN_BUTTON);
#endif
+ push_current_activity(ACTIVITY_USBSCREEN);
+
#ifdef USB_ENABLE_HID
usb_hid = global_settings.usb_hid;
usb_keypad_mode = global_settings.usb_keypad_mode;
@@ -338,4 +341,5 @@ void gui_usb_screen_run(bool early_usb)
viewportmanager_theme_undo(i, false);
}
+ pop_current_activity();
}
diff --git a/apps/misc.h b/apps/misc.h
index 994e7775d2..0d4cba6cd3 100644
--- a/apps/misc.h
+++ b/apps/misc.h
@@ -129,7 +129,8 @@ enum current_activity {
ACTIVITY_TIMEDATESCREEN,
ACTIVITY_BOOKMARKSLIST,
ACTIVITY_SHORTCUTSMENU,
- ACTIVITY_ID3SCREEN
+ ACTIVITY_ID3SCREEN,
+ ACTIVITY_USBSCREEN
};
#if CONFIG_CODEC == SWCODEC