diff options
| -rw-r--r-- | BoardConfig.mk | 2 | ||||
| -rwxr-xr-x | audio/audio_hw.c | 4 | ||||
| -rw-r--r-- | recovery_keys.c | 41 |
3 files changed, 45 insertions, 2 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 9860773..99dec11 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -79,3 +79,5 @@ BOARD_LIB_DUMPSTATE := libdumpstate.tuna BOARD_USES_SECURE_SERVICES := true BOARD_HAS_NO_SELECT_BUTTON := true +BOARD_XHDPI_RECOVERY := true +BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/samsung/tuna/recovery_keys.c diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 0ba9a41..1aec4d0 100755 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -183,7 +183,7 @@ /* use-case specific output volumes */ #define NORMAL_SPEAKER_VOLUME_TORO 4 -#define NORMAL_SPEAKER_VOLUME_MAGURO 2 +#define NORMAL_SPEAKER_VOLUME_MAGURO 7 #define NORMAL_HEADSET_VOLUME_TORO -12 #define NORMAL_HEADSET_VOLUME_MAGURO -12 #define NORMAL_HEADPHONE_VOLUME_TORO -6 /* allow louder output for headphones */ @@ -192,7 +192,7 @@ #define NORMAL_EARPIECE_VOLUME_MAGURO -2 #define VOICE_CALL_SPEAKER_VOLUME_TORO 9 -#define VOICE_CALL_SPEAKER_VOLUME_MAGURO 6 +#define VOICE_CALL_SPEAKER_VOLUME_MAGURO 7 #define VOICE_CALL_HEADSET_VOLUME_TORO -6 #define VOICE_CALL_HEADSET_VOLUME_MAGURO 0 #define VOICE_CALL_EARPIECE_VOLUME_TORO 2 diff --git a/recovery_keys.c b/recovery_keys.c new file mode 100644 index 0000000..013c169 --- /dev/null +++ b/recovery_keys.c @@ -0,0 +1,41 @@ +#include <linux/input.h> + +#include "recovery_ui.h" +#include "common.h" +#include "extendedcommands.h" + + +int device_toggle_display(volatile char* key_pressed, int key_code) { + int alt = key_pressed[KEY_LEFTALT] || key_pressed[KEY_RIGHTALT]; + if (alt && key_code == KEY_L) + return 1; + // allow toggling of the display if the correct key is pressed, and the display toggle is allowed or the display is currently off + if (ui_get_showing_back_button()) { + return 0; + //return get_allow_toggle_display() && (key_code == KEY_HOME || key_code == KEY_MENU || key_code == KEY_END); + } + return get_allow_toggle_display() && (key_code == KEY_HOME || key_code == KEY_MENU || key_code == KEY_POWER || key_code == KEY_END); +} + +int device_handle_key(int key_code, int visible) { + if (visible) { + switch (key_code) { + case KEY_VOLUMEDOWN: + return HIGHLIGHT_DOWN; + + case KEY_VOLUMEUP: + return HIGHLIGHT_UP; + + case KEY_POWER: + if (ui_get_showing_back_button()) { + return SELECT_ITEM; + } + if (!get_allow_toggle_display()) + return GO_BACK; + break; + return SELECT_ITEM; + } + } + + return NO_ACTION; +} |