← Back to branch summary

~vanvugt/mir/old-predictive-bypass

~vanvugt/mir/old-predictive-bypass

Viewing all changes in revision 2415.

Committer: Daniel van Vugt
Date: 2015-05-08 06:22:18 UTC
mfrom: (2350.2.200 prepre)
Revision ID: daniel.van.vugt@canonical.com-20150508062218-d6zpbax3t2bi1ln2

Merge latest 'prepre' branch including trunk

files added:
src/client/input/android/event_conversion_helpers.cpp

src/include/common/mir/input/android/event_conversion_helpers.h

tests/acceptance-tests/test_custom_input_dispatcher.cpp

files renamed:
tests/acceptance-tests/throwback/test_custom_input_dispatcher.cpp => tests/acceptance-tests/throwback/test_custom_input_targeter.cpp

files modified:
CMakeLists.txt

debian/control

debian/rules

include/common/mir/dispatch/action_queue.h

include/platform/mir/input/device_capability.h

include/platform/mir/input/input_sink.h

include/platform/mir/input/platform.h

playground/demo-shell/window_manager.cpp

src/client/events/event_builders.cpp

src/client/input/android/CMakeLists.txt

src/client/input/android/android_input_lexicon.cpp

src/client/input/input_event.cpp

src/client/symbols.map

src/common/dispatch/action_queue.cpp

src/common/logging/shared_library_prober_report.cpp

src/include/common/mir/events/event_private.h

src/server/compositor/gl_renderer.cpp

src/server/display_server.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/graphics/default_configuration.cpp

src/server/input/android/android_input_dispatcher.cpp

src/server/input/android/input_sender.cpp

src/server/input/android/input_translator.cpp

src/server/input/default_configuration.cpp

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/input/vt_filter.cpp

src/server/server.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/throwback/CMakeLists.txt

tests/acceptance-tests/throwback/test_touchspot_visualization.cpp

tests/include/mir_test/event_matchers.h

tests/include/mir_test_framework/fake_input_device.h

tests/include/mir_test_framework/input_testing_server_configuration.h

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

tests/unit-tests/dispatch/test_action_queue.cpp

tests/unit-tests/input/android/test_android_input_dispatcher.cpp

tests/unit-tests/input/android/test_android_input_lexicon.cpp

tests/unit-tests/input/android/test_input_translator.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_event_builders.cpp

tests/unit-tests/input/test_input_event.cpp

Show diffs side-by-side

added added

removed removed

include/common/mir/dispatch/action_queue.h

include/platform/mir/input/device_capability.h

include/platform/mir/input/input_sink.h

include/platform/mir/input/platform.h

playground/demo-shell/window_manager.cpp

src/client/events/event_builders.cpp

src/client/input/android/CMakeLists.txt

src/client/input/android/android_input_lexicon.cpp

src/client/input/android/event_conversion_helpers.cpp

src/client/input/input_event.cpp

src/client/symbols.map

src/common/dispatch/action_queue.cpp

src/common/logging/shared_library_prober_report.cpp

src/include/common/mir/events/event_private.h

src/include/common/mir/input/android/event_conversion_helpers.h

src/server/compositor/gl_renderer.cpp

src/server/display_server.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/session_mediator.h

src/server/graphics/default_configuration.cpp

src/server/input/android/android_input_dispatcher.cpp

src/server/input/android/input_sender.cpp

src/server/input/android/input_translator.cpp

src/server/input/default_configuration.cpp

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/input/vt_filter.cpp

src/server/server.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_custom_input_dispatcher.cpp

tests/acceptance-tests/throwback/CMakeLists.txt

tests/acceptance-tests/throwback/test_custom_input_targeter.cpp

tests/acceptance-tests/throwback/test_touchspot_visualization.cpp

tests/include/mir_test/event_matchers.h

tests/include/mir_test_framework/fake_input_device.h

tests/include/mir_test_framework/input_testing_server_configuration.h

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

tests/unit-tests/dispatch/test_action_queue.cpp

tests/unit-tests/input/android/test_android_input_dispatcher.cpp

tests/unit-tests/input/android/test_android_input_lexicon.cpp

tests/unit-tests/input/android/test_input_translator.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_event_builders.cpp

tests/unit-tests/input/test_input_event.cpp

Older »