diff options
-rw-r--r-- | apps/keymaps/keymap-android.c | 12 | ||||
-rw-r--r-- | firmware/export/config/android.h | 3 | ||||
-rw-r--r-- | firmware/target/hosted/android/app/button-application.c | 4 | ||||
-rw-r--r-- | firmware/target/hosted/android/app/button-target.h | 2 |
4 files changed, 20 insertions, 1 deletions
diff --git a/apps/keymaps/keymap-android.c b/apps/keymaps/keymap-android.c index c822a64fc2..b7b93ac1f0 100644 --- a/apps/keymaps/keymap-android.c +++ b/apps/keymaps/keymap-android.c | |||
@@ -60,11 +60,21 @@ static const struct button_mapping button_context_wps[] = { | |||
60 | { ACTION_WPS_BROWSE, BUTTON_BACK, BUTTON_NONE }, | 60 | { ACTION_WPS_BROWSE, BUTTON_BACK, BUTTON_NONE }, |
61 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 61 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
62 | { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 62 | { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
63 | 63 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | |
64 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
65 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | ||
66 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
67 | |||
64 | LAST_ITEM_IN_LIST | 68 | LAST_ITEM_IN_LIST |
65 | }; /* button_context_wps */ | 69 | }; /* button_context_wps */ |
66 | 70 | ||
67 | static const struct button_mapping button_context_list[] = { | 71 | static const struct button_mapping button_context_list[] = { |
72 | #ifdef HAVE_VOLUME_IN_LIST | ||
73 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
74 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | ||
75 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | ||
76 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
77 | #endif | ||
68 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 78 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
69 | }; /* button_context_list */ | 79 | }; /* button_context_list */ |
70 | 80 | ||
diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h index c9ae8ba191..ed1a283c7d 100644 --- a/firmware/export/config/android.h +++ b/firmware/export/config/android.h | |||
@@ -76,6 +76,9 @@ | |||
76 | #define HAVE_MULTIMEDIA_KEYS | 76 | #define HAVE_MULTIMEDIA_KEYS |
77 | #define CONFIG_KEYPAD ANDROID_PAD | 77 | #define CONFIG_KEYPAD ANDROID_PAD |
78 | 78 | ||
79 | /* define this if the target has volume keys which can be used in the lists */ | ||
80 | #define HAVE_VOLUME_IN_LIST | ||
81 | |||
79 | #define HAVE_SW_TONE_CONTROLS | 82 | #define HAVE_SW_TONE_CONTROLS |
80 | 83 | ||
81 | /* Define current usage levels. */ | 84 | /* Define current usage levels. */ |
diff --git a/firmware/target/hosted/android/app/button-application.c b/firmware/target/hosted/android/app/button-application.c index 1586183f6f..65aff1a1a9 100644 --- a/firmware/target/hosted/android/app/button-application.c +++ b/firmware/target/hosted/android/app/button-application.c | |||
@@ -39,6 +39,10 @@ int key_to_button(int keyboard_key) | |||
39 | return BUTTON_MENU; | 39 | return BUTTON_MENU; |
40 | case KEYCODE_DPAD_CENTER: | 40 | case KEYCODE_DPAD_CENTER: |
41 | return BUTTON_DPAD_CENTER; | 41 | return BUTTON_DPAD_CENTER; |
42 | case KEYCODE_VOLUME_UP: | ||
43 | return BUTTON_VOL_UP; | ||
44 | case KEYCODE_VOLUME_DOWN: | ||
45 | return BUTTON_VOL_DOWN; | ||
42 | default: | 46 | default: |
43 | return BUTTON_NONE; | 47 | return BUTTON_NONE; |
44 | } | 48 | } |
diff --git a/firmware/target/hosted/android/app/button-target.h b/firmware/target/hosted/android/app/button-target.h index 3b6028739c..b532c94f47 100644 --- a/firmware/target/hosted/android/app/button-target.h +++ b/firmware/target/hosted/android/app/button-target.h | |||
@@ -40,6 +40,8 @@ void android_ignore_back_button(bool yes); | |||
40 | #define BUTTON_DPAD_UP 0x00000010 | 40 | #define BUTTON_DPAD_UP 0x00000010 |
41 | #define BUTTON_DPAD_DOWN 0x00000020 | 41 | #define BUTTON_DPAD_DOWN 0x00000020 |
42 | #define BUTTON_DPAD_CENTER 0x00000040 | 42 | #define BUTTON_DPAD_CENTER 0x00000040 |
43 | #define BUTTON_VOL_UP 0x00000080 | ||
44 | #define BUTTON_VOL_DOWN 0x00000100 | ||
43 | 45 | ||
44 | /* Compatibility hacks for flipping. Needs a somewhat better fix. */ | 46 | /* Compatibility hacks for flipping. Needs a somewhat better fix. */ |
45 | #define BUTTON_LEFT BUTTON_DPAD_LEFT | 47 | #define BUTTON_LEFT BUTTON_DPAD_LEFT |