Merge lp:~gerboland/platform-api/exposeOrientation into lp:~gerboland/platform-api/devel-213

[Gerry Boland]

Add readonly notifyable property "orientation" to Window

Add window orientation property

[lp:~gerboland/platform-api/exposeOrientation]

261. By Gerry Boland on 2014-08-27

Add newline to warning message

262. By Gerry Boland on 2014-09-01

[debian] symbols file - let magic release scripts figure out new symbol version

263. By Gerry Boland on 2014-09-19

Merge trunk. Bump to version 2.4.0

Unmerged revisions

263. By Gerry Boland on 2014-09-19

Merge trunk. Bump to version 2.4.0

262. By Gerry Boland on 2014-09-01

[debian] symbols file - let magic release scripts figure out new symbol version

261. By Gerry Boland on 2014-08-27

Add newline to warning message

260. By Gerry Boland on 2014-08-26

Merge trunk & update changelog

259. By Gerry Boland on 2014-08-25

Small tweaks to fix build and syntax

258. By Gerry Boland on 2014-08-20

Add readonly notifyable property "orientation" to Window

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-07 12:21:22 +0000
+++ CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -2,8 +2,8 @@
 
 project(ubuntu-platform-api)
 
-set(UBUNTU_PLATFORM_API_VERSION_MAJOR 1)
-set(UBUNTU_PLATFORM_API_VERSION_MINOR 1)
+set(UBUNTU_PLATFORM_API_VERSION_MAJOR 2)
+set(UBUNTU_PLATFORM_API_VERSION_MINOR 2)
 set(UBUNTU_PLATFORM_API_VERSION_PATCH 0)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
@@ -57,35 +57,13 @@
   ON
 )
 
-option(
-  ENABLE_MIRSERVER_IMPLEMENTATION
-  "Enable mirserver based platorm API implementation"
-  OFF
-)
-
-if(ENABLE_MIRSERVER_IMPLEMENTATION)
-  find_package(PkgConfig)
-  pkg_check_modules(MIRSERVER REQUIRED mirserver)
-endif(ENABLE_MIRSERVER_IMPLEMENTATION)
-
-option(
-  ENABLE_MIRCLIENT_IMPLEMENTATION
-  "Enable mirclient based platform API implementation"
-  OFF
-)
-
-if(ENABLE_MIRCLIENT_IMPLEMENTATION)
-  find_package(PkgConfig)
-  pkg_check_modules(MIRCLIENT REQUIRED mirclient)
-
-  find_package(Protobuf REQUIRED)
-  if(PROTOBUF_PROTOC_EXECUTABLE STREQUAL "PROTOBUF_PROTOC_EXECUTABLE-NOTFOUND")
-    message(SEND_ERROR "protoc executable not found! Missing protobuf-compiler package?")
-  endif()
-endif(ENABLE_MIRCLIENT_IMPLEMENTATION)
-
-if(ENABLE_MIRCLIENT_IMPLEMENTATION OR ENABLE_MIRSERVER_IMPLEMENTATION)
-  pkg_check_modules(MIRCOMMON REQUIRED mircommon)
+find_package(PkgConfig)
+pkg_check_modules(MIRSERVER REQUIRED mirserver)
+pkg_check_modules(MIRCLIENT REQUIRED mirclient)
+
+find_package(Protobuf REQUIRED)
+if(PROTOBUF_PROTOC_EXECUTABLE STREQUAL "PROTOBUF_PROTOC_EXECUTABLE-NOTFOUND")
+  message(SEND_ERROR "protoc executable not found! Missing protobuf-compiler package?")
 endif()
 
 # Try to find hybris, and disable hybris from build if not found
@@ -105,6 +83,7 @@
 add_subdirectory(doc/)
 add_subdirectory(include/)
 add_subdirectory(src/)
+add_subdirectory(examples/)
 
 #### Enable tests
 include(CTest)

=== modified file 'android/default/default_ubuntu_application_sensor.cpp'
--- android/default/default_ubuntu_application_sensor.cpp	2014-02-13 14:04:30 +0000
+++ android/default/default_ubuntu_application_sensor.cpp	2014-08-26 16:06:15 +0000
@@ -17,10 +17,10 @@
  *              Ricardo Mendoza <[e-mail]>
  */
 
-#include <ubuntu/application/sensors/ubuntu_application_sensors.h>
 #include <ubuntu/application/sensors/accelerometer.h>
 #include <ubuntu/application/sensors/proximity.h>
 #include <ubuntu/application/sensors/light.h>
+#include <ubuntu/application/sensors/orientation.h>
 
 #include <private/application/sensors/sensor.h>
 #include <private/application/sensors/sensor_listener.h>
@@ -55,7 +55,8 @@
 {
     SensorListener() : on_accelerometer_event(NULL),
                        on_proximity_event(NULL),
-                       on_light_event(NULL)
+                       on_light_event(NULL),
+                       on_orientation_event(NULL)
     {
     }
 
@@ -63,6 +64,25 @@
     {
         switch(sensor_type)
         {
+            case ubuntu::application::sensors::sensor_type_orientation:
+            {
+                if (!on_orientation_event)
+                    return;
+
+                ubuntu::application::sensors::OrientationEvent::Ptr ev(
+                    new ubuntu::application::sensors::OrientationEvent(
+                        reading->timestamp,
+                        reading->vector[0],
+                        reading->vector[1],
+                        reading->vector[2])
+                        );
+
+                on_orientation_event(
+                    make_holder(ev), this->context
+                    );
+
+                break;
+            }
             case ubuntu::application::sensors::sensor_type_accelerometer:
             {
                 if (!on_accelerometer_event)
@@ -122,12 +142,15 @@
     on_accelerometer_event_cb on_accelerometer_event;
     on_proximity_event_cb on_proximity_event;
     on_light_event_cb on_light_event;
+    on_orientation_event_cb on_orientation_event;
     void *context;
 };
 
+ubuntu::application::sensors::Sensor::Ptr orientation;
 ubuntu::application::sensors::Sensor::Ptr accelerometer;
 ubuntu::application::sensors::Sensor::Ptr proximity;
 ubuntu::application::sensors::Sensor::Ptr light;
+ubuntu::application::sensors::SensorListener::Ptr orientation_listener;
 ubuntu::application::sensors::SensorListener::Ptr accelerometer_listener;
 ubuntu::application::sensors::SensorListener::Ptr proximity_listener;
 ubuntu::application::sensors::SensorListener::Ptr light_listener;
@@ -266,6 +289,22 @@
     s->register_listener(proximity_listener);
 }
 
+UStatus
+ua_sensors_proximity_set_event_rate(
+    UASensorsProximity* sensor,
+    uint32_t rate)
+{
+    if (sensor == NULL)
+       return U_STATUS_ERROR;
+
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+    auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
+    if (!s->set_event_rate(rate))
+        return U_STATUS_ERROR;
+
+    return U_STATUS_SUCCESS;
+}
+
 uint64_t
 uas_proximity_event_get_timestamp(
     UASProximityEvent* event)
@@ -410,6 +449,22 @@
     s->register_listener(light_listener);
 }
 
+UStatus
+ua_sensors_light_set_event_rate(
+    UASensorsLight* sensor,
+    uint32_t rate)
+{
+    if (sensor == NULL)
+       return U_STATUS_ERROR;
+
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+    auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
+    if (!s->set_event_rate(rate))
+        return U_STATUS_ERROR;
+
+    return U_STATUS_SUCCESS;
+}
+
 uint64_t
 uas_light_event_get_timestamp(
     UASLightEvent* event)
@@ -554,6 +609,22 @@
     s->register_listener(accelerometer_listener);
 }
 
+UStatus
+ua_sensors_accelerometer_set_event_rate(
+    UASensorsAccelerometer* sensor,
+    uint32_t rate)
+{
+    if (sensor == NULL)
+       return U_STATUS_ERROR;
+
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+    auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
+    if (!s->set_event_rate(rate))
+        return U_STATUS_ERROR;
+
+    return U_STATUS_SUCCESS;
+}
+
 uint64_t
 uas_accelerometer_event_get_timestamp(
     UASAccelerometerEvent* event)
@@ -603,3 +674,191 @@
 
     return U_STATUS_SUCCESS;
 }
