aboutsummaryrefslogtreecommitdiffstats
path: root/android/qemulator.c
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2011-01-26 11:19:19 -0800
committerVladimir Chtchetkine <vchtchetkine@google.com>2011-01-28 09:14:01 -0800
commit777eb68eb60cac18f4b62e2e1b14a906875cbe7a (patch)
tree5850f03e01bb348ad7fc4e92dd08695416650c48 /android/qemulator.c
parent316669d58104cb260e2ffa1848f24547b71af49c (diff)
downloadexternal_qemu-777eb68eb60cac18f4b62e2e1b14a906875cbe7a.zip
external_qemu-777eb68eb60cac18f4b62e2e1b14a906875cbe7a.tar.gz
external_qemu-777eb68eb60cac18f4b62e2e1b14a906875cbe7a.tar.bz2
Refactored ui-core-control and core-ui-control protocols
Also cleaned the code up from obsolete ui-core-protocol.* and core-ui-protocol.* Change-Id: I194bec669d25b68a10c32b2be50bc9da50c52ebb
Diffstat (limited to 'android/qemulator.c')
-rw-r--r--android/qemulator.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/android/qemulator.c b/android/qemulator.c
index a5f0dc0..f1b2dbc 100644
--- a/android/qemulator.c
+++ b/android/qemulator.c
@@ -14,7 +14,8 @@
#include "android/utils/bufprint.h"
#include "android/globals.h"
#include "android/qemulator.h"
-#include "android/ui-core-protocol.h"
+#include "android/protocol/core-commands-api.h"
+#include "android/protocol/ui-commands-api.h"
#include "user-events.h"
#define D(...) do { if (VERBOSE_CHECK(init)) dprint(__VA_ARGS__); } while (0)
@@ -87,8 +88,8 @@ qemulator_setup( QEmulator* emulator )
}
/* initialize hardware control support */
- android_core_set_brightness_change_callback(qemulator_light_brightness,
- emulator);
+ uicmd_set_brightness_change_callback(qemulator_light_brightness,
+ emulator);
}
static void
@@ -272,7 +273,7 @@ qemulator_set_title(QEmulator* emulator)
int
get_device_dpi( AndroidOptions* opts )
{
- int dpi_device = android_core_get_hw_lcd_density();
+ int dpi_device = corecmd_get_hw_lcd_density();
if (opts->dpi_device != NULL) {
char* end;
@@ -405,8 +406,8 @@ handle_key_command( void* opaque, SkinKeyCommand command, int down )
{
case SKIN_KEY_COMMAND_TOGGLE_NETWORK:
{
- android_core_toggle_network();
- D( "network is now %s", android_core_is_network_disabled() ?
+ corecmd_toggle_network();
+ D( "network is now %s", corecmd_is_network_disabled() ?
"disconnected" : "connected" );
}
break;
@@ -421,10 +422,7 @@ handle_key_command( void* opaque, SkinKeyCommand command, int down )
{
#ifdef CONFIG_TRACE
tracing = !tracing;
- if (tracing)
- android_core_tracing_start();
- else
- android_core_tracing_stop();
+ corecmd_trace_control(tracing);
#endif
}
break;