summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/button.h12
-rw-r--r--firmware/target/hosted/android/app/button-target.h2
-rw-r--r--firmware/target/hosted/android/lcd-android.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 3f6052a309..6276a033cc 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -81,13 +81,15 @@ void wheel_send_events(bool send);
81int button_apply_acceleration(const unsigned int data); 81int button_apply_acceleration(const unsigned int data);
82#endif 82#endif
83 83
84#define BUTTON_NONE 0x00000000 84#define BUTTON_NONE 0x00000000
85 85
86/* Button modifiers */ 86/* Button modifiers */
87#define BUTTON_REL 0x02000000 87#define BUTTON_REL 0x02000000
88#define BUTTON_REPEAT 0x04000000 88#define BUTTON_REPEAT 0x04000000
89#define BUTTON_TOUCHSCREEN 0x08000000 89/* Special buttons */
90#define BUTTON_MULTIMEDIA 0x10000000 90#define BUTTON_TOUCHSCREEN 0x08000000
91#define BUTTON_MULTIMEDIA 0x10000000
92#define BUTTON_REDRAW 0x20000000
91 93
92#define BUTTON_MULTIMEDIA_PLAYPAUSE (BUTTON_MULTIMEDIA|0x01) 94#define BUTTON_MULTIMEDIA_PLAYPAUSE (BUTTON_MULTIMEDIA|0x01)
93#define BUTTON_MULTIMEDIA_STOP (BUTTON_MULTIMEDIA|0x02) 95#define BUTTON_MULTIMEDIA_STOP (BUTTON_MULTIMEDIA|0x02)
diff --git a/firmware/target/hosted/android/app/button-target.h b/firmware/target/hosted/android/app/button-target.h
index 326d65872d..5430d7f600 100644
--- a/firmware/target/hosted/android/app/button-target.h
+++ b/firmware/target/hosted/android/app/button-target.h
@@ -56,6 +56,4 @@ void android_ignore_back_button(bool yes);
56#define BUTTON_BOTTOMMIDDLE 0x00080000 56#define BUTTON_BOTTOMMIDDLE 0x00080000
57#define BUTTON_BOTTOMRIGHT 0x00100000 57#define BUTTON_BOTTOMRIGHT 0x00100000
58 58
59#define BUTTON_FORCE_REDRAW 0x00200000
60
61#endif /* _BUTTON_TARGET_H_ */ 59#endif /* _BUTTON_TARGET_H_ */
diff --git a/firmware/target/hosted/android/lcd-android.c b/firmware/target/hosted/android/lcd-android.c
index bb0331db69..2b383741d1 100644
--- a/firmware/target/hosted/android/lcd-android.c
+++ b/firmware/target/hosted/android/lcd-android.c
@@ -146,7 +146,7 @@ Java_org_rockbox_RockboxFramebuffer_surfaceCreated(JNIEnv *env, jobject this,
146 send_event(LCD_EVENT_ACTIVATION, NULL); 146 send_event(LCD_EVENT_ACTIVATION, NULL);
147 /* Force an update, since the newly created surface is initially black 147 /* Force an update, since the newly created surface is initially black
148 * waiting for the next normal update results in a longish black screen */ 148 * waiting for the next normal update results in a longish black screen */
149 queue_post(&button_queue, BUTTON_FORCE_REDRAW, 0); 149 queue_post(&button_queue, BUTTON_REDRAW, 0);
150} 150}
151 151
152/* 152/*