+
+/*
+ * Orientation Sensor
+ */
+
+UASensorsOrientation*
+ua_sensors_orientation_new()
+{
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+    orientation =
+        ubuntu::application::sensors::SensorService::sensor_for_type(
+            ubuntu::application::sensors::sensor_type_orientation);
+
+    return orientation.get();
+}
+
+UStatus
+ua_sensors_orientation_enable(
+    UASensorsOrientation* sensor)
+{
+    if (sensor == NULL)
+        return U_STATUS_ERROR;
+
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+    auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
+    
+    s->enable();
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus
+ua_sensors_orientation_disable(
+    UASensorsOrientation* sensor)
+{
+    if (sensor == NULL)
+        return U_STATUS_ERROR;
+
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+    auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
+    s->disable();
+
+    return U_STATUS_SUCCESS;
+}
+
+uint32_t
+ua_sensors_orientation_get_min_delay(
+    UASensorsOrientation* sensor)
+{
+    if (sensor == NULL)
+        return -1;
+
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+    auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
+    return toHz(s->min_delay());
+}
+
+UStatus
+ua_sensors_orientation_get_min_value(
+    UASensorsOrientation* sensor,
+    float* value)
+{
+    if (sensor == NULL || value == NULL)
+        return U_STATUS_ERROR;
+
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+    auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
+    *value = s->min_value();
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus
+ua_sensors_orientation_get_max_value(
+    UASensorsOrientation* sensor,
+    float* value)
+{
+    if (sensor == NULL || value == NULL)
+        return U_STATUS_ERROR;
+
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+    auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
+    *value = s->max_value();
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus
+ua_sensors_orientation_get_resolution(
+    UASensorsOrientation* sensor,
+    float* value)
+{
+    if (sensor == NULL || value == NULL)
+        return U_STATUS_ERROR;
+
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+    auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
+    *value = s->resolution();
+
+    return U_STATUS_SUCCESS;
+}
+
+void
+ua_sensors_orientation_set_reading_cb(
+    UASensorsOrientation* sensor,
+    on_orientation_event_cb cb,
+    void *ctx)
+{
+    if (sensor == NULL)
+        return; 
+
+    auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
+
+    SensorListener<ubuntu::application::sensors::sensor_type_orientation>* sl
+        = new SensorListener<ubuntu::application::sensors::sensor_type_orientation>();
+
+    sl->on_orientation_event = cb;
+    sl->context = ctx;
+
+    orientation_listener = sl;
+    s->register_listener(orientation_listener);
+}
+
+UStatus
+ua_sensors_orientation_set_event_rate(
+    UASensorsOrientation* sensor,
+    uint32_t rate)
+{
+    if (sensor == NULL)
+       return U_STATUS_ERROR;
+
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+    auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
+    if (!s->set_event_rate(rate))
+        return U_STATUS_ERROR;
+
+    return U_STATUS_SUCCESS;
+}
+
+uint64_t
+uas_orientation_event_get_timestamp(
+    UASOrientationEvent* event)
+{
+    auto ev = static_cast<Holder<ubuntu::application::sensors::OrientationEvent::Ptr>*>(event);
+    return ev->value->get_timestamp();
+}
+
+UStatus
+uas_orientation_event_get_azimuth(
+    UASOrientationEvent* event,
+    float* value)
+{
+    if (event == NULL || value == NULL)
+        return U_STATUS_ERROR;
+    
+    auto ev = static_cast<Holder<ubuntu::application::sensors::OrientationEvent::Ptr>*>(event);
+    *value = ev->value->get_azimuth();
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus
+uas_orientation_event_get_pitch(
+    UASOrientationEvent* event,
+    float* value)
+{
+    if (event == NULL || value == NULL)
+        return U_STATUS_ERROR;
+
+    auto ev = static_cast<Holder<ubuntu::application::sensors::OrientationEvent::Ptr>*>(event);
+    *value = ev->value->get_pitch();
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus
+uas_orientation_event_get_roll(
+    UASOrientationEvent* event,
+    float* value)
+{
+    if (event == NULL || value == NULL)
+        return U_STATUS_ERROR;
+
+    auto ev = static_cast<Holder<ubuntu::application::sensors::OrientationEvent::Ptr>*>(event);
+    *value = ev->value->get_roll();
+
+    return U_STATUS_SUCCESS;
+}

=== modified file 'android/default/default_ubuntu_application_ui.cpp'
--- android/default/default_ubuntu_application_ui.cpp	2013-12-11 06:11:34 +0000
+++ android/default/default_ubuntu_application_ui.cpp	2014-08-26 16:06:15 +0000
@@ -229,6 +229,11 @@
 }
 
 void
+ua_ui_window_properties_set_event_cb_and_ctx(UAUiWindowProperties*, UAUiWindowEventCb, void *)
+{
+}
+
+void
 ua_ui_window_properties_set_dimensions(
     UAUiWindowProperties *properties,
     uint32_t width,
@@ -438,3 +443,14 @@
     auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window);
     return p->value->to_native_window_type();
 }
+
+UApplicationUiWindowOrientation
+ua_ui_window_get_orientation(
+    UAUiWindow *window)
+{
+    ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
+
+    auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window);
+    return p->value->get_orientation();
+}
+

=== modified file 'android/hybris/test_sensors_c_api.cpp'
--- android/hybris/test_sensors_c_api.cpp	2014-02-13 14:06:55 +0000
+++ android/hybris/test_sensors_c_api.cpp	2014-08-26 16:06:15 +0000
@@ -19,18 +19,22 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 
 #include <ubuntu/application/sensors/accelerometer.h>
 #include <ubuntu/application/sensors/proximity.h>
 #include <ubuntu/application/sensors/light.h>
+#include <ubuntu/application/sensors/orientation.h>
 
 void on_new_accelerometer_event(UASAccelerometerEvent* event, void* context)
 {
-    printf("%s \n", __PRETTY_FUNCTION__);
     float x; uas_accelerometer_event_get_acceleration_x(event, &x);
-    float y; uas_accelerometer_event_get_acceleration_x(event, &y);
-    float z; uas_accelerometer_event_get_acceleration_x(event, &z);
-    printf("\ttime: %llu\n", uas_accelerometer_event_get_timestamp(event));
+    float y; uas_accelerometer_event_get_acceleration_y(event, &y);
+    float z; uas_accelerometer_event_get_acceleration_z(event, &z);
+
+    printf("%s \n", __PRETTY_FUNCTION__);
+    printf("\ttime: %" PRIu64 "\n", uas_accelerometer_event_get_timestamp(event));
     printf("\tx: %f\n", x);
     printf("\ty: %f\n", y);
     printf("\tz: %f\n", z);
@@ -39,7 +43,7 @@
 void on_new_proximity_event(UASProximityEvent* event, void* context)
 {
     printf("%s \n", __PRETTY_FUNCTION__);
-    printf("\ttime: %llu\n", uas_proximity_event_get_timestamp(event));
+    printf("\ttime: %" PRIu64 "\n", uas_proximity_event_get_timestamp(event));
 
     switch (uas_proximity_event_get_distance(event))
     {
@@ -58,17 +62,32 @@
 
 void on_new_light_event(UASLightEvent* event, void* context)
 {
+    float light = -1.f; uas_light_event_get_light(event, &light);
+
     printf("%s \n", __PRETTY_FUNCTION__);
-    printf("\ttime: %llu\n", uas_light_event_get_timestamp(event));
-    float light; uas_light_event_get_light(event, &light);
+    printf("\ttime: %" PRIu64 "\n", uas_light_event_get_timestamp(event));
     printf("\tlight: %f\n", light);
 }
 
+void on_new_orientation_event(UASOrientationEvent* event, void* context)
+{
+    float x; uas_orientation_event_get_azimuth(event, &x);
+    float y; uas_orientation_event_get_pitch(event, &y);
+    float z; uas_orientation_event_get_roll(event, &z);
+
+    printf("%s \n", __PRETTY_FUNCTION__);
+    printf("\ttime: %" PRIu64 "\n", uas_orientation_event_get_timestamp(event));
+    printf("\tx: %f\n", x);
+    printf("\ty: %f\n", y);
+    printf("\tz: %f\n", z);
+}
+
 int main(int argc, char** argv)
 {
     UASensorsAccelerometer* accelerometer = ua_sensors_accelerometer_new();
     UASensorsProximity* proximity = ua_sensors_proximity_new();
     UASensorsLight* ambientlight = ua_sensors_light_new();
+    UASensorsOrientation* orientation = ua_sensors_orientation_new();
 
     ua_sensors_accelerometer_set_reading_cb(accelerometer,
                                             on_new_accelerometer_event,
@@ -82,9 +101,14 @@
                                     on_new_light_event,
                                     NULL);
 
+    ua_sensors_orientation_set_reading_cb(orientation,
+                                          on_new_orientation_event,
+                                          NULL);
+
     ua_sensors_accelerometer_enable(accelerometer);
     ua_sensors_proximity_enable(proximity);
     ua_sensors_light_enable(ambientlight);
+    ua_sensors_orientation_enable(orientation);
 
     while(true)
     {

=== modified file 'android/hybris/ubuntu_application_gps_for_hybris.cpp'
--- android/hybris/ubuntu_application_gps_for_hybris.cpp	2013-06-14 11:42:24 +0000
+++ android/hybris/ubuntu_application_gps_for_hybris.cpp	2014-08-26 16:06:15 +0000
@@ -36,7 +36,15 @@
     bool stop();
     void inject_time(int64_t time, int64_t timeReference, int uncertainty);
     void inject_location(double latitude, double longitude, float accuracy);
-    void delete_aiding_data(uint16_t flags);
+    void delete_aiding_data(UHardwareGpsAidingData flags);
+
+    void set_server_for_type(UHardwareGpsAGpsType type, const char* hostname, uint16_t port);
+    void set_reference_location(UHardwareGpsAGpsRefLocation* location, size_t size_of_struct);
+
+    void notify_connection_is_open(const char* apn);
+    void notify_connection_is_closed();
+    void notify_connection_not_available();
+
     bool set_position_mode(uint32_t mode, uint32_t recurrence, uint32_t min_interval,
                            uint32_t preferred_accuracy, uint32_t preferred_time);
     void inject_xtra_data(char* data, int length);
@@ -344,7 +352,7 @@
 
 void UHardwareGps_::inject_location(double latitude, double longitude, float accuracy)
 {
-    if (gps_interface)
+    if (gps_interface && gps_interface->inject_location)
         gps_interface->inject_location(latitude, longitude, accuracy);
 }
 
@@ -354,6 +362,44 @@
         gps_interface->delete_aiding_data(flags);
 }
 
+void UHardwareGps_::set_server_for_type(UHardwareGpsAGpsType type, const char* hostname, uint16_t port)
+{
+    if (agps_interface && agps_interface->set_server)
+        agps_interface->set_server(type, hostname, port);
+}
+
+void UHardwareGps_::set_reference_location(UHardwareGpsAGpsRefLocation* location, size_t size_of_struct)
+{
+    AGpsRefLocation ref_loc;
+    ref_loc.type = location->type;
+    ref_loc.u.cellID.type = location->u.cellID.type;
+    ref_loc.u.cellID.mcc = location->u.cellID.mcc;
+    ref_loc.u.cellID.mnc = location->u.cellID.mnc;
+    ref_loc.u.cellID.lac = location->u.cellID.lac;
+    ref_loc.u.cellID.cid = location->u.cellID.cid;
+
+    if (agps_ril_interface && agps_ril_interface->set_ref_location)
+        agps_ril_interface->set_ref_location(&ref_loc, sizeof(ref_loc));
+}
+
+void UHardwareGps_::notify_connection_is_open(const char* apn)
+{
+    if (agps_interface && agps_interface->data_conn_open)
+        agps_interface->data_conn_open(apn);
+}
+
+void UHardwareGps_::notify_connection_is_closed()
+{
+    if (agps_interface && agps_interface->data_conn_closed)
+        agps_interface->data_conn_closed();
+}
+
+void UHardwareGps_::notify_connection_not_available()
+{
+    if (agps_interface && agps_interface->data_conn_failed)
+        agps_interface->data_conn_failed();
+}
+
 bool UHardwareGps_::set_position_mode(uint32_t mode, uint32_t recurrence, uint32_t min_interval,
                                     uint32_t preferred_accuracy, uint32_t preferred_time)
 {
@@ -413,17 +459,53 @@
     self->inject_time(time, time_reference, uncertainty);
 }
 
-void u_hardware_gps_inject_location(UHardwareGps self, double latitude, double longitude,
-                                float accuracy)
+void u_hardware_gps_inject_location(UHardwareGps self,
+                                    UHardwareGpsLocation location)
 {
-    self->inject_location(latitude, longitude, accuracy);
+    self->inject_location(location.latitude, location.longitude,
+                          location.accuracy);
 }
 
-void u_hardware_gps_delete_aiding_data(UHardwareGps self, uint16_t flags)
+void u_hardware_gps_delete_aiding_data(UHardwareGps self, UHardwareGpsAidingData flags)
 {
     self->delete_aiding_data(flags);
 }
 
+void u_hardware_gps_agps_set_server_for_type(
+        UHardwareGps self,
+        UHardwareGpsAGpsType type,
+        const char* hostname,
+        uint16_t port)
+{
+    self->set_server_for_type(type, hostname, port);
+}
+
+void u_hardware_gps_agps_set_reference_location(
+    UHardwareGps self,
+    UHardwareGpsAGpsRefLocation *location,
+    size_t size_of_struct)
+{
+    self->set_reference_location(location, size_of_struct);
+}
+
+void u_hardware_gps_agps_notify_connection_is_open(
+    UHardwareGps self,
+    const char *apn)
+{
+    self->notify_connection_is_open(apn);
+}
+
+void u_hardware_gps_agps_notify_connection_is_closed(UHardwareGps self)
+{
+    self->notify_connection_is_closed();
+}
+
+void u_hardware_gps_agps_notify_connection_not_available(UHardwareGps self)
+{
+    self->notify_connection_not_available();
+}
+
+
 bool u_hardware_gps_set_position_mode(UHardwareGps self, uint32_t mode, uint32_t recurrence,
                                   uint32_t min_interval, uint32_t preferred_accuracy,
                                   uint32_t preferred_time)

=== modified file 'android/hybris/ubuntu_application_sensors_for_hybris.cpp'
--- android/hybris/ubuntu_application_sensors_for_hybris.cpp	2013-05-30 02:03:42 +0000
+++ android/hybris/ubuntu_application_sensors_for_hybris.cpp	2014-08-26 16:06:15 +0000
@@ -162,6 +162,11 @@
         return sensor->getPowerUsage();
     }
 
+    int set_event_rate(uint32_t nsecs)
+    {
+        return sensor_event_queue->setEventRate(sensor, nsecs);
+    }
+
     const android::Sensor* sensor;
     ubuntu::application::sensors::SensorListener::Ptr listener;
     android::List<ubuntu::application::sensors::SensorListener::Ptr> listeners;

=== modified file 'android/include/private/application/sensors/events.h'
--- android/include/private/application/sensors/events.h	2013-05-30 02:03:42 +0000
+++ android/include/private/application/sensors/events.h	2014-08-26 16:06:15 +0000
@@ -28,6 +28,40 @@
 {
 namespace sensors
 {
+class OrientationEvent : public platform::ReferenceCountedBase
+{
+public:
+    OrientationEvent(uint64_t timestamp, float azimuth, float pitch, float roll)
+        : timestamp(timestamp),
+          azimuth(azimuth),
+          pitch(pitch),
+          roll(roll)
+    {}
+
+    typedef ubuntu::platform::shared_ptr<OrientationEvent> Ptr;
+
+    uint64_t get_timestamp()
+    {
+        return this->timestamp;
+    }
+
+    float get_azimuth() { return this->azimuth; }
+    float get_pitch() { return this->pitch; }
+    float get_roll() { return this->roll; }
+
+private:
+    uint64_t timestamp;
+    float azimuth;
+    float pitch;
+    float roll;
+
+protected:
+    virtual ~OrientationEvent() {}
+
+    OrientationEvent(const OrientationEvent&) = delete;
+    OrientationEvent& operator=(const OrientationEvent&) = delete;
+};
+
 class AccelerometerEvent : public platform::ReferenceCountedBase
 {
 public:

=== modified file 'android/include/private/application/sensors/sensor.h'
--- android/include/private/application/sensors/sensor.h	2013-05-30 02:03:42 +0000
+++ android/include/private/application/sensors/sensor.h	2014-08-26 16:06:15 +0000
@@ -66,6 +66,9 @@
     /** Returns an estimate of the sensor's power consumption, normalized to [0,1]. */
     virtual float power_consumption() = 0;
 
+    /** Set event delivery rate for the given sensor, in nanoseconds */
+    virtual int set_event_rate(uint32_t nsecs) = 0;
+
     /** Returns the minimum delay between two consecutive sensor readings. */
     virtual int32_t min_delay() = 0;
 

=== removed file 'android/include/private/application/ui/input/event.h'
--- android/include/private/application/ui/input/event.h	2013-05-21 20:54:48 +0000
+++ android/include/private/application/ui/input/event.h	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-#ifndef UBUNTU_APPLICATION_UI_INPUT_EVENT_H_
-#define UBUNTU_APPLICATION_UI_INPUT_EVENT_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    /** Maximum number of pointers reported within one input event. */
-#define UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT (16)
-
-    /** Reference timebase, nanoseconds as measured by CLOCK_MONOTONIC. */
-    typedef int64_t nsecs_t;
-
-    /** Describes the different event types. */
-    typedef enum
-    {
-        KEY_EVENT_TYPE, ///< Event originates from a keyboard.
-        MOTION_EVENT_TYPE, ///< Event originates from something moving, e.g., a wheel, a mouse, a finger on a touchpad.
-        HW_SWITCH_EVENT_TYPE ///< Event originates from an additional button attached to the device's HW, e.g., power button.
-    } EventType;
-
-    /** Models an input event. */
-    typedef struct
-    {
-        EventType type; ///< Type of the event.
-        int32_t device_id; ///< Device that this event originated from.
-        int32_t source_id; ///< Source that this event originated from.
-        int32_t action; ///< Action signalled by this event.
-        int32_t flags; ///< Flags associated with this event.
-        int32_t meta_state; ///< State of the meta modifiers (ALT, CTRL, SHIFT).
-        /** Information specific to key/motion event types. */
-        union
-        {
-            /** Information describing an event originating from a HW switch. */
-            struct HardwareSwitchEvent
-            {
-                nsecs_t event_time; ///< Timestamp when the event happened.
-                uint32_t policy_flags; ///< Policy flags.
-                int32_t switch_code; ///< The scan code of the switch.
-                int32_t switch_value; ///< The value reported by the switch.
-            } hw_switch;
-            /** Information describing an event originating from a keyboard key. */
-            struct KeyEvent
-            {
-                int32_t key_code; 
-                int32_t scan_code;
-                int32_t repeat_count;
-                nsecs_t down_time;
-                nsecs_t event_time;
-                int is_system_key;  ///< \deprecated Do not use.
-            } key;
-            /** Information describing an event originating from a
-             * "moving" device, e.g., a mouse, a mouse-wheel, a finger
-             * on a touchpad. 
-             */
-            struct MotionEvent
-            {
-                int32_t edge_flags; ///< Set for touches intersecting a touchscreen's edges, requires HW support.
-                int32_t button_state; ///< State of buttons of the device
-                float x_offset; ///< Movement in x direction since down event
-                float y_offset; ///< Movement in y direction since down event
-                float x_precision; ///< Sampling precision in x direction
-                float y_precision; ///< Sampling precision in y direction
-                nsecs_t down_time; ///< Timestamp that marks the down event
-                nsecs_t event_time; ///< Timestamp that marks when this event happened
-                size_t pointer_count; ///< Number of pointers reported in this event
-                struct PointerCoordinate
-                {
-                    int id; ///< Unique id of the pointer
-                    float x, raw_x; ///< Processed and raw x coordinates
-                    float y, raw_y; ///< Processed and raw y coordinates
-                    float touch_major; ///< Touch major coordinate
-                    float touch_minor; ///< Touch minor coordinate
-                    float size; ///< Size of the pointer/touch
-                    float pressure; ///< Pressure of the touch
-                    float orientation; ///< Orientation
-                } pointer_coordinates[UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT]; ///< Pointer information, valid from [0,pointer_count).
-            } motion;
-        } details;
-    } Event;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // UBUNTU_APPLICATION_UI_INPUT_EVENT_H_

=== modified file 'android/include/private/application/ui/input/listener.h'
--- android/include/private/application/ui/input/listener.h	2013-05-21 20:54:48 +0000
+++ android/include/private/application/ui/input/listener.h	2014-08-26 16:06:15 +0000
@@ -18,7 +18,7 @@
 #ifndef UBUNTU_APPLICATION_UI_INPUT_LISTENER_H_
 #define UBUNTU_APPLICATION_UI_INPUT_LISTENER_H_
 
-#include "private/application/ui/input/event.h"
+#include "ubuntu/application/ui/input/event.h"
 #include "private/platform/shared_ptr.h"
 
 namespace ubuntu

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-06-13 12:04:14 +0000
+++ data/CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -2,7 +2,11 @@
   ubuntu-platform-api.pc.in ubuntu-platform-api.pc @ONLY
 )
 
+configure_file(
+  ubuntu-platform-hardware-api.pc.in ubuntu-platform-hardware-api.pc @ONLY
+)
+
 install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-platform-api.pc
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-platform-api.pc ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-platform-hardware-api.pc
   DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig
-)
\ No newline at end of file
+)

=== added file 'data/ubuntu-platform-hardware-api.pc.in'
--- data/ubuntu-platform-hardware-api.pc.in	1970-01-01 00:00:00 +0000
+++ data/ubuntu-platform-hardware-api.pc.in	2014-08-26 16:06:15 +0000
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/@LIB_INSTALL_DIR@
+includedir=${exec_prefix}/include
+ 
+Name: ubuntu_platform_hardware_api
+Description: Ubuntu's platform hardware abstraction layer.
+Version: @UBUNTU_PLATFORM_API_VERSION_MAJOR@.@UBUNTU_PLATFORM_API_VERSION_MINOR@.@UBUNTU_PLATFORM_API_VERSION_PATCH@
+Libs: -L${libdir} -lubuntu_platform_hardware_api
+Cflags: -I${includedir}/ubuntu

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-14 22:05:06 +0000
+++ debian/changelog	2014-08-26 16:06:15 +0000
@@ -1,12 +1,220 @@
-platform-api (1.1.0-0ubuntu1) UNRELEASED; urgency=medium
-
+platform-api (2.2.1) UNRELEASED; urgency=medium
+
+  * Add window orientation property (readonly, notifyable)
+
+ -- Gerry Boland <[e-mail]>  Wed, 20 Aug 2014 18:10:51 +0100
+
+platform-api (2.2.0+14.10.20140825-0ubuntu1) utopic; urgency=low
+
+  [ thomas-voss ]
+  * Implement installation of changed handlers. Subscribe to state
+    properties. (LP: #1348334)
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 25 Aug 2014 08:34:53 +0000
+
+platform-api (2.2.0+14.10.20140821-0ubuntu1) utopic; urgency=low
+
+  [ Iain Lane ]
+  * Fix error by pulling out and sharing a struct instead of defining it
+    twice. (LP: #1350874)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 21 Aug 2014 09:32:54 +0000
+
+platform-api (2.2.0+14.10.20140812-0ubuntu1) utopic; urgency=low
+
+  [ Cemil Azizoglu ]
+  * Bump ABI for Mir 0.6.0 release.
+
+  [ Alan Griffiths ]
+  * Bump ABI for Mir 0.6.0 release.
+
+  [ Kevin Gunn ]
+  * Bump ABI for Mir 0.6.0 release.
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 12 Aug 2014 18:49:40 +0000
+
+platform-api (2.2.0+14.10.20140808-0ubuntu1) utopic; urgency=low
+
+  [ thomas-voss ]
+  * Implement installation of changed handlers. Subscribe to state
+    properties. (LP: #1348334)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 08 Aug 2014 02:07:56 +0000
+
+platform-api (2.2.0+14.10.20140801-0ubuntu1) utopic; urgency=low
+
+  [ Ricardo Mendoza ]
+  * Remove stale event.h header, use public one instead.
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 01 Aug 2014 10:16:51 +0000
+
+platform-api (2.2.0+14.10.20140730-0ubuntu1) utopic; urgency=low
+
+  [ thomas-voss ]
+  * Check for null in functions accessing a session object. Make sure
+    that exceptions cannot propagate for controller interactions. (LP:
+    #1338610)
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 30 Jul 2014 07:26:34 +0000
+
+platform-api (2.2.0+14.10.20140728-0ubuntu1) utopic; urgency=medium
+
+  [ Gerry Boland ]
+  *  Add window resize support
+  *  Add window focus event
+
+  [ Ubuntu daily release ]
+  * debian/libubuntu-application-api2.symbols: auto-update to released
+    version
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 28 Jul 2014 02:53:27 +0000
+
+platform-api (2.1.0+14.10.20140721-0ubuntu1) utopic; urgency=low
+
+  [ thomas-voss ]
+  * Explicitly select g++-4.9 to prevent from ABI breaks.
+
+  [ Steve Langasek ]
+  * Explicitly select g++-4.9 to prevent from ABI breaks.
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 21 Jul 2014 08:47:18 +0000
+
+platform-api (2.1.0+14.10.20140717-0ubuntu1) utopic; urgency=low
+
+  [ Cemil Azizoglu ]
+  * Mir display server 0.5.0 release.
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 17 Jul 2014 08:03:12 +0000
+
+platform-api (2.1.0+14.10.20140715-0ubuntu1) utopic; urgency=low
+
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 15 Jul 2014 14:20:04 +0000
+
+platform-api (2.1.0+14.10.20140702-0ubuntu1) utopic; urgency=low
+
+  [ Alberto Aguirre ]
+  * Bump Mir dependencies to 0.4.0.
+
+  [ Cemil Azizoglu ]
+  * Bump Mir dependencies to 0.4.0.
+
+  [ Kevin Gunn ]
+  * Bump Mir dependencies to 0.4.0.
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 02 Jul 2014 02:11:11 +0000
+
+platform-api (2.1.0+14.10.20140701-0ubuntu1) utopic; urgency=low
+
+  [ Sergio Schvezov ]
+  * Setting -Wl,--no-as-needed for sensors.
+
+  [ Ricardo Mendoza ]
+  * Run thread for dbus client connection (sensors service)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 01 Jul 2014 15:17:32 +0000
+
+platform-api (2.1.0+14.10.20140630-0ubuntu1) utopic; urgency=low
+
+  [ Ubuntu daily release ]
+  * debian/*symbols: auto-update new symbols to released version
+
+  [ thomas-voss ]
+  * Adjust to API changes in location service. Implement controller
+    interface. Add functions to query the accuracy estimates for a
+    position update. (LP: #1281817)
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 30 Jun 2014 08:54:28 +0000
+
+platform-api (2.1.0+14.10.20140624.4-0ubuntu1) utopic; urgency=low
+
+  [ Ricardo Mendoza ]
+  * Add missing enable/disable functions for haptic
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 24 Jun 2014 20:22:48 +0000
+
+platform-api (2.1.0+14.10.20140623.1-0ubuntu1) utopic; urgency=medium
+
+  [ Ricardo Mendoza ]
+  * Added orientation sensor, extended existing sensor API to allow
+    for dynamic event rate setting.
+
+  [ Ubuntu daily release ]
+  * debian/*symbols: auto-update new symbols to released version
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 23 Jun 2014 16:39:59 +0000
+
+platform-api (2.0.0+14.10.20140618.1-0ubuntu1) utopic; urgency=low
+
+  [ Tarmac ]
+  * Updated for Mir 0.3.0 release.
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Cemil Azizoglu ]
+  * Updated for Mir 0.3.0 release.
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 18 Jun 2014 19:31:24 +0000
+
+platform-api (2.0.0+14.10.20140612-0ubuntu1) utopic; urgency=medium
+
+  [ Ricardo Mendoza ]
+  * Bump API version to 2.0
+  * Introduce support for dynamic backend loading
+  * Package naming changes
+  * Further support for test backend
+  * Unified bridge
+
+  [ Ubuntu daily release ]
+  * debian/*symbols: auto-update new symbols to released version
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 12 Jun 2014 09:48:31 +0000
+
+platform-api (1.2.0+14.10.20140605-0ubuntu1) utopic; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Cemil Azizoglu ]
+  * staging 0.2.0
+
+  [ Kevin Gunn ]
+  * staging 0.2.0
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 05 Jun 2014 14:08:48 +0000
+
+platform-api (1.2.0+14.10.20140522.1-0ubuntu1) utopic; urgency=medium
+
+  [ Manuel de la Pena ]
+  * Add agps hooks in the hardware api to allow the use of supl.
+
+  [ Ubuntu daily release ]
+  * debian/*symbols: auto-update new symbols to released version
+
+  [ thomas-voss ]
+  * Add hw alarm api implementation for android's /dev/alarm. Add simple
+    test executable for hw alarm api implementation on android. Adjust
+    interface signatures to make sure that status of operations is
+    reported correctly. Add HW Alarms API interface definition. Add
+    Ubuntu implementation that will bridge over to the android world.
+    (LP: #1299916)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 22 May 2014 15:29:47 +0000
+
+platform-api (1.1.0+14.10.20140515.1-0ubuntu1) utopic; urgency=medium
+
+  [ Gerry Boland ]
   [Daniel d'Andrada]
   * Add ua_ui_window_get_size().
   
   [Gerry Boland]
   * Bump package version to match library version.
 
- -- Gerry Boland <[e-mail]>  Tue, 13 May 2014 16:18:07 +0100
+ -- Ubuntu daily release <[e-mail]>  Thu, 15 May 2014 17:18:39 +0000
 
 platform-api (0.21+14.10.20140507-0ubuntu1) utopic; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2014-05-07 07:39:57 +0000
+++ debian/control	2014-08-26 16:06:15 +0000
@@ -2,19 +2,24 @@
 Priority: optional
 Section: devel
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: cmake,
+Build-Depends: android-headers,
+               cmake,
                debhelper (>= 9),
                doxygen,
                graphviz,
+# We rely on C++11 features, and to prevent from ABI breaks
+# in libstdc++ causing us issues, we explicitly select a G++
+# version.
+               g++-4.9,
                libgles2-mesa-dev,
                libhybris-common-dev,
                pkg-config,
-               libmirclient-dev (>= 0.1.8),
-               libmirserver-dev (>= 0.1.9),
+               libmirclient-dev (>= 0.6.0),
+               libmirserver-dev (>= 0.6.0),
                liburl-dispatcher1-dev,
                libdbus-1-dev,
-               libdbus-cpp-dev (>= 2.0.0),
-               libubuntu-location-service-dev,
+               libdbus-cpp-dev (>= 4.0.0),
+               libubuntu-location-service-dev (>= 1.0.0),
                libgtest-dev,
                libprocess-cpp-dev (>= 0.0.1+14.04.20131212),
                libproperties-cpp-dev,
@@ -26,9 +31,11 @@
 # just go ahead.  ~phablet-team will notice and sync up the code again.
 Vcs-Browser: https://code.launchpad.net/platform-api
 
-Package: libplatform-api-headers
+Package: libubuntu-application-api-headers
 Section: libdevel
 Architecture: any
+Replaces: libplatform-api-headers (<< 2.0.0)
+Breaks: libplatform-api-headers (<< 2.0.0)
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Depends: ${misc:Depends},
@@ -39,9 +46,11 @@
  should build depend on the libplatform-api-dev package instead, which
  will pull this package as well.
 
-Package: libplatform-hardware-api-headers
+Package: libubuntu-platform-hardware-api-headers
 Section: libdevel
 Architecture: any
+Replaces: libplatform-hardware-api-headers (<< 2.0.0)
+Breaks: libplatform-hardware-api-headers (<< 2.0.0)
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Depends: ${misc:Depends},
@@ -50,75 +59,81 @@
  This package provides the library headers for the hw-access parts of the Platform API.
  .
  Unless a new backend for the Platform API is developed, packages
- should build depend on the libplatform-hardware-api-dev package instead, which
+ should build depend on the libubuntu-platform-hardware-api-dev package instead, which
  will pull this package as well.
 
-Package: libplatform-api1-dev
+Package: libubuntu-application-api-dev
 Section: libdevel
 Architecture: any
+Replaces: libplatform-api1-dev (<< 2.0.0)
+Breaks: libplatform-api1-dev (<< 2.0.0)
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Depends: ${misc:Depends},
          libgles2-mesa-dev,
-         libplatform-api-headers (= ${binary:Version}),
-         libubuntu-application-api1 | libplatform-api1,
-         libubuntu-application-api-mirserver1 (= ${binary:Version}),
-         libubuntu-application-api-mirclient1 (= ${binary:Version}),
+         libubuntu-application-api-headers (= ${binary:Version}),
+         libubuntu-application-api2,
+         ubuntu-application-api2-touch (= ${binary:Version}),
+         ubuntu-application-api2-desktop (= ${binary:Version}),
          ${misc:Depends},
-Suggests: libplatform-api1-doc,
-Description: Platform API for system level capabilities (development)
+Suggests: libubuntu-application-api-doc,
+Description: Ubuntu Application API for system level capabilities (development)
  This package provides the development library and headers (via
- dependency) for the Platform API.
-
-Package: libubuntu-application-api-mirserver1
-Section: libs
-Pre-Depends: ${misc:Pre-Depends},
-Multi-Arch: same
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Implementation of the Platform API for a Mir server
- This package provides the implementation of the Platform API to
- provide a server instance of Mir.
-
-Package: libubuntu-application-api-mirclient1
-Section: libs
-Pre-Depends: ${misc:Pre-Depends},
-Multi-Arch: same
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Implementation of the Platform API for a Mir client
- This package provides the implementation of the Platform API to
- allow a client to connect to a Mir server.
-
-Package: libplatform-hardware-api1-dev
+ dependency) for the Ubuntu Application API.
+
+Package: ubuntu-application-api2-touch
+Section: libs
+Pre-Depends: ${misc:Pre-Depends},
+Multi-Arch: same
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libubuntu-application-api2 (= ${binary:Version}),
+Description: Implementation of the Platform API for Ubuntu Touch
+ This package provides the implementation of the Platform API to
+ bring up an Ubuntu Touch system.
+
+Package: ubuntu-application-api2-desktop
+Section: libs
+Pre-Depends: ${misc:Pre-Depends},
+Multi-Arch: same
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libubuntu-application-api2 (= ${binary:Version}),
+Description: Implementation of the Platform API for Ubuntu Desktop
+ This package provides the implementation of the Platform API to
+ bring up an Ubuntu Desktop system.
+
+Package: libubuntu-platform-hardware-api-dev
 Section: libdevel
 Architecture: any
+Replaces: libplatform-hardware-api1-dev (<< 2.0.0)
+Breaks: libplatform-hardware-api1-dev (<< 2.0.0)
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Depends: ${misc:Depends},
          libgles2-mesa-dev,
-         libplatform-hardware-api-headers (= ${binary:Version}),
-         libubuntu-platform-hardware-api1 | libplatform-hardware-api1,
-Suggests: libplatform-api1-doc,
+         libubuntu-platform-hardware-api-headers (= ${binary:Version}),
+         libubuntu-platform-hardware-api2
+Suggests: libubuntu-application-api-doc,
 Description: Platform API for system level capabilities (development)
  This package provides the development library and headers (via
  dependency) for the hw-access portions of the Platform API.
 
-Package: libplatform-api1-doc
+Package: libubuntu-application-api-doc
 Section: doc
 Architecture: all
+Replaces: libplatform-api1-doc (<< 2.0.0)
+Breaks: libplatform-api1-doc (<< 2.0.0)
 Depends: ${misc:Depends},
-         libplatform-api1-dev,
+         libubuntu-application-api-dev,
 Description: Platform API for system level capabilities (development)
  This package provides the developer documentation for the Platform API.
 
-Package: libubuntu-platform-hardware-api1
+Package: libubuntu-platform-hardware-api2
 Section: libs
 Architecture: any
-Replaces: libplatform-hardware-api1-hybris (<< 0.18.3)
-Breaks: libplatform-hardware-api1-hybris (<< 0.18.3)
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Depends: ${misc:Depends},
@@ -129,11 +144,9 @@
  The produced library should be used via libhybris, to communicate with the
  Android userspace, which is where the device drivers live.
 
-Package: libubuntu-application-api1
+Package: libubuntu-application-api2
 Section: libs
 Architecture: any
-Replaces: libplatform-api1-hybris (<< 0.18.3)
-Breaks: libplatform-api1-hybris (<< 0.18.3)
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Depends: ${misc:Depends},
@@ -144,13 +157,14 @@
  The produced library should be used via libhybris, to communicate with the
  Android userspace, which is where the Ubuntu Application Manager lives.
 
-Package: libubuntu-application-api-test1
+Package: ubuntu-application-api2-test
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         libubuntu-application-api2 (= ${binary:Version}),
 Description: test implementation of the Platform API
  This package provides an implementation of the Platform API for testing. It
  does not communicate with actual hardware, but reads input from a text file.
@@ -160,40 +174,66 @@
  .
  For now this provides simulated sensors.
 
+Package: ubuntu-application-api2-examples
+Architecture: any
+Replaces: libplatform-api1-hybris-tests (<< 2.0.0)
+Breaks: libplatform-api1-hybris-tests (<< 2.0.0)
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         ubuntu-application-api2-test,
+         ubuntu-application-api2-touch | ubuntu-application-api2-desktop,
+Description: Binary examples for Ubuntu Application API
+ This package provides a set of example programs that excercise most the
+ set of APIs provided by the Application API.
+
+Package: libplatform-api-headers
+Section: oldlibs
+Architecture: all
+Depends: libubuntu-application-api-headers,
+         ${misc:Depends},
+Description: dummy transitional package for libplatform-api-headers
+ This is a dummy transitional package, please use libubuntu-application-api-headers
+ instead.
+
+Package: libplatform-hardware-api-headers
+Section: oldlibs
+Architecture: all
+Depends: libubuntu-platform-hardware-api-headers,
+         ${misc:Depends},
+Description: dummy transitional package for libplatform-hardware-api-headers
+ This is a dummy transitional package, please use libubuntu-platform-hardware-api-headers
+ instead.
+
+Package: libplatform-api1-dev
+Section: oldlibs
+Architecture: all
+Depends: libubuntu-application-api-dev,
+         ${misc:Depends},
+Description: dummy transitional package for libplatform-api1-dev
+ This is a dummy transitional package, please use libubuntu-application-api-dev
+
+Package: libplatform-hardware-api1-dev
+Section: oldlibs
+Architecture: all
+Depends: libubuntu-platform-hardware-api-dev,
+         ${misc:Depends},
+Description: dummy transitional package for libplatform-hardware-api1-dev
+ This is a dummy transitional package, please use libubuntu-platform-hardware-api-dev
+ instead.
+
 Package: libplatform-api1-hybris-tests
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libubuntu-application-api1 (= ${binary:Version}),
-Description: Hybris implementation of the Platform API (tests)
- This package provides the test cases for the hybris implementation
- of the Platform API.
-
-Package: libubuntu-platform-api1-dev
-Section: oldlibs
-Architecture: all
-Depends: ${misc:Depends},
-         libplatform-api1-dev (= ${binary:Version}),
-Description: dummy transitional package for libplatform-api1-dev
- This is dummy transitional package, please use libplatform-api1-dev instead.
- .
- This package can be safely removed.
-
-Package: libplatform-api1-hybris
-Section: oldlibs
-Architecture: all
-Depends: libubuntu-application-api1,
-         ${misc:Depends},
-Description: dummy transitional package for libplatform-api1-hybris
- This is a dummy transitional package, please use libubuntu-application-api1
- instead.
-
-Package: libplatform-hardware-api1-hybris
-Section: oldlibs
-Architecture: all
-Depends: libubuntu-platform-hardware-api1,
-         ${misc:Depends},
-Description: dummy transitional package for libplatform-hardware-api1-hybris
- This is a dummy transitional package, please use libubuntu-platform-hardware-api1
- instead.
+Section: oldlibs
+Architecture: all
+Depends: ubuntu-application-api2-examples,
+         ${misc:Depends},
+Description: dummy transitional package for libplatform-api1-hybris-tests
+ This is a dummy transitional package, please use ubuntu-application-api2-examples
+
+Package: libplatform-api1-doc
+Section: oldlibs
+Architecture: all
+Depends: libubuntu-application-api-doc,
+         ${misc:Depends},
+Description: dummy transitional package for libplatform-api1-doc
+ This is a dummy transitional package, please use libubuntu-application-api-doc
 

=== removed file 'debian/libplatform-api1-hybris-tests.install'
--- debian/libplatform-api1-hybris-tests.install	2013-08-17 05:22:31 +0000
+++ debian/libplatform-api1-hybris-tests.install	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-usr/bin/test_android_gps_api
-usr/bin/test_android_sensors_api
-usr/bin/test_android_ubuntu_app_api
-usr/bin/test_android_ubuntu_app_api_multiple_surfaces
-usr/bin/test_android_ubuntu_session_api
-usr/bin/test_ubuntu_app_api_location_service
\ No newline at end of file

=== renamed file 'debian/libplatform-api1-dev.install' => 'debian/libubuntu-application-api-dev.install'
--- debian/libplatform-api1-dev.install	2013-08-23 13:53:42 +0000
+++ debian/libubuntu-application-api-dev.install	2014-08-26 16:06:15 +0000
@@ -1,4 +1,2 @@
 usr/lib/*/libubuntu_application_api.so
-usr/lib/*/libubuntu_application_api_mirclient.so
-usr/lib/*/libubuntu_application_api_mirserver.so
 usr/lib/*/pkgconfig/ubuntu-platform-api.pc

=== renamed file 'debian/libplatform-api1-doc.doc-base' => 'debian/libubuntu-application-api-doc.doc-base'
=== renamed file 'debian/libplatform-api1-doc.install' => 'debian/libubuntu-application-api-doc.install'
--- debian/libplatform-api1-doc.install	2013-07-05 13:50:50 +0000
+++ debian/libubuntu-application-api-doc.install	2014-08-26 16:06:15 +0000
@@ -1,1 +1,1 @@
-usr/share/doc/ubuntu-platform-api
\ No newline at end of file
+usr/share/doc/ubuntu-platform-api

=== renamed file 'debian/libplatform-api-headers.install' => 'debian/libubuntu-application-api-headers.install'
--- debian/libplatform-api-headers.install	2014-01-09 18:47:45 +0000
+++ debian/libubuntu-application-api-headers.install	2014-08-26 16:06:15 +0000
@@ -2,6 +2,7 @@
 usr/include/ubuntu/unit.h
 usr/include/ubuntu/visibility.h
 usr/include/ubuntu/application
+usr/include/ubuntu/application/init.h
 usr/include/ubuntu/ui
 usr/include/ubuntu/application/location
 usr/include/ubuntu/application/url_dispatcher

=== removed file 'debian/libubuntu-application-api-mirclient1.install'
--- debian/libubuntu-application-api-mirclient1.install	2013-08-08 17:41:19 +0000
+++ debian/libubuntu-application-api-mirclient1.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/libubuntu_application_api_mirclient.so.*

=== removed file 'debian/libubuntu-application-api-mirclient1.symbols'
--- debian/libubuntu-application-api-mirclient1.symbols	2013-09-23 05:39:42 +0000
+++ debian/libubuntu-application-api-mirclient1.symbols	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-libubuntu_application_api_mirclient.so.1 libubuntu-application-api-mirclient1 #MINVER#
- u_application_description_destroy@Base 0.18.3+13.10.20130813
- u_application_description_get_application_id@Base 0.18.3+13.10.20130813
- u_application_description_get_application_lifecycle_delegate@Base 0.18.3+13.10.20130813
- u_application_description_new@Base 0.18.3+13.10.20130813
- u_application_description_set_application_id@Base 0.18.3+13.10.20130813
- u_application_description_set_application_lifecycle_delegate@Base 0.18.3+13.10.20130813
- u_application_id_compare@Base 0.18.3+13.10.20130813
- u_application_id_destroy@Base 0.18.3+13.10.20130813
- u_application_id_new_from_stringn@Base 0.18.3+13.10.20130813
- u_application_instance_destroy@Base 0.18.3+13.10.20130813
- u_application_instance_new_from_description_with_options@Base 0.18.3+13.10.20130813
- u_application_instance_ref@Base 0.18.3+13.10.20130813
- u_application_instance_run@Base 0.18.3+13.10.20130813
- u_application_instance_unref@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_destroy@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_get_application_about_to_stop_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_get_application_resumed_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_get_context@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_new@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_ref@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_set_application_about_to_stop_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_set_application_resumed_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_set_context@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_unref@Base 0.18.3+13.10.20130813
- u_application_options_destroy@Base 0.18.3+13.10.20130813
- u_application_options_get_form_factor@Base 0.18.3+13.10.20130813
- u_application_options_get_operation_mode@Base 0.18.3+13.10.20130813
- u_application_options_get_stage@Base 0.18.3+13.10.20130813
- u_application_options_new_from_cmd_line@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_disable@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_enable@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_max_value@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_min_delay@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_min_value@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_resolution@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_new@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_set_reading_cb@Base 0.18.3+13.10.20130813
- ua_sensors_light_disable@Base 0.18.3+13.10.20130813
- ua_sensors_light_enable@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_max_value@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_min_delay@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_min_value@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_resolution@Base 0.18.3+13.10.20130813
- ua_sensors_light_new@Base 0.18.3+13.10.20130813
- ua_sensors_light_set_reading_cb@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_disable@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_enable@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_max_value@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_min_delay@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_min_value@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_resolution@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_new@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_set_reading_cb@Base 0.18.3+13.10.20130813
- ua_ui_display_destroy@Base 0.18.3+13.10.20130813
- ua_ui_display_get_native_type@Base 0.18.3+13.10.20130813
- ua_ui_display_new_with_index@Base 0.18.3+13.10.20130813
- ua_ui_display_query_horizontal_res@Base 0.18.3+13.10.20130813
- ua_ui_display_query_vertical_res@Base 0.18.3+13.10.20130813
- ua_ui_get_clipboard_content@Base 0.18.3+13.10.20130813
- ua_ui_session_new_with_properties@Base 0.18.3+13.10.20130813
- ua_ui_session_properties_new@Base 0.18.3+13.10.20130813
- ua_ui_session_properties_set_remote_pid@Base 0.18.3+13.10.20130813
- ua_ui_session_properties_set_type@Base 0.18.3+13.10.20130813
- ua_ui_set_clipboard_content@Base 0.18.3+13.10.20130813
- ua_ui_window_destroy@Base 0.18.3+13.10.20130813
- ua_ui_window_get_native_type@Base 0.18.3+13.10.20130813
- ua_ui_window_hide@Base 0.18.3+13.10.20130813
- ua_ui_window_move@Base 0.18.3+13.10.20130813
- ua_ui_window_new_for_application_with_properties@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_destroy@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_get_title@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_new_for_normal_window@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_set_input_cb_and_ctx@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_set_role@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_set_titlen@Base 0.18.3+13.10.20130813
- ua_ui_window_request_fullscreen@Base 0.18.3+13.10.20130813
- ua_ui_window_resize@Base 0.18.3+13.10.20130813
- ua_ui_window_show@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_acceleration_x@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_acceleration_y@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_acceleration_z@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_timestamp@Base 0.18.3+13.10.20130813
- uas_light_event_get_light@Base 0.18.3+13.10.20130813
- uas_light_event_get_timestamp@Base 0.18.3+13.10.20130813
- uas_proximity_event_get_distance@Base 0.18.3+13.10.20130813
- uas_proximity_event_get_timestamp@Base 0.18.3+13.10.20130813
- ua_location_heading_update_get_heading_in_degree@Base 0.19+13.10.20130919.3
- ua_location_heading_update_get_timestamp@Base 0.19+13.10.20130919.3
- ua_location_heading_update_ref@Base 0.19+13.10.20130919.3
- ua_location_heading_update_unref@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_altitude_in_meter@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_latitude_in_degree@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_longitude_in_degree@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_timestamp@Base 0.19+13.10.20130919.3
- ua_location_position_update_has_altitude@Base 0.19+13.10.20130919.3
- ua_location_position_update_ref@Base 0.19+13.10.20130919.3
- ua_location_position_update_unref@Base 0.19+13.10.20130919.3
- ua_location_service_controller_disable_gps@Base 0.19+13.10.20130919.3
- ua_location_service_controller_disable_service@Base 0.19+13.10.20130919.3
- ua_location_service_controller_enable_gps@Base 0.19+13.10.20130919.3
- ua_location_service_controller_enable_service@Base 0.19+13.10.20130919.3
- ua_location_service_controller_query_status@Base 0.19+13.10.20130919.3
- ua_location_service_controller_ref@Base 0.19+13.10.20130919.3
- ua_location_service_controller_set_status_changed_handler@Base 0.19+13.10.20130919.3
- ua_location_service_controller_unref@Base 0.19+13.10.20130919.3
- ua_location_service_create_controller@Base 0.19+13.10.20130919.3
- ua_location_service_create_session_for_high_accuracy@Base 0.19+13.10.20130919.3
- ua_location_service_create_session_for_low_accuracy@Base 0.19+13.10.20130919.3
- ua_location_service_session_ref@Base 0.19+13.10.20130919.3
- ua_location_service_session_set_heading_updates_handler@Base 0.19+13.10.20130919.3
- ua_location_service_session_set_position_updates_handler@Base 0.19+13.10.20130919.3
- ua_location_service_session_set_velocity_updates_handler@Base 0.19+13.10.20130919.3
- ua_location_service_session_start_heading_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_start_position_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_start_velocity_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_stop_heading_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_stop_position_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_stop_velocity_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_unref@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_get_timestamp@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_get_velocity_in_meters_per_second@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_ref@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_unref@Base 0.19+13.10.20130919.3
- ua_url_dispatcher_session@Base 0.19+13.10.20130919.3
- ua_url_dispatcher_session_open@Base 0.19+13.10.20130919.3
\ No newline at end of file

=== removed file 'debian/libubuntu-application-api-mirserver1.install'
--- debian/libubuntu-application-api-mirserver1.install	2013-08-08 17:41:19 +0000
+++ debian/libubuntu-application-api-mirserver1.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/libubuntu_application_api_mirserver.so.*

=== removed file 'debian/libubuntu-application-api-mirserver1.symbols'
--- debian/libubuntu-application-api-mirserver1.symbols	2013-09-23 05:39:42 +0000
+++ debian/libubuntu-application-api-mirserver1.symbols	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
-libubuntu_application_api_mirserver.so.1 libubuntu-application-api-mirserver1 #MINVER#
- u_application_description_destroy@Base 0.18.3+13.10.20130813
- u_application_description_get_application_id@Base 0.18.3+13.10.20130813
- u_application_description_get_application_lifecycle_delegate@Base 0.18.3+13.10.20130813
- u_application_description_new@Base 0.18.3+13.10.20130813
- u_application_description_set_application_id@Base 0.18.3+13.10.20130813
- u_application_description_set_application_lifecycle_delegate@Base 0.18.3+13.10.20130813
- u_application_id_compare@Base 0.18.3+13.10.20130813
- u_application_id_destroy@Base 0.18.3+13.10.20130813
- u_application_id_new_from_stringn@Base 0.18.3+13.10.20130813
- u_application_instance_destroy@Base 0.18.3+13.10.20130813
- u_application_instance_new_from_description_with_options@Base 0.18.3+13.10.20130813
- u_application_instance_ref@Base 0.18.3+13.10.20130813
- u_application_instance_run@Base 0.18.3+13.10.20130813
- u_application_instance_unref@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_destroy@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_get_application_about_to_stop_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_get_application_resumed_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_get_context@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_new@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_ref@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_set_application_about_to_stop_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_set_application_resumed_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_set_context@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_unref@Base 0.18.3+13.10.20130813
- u_application_options_destroy@Base 0.18.3+13.10.20130813
- u_application_options_get_form_factor@Base 0.18.3+13.10.20130813
- u_application_options_get_operation_mode@Base 0.18.3+13.10.20130813
- u_application_options_get_stage@Base 0.18.3+13.10.20130813
- u_application_options_new_from_cmd_line@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_disable@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_enable@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_max_value@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_min_delay@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_min_value@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_resolution@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_new@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_set_reading_cb@Base 0.18.3+13.10.20130813
- ua_sensors_light_disable@Base 0.18.3+13.10.20130813
- ua_sensors_light_enable@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_max_value@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_min_delay@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_min_value@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_resolution@Base 0.18.3+13.10.20130813
- ua_sensors_light_new@Base 0.18.3+13.10.20130813
- ua_sensors_light_set_reading_cb@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_disable@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_enable@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_max_value@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_min_delay@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_min_value@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_resolution@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_new@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_set_reading_cb@Base 0.18.3+13.10.20130813
- ua_ui_display_destroy@Base 0.18.3+13.10.20130813
- ua_ui_display_get_native_type@Base 0.18.3+13.10.20130813
- ua_ui_display_new_with_index@Base 0.18.3+13.10.20130813
- ua_ui_display_query_horizontal_res@Base 0.18.3+13.10.20130813
- ua_ui_display_query_vertical_res@Base 0.18.3+13.10.20130813
- ua_ui_get_clipboard_content@Base 0.18.3+13.10.20130813
- ua_ui_mirserver_finish@Base 0.18.3+13.10.20130823
- ua_ui_mirserver_init@Base 0.18.3+13.10.20130823
- ua_ui_session_new_with_properties@Base 0.18.3+13.10.20130813
- ua_ui_session_properties_new@Base 0.18.3+13.10.20130813
- ua_ui_session_properties_set_remote_pid@Base 0.18.3+13.10.20130813
- ua_ui_session_properties_set_type@Base 0.18.3+13.10.20130813
- ua_ui_set_clipboard_content@Base 0.18.3+13.10.20130813
- ua_ui_window_destroy@Base 0.18.3+13.10.20130813
- ua_ui_window_get_native_type@Base 0.18.3+13.10.20130813
- ua_ui_window_hide@Base 0.18.3+13.10.20130813
- ua_ui_window_move@Base 0.18.3+13.10.20130813
- ua_ui_window_new_for_application_with_properties@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_destroy@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_get_title@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_new_for_normal_window@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_set_input_cb_and_ctx@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_set_role@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_set_titlen@Base 0.18.3+13.10.20130813
- ua_ui_window_request_fullscreen@Base 0.18.3+13.10.20130813
- ua_ui_window_resize@Base 0.18.3+13.10.20130813
- ua_ui_window_show@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_acceleration_x@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_acceleration_y@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_acceleration_z@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_timestamp@Base 0.18.3+13.10.20130813
- uas_light_event_get_light@Base 0.18.3+13.10.20130813
- uas_light_event_get_timestamp@Base 0.18.3+13.10.20130813
- uas_proximity_event_get_distance@Base 0.18.3+13.10.20130813
- uas_proximity_event_get_timestamp@Base 0.18.3+13.10.20130813
- ua_location_heading_update_get_heading_in_degree@Base 0.19+13.10.20130919.3
- ua_location_heading_update_get_timestamp@Base 0.19+13.10.20130919.3
- ua_location_heading_update_ref@Base 0.19+13.10.20130919.3
- ua_location_heading_update_unref@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_altitude_in_meter@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_latitude_in_degree@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_longitude_in_degree@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_timestamp@Base 0.19+13.10.20130919.3
- ua_location_position_update_has_altitude@Base 0.19+13.10.20130919.3
- ua_location_position_update_ref@Base 0.19+13.10.20130919.3
- ua_location_position_update_unref@Base 0.19+13.10.20130919.3
- ua_location_service_controller_disable_gps@Base 0.19+13.10.20130919.3
- ua_location_service_controller_disable_service@Base 0.19+13.10.20130919.3
- ua_location_service_controller_enable_gps@Base 0.19+13.10.20130919.3
- ua_location_service_controller_enable_service@Base 0.19+13.10.20130919.3
- ua_location_service_controller_query_status@Base 0.19+13.10.20130919.3
- ua_location_service_controller_ref@Base 0.19+13.10.20130919.3
- ua_location_service_controller_set_status_changed_handler@Base 0.19+13.10.20130919.3
- ua_location_service_controller_unref@Base 0.19+13.10.20130919.3
- ua_location_service_create_controller@Base 0.19+13.10.20130919.3
- ua_location_service_create_session_for_high_accuracy@Base 0.19+13.10.20130919.3
- ua_location_service_create_session_for_low_accuracy@Base 0.19+13.10.20130919.3
- ua_location_service_session_ref@Base 0.19+13.10.20130919.3
- ua_location_service_session_set_heading_updates_handler@Base 0.19+13.10.20130919.3
- ua_location_service_session_set_position_updates_handler@Base 0.19+13.10.20130919.3
- ua_location_service_session_set_velocity_updates_handler@Base 0.19+13.10.20130919.3
- ua_location_service_session_start_heading_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_start_position_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_start_velocity_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_stop_heading_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_stop_position_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_stop_velocity_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_unref@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_get_timestamp@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_get_velocity_in_meters_per_second@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_ref@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_unref@Base 0.19+13.10.20130919.3
- ua_url_dispatcher_session@Base 0.19+13.10.20130919.3
- ua_url_dispatcher_session_open@Base 0.19+13.10.20130919.3
\ No newline at end of file

=== renamed file 'debian/libubuntu-application-api1.install' => 'debian/libubuntu-application-api2.install'
=== renamed file 'debian/libubuntu-application-api1.symbols' => 'debian/libubuntu-application-api2.symbols'
--- debian/libubuntu-application-api1.symbols	2013-08-26 18:07:34 +0000
+++ debian/libubuntu-application-api2.symbols	2014-08-26 16:06:15 +0000
@@ -1,11 +1,13 @@
-libubuntu_application_api.so.1 libubuntu-application-api1 #MINVER#
+libubuntu_application_api.so.2 libubuntu-application-api2 #MINVER#
  u_application_description_destroy@Base 0.18.1daily13.06.21
  u_application_description_new@Base 0.18.1daily13.06.21
  u_application_description_set_application_id@Base 0.18.1daily13.06.21
  u_application_description_set_application_lifecycle_delegate@Base 0.18.1daily13.06.21
+ u_application_finish@Base 2.0.0+14.10.20140612
  u_application_id_compare@Base 0.18.1daily13.06.21
  u_application_id_destroy@Base 0.18.1daily13.06.21
  u_application_id_new_from_stringn@Base 0.18.1daily13.06.21
+ u_application_init@Base 2.0.0+14.10.20140612
  u_application_instance_new_from_description_with_options@Base 0.18.1daily13.06.21
  u_application_lifecycle_delegate_new@Base 0.18.1daily13.06.21
  u_application_lifecycle_delegate_ref@Base 0.18.1daily13.06.21
@@ -13,24 +15,37 @@
  u_application_lifecycle_delegate_set_application_resumed_cb@Base 0.18.1daily13.06.21
  u_application_lifecycle_delegate_set_context@Base 0.18.1daily13.06.21
  u_application_lifecycle_delegate_unref@Base 0.18.1daily13.06.21
+ u_application_module_version@Base 2.0.0+14.10.20140612
  u_application_options_destroy@Base 0.18.1daily13.06.21
  u_application_options_get_form_factor@Base 0.18.1daily13.06.21
  u_application_options_get_stage@Base 0.18.1daily13.06.21
  u_application_options_new_from_cmd_line@Base 0.18.1daily13.06.21
+ ua_location_heading_update_get_heading_in_degree@Base 0.18.3+13.10.20130815.1
  ua_location_heading_update_get_timestamp@Base 0.18.3+13.10.20130807
  ua_location_heading_update_ref@Base 0.18.3+13.10.20130807
  ua_location_heading_update_unref@Base 0.18.3+13.10.20130807
- ua_location_heading_update_get_heading_in_degree@Base 0.18.3+13.10.20130815.1
  ua_location_position_update_get_altitude_in_meter@Base 0.18.3+13.10.20130807
+ ua_location_position_update_get_horizontal_accuracy_in_meter@Base 2.1.0+14.10.20140630
  ua_location_position_update_get_latitude_in_degree@Base 0.18.3+13.10.20130807
  ua_location_position_update_get_longitude_in_degree@Base 0.18.3+13.10.20130807
  ua_location_position_update_get_timestamp@Base 0.18.3+13.10.20130807
+ ua_location_position_update_get_vertical_accuracy_in_meter@Base 2.1.0+14.10.20140630
  ua_location_position_update_has_altitude@Base 0.18.3+13.10.20130807
+ ua_location_position_update_has_horizontal_accuracy@Base 2.1.0+14.10.20140630
+ ua_location_position_update_has_vertical_accuracy@Base 2.1.0+14.10.20140630
  ua_location_position_update_ref@Base 0.18.3+13.10.20130807
  ua_location_position_update_unref@Base 0.18.3+13.10.20130807
+ ua_location_service_controller_disable_gps@Base 0.18.3+13.10.20130826
+ ua_location_service_controller_disable_service@Base 0.18.3+13.10.20130826
+ ua_location_service_controller_enable_gps@Base 0.18.3+13.10.20130826
+ ua_location_service_controller_enable_service@Base 0.18.3+13.10.20130826
+ ua_location_service_controller_query_status@Base 0.18.3+13.10.20130826
+ ua_location_service_controller_ref@Base 0.18.3+13.10.20130826
+ ua_location_service_controller_set_status_changed_handler@Base 0.18.3+13.10.20130826
+ ua_location_service_controller_unref@Base 0.18.3+13.10.20130826
+ ua_location_service_create_controller@Base 0.18.3+13.10.20130826.3
  ua_location_service_create_session_for_high_accuracy@Base 0.18.3+13.10.20130807
  ua_location_service_create_session_for_low_accuracy@Base 0.18.3+13.10.20130807
- ua_location_service_create_controller@Base 0.18.3+13.10.20130826.3
  ua_location_service_session_ref@Base 0.18.3+13.10.20130807
  ua_location_service_session_set_heading_updates_handler@Base 0.18.3+13.10.20130807
  ua_location_service_session_set_position_updates_handler@Base 0.18.3+13.10.20130807
@@ -53,15 +68,31 @@
  ua_sensors_accelerometer_get_min_value@Base 0.18.1daily13.06.21
  ua_sensors_accelerometer_get_resolution@Base 0.18.1daily13.06.21
  ua_sensors_accelerometer_new@Base 0.18.1daily13.06.21
+ ua_sensors_accelerometer_set_event_rate@Base 2.1.0+14.10.20140623.1
  ua_sensors_accelerometer_set_reading_cb@Base 0.18.1daily13.06.21
+ ua_sensors_haptic_disable@Base 2.0.0+14.10.20140612
+ ua_sensors_haptic_enable@Base 2.0.0+14.10.20140612
+ ua_sensors_haptic_new@Base 2.0.0+14.10.20140612
+ ua_sensors_haptic_vibrate_once@Base 2.0.0+14.10.20140612
+ ua_sensors_haptic_vibrate_with_pattern@Base 2.0.0+14.10.20140612
+ ua_sensors_light_disable@Base 0.18.2+13.10.20130708
  ua_sensors_light_enable@Base 0.18.1daily13.06.21
- ua_sensors_light_disable@Base 0.18.2+13.10.20130708
  ua_sensors_light_get_max_value@Base 0.18.1daily13.06.21
  ua_sensors_light_get_min_delay@Base 0.18.1daily13.06.21
  ua_sensors_light_get_min_value@Base 0.18.1daily13.06.21
  ua_sensors_light_get_resolution@Base 0.18.1daily13.06.21
  ua_sensors_light_new@Base 0.18.1daily13.06.21
+ ua_sensors_light_set_event_rate@Base 2.1.0+14.10.20140623.1
  ua_sensors_light_set_reading_cb@Base 0.18.1daily13.06.21
+ ua_sensors_orientation_disable@Base 2.1.0+14.10.20140623.1
+ ua_sensors_orientation_enable@Base 2.1.0+14.10.20140623.1
+ ua_sensors_orientation_get_max_value@Base 2.1.0+14.10.20140623.1
+ ua_sensors_orientation_get_min_delay@Base 2.1.0+14.10.20140623.1
+ ua_sensors_orientation_get_min_value@Base 2.1.0+14.10.20140623.1
+ ua_sensors_orientation_get_resolution@Base 2.1.0+14.10.20140623.1
+ ua_sensors_orientation_new@Base 2.1.0+14.10.20140623.1
+ ua_sensors_orientation_set_event_rate@Base 2.1.0+14.10.20140623.1
+ ua_sensors_orientation_set_reading_cb@Base 2.1.0+14.10.20140623.1
  ua_sensors_proximity_disable@Base 0.18.1daily13.06.21
  ua_sensors_proximity_enable@Base 0.18.1daily13.06.21
  ua_sensors_proximity_get_max_value@Base 0.18.1daily13.06.21
@@ -69,6 +100,7 @@
  ua_sensors_proximity_get_min_value@Base 0.18.1daily13.06.21
  ua_sensors_proximity_get_resolution@Base 0.18.1daily13.06.21
  ua_sensors_proximity_new@Base 0.18.1daily13.06.21
+ ua_sensors_proximity_set_event_rate@Base 2.1.0+14.10.20140623.1
  ua_sensors_proximity_set_reading_cb@Base 0.18.1daily13.06.21
  ua_ui_display_destroy@Base 0.18.1daily13.06.21
  ua_ui_display_get_native_type@Base 0.18.1daily13.06.21
@@ -83,13 +115,18 @@
  ua_ui_set_clipboard_content@Base 0.18.1daily13.06.21
  ua_ui_window_destroy@Base 0.18.1daily13.06.21
  ua_ui_window_get_native_type@Base 0.18.1daily13.06.21
+ ua_ui_window_get_orientation@Base 2.2.1+14.10.20140812
+ ua_ui_window_get_size@Base 2.0.0+14.10.20140612
  ua_ui_window_hide@Base 0.18.1daily13.06.21
+ ua_ui_window_is_focused@Base 2.2.0+14.10.20140728
  ua_ui_window_move@Base 0.18.1daily13.06.21
  ua_ui_window_new_for_application_with_properties@Base 0.18.1daily13.06.21
  ua_ui_window_properties_destroy@Base 0.18.1daily13.06.21
  ua_ui_window_properties_get_title@Base 0.18.1daily13.06.21
  ua_ui_window_properties_new_for_normal_window@Base 0.18.1daily13.06.21
+ ua_ui_window_properties_set_dimensions@Base 2.0.0+14.10.20140612
  ua_ui_window_properties_set_input_cb_and_ctx@Base 0.18.1daily13.06.21
+ ua_ui_window_properties_set_event_cb_and_ctx@Base 2.2.0+14.10.20140728
  ua_ui_window_properties_set_role@Base 0.18.1daily13.06.21
  ua_ui_window_properties_set_titlen@Base 0.18.1daily13.06.21
  ua_ui_window_request_fullscreen@Base 0.18.1daily13.06.21
@@ -103,28 +140,9 @@
  uas_accelerometer_event_get_timestamp@Base 0.18.1daily13.06.21
  uas_light_event_get_light@Base 0.18.1daily13.06.21
  uas_light_event_get_timestamp@Base 0.18.1daily13.06.21
+ uas_orientation_event_get_azimuth@Base 2.1.0+14.10.20140623.1
+ uas_orientation_event_get_pitch@Base 2.1.0+14.10.20140623.1
+ uas_orientation_event_get_roll@Base 2.1.0+14.10.20140623.1
+ uas_orientation_event_get_timestamp@Base 2.1.0+14.10.20140623.1
  uas_proximity_event_get_distance@Base 0.18.1daily13.06.21
  uas_proximity_event_get_timestamp@Base 0.18.1daily13.06.21
- ubuntu_ui_install_task_controller@Base 0.18.1daily13.06.21
- ubuntu_ui_report_notification_invisible@Base 0.18.1daily13.06.21
- ubuntu_ui_report_notification_visible@Base 0.18.1daily13.06.21
- ubuntu_ui_report_osk_invisible@Base 0.18.1daily13.06.21
- ubuntu_ui_report_osk_visible@Base 0.18.1daily13.06.21
- ubuntu_ui_session_focus_running_session_with_id@Base 0.18.1daily13.06.21
- ubuntu_ui_session_install_session_lifecycle_observer@Base 0.18.1daily13.06.21
- ubuntu_ui_session_properties_get_application_instance_id@Base 0.18.1daily13.06.21
- ubuntu_ui_session_properties_get_application_stage_hint@Base 0.18.1daily13.06.21
- ubuntu_ui_session_properties_get_desktop_file_hint@Base 0.18.1daily13.06.21
- ubuntu_ui_session_snapshot_running_session_with_id@Base 0.18.1daily13.06.21
- ubuntu_ui_session_trigger_switch_to_well_known_application@Base 0.18.1daily13.06.21
- ubuntu_ui_session_unfocus_running_sessions@Base 0.18.1daily13.06.21
- ubuntu_ui_set_surface_trap@Base 0.18.1daily13.06.21
- ubuntu_ui_unset_surface_trap@Base 0.18.1daily13.06.21
- ua_location_service_controller_disable_gps@Base 0.18.3+13.10.20130826
- ua_location_service_controller_disable_service@Base 0.18.3+13.10.20130826
- ua_location_service_controller_enable_gps@Base 0.18.3+13.10.20130826
- ua_location_service_controller_enable_service@Base 0.18.3+13.10.20130826
- ua_location_service_controller_query_status@Base 0.18.3+13.10.20130826
- ua_location_service_controller_ref@Base 0.18.3+13.10.20130826
- ua_location_service_controller_set_status_changed_handler@Base 0.18.3+13.10.20130826
- ua_location_service_controller_unref@Base 0.18.3+13.10.20130826

=== renamed file 'debian/libplatform-hardware-api1-dev.install' => 'debian/libubuntu-platform-hardware-api-dev.install'
--- debian/libplatform-hardware-api1-dev.install	2013-07-08 10:39:36 +0000
+++ debian/libubuntu-platform-hardware-api-dev.install	2014-08-26 16:06:15 +0000
@@ -1,2 +1,2 @@
 usr/lib/*/libubuntu_platform_hardware_api.so
-
+usr/lib/*/pkgconfig/ubuntu-platform-hardware-api.pc

=== renamed file 'debian/libplatform-hardware-api-headers.install' => 'debian/libubuntu-platform-hardware-api-headers.install'
=== renamed file 'debian/libubuntu-platform-hardware-api1.install' => 'debian/libubuntu-platform-hardware-api2.install'
=== renamed file 'debian/libubuntu-platform-hardware-api1.symbols' => 'debian/libubuntu-platform-hardware-api2.symbols'
--- debian/libubuntu-platform-hardware-api1.symbols	2013-07-17 14:29:04 +0000
+++ debian/libubuntu-platform-hardware-api2.symbols	2014-08-26 16:06:15 +0000
@@ -1,4 +1,11 @@
-libubuntu_platform_hardware_api.so.1 libubuntu-platform-hardware-api1 #MINVER#
+libubuntu_platform_hardware_api.so.2 libubuntu-platform-hardware-api2 #MINVER#
+ u_hardware_alarm_create@Base 1.2.0+14.10.20140522.1
+ u_hardware_alarm_get_elapsed_real_time@Base 1.2.0+14.10.20140522.1
+ u_hardware_alarm_ref@Base 1.2.0+14.10.20140522.1
+ u_hardware_alarm_set_relative_to_with_behavior@Base 1.2.0+14.10.20140522.1
+ u_hardware_alarm_set_timezone@Base 1.2.0+14.10.20140522.1
+ u_hardware_alarm_unref@Base 1.2.0+14.10.20140522.1
+ u_hardware_alarm_wait_for_next_alarm@Base 1.2.0+14.10.20140522.1
  u_hardware_gps_delete@Base 0.18.2+13.10.20130709
  u_hardware_gps_delete_aiding_data@Base 0.18.2+13.10.20130709
  u_hardware_gps_inject_location@Base 0.18.2+13.10.20130709
@@ -8,3 +15,8 @@
  u_hardware_gps_set_position_mode@Base 0.18.2+13.10.20130709
  u_hardware_gps_start@Base 0.18.2+13.10.20130709
  u_hardware_gps_stop@Base 0.18.2+13.10.20130709
+ u_hardware_gps_agps_notify_connection_is_closed@Base 0.21+14.10.20140507
+ u_hardware_gps_agps_notify_connection_is_open@Base 0.21+14.10.20140507
+ u_hardware_gps_agps_notify_connection_not_available@Base 0.21+14.10.20140507
+ u_hardware_gps_agps_set_reference_location@Base 0.21+14.10.20140507
+ u_hardware_gps_agps_set_server_for_type@Base 0.21+14.10.20140507

=== modified file 'debian/rules'
--- debian/rules	2014-02-13 14:12:28 +0000
+++ debian/rules	2014-08-26 16:06:15 +0000
@@ -2,11 +2,18 @@
 
 DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
+include /usr/share/dpkg/default.mk
+
+# Explicitly selecting a G{CC,++}-version here to avoid accidental
+# ABI breaks introduced by toolchain updates.
+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
+
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DENABLE_MIRCLIENT_IMPLEMENTATION=true -DENABLE_MIRSERVER_IMPLEMENTATION=true
+	dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
 
 override_dh_install:
 	dh_install --fail-missing

=== added file 'debian/ubuntu-application-api2-desktop.install'
--- debian/ubuntu-application-api2-desktop.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-application-api2-desktop.install	2014-08-26 16:06:15 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libubuntu_application_api_desktop_mirclient.so.*
+usr/lib/*/libubuntu_application_api_desktop_mirserver.so.*

=== added file 'debian/ubuntu-application-api2-examples.install'
--- debian/ubuntu-application-api2-examples.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-application-api2-examples.install	2014-08-26 16:06:15 +0000
@@ -0,0 +1,7 @@
+usr/bin/test_android_gps_api
+usr/bin/test_android_sensors_api
+usr/bin/test_android_ubuntu_app_api
+usr/bin/test_android_ubuntu_app_api_multiple_surfaces
+usr/bin/test_ubuntu_app_api_location_service
+usr/bin/test_hardware_alarms_api
+usr/bin/test_ubuntu_haptic_device

=== renamed file 'debian/libubuntu-application-api-test1.docs' => 'debian/ubuntu-application-api2-test.docs'
--- debian/libubuntu-application-api-test1.docs	2014-01-08 15:17:41 +0000
+++ debian/ubuntu-application-api2-test.docs	2014-08-26 16:06:15 +0000
@@ -1,1 +1,1 @@
-src/ubuntu/testbackend/README.md
+src/ubuntu/application/testbackend/README.md

=== renamed file 'debian/libubuntu-application-api-test1.install' => 'debian/ubuntu-application-api2-test.install'
=== added file 'debian/ubuntu-application-api2-touch.install'
--- debian/ubuntu-application-api2-touch.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-application-api2-touch.install	2014-08-26 16:06:15 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libubuntu_application_api_touch_mirserver.so.*
+usr/lib/*/libubuntu_application_api_touch_mirclient.so.*

=== added directory 'examples'
=== added file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ examples/CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -0,0 +1,29 @@
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC -Wl,--no-as-needed -pthread")
+
+add_executable(test_android_ubuntu_app_api test_c_api.cpp)
+target_link_libraries(test_android_ubuntu_app_api ubuntu_application_api EGL GLESv2)
+
+add_executable(test_android_ubuntu_app_api_multiple_surfaces test_multiple_surfaces_event_delivery.cpp)
+target_link_libraries(test_android_ubuntu_app_api_multiple_surfaces ubuntu_application_api EGL GLESv2)
+
+add_executable(test_android_sensors_api test_sensors_api.cpp)
+target_link_libraries(test_android_sensors_api ubuntu_application_api)
+
+add_executable(test_ubuntu_app_api_location_service test_location_api.cpp)
+target_link_libraries(test_ubuntu_app_api_location_service ubuntu_application_api)
+
+add_executable(test_ubuntu_haptic_device test_haptic_device.cpp)
+target_link_libraries(test_ubuntu_haptic_device ubuntu_application_api)
+
+install(TARGETS
+    test_android_ubuntu_app_api
+    test_android_ubuntu_app_api_multiple_surfaces
+    test_android_sensors_api
+    test_ubuntu_app_api_location_service
+    test_ubuntu_haptic_device
+    DESTINATION bin
+)

=== renamed file 'src/ubuntu/hybris/tests/test_c_api.cpp' => 'examples/test_c_api.cpp'
--- src/ubuntu/hybris/tests/test_c_api.cpp	2013-05-21 22:14:40 +0000
+++ examples/test_c_api.cpp	2014-08-26 16:06:15 +0000
@@ -1,16 +1,16 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * it under the terms of the GNU Lesser General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Thomas Voß <[e-mail]>
@@ -83,7 +83,7 @@
     const GLfloat * color_data;
 };
 
-void on_new_event(void* ctx, const Event* ev)
+void on_new_event(void* ctx, const WindowEvent* ev)
 {
 }
 
@@ -110,7 +110,7 @@
     UAUiWindowProperties* wprops = ua_ui_window_properties_new_for_normal_window();
     ua_ui_window_properties_set_titlen(wprops, "Window 1", 8);
     ua_ui_window_properties_set_role(wprops, U_MAIN_ROLE);
-    ua_ui_window_properties_set_input_cb_and_ctx(wprops, on_new_event, NULL);
+    ua_ui_window_properties_set_event_cb_and_ctx(wprops, on_new_event, NULL);
    
     UAUiWindow* surface = ua_ui_window_new_for_application_with_properties(instance, wprops);
     

=== added file 'examples/test_haptic_device.cpp'
--- examples/test_haptic_device.cpp	1970-01-01 00:00:00 +0000
+++ examples/test_haptic_device.cpp	2014-08-26 16:06:15 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Ricardo Mendoza <[e-mail]>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <ubuntu/application/sensors/haptic.h>
+
+int main(int argc, char *argv[])
+{
+    UASensorsHaptic *sensor = ua_sensors_haptic_new();
+
+    if (!sensor) {
+        printf("Haptic device unavailable\n");
+        return 1;
+    }
+
+    printf("Vibrating once for 1500ms\n");
+    ua_sensors_haptic_vibrate_once(sensor, 1500);
+
+    sleep(3);
+
+    printf("Vibrating with pattern 6*1500, repeat twice.\n");
+    uint32_t pattern[MAX_PATTERN_SIZE] = {1500, 1500, 1500, 1500, 1500, 1500};
+    ua_sensors_haptic_vibrate_with_pattern(sensor, pattern, 2);
+
+    return 0;
+}

=== renamed file 'src/ubuntu/hybris/tests/test_location_api.cpp' => 'examples/test_location_api.cpp'
--- src/ubuntu/hybris/tests/test_location_api.cpp	2013-12-03 07:10:43 +0000
+++ examples/test_location_api.cpp	2014-08-26 16:06:15 +0000
@@ -1,19 +1,19 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * it under the terms of the GNU Lesser General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voß <[e-mail]>
+ * Authored by: Thomas Voss <[e-mail]>
  */
 
 #include <ubuntu/application/location/service.h>

=== renamed file 'src/ubuntu/hybris/tests/test_multiple_surfaces_event_delivery.cpp' => 'examples/test_multiple_surfaces_event_delivery.cpp'
--- src/ubuntu/hybris/tests/test_multiple_surfaces_event_delivery.cpp	2013-05-21 22:14:40 +0000
+++ examples/test_multiple_surfaces_event_delivery.cpp	2014-08-26 16:06:15 +0000
@@ -1,19 +1,19 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * it under the terms of the GNU Lesser General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voß <[e-mail]>
+ * Authored by: Thomas Voss <[e-mail]>
  */
 
 #include <ubuntu/application/ui/window.h>
@@ -83,7 +83,7 @@
     const GLfloat * color_data;
 };
 
-void on_new_event(void* ctx, const Event* ev)
+void on_new_event(void* ctx, const WindowEvent* ev)
 {
     int* surface = (int*) ctx;
 
@@ -115,14 +115,14 @@
     UAUiWindowProperties* wprops1 = ua_ui_window_properties_new_for_normal_window();
     ua_ui_window_properties_set_titlen(wprops1, "Window 1", 8);
     ua_ui_window_properties_set_role(wprops1, U_MAIN_ROLE);
-    ua_ui_window_properties_set_input_cb_and_ctx(wprops1, on_new_event, &i);
+    ua_ui_window_properties_set_event_cb_and_ctx(wprops1, on_new_event, &i);
    
     UAUiWindow* surface1 = ua_ui_window_new_for_application_with_properties(instance, wprops1);
  
     UAUiWindowProperties* wprops2 = ua_ui_window_properties_new_for_normal_window();
     ua_ui_window_properties_set_titlen(wprops2, "Window 2", 8);
     ua_ui_window_properties_set_role(wprops2, U_MAIN_ROLE);
-    ua_ui_window_properties_set_input_cb_and_ctx(wprops2, on_new_event, &j);
+    ua_ui_window_properties_set_event_cb_and_ctx(wprops2, on_new_event, &j);
    
     UAUiWindow* surface2 = ua_ui_window_new_for_application_with_properties(instance, wprops2);
 

=== renamed file 'src/ubuntu/hybris/tests/test_sensors_api.cpp' => 'examples/test_sensors_api.cpp'
--- src/ubuntu/hybris/tests/test_sensors_api.cpp	2014-02-13 13:12:41 +0000
+++ examples/test_sensors_api.cpp	2014-08-26 16:06:15 +0000
@@ -1,16 +1,16 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * it under the terms of the GNU Lesser General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Ricardo Mendoza <[e-mail]>
@@ -25,6 +25,7 @@
 #include <ubuntu/application/sensors/accelerometer.h>
 #include <ubuntu/application/sensors/proximity.h>
 #include <ubuntu/application/sensors/light.h>
+#include <ubuntu/application/sensors/orientation.h>
 
 void on_new_accelerometer_event(UASAccelerometerEvent* event, void* context)
 {
@@ -68,11 +69,25 @@
     printf("\tlight: %f\n", light);
 }
 
+void on_new_orientation_event(UASOrientationEvent* event, void* context)
+{
+    float x; uas_orientation_event_get_azimuth(event, &x);
+    float y; uas_orientation_event_get_pitch(event, &y);
+    float z; uas_orientation_event_get_roll(event, &z);
+
+    printf("%s \n", __PRETTY_FUNCTION__);
+    printf("\ttime: %" PRIu64 "\n", uas_orientation_event_get_timestamp(event));
+    printf("\tx: %f\n", x);
+    printf("\ty: %f\n", y);
+    printf("\tz: %f\n", z);
+}
+
 int main(int argc, char** argv)
 {
     UASensorsAccelerometer* accelerometer = ua_sensors_accelerometer_new();
     UASensorsProximity* proximity = ua_sensors_proximity_new();
     UASensorsLight* ambientlight = ua_sensors_light_new();
+    UASensorsOrientation* orientation = ua_sensors_orientation_new();
 
     ua_sensors_accelerometer_set_reading_cb(accelerometer,
                                             on_new_accelerometer_event,
@@ -86,9 +101,14 @@
                                     on_new_light_event,
                                     NULL);
 
+    ua_sensors_orientation_set_reading_cb(orientation,
+                                          on_new_orientation_event,
+                                          NULL);
+
     ua_sensors_accelerometer_enable(accelerometer);
     ua_sensors_proximity_enable(proximity);
     ua_sensors_light_enable(ambientlight);
+    ua_sensors_orientation_enable(orientation);
 
     while(true)
     {

=== renamed file 'src/ubuntu/hybris/tests/test_session_c_api.cpp' => 'examples/test_session_c_api.cpp'
--- src/ubuntu/hybris/tests/test_session_c_api.cpp	2013-02-13 23:09:01 +0000
+++ examples/test_session_c_api.cpp	2014-08-26 16:06:15 +0000
@@ -1,16 +1,16 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
+ * it under the terms of the GNU Lesser General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Thomas Voß <[e-mail]>

=== modified file 'include/ubuntu/application/CMakeLists.txt'
--- include/ubuntu/application/CMakeLists.txt	2013-08-22 10:54:28 +0000
+++ include/ubuntu/application/CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -7,6 +7,7 @@
   lifecycle_delegate.h
   operation_mode.h
   options.h
+  init.h
 )
 
 install(

=== added file 'include/ubuntu/application/init.h'
--- include/ubuntu/application/init.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/init.h	2014-08-26 16:06:15 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Ricardo Mendoza <[e-mail]>
+ */
+
+#ifndef UBUNTU_APPLICATION_INIT_H_
+#define UBUNTU_APPLICATION_INIT_H_
+
+#include <ubuntu/visibility.h>
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
+    /**
+     * \brief Queries the Module Version that is currently loaded.
+     * \ingroup application_support
+     * \param[out] major Major version.
+     * \param[out] minor Minor version.
+     * \param[out] patch Patch version.
+     */
+     UBUNTU_DLL_PUBLIC void
+     u_application_module_version(
+        uint32_t *major,
+        uint32_t *minor,
+        uint32_t *patch);
+
+    /**
+     * \brief Initializes the Ubuntu Application API backend with args.
+     * \ingroup application_support
+     * \param[in] args Opaque initialization arguments.
+     */
+    UBUNTU_DLL_PUBLIC void
+    u_application_init(
+        void *args);
+
+    /**
+     * \brief Signal termination to the Application backend instance.
+     * \ingroup application_support
+     */
+    UBUNTU_DLL_PUBLIC void
+    u_application_finish();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* UBUNTU_APPLICATION_INIT_H_ */

=== modified file 'include/ubuntu/application/location/position_update.h'
--- include/ubuntu/application/location/position_update.h	2013-08-22 07:03:49 +0000
+++ include/ubuntu/application/location/position_update.h	2014-08-26 16:06:15 +0000
@@ -103,6 +103,46 @@
     ua_location_position_update_get_altitude_in_meter(
         UALocationPositionUpdate *update);
 
+    /**
+     * \brief Checks if the position update contains a horizontal accuracy estimate.
+     * \ingroup location_service
+     * \returns TRUE if the update contains a horizontal accuracy estimate, else FALSE.
+     * \param[in] update The position update instance to be queried.
+     */
+    UBUNTU_DLL_PUBLIC bool
+    ua_location_position_update_has_horizontal_accuracy(
+        UALocationPositionUpdate *update);
+
+    /**
+     * \brief Queries the horizontal accuracy contained in the position update.
+     * \ingroup location_service
+     * \returns The horizontal accuracy of the position update in [m].
+     * \param[in] update The position update instance to be queried.
+     */
+    UBUNTU_DLL_PUBLIC double
+    ua_location_position_update_get_horizontal_accuracy_in_meter(
+        UALocationPositionUpdate *update);
+
+    /**
+     * \brief Checks if the position update contains a vertical accuracy estimate.
+     * \ingroup location_service
+     * \returns TRUE if the update contains a vertical accuracy estimate, else FALSE.
+     * \param[in] update The position update instance to be queried.
+     */
+    UBUNTU_DLL_PUBLIC bool
+    ua_location_position_update_has_vertical_accuracy(
+        UALocationPositionUpdate *update);
+
+    /**
+     * \brief Queries the vertical accuracy contained in the position update.
+     * \ingroup location_service
+     * \returns The vertical accuracy of the position update in [m].
+     * \param[in] update The position update instance to be queried.
+     */
+    UBUNTU_DLL_PUBLIC double
+    ua_location_position_update_get_vertical_accuracy_in_meter(
+        UALocationPositionUpdate *update);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'include/ubuntu/application/sensors/CMakeLists.txt'
--- include/ubuntu/application/sensors/CMakeLists.txt	2013-07-18 09:08:17 +0000
+++ include/ubuntu/application/sensors/CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -3,7 +3,8 @@
   accelerometer.h
   light.h
   proximity.h
-  ubuntu_application_sensors.h
+  haptic.h
+  orientation.h
 )
 
 install(
@@ -11,4 +12,4 @@
   DESTINATION include/ubuntu/application/sensors
 )
 
-add_subdirectory(event)
\ No newline at end of file
+add_subdirectory(event)

=== modified file 'include/ubuntu/application/sensors/accelerometer.h'
--- include/ubuntu/application/sensors/accelerometer.h	2014-02-13 13:12:41 +0000
+++ include/ubuntu/application/sensors/accelerometer.h	2014-08-26 16:06:15 +0000
@@ -125,6 +125,18 @@
         on_accelerometer_event_cb cb,
         void *ctx);
 
+    /**
+     * \brief Set the sensor event delivery rate in nanoseconds..
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if successful or U_STATUS_ERROR if an error occured.
+     * \param[in] sensor The sensor instance to be modified.
+     * \param[in] rate The new event delivery rate.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    ua_sensors_accelerometer_set_event_rate(
+        UASensorsAccelerometer* sensor,
+        uint32_t rate);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'include/ubuntu/application/sensors/event/CMakeLists.txt'
--- include/ubuntu/application/sensors/event/CMakeLists.txt	2013-07-18 09:08:17 +0000
+++ include/ubuntu/application/sensors/event/CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -3,9 +3,10 @@
   accelerometer.h
   light.h
   proximity.h
+  orientation.h
 )
 
 install(
   FILES ${UBUNTU_APPLICATION_SENSORS_EVENT_HEADERS}
   DESTINATION include/ubuntu/application/sensors/event
-)
\ No newline at end of file
+)

=== added file 'include/ubuntu/application/sensors/event/orientation.h'
--- include/ubuntu/application/sensors/event/orientation.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/sensors/event/orientation.h	2014-08-26 16:06:15 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Ricardo Mendoza <[e-mail]>
+ */
+
+#ifndef UBUNTU_APPLICATION_SENSORS_ORIENTATION_EVENT_H_
+#define UBUNTU_APPLICATION_SENSORS_ORIENTATION_EVENT_H_
+
+#include <ubuntu/visibility.h>
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /**
+     * \brief Opaque type describing an orientation reading.
+     * \ingroup sensor_access
+     */
+    typedef void UASOrientationEvent;
+
+    /**
+     * \brief Query the timestamp of the sensor reading.
+     * \ingroup sensor_access
+     * \returns The timestamp of the sensor reading in [µs], timebase: monotonic clock.
+     * \param[in] event The reading to be queried.
+     */
+    UBUNTU_DLL_PUBLIC uint64_t
+    uas_orientation_event_get_timestamp(
+        UASOrientationEvent* event);
+
+    /**
+     * \brief Query the azimuth (rotation around Z-axis).
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if the updates were successfully started on the service side, else U_STATUS_ERROR.
+     * \param[out] value The reading to be queried.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    uas_orientation_event_get_azimuth(
+        UASOrientationEvent* event,
+        float* value);
+
+    /**
+     * \brief Query the pitch (rotation around X-axis).
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if the updates were successfully started on the service side, else U_STATUS_ERROR.
+     * \param[out] value The reading to be queried.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    uas_orientation_event_get_pitch(
+        UASOrientationEvent* event,
+        float* value);
+
+    /**
+     * \brief Query the roll (rotation around Y-axis).
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if the updates were successfully started on the service side, else U_STATUS_ERROR.
+     * \param[out] value The reading to be queried.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    uas_orientation_event_get_roll(
+        UASOrientationEvent* event,
+        float* value);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* UBUNTU_APPLICATION_SENSORS_ORIENTATION_EVENT_H_ */

=== added file 'include/ubuntu/application/sensors/haptic.h'
--- include/ubuntu/application/sensors/haptic.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/sensors/haptic.h	2014-08-26 16:06:15 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Ricardo Mendoza <[e-mail]>
+ */
+
+#ifndef UBUNTU_APPLICATION_SENSORS_HAPTIC_H_
+#define UBUNTU_APPLICATION_SENSORS_HAPTIC_H_
+
+#include <ubuntu/status.h>
+#include <ubuntu/visibility.h>
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /**
+     * \brief Opaque type that models the haptics device.
+     * \ingroup sensor_access
+     */
+    typedef void UASensorsHaptic;
+
+    /**
+     * \brief Create a new object for accessing the haptics device.
+     * \ingroup sensor_access
+     * \returns A new instance or NULL in case of errors.
+     */
+    UBUNTU_DLL_PUBLIC UASensorsHaptic*
+    ua_sensors_haptic_new();
+
+    /**
+     * \brief Enables the supplied haptics device.
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if successful or U_STATUS_ERROR if an error occured.
+     * \param[in] sensor The sensor instance to be enabled.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    ua_sensors_haptic_enable(
+        UASensorsHaptic* sensor);
+
+    /**
+     * \brief Disables the supplied haptics device.
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if successful or U_STATUS_ERROR if an error occured.
+     * \param[in] sensor The sensor instance to be disabled.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    ua_sensors_haptic_disable(
+        UASensorsHaptic* sensor);
+
+    /**
+     * \brief Run the vibrator for a fixed duration.
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if pushed correctly, U_STATUS_ERROR if the pattern limit is invalid or the actuator cannot be activated.
+     * \param[in] sensor Haptic device to activate.
+     * \param[in] duration How long should the vibrator stay on.
+     */
+     UBUNTU_DLL_PUBLIC UStatus
+     ua_sensors_haptic_vibrate_once(
+        UASensorsHaptic* sensor,
+        uint32_t duration);
+        
+    #define MAX_PATTERN_SIZE 6
+
+    /**
+     * \brief Run the vibrator with a pattern and repeat a precise number of times.
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if pushed correctly, U_STATUS_ERROR if the pattern limit is invalid or the actuator cannot be activated.
+     * \param[in] sensor Haptic device to activate.
+     * \param[in] pattern An array of uint32_t durations for which to keep the vibrator on or off. The first value indicates how long to keep the vibrator on for, the second value how long to keep it off for, and so on until the end of the array.
+     * \param[in] repeat How many times to repeat the whole pattern for.
+     */
+    
+     UBUNTU_DLL_PUBLIC UStatus
+     ua_sensors_haptic_vibrate_with_pattern(
+        UASensorsHaptic* sensor,
+        uint32_t pattern[MAX_PATTERN_SIZE],
+        uint32_t repeat);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* UBUNTU_APPLICATION_SENSORS_HAPTIC_H_ */

=== modified file 'include/ubuntu/application/sensors/light.h'
--- include/ubuntu/application/sensors/light.h	2014-02-13 13:12:41 +0000
+++ include/ubuntu/application/sensors/light.h	2014-08-26 16:06:15 +0000
@@ -125,6 +125,18 @@
         on_light_event_cb cb,
         void *ctx);
 
+    /**
+     * \brief Set the sensor event delivery rate in nanoseconds..
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if successful or U_STATUS_ERROR if an error occured.
+     * \param[in] sensor The sensor instance to be modified.
+     * \param[in] rate The new event delivery rate.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    ua_sensors_light_set_event_rate(
+        UASensorsLight* sensor,
+        uint32_t rate);
+
 #ifdef __cplusplus
 }
 #endif

=== added file 'include/ubuntu/application/sensors/orientation.h'
--- include/ubuntu/application/sensors/orientation.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/sensors/orientation.h	2014-08-26 16:06:15 +0000
@@ -0,0 +1,144 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Ricardo Mendoza <[e-mail]>
+ */
+
+#ifndef UBUNTU_APPLICATION_SENSORS_ORIENTATION_H_
+#define UBUNTU_APPLICATION_SENSORS_ORIENTATION_H_
+
+#include <ubuntu/status.h>
+#include <ubuntu/visibility.h>
+
+#include <ubuntu/application/sensors/event/orientation.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /**
+     * \brief Opaque type that models the orientation.
+     * \ingroup sensor_access
+     */
+    typedef void UASensorsOrientation;
+
+    /**
+     * \brief Callback type used by applications to subscribe to orientation events.
+     * \ingroup sensor_access
+     */
+    typedef void (*on_orientation_event_cb)(UASOrientationEvent* event,
+                                              void* context);
+
+    /**
+     * \brief Create a new object for accessing the orientation sensor.
+     * \ingroup sensor_access
+     * \returns A new instance or NULL in case of errors.
+     */
+    UBUNTU_DLL_PUBLIC UASensorsOrientation*
+    ua_sensors_orientation_new();
+
+    /**
+     * \brief Enables the supplied orientation sensor.
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if successful or U_STATUS_ERROR if an error occured.
+     * \param[in] sensor The sensor instance to be enabled.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    ua_sensors_orientation_enable(
+        UASensorsOrientation* sensor);
+
+    /**
+     * \brief Disables the supplied orientation sensor.
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if successful or U_STATUS_ERROR if an error occured.
+     * \param[in] sensor The sensor instance to be disabled.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    ua_sensors_orientation_disable(
+        UASensorsOrientation* sensor);
+
+    /**
+     * \brief Queries the minimum delay between two readings for the supplied sensor.
+     * \ingroup sensor_access
+     * \returns The minimum delay between two readings in [ms].
+     * \param[in] sensor The sensor instance to be queried.
+     */
+    UBUNTU_DLL_PUBLIC uint32_t
+    ua_sensors_orientation_get_min_delay(
+        UASensorsOrientation* sensor);
+
+    /**
+     * \brief Queries the minimum value that can be reported by the sensor.
+     * \ingroup sensor_access
+     * \returns The minimum value that can be reported by the sensor.
+     * \param[in] sensor The sensor instance to be queried.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    ua_sensors_orientation_get_min_value(
+        UASensorsOrientation* sensor,
+        float* value);
+
+    /**
+     * \brief Queries the maximum value that can be reported by the sensor.
+     * \ingroup sensor_access
+     * \returns The maximum value that can be reported by the sensor.
+     * \param[in] sensor The sensor instance to be queried.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    ua_sensors_orientation_get_max_value(
+        UASensorsOrientation* sensor,
+        float* value);
+
+    /**
+     * \brief Queries the numeric resolution supported by the sensor
+     * \ingroup sensor_access
+     * \returns The numeric resolution supported by the sensor.
+     * \param[in] sensor The sensor instance to be queried.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    ua_sensors_orientation_get_resolution(
+        UASensorsOrientation* sensor,
+        float* value);
+
+    /**
+     * \brief Set the callback to be invoked whenever a new sensor reading is available.
+     * \ingroup sensor_access
+     * \param[in] sensor The sensor instance to associate the callback with.
+     * \param[in] cb The callback to be invoked.
+     * \param[in] ctx The context supplied to the callback invocation.
+     */
+    UBUNTU_DLL_PUBLIC void
+    ua_sensors_orientation_set_reading_cb(
+        UASensorsOrientation* sensor,
+        on_orientation_event_cb cb,
+        void *ctx);
+
+    /**
+     * \brief Set the sensor event delivery rate in nanoseconds..
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if successful or U_STATUS_ERROR if an error occured.
+     * \param[in] sensor The sensor instance to be modified.
+     * \param[in] rate The new event delivery rate.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    ua_sensors_orientation_set_event_rate(
+        UASensorsOrientation* sensor,
+        uint32_t rate);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* UBUNTU_APPLICATION_SENSORS_ORIENTATION_H_ */

=== modified file 'include/ubuntu/application/sensors/proximity.h'
--- include/ubuntu/application/sensors/proximity.h	2014-02-13 13:12:41 +0000
+++ include/ubuntu/application/sensors/proximity.h	2014-08-26 16:06:15 +0000
@@ -125,6 +125,18 @@
         on_proximity_event_cb cb,
         void *ctx);
 
+    /**
+     * \brief Set the sensor event delivery rate in nanoseconds..
+     * \ingroup sensor_access
+     * \returns U_STATUS_SUCCESS if successful or U_STATUS_ERROR if an error occured.
+     * \param[in] sensor The sensor instance to be modified.
+     * \param[in] rate The new event delivery rate.
+     */
+    UBUNTU_DLL_PUBLIC UStatus
+    ua_sensors_proximity_set_event_rate(
+        UASensorsProximity* sensor,
+        uint32_t rate);
+
 #ifdef __cplusplus
 }
 #endif

=== removed file 'include/ubuntu/application/sensors/ubuntu_application_sensors.h'
--- include/ubuntu/application/sensors/ubuntu_application_sensors.h	2014-02-13 13:12:41 +0000
+++ include/ubuntu/application/sensors/ubuntu_application_sensors.h	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-#ifndef UBUNTU_APPLICATION_SENSORS_C_API_H_
-#define UBUNTU_APPLICATION_SENSORS_C_API_H_
-
-#include <ubuntu/status.h>
-#include <ubuntu/visibility.h>
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-    
-    /** \defgroup sensor_access Functions and types to access sensor devices. */
-
-    /** A timestamped accelerometer reading 
-     * \ingroup sensor_access
-     */
-    typedef struct
-    {
-        int64_t timestamp;
-
-        float acceleration_x;
-        float acceleration_y;
-        float acceleration_z;
-    } ubuntu_sensor_accelerometer_reading;
-
-    /** A timestamped proximity sensor reading 
-     * \ingroup sensor_access
-     */
-    typedef struct
-    {
-        int64_t timestamp;
-
-        float distance;
-    } ubuntu_sensor_proximity_reading;
-
-    /** A timestamped ambient light sensor reading 
-     * \ingroup sensor_access
-     */
-    typedef struct
-    {
-        int64_t timestamp;
-
-        float light;
-    } ubuntu_sensor_ambient_light_reading;
-
-    /** Describes the sensor types known to the system 
-     * \ingroup sensor_access
-     */
-    enum ubuntu_sensor_type
-    {
-        first_defined_sensor_type = 0,
-        ubuntu_sensor_type_accelerometer = first_defined_sensor_type,
-        ubuntu_sensor_type_magnetic_field,
-        ubuntu_sensor_type_gyroscope,
-        ubuntu_sensor_type_light,
-        ubuntu_sensor_type_proximity,
-        ubuntu_sensor_type_orientation,
-        ubuntu_sensor_type_linear_acceleration,
-        ubuntu_sensor_type_rotation_vector,
-        undefined_sensor_type
-    };
-
-    /** Callback that is invoked for new accelerometer readings.
-     * \ingroup sensor_access
-     * \param reading [in] The new reading.
-     * \param context [in] The callback context.
-     */
-    typedef void (*on_new_accelerometer_reading)(ubuntu_sensor_accelerometer_reading* reading, void* context);
-    
-    /** Callback that is invoked for new proximity sensor readings.
-     * \ingroup sensor_access
-     * \param reading [in] The new reading.
-     * \param context [in] The callback context.
-     */
-    typedef void (*on_new_proximity_reading)(ubuntu_sensor_proximity_reading* reading, void* context);
-    
-    /** Callback that is invoked for new ambient light sensor readings.
-     * \ingroup sensor_access
-     * \param reading [in] The new reading.
-     * \param context [in] The callback context.
-     */
-    typedef void (*on_new_ambient_light_reading)(ubuntu_sensor_ambient_light_reading* reading, void* context);
-    
-    /** Models a sensor observer. 
-     * \ingroup sensor_access
-     */
-    typedef struct
-    {   
-        /** Invoked for new readings from an accelerometer. */
-        on_new_accelerometer_reading on_new_accelerometer_reading_cb;
-        /** Invoked for new readings from a proximity sensor. */
-        on_new_proximity_reading on_new_proximity_reading_cb;
-        /** Invoked for new readings from an ambient light sensor. */
-        on_new_ambient_light_reading on_new_ambient_light_reading_cb;
-
-        /** Callback context. */
-        void* context;
-    } ubuntu_sensor_observer;
-
-    UBUNTU_DLL_PUBLIC void ubuntu_sensor_initialize_observer(ubuntu_sensor_observer* observer);
-    /** Installs the supplied observer. 
-     * \ingroup sensor_access
-     */
-    UBUNTU_DLL_PUBLIC void ubuntu_sensor_install_observer(ubuntu_sensor_observer* observer);
-    /** Uninstalls the supplied observer. 
-     * \ingroup sensor_access
-     */
-    UBUNTU_DLL_PUBLIC void ubuntu_sensor_uninstall_observer(ubuntu_sensor_observer* observer);
-
-    /** Enables the specified sensor type and starts data acquisition. 
-     * \ingroup sensor_access
-     */
-    UBUNTU_DLL_PUBLIC void ubuntu_sensor_enable_sensor(ubuntu_sensor_type sensor_type);
-    /** Disables the specified sensor type and starts data acquisition. 
-     * \ingroup sensor_access
-     */
-    UBUNTU_DLL_PUBLIC void ubuntu_sensor_disable_sensor(ubuntu_sensor_type sensor_type);
-    /** Returns the minimum sensor sampling delay in Hz.
-     * \ingroup sensor_access
-     */
-    UBUNTU_DLL_PUBLIC int32_t ubuntu_sensor_get_sensor_min_delay(ubuntu_sensor_type sensor_type);
-    /** Returns the minimum valid value for the sensor_type.
-     * \ingroup sensor_access
-     */
-    UBUNTU_DLL_PUBLIC UStatus ubuntu_sensor_get_sensor_min_value(ubuntu_sensor_type sensor_type, float* value);
-
-    /** Returns the maximum valid value for the sensor_type.
-     * \ingroup sensor_access
-     */
-    UBUNTU_DLL_PUBLIC UStatus ubuntu_sensor_get_sensor_max_value(ubuntu_sensor_type sensor_type, float* value);
-
-    /** Returns the resolution of valid values for the sensor_type.
-     * \ingroup sensor_access
-     */
-    UBUNTU_DLL_PUBLIC UStatus ubuntu_sensor_get_sensor_resolution(ubuntu_sensor_type sensor_type, float* value);
-
-    /** \example test_sensors_api.cpp */
-#ifdef __cplusplus
-}
-#endif
-
-#endif // UBUNTU_APPLICATION_SENSORS_C_API_H_

=== modified file 'include/ubuntu/application/ui/CMakeLists.txt'
--- include/ubuntu/application/ui/CMakeLists.txt	2013-08-18 20:33:22 +0000
+++ include/ubuntu/application/ui/CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -12,6 +12,7 @@
   session.h
   stage.h
   window.h
+  window_orientation.h
   window_parent.h
   window_properties.h
   window_state.h

=== modified file 'include/ubuntu/application/ui/input/CMakeLists.txt'
--- include/ubuntu/application/ui/input/CMakeLists.txt	2013-07-18 09:08:17 +0000
+++ include/ubuntu/application/ui/input/CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -1,9 +1,5 @@
-set(
-  UBUNTU_APPLICATION_UI_INPUT_HEADERS
-  event.h
+install(
+  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  DESTINATION include/ubuntu/application/ui
+  FILES_MATCHING PATTERN "*.h"
 )
-
-install(
-  FILES ${UBUNTU_APPLICATION_UI_INPUT_HEADERS}
-  DESTINATION include/ubuntu/application/ui/input
-)
\ No newline at end of file

=== modified file 'include/ubuntu/application/ui/input/event.h'
--- include/ubuntu/application/ui/input/event.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/ui/input/event.h	2014-08-26 16:06:15 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3 as
@@ -14,11 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Thomas Voß <[e-mail]>
+ *              Daniel d'Andrada <[e-mail]>
  */
 #ifndef UBUNTU_APPLICATION_UI_INPUT_EVENT_H_
 #define UBUNTU_APPLICATION_UI_INPUT_EVENT_H_
 
 #include <ubuntu/visibility.h>
+#include <ubuntu/application/ui/window_orientation.h>
 
 #include <stddef.h>
 #include <stdint.h>
@@ -102,82 +104,123 @@
 } UMotionButtonMask;
 
 
-    /** Maximum number of pointers reported within one input event. */
+    /** Maximum number of pointers reported within one event. */
 #define UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT (16)
 
-    /** Reference timebase, nanoseconds as measured by CLOCK_MONOTONIC. */
-    typedef int64_t nsecs_t;
-
-    /** Describes the different event types. */
-    typedef enum
-    {
-        KEY_EVENT_TYPE, ///< Event originates from a keyboard.
-        MOTION_EVENT_TYPE, ///< Event originates from something moving, e.g., a wheel, a mouse, a finger on a touchpad.
-        HW_SWITCH_EVENT_TYPE ///< Event originates from an additional button attached to the device's HW, e.g., power button.
-    } EventType;
-
-    /** Models an input event. */
-    typedef struct
-    {
-        EventType type; ///< Type of the event.
-        int32_t device_id; ///< Device that this event originated from.
-        int32_t source_id; ///< Source that this event originated from.
-        int32_t action; ///< Action signalled by this event.
-        int32_t flags; ///< Flags associated with this event.
-        int32_t meta_state; ///< State of the meta modifiers (ALT, CTRL, SHIFT).
-        /** Information specific to key/motion event types. */
-        union
-        {
-            /** Information describing an event originating from a HW switch. */
-            struct HardwareSwitchEvent
-            {
-                nsecs_t event_time; ///< Timestamp when the event happened.
-                uint32_t policy_flags; ///< Policy flags.
-                int32_t switch_code; ///< The scan code of the switch.
-                int32_t switch_value; ///< The value reported by the switch.
-            } hw_switch;
-            /** Information describing an event originating from a keyboard key. */
-            struct KeyEvent
-            {
-                int32_t key_code; 
-                int32_t scan_code;
-                int32_t repeat_count;
-                nsecs_t down_time;
-                nsecs_t event_time;
-                int is_system_key;  ///< \deprecated Do not use.
-            } key;
-            /** Information describing an event originating from a
-             * "moving" device, e.g., a mouse, a mouse-wheel, a finger
-             * on a touchpad. 
-             */
-            struct MotionEvent
-            {
-                int32_t edge_flags; ///< Set for touches intersecting a touchscreen's edges, requires HW support.
-                int32_t button_state; ///< State of buttons of the device
-                float x_offset; ///< Movement in x direction since down event
-                float y_offset; ///< Movement in y direction since down event
-                float x_precision; ///< Sampling precision in x direction
-                float y_precision; ///< Sampling precision in y direction
-                nsecs_t down_time; ///< Timestamp that marks the down event
-                nsecs_t event_time; ///< Timestamp that marks when this event happened
-                size_t pointer_count; ///< Number of pointers reported in this event
-                struct PointerCoordinate
-                {
-                    int id; ///< Unique id of the pointer
-                    float x, raw_x; ///< Processed and raw x coordinates
-                    float y, raw_y; ///< Processed and raw y coordinates
-                    float touch_major; ///< Touch major coordinate
-                    float touch_minor; ///< Touch minor coordinate
-                    float size; ///< Size of the pointer/touch
-                    float pressure; ///< Pressure of the touch
-                    float orientation; ///< Orientation
-                } pointer_coordinates[UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT]; ///< Pointer information, valid from [0,pointer_count).
-            } motion;
-        } details;
-    } Event;
+/** Reference timebase, nanoseconds as measured by CLOCK_MONOTONIC. */
+typedef int64_t nsecs_t;
+
+typedef enum
+{
+    SURFACE_ATTRIBUTE_FOCUS
+} SurfaceAttributeType;
+
+/** Describes the different event types. */
+typedef enum
+{
+    KEY_WEVENT_TYPE, ///< Event originates from a keyboard.
+    MOTION_WEVENT_TYPE, ///< Event originates from something moving, e.g., a wheel, a mouse, a finger on a touchpad.
+    RESIZE_WEVENT_TYPE, ///< Surface has been resized
+    SURFACE_WEVENT_TYPE, ///< A surface attribute has changed its value
+    ORIENTATION_WEVENT_TYPE, ///< The device orientation changed
+} WindowEventType;
+
+/** Information describing an event originating from a keyboard key. */
+typedef struct
+{
+    WindowEventType type;
+
+    int32_t device_id; ///< Device that this event originated from.
+    int32_t source_id; ///< Source that this event originated from.
+    int32_t action; ///< Action signalled by this event.
+    int32_t flags; ///< Flags associated with this event.
+    int32_t meta_state; ///< State of the meta modifiers (ALT, CTRL, SHIFT).
+
+    int32_t key_code;
+    int32_t scan_code;
+    int32_t repeat_count;
+    nsecs_t down_time;
+    nsecs_t event_time;
+    int is_system_key;  ///< \deprecated Do not use.
+} KeyEvent;
+
+struct PointerCoordinate
+{
+    int id; ///< Unique id of the pointer
+    float x, raw_x; ///< Processed and raw x coordinates
+    float y, raw_y; ///< Processed and raw y coordinates
+    float touch_major; ///< Touch major coordinate
+    float touch_minor; ///< Touch minor coordinate
+    float size; ///< Size of the pointer/touch
+    float pressure; ///< Pressure of the touch
+    float orientation; ///< Orientation
+};
+
+/** Information describing an event originating from a
+ * "moving" device, e.g., a mouse, a mouse-wheel, a finger
+ * on a touchpad. 
+ */
+typedef struct
+{
+    WindowEventType type;
+
+    int32_t device_id; ///< Device that this event originated from.
+    int32_t source_id; ///< Source that this event originated from.
+    int32_t action; ///< Action signalled by this event.
+    int32_t flags; ///< Flags associated with this event.
+    int32_t meta_state; ///< State of the meta modifiers (ALT, CTRL, SHIFT).
+
+    int32_t edge_flags; ///< Set for touches intersecting a touchscreen's edges, requires HW support.
+    int32_t button_state; ///< State of buttons of the device
+    float x_offset; ///< Movement in x direction since down event
+    float y_offset; ///< Movement in y direction since down event
+    float x_precision; ///< Sampling precision in x direction
+    float y_precision; ///< Sampling precision in y direction
+    nsecs_t down_time; ///< Timestamp that marks the down event
+    nsecs_t event_time; ///< Timestamp that marks when this event happened
+    size_t pointer_count; ///< Number of pointers reported in this event
+    struct PointerCoordinate pointer_coordinates[UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT]; ///< Pointer information, valid from [0,pointer_count).
+} MotionEvent;
+
+typedef struct
+{
+    WindowEventType type;
+
+    SurfaceAttributeType attribute; ///< The surface attribute that has changed
+    int32_t value; ///< The new value of that surface attribute.
+} SurfaceEvent;
+
+/** Information describing a surface resize event. */
+typedef struct
+{
+    WindowEventType type;
+
+    int32_t width; ///< The new surface width
+    int32_t height; ///< The new surface height.
+} ResizeEvent;
+
+/** Information describing a surface orientation change event. */
+typedef struct
+{
+    WindowEventType type;
+
+    UApplicationUiWindowOrientation direction; ///< The new surface orientation
+} OrientationEvent;
+
+typedef union
+{
+    WindowEventType type;
+    KeyEvent key;
+    MotionEvent motion;
+    SurfaceEvent surface;
+    ResizeEvent resize;
+    OrientationEvent orientation;
+} WindowEvent;
 
 #ifdef __cplusplus
 }
 #endif
 
+#include "event_deprecated.h"
+
 #endif // UBUNTU_APPLICATION_UI_INPUT_EVENT_H_

=== added file 'include/ubuntu/application/ui/input/event_deprecated.h'
--- include/ubuntu/application/ui/input/event_deprecated.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/ui/input/event_deprecated.h	2014-08-26 16:06:15 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#ifndef UBUNTU_APPLICATION_UI__EVENT_DEPRECATED_H_
+#define UBUNTU_APPLICATION_UI__EVENT_DEPRECATED_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /** Describes the different event types. */
+    typedef enum
+    {
+        KEY_EVENT_TYPE, ///< Event originates from a keyboard.
+        MOTION_EVENT_TYPE, ///< Event originates from something moving, e.g., a wheel, a mouse, a finger on a touchpad.
+        HW_SWITCH_EVENT_TYPE ///< Event originates from an additional button attached to the device's HW, e.g., power button.
+    } EventType;
+
+    /** Models an input event. */
+    typedef struct
+    {
+        EventType type; ///< Type of the event.
+        int32_t device_id; ///< Device that this event originated from.
+        int32_t source_id; ///< Source that this event originated from.
+        int32_t action; ///< Action signalled by this event.
+        int32_t flags; ///< Flags associated with this event.
+        int32_t meta_state; ///< State of the meta modifiers (ALT, CTRL, SHIFT).
+        /** Information specific to key/motion event types. */
+        union
+        {
+            /** Information describing an event originating from a HW switch. */
+            struct HardwareSwitchEvent
+            {
+                nsecs_t event_time; ///< Timestamp when the event happened.
+                uint32_t policy_flags; ///< Policy flags.
+                int32_t switch_code; ///< The scan code of the switch.
+                int32_t switch_value; ///< The value reported by the switch.
+            } hw_switch;
+            /** Information describing an event originating from a keyboard key. */
+            struct KeyEvent
+            {
+                int32_t key_code; 
+                int32_t scan_code;
+                int32_t repeat_count;
+                nsecs_t down_time;
+                nsecs_t event_time;
+                int is_system_key;  ///< \deprecated Do not use.
+            } key;
+            /** Information describing an event originating from a
+             * "moving" device, e.g., a mouse, a mouse-wheel, a finger
+             * on a touchpad. 
+             */
+            struct MotionEvent
+            {
+                int32_t edge_flags; ///< Set for touches intersecting a touchscreen's edges, requires HW support.
+                int32_t button_state; ///< State of buttons of the device
+                float x_offset; ///< Movement in x direction since down event
+                float y_offset; ///< Movement in y direction since down event
+                float x_precision; ///< Sampling precision in x direction
+                float y_precision; ///< Sampling precision in y direction
+                nsecs_t down_time; ///< Timestamp that marks the down event
+                nsecs_t event_time; ///< Timestamp that marks when this event happened
+                size_t pointer_count; ///< Number of pointers reported in this event
+                struct PointerCoordinate pointer_coordinates[UBUNTU_APPLICATION_UI_INPUT_EVENT_MAX_POINTER_COUNT]; ///< Pointer information, valid from [0,pointer_count).
+            } motion;
+        } details;
+    } Event;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // UBUNTU_APPLICATION_UI__EVENT_DEPRECATED_H_

=== modified file 'include/ubuntu/application/ui/window.h'
--- include/ubuntu/application/ui/window.h	2014-05-07 12:21:22 +0000
+++ include/ubuntu/application/ui/window.h	2014-08-26 16:06:15 +0000
@@ -25,6 +25,7 @@
 #include <ubuntu/status.h>
 #include <ubuntu/application/instance.h>
 #include <ubuntu/application/ui/window_properties.h>
+#include <ubuntu/application/ui/window_orientation.h>
 
 #include <EGL/egl.h>
 
@@ -34,7 +35,10 @@
 
     typedef void UAUiWindow;
     typedef int32_t UAUiWindowId;
-    
+
+    /*
+        Ownership of properties is given to the returned UAUiWindow
+    */
     UBUNTU_DLL_PUBLIC UAUiWindow*
     ua_ui_window_new_for_application_with_properties(
     	UApplicationInstance *instance,
@@ -82,6 +86,14 @@
     ua_ui_window_get_native_type(
         UAUiWindow *window);
 
+    UBUNTU_DLL_PUBLIC int
+    ua_ui_window_is_focused(
+        UAUiWindow *window);
+
+    UBUNTU_DLL_PUBLIC UApplicationUiWindowOrientation
+    ua_ui_window_get_orientation(
+        UAUiWindow *window);
+
 #ifdef __cplusplus
 }
 #endif

=== added file 'include/ubuntu/application/ui/window_orientation.h'
--- include/ubuntu/application/ui/window_orientation.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/ui/window_orientation.h	2014-08-26 16:06:15 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UBUNTU_APPLICATION_UI_WINDOW_ORIENTATION_H
+#define UBUNTU_APPLICATION_UI_WINDOW_ORIENTATION_H
+
+typedef enum {
+    U_ORIENTATION_NORMAL = 1,
+    U_ORIENTATION_LEFT,
+    U_ORIENTATION_RIGHT,
+    U_ORIENTATION_INVERTED,
+} UApplicationUiWindowOrientation;
+
+#endif // UBUNTU_APPLICATION_UI_WINDOW_ORIENTATION_H

=== modified file 'include/ubuntu/application/ui/window_properties.h'
--- include/ubuntu/application/ui/window_properties.h	2013-12-11 04:56:15 +0000
+++ include/ubuntu/application/ui/window_properties.h	2014-08-26 16:06:15 +0000
@@ -39,10 +39,13 @@
         U_SHUTDOWN_DIALOG_ROLE,
     } UAUiWindowRole;
 
-
+    // Deprecated! Use UAUiWindowEventCb instead
     typedef void (*input_event_cb)(void* ctx, const Event* ev);
     typedef input_event_cb UAUiWindowInputEventCb;
 
+    typedef void (*event_cb)(void* ctx, const WindowEvent* ev);
+    typedef event_cb UAUiWindowEventCb;
+
     typedef void UAUiWindowProperties;
     
     UBUNTU_DLL_PUBLIC UAUiWindowProperties*
@@ -70,7 +73,8 @@
     UBUNTU_DLL_PUBLIC UAUiWindowRole
     ua_ui_window_properties_get_role(
         UAUiWindowProperties *properties);
-   
+
+    // Deprecated! Use ua_ui_window_properties_set_event_cb_and_ctx instead.
     UBUNTU_DLL_PUBLIC void
     ua_ui_window_properties_set_input_cb_and_ctx(
         UAUiWindowProperties *properties,
@@ -78,6 +82,12 @@
         void *ctx);
 
     UBUNTU_DLL_PUBLIC void
+    ua_ui_window_properties_set_event_cb_and_ctx(
+        UAUiWindowProperties *properties,
+        UAUiWindowEventCb cb,
+        void *ctx);
+
+    UBUNTU_DLL_PUBLIC void
     ua_ui_window_properties_set_dimensions(
         UAUiWindowProperties *properties,
         uint32_t width,

=== modified file 'include/ubuntu/hardware/CMakeLists.txt'
--- include/ubuntu/hardware/CMakeLists.txt	2013-07-18 09:08:17 +0000
+++ include/ubuntu/hardware/CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -1,9 +1,10 @@
 set(
   UBUNTU_HARDWARE_HEADERS
+  alarm.h
   gps.h
 )
 
 install(
   FILES ${UBUNTU_HARDWARE_HEADERS}
   DESTINATION include/ubuntu/hardware
-)
\ No newline at end of file
+)

=== added file 'include/ubuntu/hardware/alarm.h'
--- include/ubuntu/hardware/alarm.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/hardware/alarm.h	2014-08-26 16:06:15 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef UBUNTU_HARDWARE_ALARM_H_
+#define UBUNTU_HARDWARE_ALARM_H_
+
+#include <ubuntu/status.h>
+#include <ubuntu/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** The time reference that alarms are setup to. */
+typedef enum
+{
+    U_HARDWARE_ALARM_TIME_REFERENCE_BOOT, /**< Relative to the device's boot time, including sleep. */
+    U_HARDWARE_ALARM_TIME_REFERENCE_RTC /**< Wall clock time in UTC. */
+} UbuntuHardwareAlarmTimeReference;
+
+typedef UbuntuHardwareAlarmTimeReference UHardwareAlarmTimeReference;
+
+/** Describes if an alarm is able to wakup the device from sleep. */
+typedef enum
+{
+    /** Alarm will wakeup the device from sleep. */
+    U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE,
+    /** Alarm will not wakeup the device and will be delivered on the next wakeup of the device */
+    U_HARDWARE_ALARM_SLEEP_BEHAVIOR_KEEP_DEVICE_ASLEEP
+} UbuntuHardwareAlarmSleepBehavior;
+
+typedef UbuntuHardwareAlarmSleepBehavior UHardwareAlarmSleepBehavior;
+
+/** Bundles the time reference and sleep/wakeup behavior when waiting for an alarm to happen. */
+typedef struct
+{
+  UHardwareAlarmTimeReference reference;
+  UHardwareAlarmSleepBehavior sleep_behavior;
+} UbuntuHardwareAlarmWaitResult;
+
+typedef UbuntuHardwareAlarmWaitResult UHardwareAlarmWaitResult;
+
+/** Opaque type modelling access to the kernel/hw-level alarm capabilities. */
+typedef struct UbuntuHardwareAlarm* UHardwareAlarm;
+
+/** Creates an instance and/or increments its refcount. */
+UBUNTU_DLL_PUBLIC UHardwareAlarm
+u_hardware_alarm_create();
+
+/** Increments the instance's ref count. */
+UBUNTU_DLL_PUBLIC void
+u_hardware_alarm_ref(
+    UHardwareAlarm alarm);
+
+/** Decrements the instance's ref count. */
+UBUNTU_DLL_PUBLIC void
+u_hardware_alarm_unref(
+    UHardwareAlarm alarm);
+
+/** Query the time that elapsed since boot, including deep sleeps. */
+UBUNTU_DLL_PUBLIC UStatus
+u_hardware_alarm_get_elapsed_real_time(
+    UHardwareAlarm alarm,
+    struct timespec *tz);
+
+/** Reports a timezone change to kernel and HW. */
+UBUNTU_DLL_PUBLIC UStatus
+u_hardware_alarm_set_timezone(
+    UHardwareAlarm alarm,
+    const struct timezone *tz);
+
+/** Sets and arms a timer. */
+UBUNTU_DLL_PUBLIC UStatus
+u_hardware_alarm_set_relative_to_with_behavior(
+    UHardwareAlarm alarm,
+    UHardwareAlarmTimeReference time_reference,
+    UHardwareAlarmSleepBehavior behavior,
+    const struct timespec *ts);
+
+/** Blocks until the next alarm occurs. */
+UBUNTU_DLL_PUBLIC UStatus
+u_hardware_alarm_wait_for_next_alarm(
+    UHardwareAlarm alarm,
+    UHardwareAlarmWaitResult *result);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

=== modified file 'include/ubuntu/hardware/gps.h'
--- include/ubuntu/hardware/gps.h	2013-08-22 07:17:47 +0000
+++ include/ubuntu/hardware/gps.h	2014-08-26 16:06:15 +0000
@@ -180,6 +180,37 @@
     U_HARDWARE_GPS_AGPS_DATA_CONN_FAILED = 5
 };
 
+/** Flags used to specify which aiding data to delete
+    when calling delete_aiding_data(). */
+typedef uint16_t UHardwareGpsAidingData;
+
+#define U_HARDWARE_GPS_DELETE_EPHEMERIS        0x0001
+#define U_HARDWARE_GPS_DELETE_ALMANAC          0x0002
+#define U_HARDWARE_GPS_DELETE_POSITION         0x0004
+#define U_HARDWARE_GPS_DELETE_TIME             0x0008
+#define U_HARDWARE_GPS_DELETE_IONO             0x0010
+#define U_HARDWARE_GPS_DELETE_UTC              0x0020
+#define U_HARDWARE_GPS_DELETE_HEALTH           0x0040
+#define U_HARDWARE_GPS_DELETE_SVDIR            0x0080
+#define U_HARDWARE_GPS_DELETE_SVSTEER          0x0100
+#define U_HARDWARE_GPS_DELETE_SADATA           0x0200
+#define U_HARDWARE_GPS_DELETE_RTI              0x0400
+#define U_HARDWARE_GPS_DELETE_CELLDB_INFO      0x8000
+#define U_HARDWARE_GPS_DELETE_ALL              0xFFFF
+
+/** AGPS type */
+typedef uint16_t UHardwareGpsAGpsType;
+#define U_HARDWARE_GPS_AGPS_TYPE_SUPL          1
+#define U_HARDWARE_GPS_AGPS_TYPE_C2K           2
+
+/** Known types for AGps reference locations. */
+/** A GSM cell ID. */
+#define U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_GSM_CELLID   1
+/** A UMTS cell ID. */
+#define U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_UMTS_CELLID  2
+/** The BSSID of a visible access point. */
+#define U_HARDWARE_GPS_AGPS_REG_LOCATION_TYPE_MAC          3
+
 /** UHardwareGpsLocation has valid latitude and longitude. */
 #define U_HARDWARE_GPS_LOCATION_HAS_LAT_LONG   0x0001
 /** UHardwareGpsLocation has valid altitude. */
@@ -207,8 +238,7 @@
     double latitude;
     /** Represents longitude in degrees. */
     double longitude;
-    /** Represents altitude in meters above the WGS 84 reference
-     * ellipsoid. */
+    /** Represents altitude in meters above the WGS 84 reference ellipsoid. */
     double altitude;
     /** Represents speed in meters per second. */
     float speed;
@@ -281,6 +311,46 @@
     uint32_t ipaddr;
 } UHardwareGpsAGpsStatus;
 
+/** \brief Describes a cell ID as understood by the GPS chipset. */
+typedef struct
+{
+    /** One of:
+     * U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_GSM_CELLID
+     * U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_UMTS_CELLID
+     */
+    uint16_t type;
+    /** Mobile country code. */
+    uint16_t mcc;
+    /** Mobile network code. */
+    uint16_t mnc;
+    /** Location area code. */
+    uint16_t lac;
+    /** The actual cell id. */
+    uint32_t cid;
+} UHardwareGpsAGpsRefLocationCellID;
+
+/** \brief Describes a wifi ID as understood by the GPS chipset. */
+typedef struct
+{
+    /** The MAC address/BSSID of an AP. */
+    uint8_t mac[6];
+} UHardwareGpsAGpsRefLocationMac;
+
+/** @brief Describes a reference location, either a radio cell or a wifi. */
+typedef struct
+{
+    /** One of:
+     * U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_GSM_CELLID
+     * U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_UMTS_CELLID
+     * U_HARDWARE_GPS_AGPS_REG_LOCATION_TYPE_MAC
+     */
+    uint16_t type;
+    union {
+        UHardwareGpsAGpsRefLocationCellID   cellID;
+        UHardwareGpsAGpsRefLocationMac      mac;
+    } u;
+} UHardwareGpsAGpsRefLocation;
+
 /**
  * Represents an NI request
  * \ingroup gps_access
@@ -353,23 +423,18 @@
 typedef void (*UHardwareGpsSetCapabilities)(uint32_t capabilities, void *context);
 typedef void (*UHardwareGpsRequestUtcTime)(void *context);
 
-/** Callback to request the client to download XTRA data.
- *  The client should download XTRA data and inject it by calling inject_xtra_data().
- */
+/** Callback to request the client to download XTRA data. The client should download XTRA data and inject it by calling inject_xtra_data(). */
 typedef void (*UHardwareGpsXtraDownloadRequest)(void *context);
 
-/** Callback with AGPS status information.
- */
+/** Callback with AGPS status information. */
 typedef void (*UHardwareGpsAGpsStatusCallback)(UHardwareGpsAGpsStatus *status, void *context);
 
-/** Callback with NI notification.
- */
+/** Callback with NI notification. */
 typedef void (*UHardwareGpsNiNotifyCallback)(UHardwareGpsNiNotification *notification, void *context);
 
-/*
- Callback for AGPS RIL (Radio Interface Library) set id
-*/
+/** Callback invoked by the driver to set the set id. */
 typedef void (*UHardwareGpsAGpsRilRequestSetId)(uint32_t flags, void *context);
+/** Callback invoked by the driver to request a reference location (typically cell ID). */
 typedef void (*UHardwareGpsAGpsRilRequestRefLoc)(uint32_t flags, void *context);
 
 typedef struct
@@ -409,10 +474,10 @@
 UBUNTU_DLL_PUBLIC bool
 u_hardware_gps_stop(UHardwareGps self);
 
-/*
-    \param time NTP time, in milliseconds since Jan 1st 1970.
-    \param time_reference time from the internal clock at the moment that NTP time was taken.
-    \param uncertainty possible deviation in the time supplied (uncertainty) in milliseconds.
+/** \brief Injects a new reference time into the GPS chipset.
+ *  \param time NTP time, in milliseconds since Jan 1st 1970.
+ *  \param time_reference time from the internal clock at the moment that NTP time was taken.
+ *  \param uncertainty possible deviation in the time supplied (uncertainty) in milliseconds.
  */
 UBUNTU_DLL_PUBLIC void
 u_hardware_gps_inject_time(
@@ -421,24 +486,88 @@
     int64_t time_reference,
     int uncertainty);
 
+/**
+  * \brief Injects a new reference location into the GPS chipset.
+  * \param self The instance to apply the change to.
+  * \param location New location to me injected. The structure must have the following details, any others are ignored:
+  *    - location: New coordinate, in [°].
+  *    - longitude: New coordinate, [°].
+  *    - accuracy: Accuracy estimate of the location, in [m].
+  */
 UBUNTU_DLL_PUBLIC void
 u_hardware_gps_inject_location(
     UHardwareGps self,
-    double latitude,
-    double longitude,
-    float accuracy);
-
+    UHardwareGpsLocation location);
+
+/**
+  * \brief Informs the GPS chipset about wifi ap's or radio cells to be used in AGPS calls.
+  * \param self The instance to inform.
+  * \param location The reference location, that is a wifi ap or a radio cell.
+  * \param size_of_struct The size of the reference location struct.
+  */
+UBUNTU_DLL_PUBLIC void
+u_hardware_gps_agps_set_reference_location(
+    UHardwareGps self,
+    UHardwareGpsAGpsRefLocation *location,
+    size_t size_of_struct);
+
+/**
+  * \brief Notifies the chipset that a data connection is availble.
+  * \param self The instance to be notified.
+  * \param apn Name of the apn to be used for SUPL.
+  */
+UBUNTU_DLL_PUBLIC void
+u_hardware_gps_agps_notify_connection_is_open(
+    UHardwareGps self,
+    const char *apn);
+
+/**
+  * \brief Notifies the chipset that an AGPS data connection has been closed.
+  * \param self The instance to be notified.
+  */
+UBUNTU_DLL_PUBLIC void
+u_hardware_gps_agps_notify_connection_is_closed(
+    UHardwareGps self);
+
+/**
+  * \brief Notifies the chipset that an AGPS data connection is not available.
+  * \param self The instance to be notified.
+  */
+UBUNTU_DLL_PUBLIC void
+u_hardware_gps_agps_notify_connection_not_available(
+        UHardwareGps self);
+
+/**
+  * \brief Sets the hostname and port for the AGPS server.
+  * \param self The instance to be altered.
+  * \param type Type of the server, one of U_HARDWARE_GPS_AGPS_TYPE_SUPL or U_HARDWARE_GPS_AGPS_TYPE_C2K.
+  * \param hostname The hostname of the AGPS server.
+  * \param port The post of the AGPS server.
+  */
+UBUNTU_DLL_PUBLIC void
+u_hardware_gps_agps_set_server_for_type(
+        UHardwareGps self,
+        UHardwareGpsAGpsType type,
+        const char* hostname,
+        uint16_t port);
+
+/**
+  * \brief Requests the chipset to delete the aiding data specified in flags.
+  * \param self The instance to apply the change to.
+  * \param flags Specifies the aiding data that should be deleted.
+  */
 UBUNTU_DLL_PUBLIC void
 u_hardware_gps_delete_aiding_data(
     UHardwareGps self,
-    uint16_t flags);
+    UHardwareGpsAidingData flags);
 
-/*
-    \param mode One of the U_HARDWARE_GPS_POSITION_MODE_* values
-    \param recurrence One of the U_HARDWARE_GPS_POSITION_RECURRENCE_* values
-    \param min_interval represents the time between fixes in milliseconds.
-    \param preferred_accuracy The requested fix accuracy in meters. Can be zero.
-    \param preferred_time The requested time to first fix in milliseconds. Can be zero.
+/**
+ * \brief Sets the positioning mode of the chipset.
+ * \param mode One of the U_HARDWARE_GPS_POSITION_MODE_* values
+ * \param recurrence One of the U_HARDWARE_GPS_POSITION_RECURRENCE_* values
+ * \param min_interval represents the time between fixes in milliseconds.
+ * \param preferred_accuracy The requested fix accuracy in meters. Can be zero.
+ * \param preferred_time The requested time to first fix in milliseconds. Can be zero.
  */
 UBUNTU_DLL_PUBLIC bool
 u_hardware_gps_set_position_mode(

=== modified file 'include/ubuntu/visibility.h'
--- include/ubuntu/visibility.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/visibility.h	2014-08-26 16:06:15 +0000
@@ -21,8 +21,10 @@
 
 #if __GNUC__ >= 4
 #define UBUNTU_DLL_PUBLIC __attribute__ ((visibility ("default")))
+#define UBUNTU_DLL_LOCAL __attribute__ ((visibility ("hidden")))
 #else
 #define UBUNTU_DLL_PUBLIC
+#define UBUNTU_DLL_LOCAL
 #endif
 
 #endif /* UBUNTU_VISIBILITY_H_ */

=== added directory 'src/bridge'
=== added file 'src/bridge/bridge.h'
--- src/bridge/bridge.h	1970-01-01 00:00:00 +0000
+++ src/bridge/bridge.h	2014-08-26 16:06:15 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voss <[e-mail]>
+ *              Ricardo Mendoza <[e-mail]>
+ */
+#ifndef BASE_BRIDGE_H_
+#define BASE_BRIDGE_H_
+
+#include <assert.h>
+#include <dlfcn.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#define MAX_MODULE_NAME 32
+
+#define HIDDEN_SYMBOL __attribute__ ((visibility ("hidden")))
+
+namespace internal
+{
+template<typename Scope>
+class HIDDEN_SYMBOL Bridge
+{
+  public:
+    static Bridge<Scope>& instance()
+    { 
+        static Bridge<Scope> bridge; 
+        return bridge; 
+    }
+
+    void* resolve_symbol(const char* symbol) const
+    {
+        return Scope::dlsym_fn(lib_handle, symbol);
+    }
+
+  protected:
+    Bridge() : lib_handle(Scope::dlopen_fn(Scope::path(), RTLD_LAZY))
+    {
+    }
+
+    ~Bridge()
+    {
+    }
+
+    void* lib_handle;
+};
+}
+
+#endif // BRIDGE_H_

=== added file 'src/bridge/bridge_defs.h'
--- src/bridge/bridge_defs.h	1970-01-01 00:00:00 +0000
+++ src/bridge/bridge_defs.h	2014-08-26 16:06:15 +0000
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voss <[e-mail]>
+ *              Ricardo Mendoza <[e-mail]>
+ */
+#ifndef BRIDGE_DEFS_H_
+#define BRIDGE_DEFS_H_
+
+// Must be included afterthe Bridge class is defined
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**********************************************************/
+/*********** Implementation starts here *******************/
+/**********************************************************/
+
+// this allows DLSYM to return NULL (happens if the backend is not available),
+// and returns NULL in that case; return_type must be a pointer!
+#define IMPLEMENT_CTOR0(return_type, symbol)  \
+    return_type symbol()                          \
+    {                                             \
+        static return_type (*f)() = NULL;         \
+        DLSYM(&f, #symbol);                       \
+        return f ? f() : NULL;}
+
+#define IMPLEMENT_FUNCTION0(return_type, symbol)  \
+    return_type symbol()                          \
+    {                                             \
+        static return_type (*f)() = NULL;         \
+        DLSYM(&f, #symbol);                       \
+        return f();}
+
+#define IMPLEMENT_VOID_FUNCTION0(symbol)          \
+    void symbol()                                 \
+    {                                             \
+        static void (*f)() = NULL;                \
+        DLSYM(&f, #symbol);                       \
+        f();}
+
+#define IMPLEMENT_FUNCTION1(return_type, symbol, arg1) \
+    return_type symbol(arg1 _1)                        \
+    {                                                  \
+        static return_type (*f)(arg1) = NULL;          \
+        DLSYM(&f, #symbol);                     \
+        return f(_1); }
+
+#define IMPLEMENT_VOID_FUNCTION1(symbol, arg1)               \
+    void symbol(arg1 _1)                                     \
+    {                                                        \
+        static void (*f)(arg1) = NULL;                       \
+        DLSYM(&f, #symbol);                           \
+        f(_1); }
+
+#define IMPLEMENT_FUNCTION2(return_type, symbol, arg1, arg2)    \
+    return_type symbol(arg1 _1, arg2 _2)                        \
+    {                                                           \
+        static return_type (*f)(arg1, arg2) = NULL;             \
+        DLSYM(&f, #symbol);                              \
+        return f(_1, _2); }
+
+#define IMPLEMENT_VOID_FUNCTION2(symbol, arg1, arg2)            \
+    void symbol(arg1 _1, arg2 _2)                               \
+    {                                                           \
+        static void (*f)(arg1, arg2) = NULL;                    \
+        DLSYM(&f, #symbol);                              \
+        f(_1, _2); }
+
+#define IMPLEMENT_FUNCTION3(return_type, symbol, arg1, arg2, arg3)    \
+    return_type symbol(arg1 _1, arg2 _2, arg3 _3)                     \
+    {                                                                 \
+        static return_type (*f)(arg1, arg2, arg3) = NULL;             \
+        DLSYM(&f, #symbol);                                           \
+        return f(_1, _2, _3); } 
+
+#define IMPLEMENT_VOID_FUNCTION3(symbol, arg1, arg2, arg3)      \
+    void symbol(arg1 _1, arg2 _2, arg3 _3)                      \
+    {                                                           \
+        static void (*f)(arg1, arg2, arg3) = NULL;              \
+        DLSYM(&f, #symbol);                                     \
+        f(_1, _2, _3); }
+
+#define IMPLEMENT_VOID_FUNCTION4(symbol, arg1, arg2, arg3, arg4) \
+    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4)              \
+    {                                                            \
+        static void (*f)(arg1, arg2, arg3, arg4) = NULL;         \
+        DLSYM(&f, #symbol);                                      \
+        f(_1, _2, _3, _4); }
+
+#define IMPLEMENT_FUNCTION4(return_type, symbol, arg1, arg2, arg3, arg4) \
+    return_type symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4)               \
+    {                                                                    \
+        static return_type (*f)(arg1, arg2, arg3, arg4) = NULL;          \
+        DLSYM(&f, #symbol);                                              \
+        return f(_1, _2, _3, _4); }
+
+#define IMPLEMENT_FUNCTION6(return_type, symbol, arg1, arg2, arg3, arg4, arg5, arg6) \
+    return_type symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4, arg5 _5, arg6 _6)         \
+    {                                                                                \
+        static return_type (*f)(arg1, arg2, arg3, arg4, arg5, arg6) = NULL;          \
+        DLSYM(&f, #symbol);                                                          \
+        return f(_1, _2, _3, _4, _5, _6); }
+
+#define IMPLEMENT_VOID_FUNCTION7(symbol, arg1, arg2, arg3, arg4, arg5, arg6, arg7) \
+    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4, arg5 _5, arg6 _6, arg7 _7) \
+    {                                                                   \
+        static void (*f)(arg1, arg2, arg3, arg4, arg5, arg6, arg7) = NULL; \
+        DLSYM(&f, #symbol);                                             \
+        f(_1, _2, _3, _4, _5, _6, _7); }
+
+#define IMPLEMENT_VOID_FUNCTION8(symbol, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) \
+    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4, arg5 _5, arg6 _6, arg7 _7, arg8 _8) \
+    {                                                                   \
+        static void (*f)(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) = NULL; \
+        DLSYM(&f, #symbol);                                             \
+        f(_1, _2, _3, _4, _5, _6, _7, _8); }
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // BRIDGE_DEFS_H_

=== added file 'src/ubuntu/CMakeLists.txt'
--- src/ubuntu/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/ubuntu/CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(application)
+add_subdirectory(hardware)

=== added directory 'src/ubuntu/application'
=== renamed file 'src/ubuntu/CMakeLists.txt' => 'src/ubuntu/application/CMakeLists.txt'
--- src/ubuntu/CMakeLists.txt	2013-12-02 17:03:45 +0000
+++ src/ubuntu/application/CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -1,29 +1,44 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-add_subdirectory(application)
-add_subdirectory(testbackend)
-
 set(
   UBUNTU_APPLICATION_API_LINK_LIBRARIES
-  
+
+  ubuntu_application_sensors_haptic
   ubuntu_application_location
   ubuntu_application_url_dispatcher
 )
 
-if(ENABLE_HYBRIS_IMPLEMENTATION)
-  add_subdirectory(hybris/)
-endif()
-
-if(ENABLE_MIRSERVER_IMPLEMENTATION OR ENABLE_MIRCLIENT_IMPLEMENTATION)
-  add_subdirectory(mircommon/)
-endif()
-
-if(ENABLE_MIRSERVER_IMPLEMENTATION)
-  add_subdirectory(mirserver/)
-endif()
-
-if(ENABLE_MIRCLIENT_IMPLEMENTATION)
-  add_subdirectory(mirclient/)
-endif()
+include_directories(
+  ${CMAKE_BINARY_DIR}/include
+)
+
+include_directories(../../bridge)
+
+add_subdirectory(common)
+add_subdirectory(desktop)
+add_subdirectory(touch)
+add_subdirectory(testbackend)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
+
+add_library(
+  ubuntu_application_api SHARED
+  
+  ubuntu_application_api.cpp
+)
+
+target_link_libraries(
+  ubuntu_application_api
+
+  dl  
+)
+
+set_target_properties(
+  ubuntu_application_api
+  PROPERTIES
+  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
+  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
+)
+
+install(
+  TARGETS ubuntu_application_api
+  ${INSTALL_TARGETS_DEFAULT_ARGS}
+)

=== added file 'src/ubuntu/application/base_module.h'
--- src/ubuntu/application/base_module.h	1970-01-01 00:00:00 +0000
+++ src/ubuntu/application/base_module.h	2014-08-26 16:06:15 +0000
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voss <[e-mail]>
+ *              Ricardo Mendoza <[e-mail]>
+ */
+#ifndef BASE_MODULE_H_
+#define BASE_MODULE_H_
+
+#include <bridge.h>
+#include <stdio.h>
+#include <unistd.h>
+
+/*
+ * This is the base backend loader for the Platform API
+ */
+
+#define API_VERSION_MAJOR   "2"
+#define API_VERSION_MINOR   "2"
+#define API_VERSION_PATCH   "0"
+#define SO_SUFFIX ".so." API_VERSION_MAJOR "." API_VERSION_MINOR "." API_VERSION_PATCH
+
+namespace internal
+{
+/* Programs can select a backend with $UBUNTU_PLATFORM_API_BACKEND,
+ * which either needs to be a full path or just the file name (then it will be
+ * looked up in the usual library search path, see dlopen(3)).
+ */
+struct HIDDEN_SYMBOL ToBackend
+{
+    static const char* path()
+    {
+        static char* cache = NULL;
+        static char path[64];
+        char module_name[32];
+
+        if (cache == NULL) {
+            cache = secure_getenv("UBUNTU_PLATFORM_API_BACKEND");
+            if (cache == NULL) {
+                FILE *conf;
+                conf = fopen("/etc/ubuntu-platform-api/application.conf", "r");
+                if (conf == NULL) {
+                    exit_module("Unable to find module configuration file");
+                } else {
+                    if (fgets(module_name, 32, conf))
+                        cache = module_name;
+                    else
+                        exit_module("Error reading module name from file");
+                }
+                // Null terminate module blob
+                cache[strlen(cache)-1] = '\0';
+                fclose(conf);
+            }
+            if (cache == NULL)
+                exit_module("Unable to determine backend");
+
+            strcpy(path, "libubuntu_application_api_");
+            
+            if (strlen(cache) > MAX_MODULE_NAME)
+                exit_module("Selected module is invalid");
+            
+            strcat(path, cache);
+            strcat(path, SO_SUFFIX);
+        }
+
+        return path;
+    }
+
+    static void exit_module(const char* msg)
+    {
+        printf("Ubuntu Platform API: %s -- Aborting\n", msg);
+        abort();
+    }
+
+    static void* dlopen_fn(const char* path, int flags)
+    {
+        void *handle = dlopen(path, flags);
+        if (handle == NULL)
+            exit_module("Unable to load selected module.");
+
+        return handle;
+    }
+
+    static void* dlsym_fn(void* handle, const char* symbol)
+    {
+        return dlsym(handle, symbol);
+    }
+};
+}
+
+#define DLSYM(fptr, sym) if (*(fptr) == NULL) { *((void**)fptr) = (void *) internal::Bridge<internal::ToBackend>::instance().resolve_symbol(sym); }
+
+#include <bridge_defs.h>
+
+#endif // BASE_MODULE_H_

=== added directory 'src/ubuntu/application/common'
=== added file 'src/ubuntu/application/common/CMakeLists.txt'
--- src/ubuntu/application/common/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/ubuntu/application/common/CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -0,0 +1,8 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_subdirectory(application)
+add_subdirectory(mircommon)
+add_subdirectory(mirclient)
+add_subdirectory(mirserver)

=== renamed directory 'src/ubuntu/application' => 'src/ubuntu/application/common/application'
=== modified file 'src/ubuntu/application/common/application/CMakeLists.txt'
--- src/ubuntu/application/CMakeLists.txt	2013-08-22 10:54:28 +0000
+++ src/ubuntu/application/common/application/CMakeLists.txt	2014-08-26 16:06:15 +0000
@@ -1,2 +1,3 @@
+add_subdirectory(sensors)
 add_subdirectory(location)
 add_subdirectory(url_dispatcher)

=== modified file 'src/ubuntu/application/common/application/location/controller.cpp'
--- src/ubuntu/application/location/controller.cpp	2013-08-23 10:55:16 +0000
+++ src/ubuntu/application/common/application/location/controller.cpp	2014-08-26 16:06:15 +0000
@@ -19,6 +19,7 @@
 #include "ubuntu/application/location/controller.h"
 
 #include "controller_p.h"
+#include "instance.h"
 
 void
 ua_location_service_controller_ref(
@@ -41,8 +42,17 @@
     void *context)
 {
     (void) controller;
-    (void) handler;
-    (void) context;
+
+    try
+    {
+        Instance::instance().set_changed_handler_with_context(handler, context);
+    } catch(const std::exception& e)
+    {
+        std::cerr << "ua_location_service_controller_set_status_changed_handler: error accessing instance: " << e.what() << std::endl;
+    } catch(...)
+    {
+        std::cerr << "ua_location_service_controller_set_status_changed_handler: error accessing instance." << std::endl;
+    }
 }
 
 UStatus
@@ -51,9 +61,33 @@
     UALocationServiceStatusFlags *out_flags)
 {
     (void) controller;
-    (void) out_flags;
-
-    return U_STATUS_SUCCESS;
+
+    *out_flags = 0;
+
+    try
+    {
+        auto service = Instance::instance().get_service();
+
+        if (service->is_online().get())
+            *out_flags |= UA_LOCATION_SERVICE_ENABLED;
+        else
+            *out_flags |= UA_LOCATION_SERVICE_DISABLED;
+
+        if (service->does_satellite_based_positioning().get())
+            *out_flags |= UA_LOCATION_SERVICE_GPS_ENABLED;
+        else
+            *out_flags |= UA_LOCATION_SERVICE_GPS_DISABLED;
+
+        return U_STATUS_SUCCESS;
+    } catch(const std::exception& e)
+    {
+        std::cerr << "ua_location_service_controller_query_status: error accessing instance: " << e.what() << std::endl;
+    } catch(...)
+    {
+        std::cerr << "ua_location_service_controller_query_status: error accessing instance." << std::endl;
+    }
+
+    return U_STATUS_ERROR;
 }
 
 UStatus
@@ -62,7 +96,21 @@
 {
     (void) controller;
 
-    return U_STATUS_SUCCESS;
+    try
+    {
+        auto service = Instance::instance().get_service();
+        service->is_online().set(true);
+
+        return U_STATUS_SUCCESS;
+    } catch(const std::exception& e)
+    {
+        std::cerr << "ua_location_service_controller_enable_service: error accessing instance: " << e.what() << std::endl;
+    } catch(...)
+    {
+        std::cerr << "ua_location_service_controller_enable_service: error accessing instance." << std::endl;
+    }
+
+    return U_STATUS_ERROR;
 }
 
 UStatus
@@ -70,8 +118,22 @@
     UALocationServiceController *controller)
 {
     (void) controller;
-    
-    return U_STATUS_SUCCESS;
+
+    try
+    {
+        auto service = Instance::instance().get_service();
+        service->is_online().set(false);
+
+        return U_STATUS_SUCCESS;
+    } catch(const std::exception& e)
+    {
+        std::cerr << "ua_location_service_controller_disable_service: error accessing instance: " << e.what() << std::endl;
+    } catch(...)
+    {
+        std::cerr << "ua_location_service_controller_disable_service: error accessing instance." << std::endl;
+    }
+
+    return U_STATUS_ERROR;
 }
 
 UStatus
@@ -80,7 +142,21 @@
 {
     (void) controller;
 
-    return U_STATUS_SUCCESS;
+    try
+    {
+        auto service = Instance::instance().get_service();
+        service->does_satellite_based_positioning().set(true);
+
+        return U_STATUS_SUCCESS;
+    } catch(const std::exception& e)
+    {
+        std::cerr << "ua_location_service_controller_enable_gps: error accessing instance: " << e.what() << std::endl;
+    } catch(...)
+    {
+        std::cerr << "ua_location_service_controller_enable_gps: error accessing instance." << std::endl;
+    }
+
+    return U_STATUS_ERROR;
 }
 
 UStatus
@@ -89,5 +165,19 @@
 {
     (void) controller;
 
-    return U_STATUS_SUCCESS;
+    try
+    {
+        auto service = Instance::instance().get_service();
+        service->does_satellite_based_positioning().set(false);
+
+        return U_STATUS_SUCCESS;
+    } catch(const std::exception& e)
+    {
+        std::cerr << "ua_location_service_controller_disable_gps: error accessing instance: " << e.what() << std::endl;
+    } catch(...)
+    {
+        std::cerr << "ua_location_service_controller_disable_gps: error accessing instance." << std::endl;
+    }
+
+    return U_STATUS_ERROR;
 }

=== modified file 'src/ubuntu/application/common/application/location/controller_p.h'
--- src/ubuntu/application/location/controller_p.h	2013-08-21 14:59:45 +0000
+++ src/ubuntu/application/common/application/location/controller_p.h	2014-08-26 16:06:15 +0000
@@ -25,6 +25,7 @@
 
 struct UbuntuApplicationLocationServiceController : public detail::RefCounted
 {
+
 };
 
 #endif // CONTROLLER_PRIVATE_H_

=== modified file 'src/ubuntu/application/common/application/location/heading_update.cpp'
--- src/ubuntu/application/location/heading_update.cpp	2013-08-19 06:46:47 +0000
+++ src/ubuntu/application/common/application/location/heading_update.cpp	2014-08-26 16:06:15 +0000
@@ -51,5 +51,5 @@
 ua_location_heading_update_get_heading_in_degree(
     UALocationHeadingUpdate *update)
 {
-    return update->update.value.value.value();
+    return update->update.value.value();
 }

=== added file 'src/ubuntu/application/common/application/location/instance.h'
--- src/ubuntu/application/common/application/location/instance.h	1970-01-01 00:00:00 +0000
+++ src/ubuntu/application/common/application/location/instance.h	2014-08-26 16:06:15 +0000
@@ -0,0 +1,143 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#ifndef INSTANCE_H_
+#define INSTANCE_H_
+
+#include "ubuntu/visibility.h"
+
+#include "ubuntu/application/location/controller.h"
+
+#include <com/ubuntu/location/service/stub.h>
+
+#include <core/dbus/resolver.h>
+#include <core/dbus/asio/executor.h>
+
+#include <thread>
+
+class UBUNTU_DLL_LOCAL Instance
+{
+  public:
+    static Instance& instance()
+    {
+        static Instance inst;
+        return inst;
+    }
+
+    const com::ubuntu::location::service::Interface::Ptr& get_service() const
+    {
+        return service;
+    }
+
+    void set_changed_handler_with_context(
+            UALocationServiceStatusChangedHandler handler,
+            void* context)
+    {
+        changed_handler = handler;
+        changed_handler_context = context;
+    }
+
+  private:
+    Instance()
+        : bus(std::make_shared<core::dbus::Bus>(core::dbus::WellKnownBus::system)),
+          executor(core::dbus::asio::make_executor(bus)),
+          service(core::dbus::resolve_service_on_bus<
+                    com::ubuntu::location::service::Interface,
+                    com::ubuntu::location::service::Stub
+                  >(bus)),
+          connections
+          {
+              service->does_satellite_based_positioning().changed().connect([this](bool value)
+              {
+                  // Update our cached value.
+                  if (value)
+                  {
+                      cached_state_flags |= UA_LOCATION_SERVICE_GPS_ENABLED;
+                      cached_state_flags &= ~UA_LOCATION_SERVICE_GPS_DISABLED;
+                  }
+                  else
+                  {
+                      cached_state_flags |= UA_LOCATION_SERVICE_GPS_DISABLED;
+                      cached_state_flags &= ~UA_LOCATION_SERVICE_GPS_ENABLED;
+                  }
+
+                  // And notify change handler if one is set.
+                  if (changed_handler)
+                      changed_handler(cached_state_flags, changed_handler_context);
+              }),
+              service->is_online().changed().connect([this](bool value)
+              {
+                  // Update our cached value.
+                  if (value)
+                  {
+                      cached_state_flags |= UA_LOCATION_SERVICE_ENABLED;
+                      cached_state_flags &= ~UA_LOCATION_SERVICE_DISABLED;
+                  }
+                  else
+                  {
+                      cached_state_flags |= UA_LOCATION_SERVICE_DISABLED;
+                      cached_state_flags &= ~UA_LOCATION_SERVICE_ENABLED;
+                  }
+
+                  // And notify change handler if one is set.
+                  if (changed_handler)
+                      changed_handler(cached_state_flags, changed_handler_context);
+              })
+          },
+          cached_state_flags{0},
+          changed_handler{nullptr},
+          changed_handler_context{nullptr}
+    {
+        bus->install_executor(executor);
+        worker = std::move(std::thread([&]() { bus->run(); }));
+    }
+
+    ~Instance() noexcept
+    {
+        try
+        {
+            bus->stop();
+
+            if (worker.joinable())
+                worker.join();
+        } catch(...)
+        {
+            // We silently ignore errors to fulfill our noexcept guarantee.
+        }
+    }
+
+    core::dbus::Bus::Ptr bus;
+    core::dbus::Executor::Ptr executor;
+    std::thread worker;
+
+    com::ubuntu::location::service::Interface::Ptr service;
+
+    // All event connections go here.
+    struct
+    {
+        core::ScopedConnection on_does_satellite_based_positioning_changed;
+        core::ScopedConnection on_is_online_changed;
+    } connections;
+
+    // All change-handler specifics go here.
+    UALocationServiceStatusFlags cached_state_flags;
+    UALocationServiceStatusChangedHandler changed_handler;
+    void* changed_handler_context;
+};
+
+#endif // INSTANCE_H_

=== modified file 'src/ubuntu/application/common/application/location/position_update.cpp'
--- src/ubuntu/application/location/position_update.cpp	2013-08-19 06:46:47 +0000
+++ src/ubuntu/application/common/application/location/position_update.cpp	2014-08-26 16:06:15 +0000
@@ -51,26 +51,54 @@
 ua_location_position_update_get_latitude_in_degree(
     UALocationPositionUpdate *update)
 {
-    return update->update.value.latitude().value.value();
+    return update->update.value.latitude.value.value();
 }
 
 double
 ua_location_position_update_get_longitude_in_degree(
     UALocationPositionUpdate *update)
 {
-    return update->update.value.longitude().value.value();
+    return update->update.value.longitude.value.value();
 }
 
 bool
 ua_location_position_update_has_altitude(
     UALocationPositionUpdate *update)
 {
-    return update->update.value.has_altitude();
+    return update->update.value.altitude;
 }
 
 double
 ua_location_position_update_get_altitude_in_meter(
     UALocationPositionUpdate *update)
 {
-    return update->update.value.altitude().value.value();
+    return update->update.value.altitude->value.value();
+}
+
+bool
+ua_location_position_update_has_horizontal_accuracy(
+    UALocationPositionUpdate *update)
+{
+    return update->update.value.accuracy.horizontal;
+}
+
+double
+ua_location_position_update_get_horizontal_accuracy_in_meter(
+    UALocationPositionUpdate *update)
+{
+    return update->update.value.accuracy.horizontal->value();
+}
+
+bool
+ua_location_position_update_has_vertical_accuracy(
+    UALocationPositionUpdate *update)
+{
+    return update->update.value.accuracy.vertical;
+}
+
+double
+ua_location_position_update_get_vertical_accuracy_in_meter(
+    UALocationPositionUpdate *update)
+{
+    return update->update.value.accuracy.vertical->value();
 }

=== modified file 'src/ubuntu/application/common/application/location/ref_counted.h'
--- src/ubuntu/application/location/ref_counted.h	2013-08-19 06:47:19 +0000
+++ src/ubuntu/application/common/application/location/ref_counted.h	2014-08-26 16:06:15 +0000
@@ -32,7 +32,7 @@
     bool operator==(const RefCounted&) const = delete;
 
     void ref() { counter.fetch_add(1); }
-    void unref() { if (0 == counter.fetch_sub(1)) { delete this; } }
+    void unref() { if (1 == counter.fetch_sub(1)) { delete this; } }
 
   protected:
     RefCounted() : counter(1)

=== modified file 'src/ubuntu/application/common/application/location/service.cpp'
--- src/ubuntu/application/location/service.cpp	2014-01-31 13:35:28 +0000
+++ src/ubuntu/application/common/application/location/service.cpp	2014-08-26 16:06:15 +0000
@@ -19,6 +19,7 @@
 #include "ubuntu/application/location/service.h"
 
 #include "controller_p.h"
+#include "instance.h"
 #include "session_p.h"
 
 #include <com/ubuntu/location/service/stub.h>
@@ -30,59 +31,58 @@
 namespace cul = com::ubuntu::location;
 namespace culs = com::ubuntu::location::service;
 
-namespace
-{
-class Instance
-{
-  public:
-    static Instance& instance()
-    {
-        static Instance inst;
-        return inst;
-    }
-
-    const culs::Interface::Ptr& get_service() const
-    {
-        return service;
-    }
-
-  private:
-    Instance() : bus(std::make_shared<dbus::Bus>(dbus::WellKnownBus::system)),
-                 executor(dbus::asio::make_executor(bus)),
-                 service(dbus::resolve_service_on_bus<culs::Interface, culs::Stub>(bus))
-    {
-        bus->install_executor(executor);
-        worker = std::move(std::thread([&]() { bus->run(); }));
-    }
-
-    ~Instance() noexcept
-    {
-        if (worker.joinable())
-            worker.join();
-    }
-
-    dbus::Bus::Ptr bus;
-    dbus::Executor::Ptr executor;
-    culs::Interface::Ptr service;
-    std::thread worker;
-};
-
-}
-
 UALocationServiceSession*
 ua_location_service_create_session_for_low_accuracy(
     UALocationServiceRequirementsFlags /*flags*/)
 {
-    return new UbuntuApplicationLocationServiceSession{
-        Instance::instance().get_service()->create_session_for_criteria(cul::Criteria{})};
+    // Creating the instance might fail for a number of reason and
+    // we cannot allow exceptions to propagate to prevent applications
+    // from aborting. For that, we catch all exceptions, provide some error
+    // information to std::cerr and return a nullptr in case of errors.
+    try
+    {
+        return new UbuntuApplicationLocationServiceSession
+        {
+            // Creating the instance might fail for a number of reasons.
+
+            Instance::instance().get_service()->create_session_for_criteria(cul::Criteria{})
+        };
+    } catch(const std::exception& e)
+    {
+        std::cerr << "ua_location_service_create_session_for_low_accuracy: Error creating instance: " << e.what() << std::endl;
+    } catch(...)
+    {
+        std::cerr << "ua_location_service_create_session_for_low_accuracy: Error creating instance." << std::endl;
+    }
+
+    return nullptr;
 }
 
 UALocationServiceSession*
 ua_location_service_create_session_for_high_accuracy(
     UALocationServiceRequirementsFlags /*flags*/)
 {
-    return new UbuntuApplicationLocationServiceSession{
-        Instance::instance().get_service()->create_session_for_criteria(cul::Criteria{})};
+    // Creating the instance might fail for a number of reason and
+    // we cannot allow exceptions to propagate to prevent applications
+    // from aborting. For that, we catch all exceptions, provide some error
+    // information to std::cerr and return a nullptr in case of errors.
+    try
+    {
+        return new UbuntuApplicationLocationServiceSession
+        {
+            // Creating the instance might fail for a number of reasons.
+
+            Instance::instance().get_service()->create_session_for_criteria(cul::Criteria{})
+        };
+    } catch(const std::exception& e)
+    {
+        std::cerr << "ua_location_service_create_session_for_high_accuracy: Error creating instance: " << e.what() << std::endl;
+    } catch(...)
+    {
+        std::cerr << "ua_location_service_create_session_for_high_accuracy: Error creating instance." << std::endl;
+    }
+
+    return nullptr;
 }
 
 UALocationServiceController*

=== modified file 'src/ubuntu/application/common/application/location/session.cpp'
--- src/ubuntu/application/location/session.cpp	2013-08-19 06:46:47 +0000
+++ src/ubuntu/application/common/application/location/session.cpp	2014-08-26 16:06:15 +0000
@@ -24,10 +24,15 @@
 #include "position_update_p.h"
 #include "velocity_update_p.h"
 
+namespace location = com::ubuntu::location;
+
 void
 ua_location_service_session_ref(
     UALocationServiceSession *session)
 {
+    if (not session)
+        return;
+
     auto s = static_cast<UbuntuApplicationLocationServiceSession*>(session);
     s->ref();
 }
@@ -36,6 +41,9 @@
 ua_location_service_session_unref(
     UALocationServiceSession *session)
 {
+    if (not session)
+        return;
+
     auto s = static_cast<UbuntuApplicationLocationServiceSession*>(session);
     s->unref();
 }
@@ -46,13 +54,23 @@
     UALocationServiceSessionPositionUpdatesHandler handler,
     void *context)
 {
+    if (not session)
+        return;
+
     auto s = static_cast<UbuntuApplicationLocationServiceSession*>(session);
-    s->session->install_position_updates_handler(
-        [handler, context](const com::ubuntu::location::Update<com::ubuntu::location::Position>& new_position)
-        {
-            UbuntuApplicationLocationPositionUpdate pu{new_position};
-            handler(std::addressof(pu), context);
-        });
+
+    try
+    {
+        std::lock_guard<std::mutex> lg(s->position_updates.guard);
+        s->position_updates.handler = handler;
+        s->position_updates.context = context;
+    } catch(const std::exception& e)
+    {
+        fprintf(stderr, "Error setting up position updates handler: %s \n", e.what());
+    } catch(...)
+    {
+        fprintf(stderr, "Error setting up position updates handler.\n");
+    }
 }
 
 void
@@ -61,13 +79,23 @@
     UALocationServiceSessionHeadingUpdatesHandler handler,
     void *context)
 {
+    if (not session)
+        return;
+
     auto s = static_cast<UbuntuApplicationLocationServiceSession*>(session);
-    s->session->install_heading_updates_handler(
-        [handler, context](const com::ubuntu::location::Update<com::ubuntu::location::Heading>& new_heading) 
-        {
-            UbuntuApplicationLocationHeadingUpdate hu{new_heading};
-            handler(std::addressof(hu), context);
-        });
+
+    try
+    {
+        std::lock_guard<std::mutex> lg(s->heading_updates.guard);
+        s->heading_updates.handler = handler;
+        s->heading_updates.context = context;
+    } catch(const std::exception& e)
+    {
+        fprintf(stderr, "Error setting up heading updates handler: %s \n", e.what());
+    } catch(...)
+    {
+        fprintf(stderr, "Error setting up heading updates handler. \n");
+    }
 }
 
 void
@@ -76,26 +104,38 @@
     UALocationServiceSessionVelocityUpdatesHandler handler,
     void *context)
 {
+    if (not session)
+        return;
+
     auto s = static_cast<UbuntuApplicationLocationServiceSession*>(session);
-    s->session->install_velocity_updates_handler(
-        [handler, context](const com::ubuntu::location::Update<com::ubuntu::location::Velocity>& new_velocity) 
-        {
-            UbuntuApplicationLocationVelocityUpdate vu{new_velocity};
-            handler(std::addressof(vu), context);
-        });
+
+    try
+    {
+        std::lock_guard<std::mutex> lg(s->velocity_updates.guard);
+        s->velocity_updates.handler = handler;
+        s->velocity_updates.context = context;
+    } catch(const std::exception& e)
+    {
+        fprintf(stderr, "Error setting up velocity updates handler: %s \n", e.what());
+    } catch(...)
+    {
+        fprintf(stderr, "Error setting up velocity updates handler.");
+    }
 }
 
 UStatus
 ua_location_service_session_start_position_updates(
     UALocationServiceSession *session)
 {
+    if (not session)
+        return U_STATUS_ERROR;
+
     auto s = static_cast<UbuntuApplicationLocationServiceSession*>(session);
-    if (!s)
-        return U_STATUS_ERROR;
 
     try
     {
-        s->session->start_position_updates();
+        s->session->updates().position_status.set(
+                    location::service::session::Interface::Updates::Status::enabled);
     } catch(...)
     {
         return U_STATUS_ERROR;
@@ -108,13 +148,15 @@
 ua_location_service_session_stop_position_updates(
     UALocationServiceSession *session)
 {
+    if (not session)
+        return;
+
     auto s = static_cast<UbuntuApplicationLocationServiceSession*>(session);
-    if (!s)
-        return;
 
     try
     {
-        s->session->stop_position_updates();
+        s->session->updates().position_status.set(
+                    location::service::session::Interface::Updates::Status::disabled);
     } catch(...)
     {
     }    
@@ -124,13 +166,15 @@
 ua_location_service_session_start_heading_updates(
     UALocationServiceSession *session)
 {
+    if (not session)
+        return U_STATUS_ERROR;
+
     auto s = static_cast<UbuntuApplicationLocationServiceSession*>(session);
-    if (!s)
-        return U_STATUS_ERROR;
 
     try