Merge lp:~ricmm/platform-api/refactor-headers-new-cleanup into lp:platform-api

[Ricardo Mendoza]

* Move all private headers for android interfaces to android/include/
* Expose publicly only the C headers for the API
* Change namespaces to match new coding guidelines
* General cleanup and housekeeping of the codebase

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:56
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ricmm/platform-api/refactor-headers-new-cleanup/+merge/165467/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/platform-api-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/19/rebuild

review: Needs Fixing (continuous-integration)

[Ricardo Salveti (rsalveti)]

Code review, not yet tested:

87 + $(UPAPI_PATH)/include \
88 + $(UPAPI_PATH)/android/include

97 + $(UPAPI_PATH)/include \
98 + $(UPAPI_PATH)/android/include

107 + $(UPAPI_PATH)/include \
108 + $(UPAPI_PATH)/android/include

117 + $(UPAPI_PATH)/include \
118 + $(UPAPI_PATH)/android/include

127 + $(UPAPI_PATH)/include \
128 + $(UPAPI_PATH)/android/include

137 + $(UPAPI_PATH)/include \
138 + $(UPAPI_PATH)/android/include

147 + $(UPAPI_PATH)/include \
148 + $(UPAPI_PATH)/android/include

157 + $(UPAPI_PATH)/include \
158 + $(UPAPI_PATH)/android/include

167 + $(UPAPI_PATH)/include \
168 + $(UPAPI_PATH)/android/include

177 + $(UPAPI_PATH)/include \
178 + $(UPAPI_PATH)/android/include

187 + $(UPAPI_PATH)/include \
188 + $(UPAPI_PATH)/android/include

Cosmetics, please use tab instead of spaces in the new line (android/include).

Please remove android/include/private/application/ui/session_credentials.h.rej.

+//#include "NEW_lifecycle_delegate.h"

If not needed, please remove.

android/include/private/application/ui/window_internal.h
include/ubuntu/application/description.h
include/ubuntu/application/id.h
include/ubuntu/application/instance.h
include/ubuntu/application/options.h
include/ubuntu/application/ui/clipboard.h
include/ubuntu/application/ui/display.h
include/ubuntu/application/ui/form_factor.h
include/ubuntu/application/ui/options.h
include/ubuntu/application/ui/session.h
include/ubuntu/application/ui/stage.h
include/ubuntu/application/ui/window.h
include/ubuntu/application/ui/window_parent.h
include/ubuntu/application/ui/window_properties.h
include/ubuntu/application/ui/window_type.h

Missing copyright/license header.

871 + this->string = (char*) malloc(sizeof (char) * (size+1));
2408 + this->title = (char *) malloc(sizeof (char) * (size+1));

When allocating with malloc, don't you need a free in the class destructor?

include/ubuntu/application/description.h

/*
void
u_application_description_set_application_error_delegate(
 UApplicationDescription *desc,
 u_application_error_delegate *error_delegate);

u_application_error_delegate*
u_application_description_get_application_error_delegate(
 UApplicationDescription *desc);

void
u_application_description_set_system_delegate(
 UApplicationDescription *desc,
 u_system_delegate *system_delegate);

u_system_delegate*
u_application_description_get_system_delegate(
 UApplicationDescription *desc);
*/

Why is this piece commented out?

include/ubuntu/application/ui/form_factor.h

//typedef unsigned int FormFactorHintFlags;
//typedef FormFactorHintFlags UApplicationUiFormFactor;

Why is this piece commented out?

include/ubuntu/application/ui/stage.h

typedef enum
{
 U_MAIN_STAGE = 0,
 U_INTEGRATION_STAGE = 1,
    U_SHARE_STAGE = 2,
    U_CONTENT_PICKING_STAGE = 3,
    U_SIDE_STAGE = 4,
    U_CONFIGURATION_STAGE = 5
} UAUiStage;

Cosmetics, please fix the indentation.

include/ubuntu/application/ui/stage.h

#ifndef UBUNTU_APPLICATION_UI_STAGE_HINT_H_
#define UBUNTU_APPLICATION_UI_STAGE_HINT_H_

/*namespace ubuntu
{
namespace application
{
namespace ui
{
enum StageHint
{
    main_stage = MAIN_STAGE_HINT,
    integration_stage = INTEGRATION_STAGE_HINT,
    share_stage = SHARE_STAGE_HINT,
 ...

review: Needs Fixing

[Ricardo Salveti (rsalveti)]

Also, you're not just moving stuff around, but we also got quite a few new headers and new definitions. Ideally they would be part of a different MR.

[Ricardo Salveti (rsalveti)]

Also, build failure:
Install: /media/rsalveti/home/dev/android/build/public/out/target/product/mako/system/bin/direct_osk_visibility
Import includes file: /media/rsalveti/home/dev/android/build/public/out/target/product/mako/obj/EXECUTABLES/direct_ubuntu_application_sensors_c_api_for_hybris_test_intermediates/import_includes
target thumb C++: direct_ubuntu_application_sensors_c_api_for_hybris_test <= ubuntu/platform-api/android/hybris/test_sensors_c_api.cpp
ubuntu/platform-api/android/hybris/test_sensors_c_api.cpp:19:68: fatal error: private/application/sensors/ubuntu_application_sensors.h: No such file or directory
compilation terminated.
make: *** [/media/rsalveti/home/dev/android/build/public/out/target/product/mako/obj/EXECUTABLES/direct_ubuntu_application_sensors_c_api_for_hybris_test_intermediates/test_sensors_c_api.o] Error 1
make: Leaving directory `/media/rsalveti/home/dev/android/build/public'

mmm ubuntu/platform-api/android/hybris/

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/platform-api-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/23/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/platform-api-autolanding/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-autolanding/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-autolanding/6
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-autolanding/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-i386-autolanding/3

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-02-06 00:32:45 +0000
+++ CMakeLists.txt	2013-05-28 11:49:27 +0000
@@ -10,6 +10,7 @@
                                  ARCHIVE DESTINATION "${LIB_INSTALL_DIR}")
 
 include_directories(include/)
+include_directories(android/include/)
 
 add_subdirectory(src/)
 add_subdirectory(include/)

=== modified file 'android/default/default_ubuntu_application_sensor.cpp'
--- android/default/default_ubuntu_application_sensor.cpp	2013-02-28 14:29:36 +0000
+++ android/default/default_ubuntu_application_sensor.cpp	2013-05-28 11:49:27 +0000
@@ -18,10 +18,10 @@
 
 #include <ubuntu/application/sensors/ubuntu_application_sensors.h>
 
-#include <ubuntu/application/sensors/sensor.h>
-#include <ubuntu/application/sensors/sensor_listener.h>
-#include <ubuntu/application/sensors/sensor_service.h>
-#include <ubuntu/application/sensors/sensor_type.h>
+#include <private/application/sensors/sensor.h>
+#include <private/application/sensors/sensor_listener.h>
+#include <private/application/sensors/sensor_service.h>
+#include <private/application/sensors/sensor_type.h>
 
 #include <cassert>
 #include <cstdio>

=== modified file 'android/default/default_ubuntu_application_ui.cpp'
--- android/default/default_ubuntu_application_ui.cpp	2013-02-19 12:36:06 +0000
+++ android/default/default_ubuntu_application_ui.cpp	2013-05-28 11:49:27 +0000
@@ -15,18 +15,18 @@
  *
  * Authored by: Thomas Voß <[e-mail]>
  */
-#include <ubuntu/application/ui/init.h>
-#include <ubuntu/application/ui/session.h>
-#include <ubuntu/application/ui/session_credentials.h>
-#include <ubuntu/application/ui/setup.h>
-#include <ubuntu/application/ui/surface.h>
-#include <ubuntu/application/ui/surface_factory.h>
-#include <ubuntu/application/ui/surface_properties.h>
+#include <private/application/ui/init.h>
+#include <private/application/ui/session.h>
+#include <private/application/ui/session_credentials.h>
+#include <private/application/ui/setup.h>
+#include <private/application/ui/surface.h>
+#include <private/application/ui/surface_factory.h>
+#include <private/application/ui/surface_properties.h>
 
-#include <ubuntu/ui/session_service.h>
+#include <private/ui/session_service.h>
 
 // C apis
-#include <ubuntu/application/ui/ubuntu_application_ui.h>
+#include <private/application/ui/ubuntu_application_ui.h>
 
 // C-API implementation
 namespace

=== modified file 'android/default/default_ubuntu_ui.cpp'
--- android/default/default_ubuntu_ui.cpp	2013-02-20 05:24:03 +0000
+++ android/default/default_ubuntu_ui.cpp	2013-05-28 11:49:27 +0000
@@ -18,8 +18,8 @@
 
 #include <ubuntu/ui/ubuntu_ui_session_service.h>
 
-#include <ubuntu/ui/session_service.h>
-#include <ubuntu/ui/session_enumerator.h>
+#include <private/ui/session_service.h>
+#include <private/ui/session_enumerator.h>
 
 #include <stdio.h>
 

=== modified file 'android/hybris/Android.mk'
--- android/hybris/Android.mk	2013-04-12 13:34:02 +0000
+++ android/hybris/Android.mk	2013-05-28 11:49:27 +0000
@@ -13,7 +13,8 @@
 LOCAL_GENERATED_SOURCES := $(CONFIG_H)
 
 LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include
+	$(UPAPI_PATH)/include \
+	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES := \
 	ubuntu_application_api_for_hybris.cpp \
@@ -44,7 +45,8 @@
 LOCAL_CFLAGS += -std=gnu++0x
 
 LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include
+	$(UPAPI_PATH)/include \
+	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES:= \
 	test.cpp \
@@ -66,7 +68,8 @@
 LOCAL_CFLAGS += -std=gnu++0x
 
 LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include
+	$(UPAPI_PATH)/include \
+	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES:= \
 	test_c_api.cpp \
@@ -88,7 +91,8 @@
 LOCAL_CFLAGS += -std=gnu++0x
 
 LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include
+	$(UPAPI_PATH)/include \
+	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES:= \
 	test_session_c_api.cpp \
@@ -110,7 +114,8 @@
 LOCAL_CFLAGS += -std=gnu++0x
 
 LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include
+	$(UPAPI_PATH)/include \
+	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES:= \
 	test_trap.cpp \
@@ -132,7 +137,8 @@
 LOCAL_CFLAGS += -std=gnu++0x
 
 LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include
+	$(UPAPI_PATH)/include \
+	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES:= \
 	test_osk_visibility.cpp \
@@ -154,7 +160,8 @@
 LOCAL_CFLAGS += -std=gnu++0x
 
 LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include
+	$(UPAPI_PATH)/include \
+	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES:= \
 	test_sensors_c_api.cpp \
@@ -176,7 +183,8 @@
 LOCAL_CFLAGS += -std=gnu++0x
 
 LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include
+	$(UPAPI_PATH)/include \
+	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES:= \
 	test_sensors.cpp \
@@ -200,7 +208,8 @@
 LOCAL_C_INCLUDES := \
 	external/skia/include/core \
 	frameworks/base/services \
-	$(UPAPI_PATH)/include
+	$(UPAPI_PATH)/include \
+	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES:= \
 	application_manager.cpp \
@@ -227,7 +236,8 @@
 LOCAL_CFLAGS += -std=gnu++0x
 
 LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include
+	$(UPAPI_PATH)/include \
+	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES:= \
 	application_manager.cpp \
@@ -251,7 +261,8 @@
 LOCAL_CFLAGS += -std=gnu++0x
 
 LOCAL_C_INCLUDES := \
-	$(UPAPI_PATH)/include
+	$(UPAPI_PATH)/include \
+	$(UPAPI_PATH)/android/include
 
 LOCAL_SRC_FILES:= \
 	test_gps_api.cpp \

=== modified file 'android/hybris/default_application_session.h'
--- android/hybris/default_application_session.h	2013-02-27 22:05:31 +0000
+++ android/hybris/default_application_session.h	2013-05-28 11:49:27 +0000
@@ -20,9 +20,9 @@
 
 #include "application_manager.h"
 
-#include "ubuntu/application/ui/session_credentials.h"
-#include "ubuntu/application/ui/surface_role.h"
-#include "ubuntu/application/ui/stage_hint.h"
+#include "private/application/ui/session_credentials.h"
+#include "private/application/ui/surface_role.h"
+#include "private/application/ui/stage_hint.h"
 
 #include <binder/IPCThreadState.h>
 #include <binder/IServiceManager.h>

=== modified file 'android/hybris/test.cpp'
--- android/hybris/test.cpp	2013-02-05 08:01:14 +0000
+++ android/hybris/test.cpp	2013-05-28 11:49:27 +0000
@@ -15,12 +15,12 @@
  *
  * Authored by: Thomas Voß <[e-mail]>
  */
-#include <ubuntu/application/ui/init.h>
-#include <ubuntu/application/ui/session.h>
-#include <ubuntu/application/ui/session_credentials.h>
-#include <ubuntu/application/ui/setup.h>
+#include <private/application/ui/init.h>
+#include <private/application/ui/session.h>
+#include <private/application/ui/session_credentials.h>
+#include <private/application/ui/setup.h>
 
-#include <ubuntu/ui/session_service.h>
+#include <private/ui/session_service.h>
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>

=== modified file 'android/hybris/test_c_api.cpp'
--- android/hybris/test_c_api.cpp	2013-02-05 08:01:14 +0000
+++ android/hybris/test_c_api.cpp	2013-05-28 11:49:27 +0000
@@ -15,7 +15,7 @@
  *
  * Authored by: Thomas Voß <[e-mail]>
  */
-#include <ubuntu/application/ui/ubuntu_application_ui.h>
+#include <private/application/ui/ubuntu_application_ui.h>
 
 #include <EGL/egl.h>
 #include <GLES2/gl2.h>

=== modified file 'android/hybris/test_sensors.cpp'
--- android/hybris/test_sensors.cpp	2013-02-05 08:01:14 +0000
+++ android/hybris/test_sensors.cpp	2013-05-28 11:49:27 +0000
@@ -15,11 +15,11 @@
  *
  * Authored by: Thomas Voß <[e-mail]>
  */
-#include <ubuntu/application/sensors/sensor_service.h>
+#include <private/application/sensors/sensor_service.h>
 
-#include <ubuntu/application/sensors/sensor.h>
-#include <ubuntu/application/sensors/sensor_listener.h>
-#include <ubuntu/application/sensors/sensor_reading.h>
+#include <private/application/sensors/sensor.h>
+#include <private/application/sensors/sensor_listener.h>
+#include <private/application/sensors/sensor_reading.h>
 
 #include <cstdio>
 

=== modified file 'android/hybris/ubuntu_application_api_for_hybris.cpp'
--- android/hybris/ubuntu_application_api_for_hybris.cpp	2013-02-20 05:24:03 +0000
+++ android/hybris/ubuntu_application_api_for_hybris.cpp	2013-05-28 11:49:27 +0000
@@ -19,18 +19,18 @@
 #include "event_loop.h"
 #include "input_consumer_thread.h"
 
-#include <ubuntu/application/ui/clipboard.h>
-#include <ubuntu/application/ui/init.h>
-#include <ubuntu/application/ui/session.h>
-#include <ubuntu/application/ui/session_credentials.h>
-#include <ubuntu/application/ui/setup.h>
-#include <ubuntu/application/ui/surface.h>
-#include <ubuntu/application/ui/surface_factory.h>
-#include <ubuntu/application/ui/surface_properties.h>
+#include <private/application/ui/clipboard.h>
+#include <private/application/ui/init.h>
+#include <private/application/ui/session.h>
+#include <private/application/ui/session_credentials.h>
+#include <private/application/ui/setup.h>
+#include <private/application/ui/surface.h>
+#include <private/application/ui/surface_factory.h>
+#include <private/application/ui/surface_properties.h>
 
-#include <ubuntu/ui/session_enumerator.h>
-#include <ubuntu/ui/session_service.h>
-#include <ubuntu/ui/well_known_applications.h>
+#include <private/ui/session_enumerator.h>
+#include <private/ui/session_service.h>
+#include <private/ui/well_known_applications.h>
 
 #include <binder/IMemory.h>
 #include <binder/IPCThreadState.h>

=== modified file 'android/hybris/ubuntu_application_sensors_for_hybris.cpp'
--- android/hybris/ubuntu_application_sensors_for_hybris.cpp	2013-02-27 14:43:42 +0000
+++ android/hybris/ubuntu_application_sensors_for_hybris.cpp	2013-05-28 11:49:27 +0000
@@ -17,11 +17,11 @@
  */
 #include "event_loop.h"
 
-#include <ubuntu/application/sensors/sensor_service.h>
-#include <ubuntu/application/sensors/sensor_listener.h>
-#include <ubuntu/application/sensors/sensor_reading.h>
-#include <ubuntu/application/sensors/sensor_type.h>
-#include <ubuntu/application/sensors/sensor.h>
+#include <private/application/sensors/sensor_service.h>
+#include <private/application/sensors/sensor_listener.h>
+#include <private/application/sensors/sensor_reading.h>
+#include <private/application/sensors/sensor_type.h>
+#include <private/application/sensors/sensor.h>
 
 #include <android/sensor.h>
 

=== added directory 'android/include'
=== added directory 'android/include/private'
=== added directory 'android/include/private/application'
=== added file 'android/include/private/application/application.h'
--- android/include/private/application/application.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/application.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,119 @@
+/*
+ * 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_APPLICATION_H_
+#define UBUNTU_APPLICATION_APPLICATION_H_
+
+#include <utils/Log.h>
+
+namespace ubuntu
+{
+namespace application
+{
+class Instance : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    Instance(UApplicationDescription *description, UApplicationOptions *options)
+            : description(description),
+              options(options)
+    {}
+
+    typedef ubuntu::platform::shared_ptr<Instance> Ptr;
+
+    void run()
+    {
+        return;
+    }
+
+    void ref()
+    {
+        refcount++;
+    }
+
+    void unref()
+    {
+        if (refcount)
+            refcount--;
+    }
+
+    unsigned int get_refcount()
+    {
+        return this->refcount;
+    }
+
+    UApplicationDescription* get_description()
+    {
+        return this->description;
+    }
+
+private:
+    UApplicationDescription *description;
+    UApplicationOptions *options;
+    unsigned int refcount;
+
+protected:
+    virtual ~Instance() {}
+
+    Instance(const Instance&) = delete;
+    Instance& operator=(const Instance&) = delete;
+};
+
+
+class Description : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    Description() : refcount(1) {}
+
+    typedef ubuntu::platform::shared_ptr<Description> Ptr;
+
+    void set_lifecycle_delegate(UApplicationLifecycleDelegate *delegate)
+    {
+        this->lifecycle_delegate = delegate;
+    }
+
+    void set_application_id(UApplicationId *id)
+    {
+        this->application_id = id;
+    }
+
+    UApplicationId* get_application_id()
+    {
+        return this->application_id;
+    }
+
+    UApplicationLifecycleDelegate* get_lifecycle_delegate()
+    {
+        return this->lifecycle_delegate;
+    }
+
+    unsigned int refcount;
+
+private:
+    UApplicationId *application_id;
+    UApplicationLifecycleDelegate *lifecycle_delegate;
+   
+protected:
+    virtual ~Description() {}
+
+    Description(const Description&) = delete;
+    Description& operator=(const Description&) = delete;
+};
+}
+}
+
+#endif /* UBUNTU_APPLICATION_UI_WINDOW_INTERNAL_H_ */

=== added directory 'android/include/private/application/sensors'
=== added file 'android/include/private/application/sensors/sensor.h'
--- android/include/private/application/sensors/sensor.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/sensors/sensor.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,83 @@
+/*
+ * 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_SENSOR_H_
+#define UBUNTU_APPLICATION_SENSORS_SENSOR_H_
+
+#include "private/platform/shared_ptr.h"
+
+#include "private/application/sensors/sensor_listener.h"
+#include "private/application/sensors/sensor_type.h"
+
+#include <cstdint>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace sensors
+{
+/** A data acquisition device that samples a device's environment. */
+class Sensor : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    typedef ubuntu::platform::shared_ptr<Sensor> Ptr;
+
+    /** Accesses the name of the sensor. Returned pointer is owned by the implementation. */
+    virtual const char* name() = 0;
+
+    /** Accesses the vendor of the sensor. Returned pointer is owned by the implementation. */
+    virtual const char* vendor() = 0;
+
+    /** Accesses the numeric id of the sensor. Should be as stable as possible. */
+    virtual int32_t id() = 0;
+
+    /** Registers the provided listener with the sensor and integrates it with the reporting of sensor readings. */
+    virtual void register_listener(const SensorListener::Ptr& listener) = 0;
+
+    /** Enables the sensor and starts the data acquisition. */
+    virtual void enable() = 0;
+    /** Disables the sensor and stops the data acquisition. */
+    virtual void disable() = 0;
+
+    virtual SensorType type() = 0;
+
+    /** Returns the minimum numeric value of a sensor reading. */
+    virtual float min_value() = 0;
+    /** Returns the maximum numeric value of a sensor reading. */
+    virtual float max_value() = 0;
+    /** Returns the numerical resolution of a sensor reading. */
+    virtual float resolution() = 0;
+
+    /** Returns an estimate of the sensor's power consumption, normalized to [0,1]. */
+    virtual float power_consumption() = 0;
+
+    /** Returns the minimum delay between two consecutive sensor readings. */
+    virtual int32_t min_delay() = 0;
+
+protected:
+    Sensor() {}
+    virtual ~Sensor() {}
+
+    Sensor(const Sensor&) = delete;
+    Sensor& operator=(const Sensor&) = delete;
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_SENSORS_SENSOR_H_

=== added file 'android/include/private/application/sensors/sensor_listener.h'
--- android/include/private/application/sensors/sensor_listener.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/sensors/sensor_listener.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,53 @@
+/*
+ * 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_SENSOR_LISTENER_H_
+#define UBUNTU_APPLICATION_SENSORS_SENSOR_LISTENER_H_
+
+#include "private/platform/shared_ptr.h"
+
+#include "private/application/sensors/sensor_reading.h"
+
+namespace ubuntu
+{
+namespace application
+{
+namespace sensors
+{
+/** Extension point to allow for observing a sensor's readings. */
+class SensorListener : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    typedef ubuntu::platform::shared_ptr<SensorListener> Ptr;
+
+    /** Invoked whenever a new reading is available from the sensor.
+     * \param [in] reading The new reading.
+     */
+    virtual void on_new_reading(const SensorReading::Ptr& reading) = 0;
+
+protected:
+    SensorListener() {}
+    virtual ~SensorListener() {}
+
+    SensorListener(const SensorListener&) = delete;
+    SensorListener& operator=(const SensorListener&) = delete;
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_SENSORS_SENSOR_LISTENER_H_

=== added file 'android/include/private/application/sensors/sensor_reading.h'
--- android/include/private/application/sensors/sensor_reading.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/sensors/sensor_reading.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,78 @@
+/*
+ * 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_SENSOR_READING_H_
+#define UBUNTU_APPLICATION_SENSORS_SENSOR_READING_H_
+
+#include "private/platform/shared_ptr.h"
+
+#include <cstddef>
+#include <cstdint>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace sensors
+{
+
+/** A vector of static size. */
+template<size_t size, typename NumericType = float>
+struct Vector
+{
+    NumericType v[size];
+
+    /** Accesses the element at index index. */
+    NumericType& operator[](size_t index)
+    {
+        return v[index];
+    }
+
+    /** Accesses the element at index index. */
+    const NumericType& operator[](size_t index) const
+    {
+        return v[index];
+    }
+};
+
+/** A timestamped reading from a sensor. */
+struct SensorReading : public ubuntu::platform::ReferenceCountedBase
+{
+    typedef ubuntu::platform::shared_ptr<SensorReading> Ptr;
+
+    SensorReading() : timestamp(-1)
+    {
+    }
+
+    int64_t timestamp; ///< The timestamp of the reading in [ns], CLOCK_MONOTONIC.
+    /** A union of different possible sensor readings. */
+    union
+    {
+        Vector<3> vector; ///< Arbitrary vector, orientation and linear acceleration readings are reported here.
+        Vector<3> acceleration; ///< Acceleration vector containing acceleration readings for the three axis.
+        Vector<3> magnetic; ///< Readings from magnetometer, in three dimensions.
+        float temperature; ///< Ambient temperature.
+        float distance; ///< Discrete distance, everything > 5 is considered far, everything < 5 is considered near.
+        float light; ///< Ambient light conditions.
+        float pressure; ///< Ambient pressure.
+    };
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_SENSORS_SENSOR_READING_H_

=== added file 'android/include/private/application/sensors/sensor_service.h'
--- android/include/private/application/sensors/sensor_service.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/sensors/sensor_service.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,48 @@
+/*
+ * 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_SENSOR_SERVICE_H_
+#define UBUNTU_APPLICATION_SENSORS_SENSOR_SERVICE_H_
+
+#include "private/platform/shared_ptr.h"
+
+#include "private/application/sensors/sensor.h"
+
+namespace ubuntu
+{
+namespace application
+{
+namespace sensors
+{
+/** Local stub that allows for instantiating sensor instances given a type. */
+class SensorService : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    /** Returns a sensor instance for the provided type or NULL. */
+    static Sensor::Ptr sensor_for_type(SensorType type);
+protected:
+    SensorService() {}
+    virtual ~SensorService() {}
+
+    SensorService(const SensorService&) = delete;
+    SensorService& operator=(const SensorService&) = delete;
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_SENSORS_SENSOR_SERVICE_H_

=== added file 'android/include/private/application/sensors/sensor_type.h'
--- android/include/private/application/sensors/sensor_type.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/sensors/sensor_type.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,45 @@
+/*
+ * 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_SENSOR_TYPE_H_
+#define UBUNTU_APPLICATION_SENSORS_SENSOR_TYPE_H_
+
+namespace ubuntu
+{
+namespace application
+{
+namespace sensors
+{
+/** Models a special type of a sensor */
+enum SensorType
+{
+    first_defined_sensor_type = 0,
+    sensor_type_accelerometer = first_defined_sensor_type, ///< An accelerometer
+    sensor_type_magnetic_field, ///< A magnetic field sensor, i.e., a compass
+    sensor_type_gyroscope, ///< A gyroscope
+    sensor_type_light, ///< An ambient light sensor
+    sensor_type_proximity, ///< A proximity sensor, used to blank the screen when making a call
+    sensor_type_orientation, ///< Virtual sensor, reports sensor fusion results regarding a device's orientation
+    sensor_type_linear_acceleration, ///< Virtual sensor, reports sensor fusion results regarding a device's linear acceleration
+    sensor_type_rotation_vector, ///< Virtual sensor, reports sensor fusion results regarding a device's rotation vector
+    undefined_sensor_type
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_SENSORS_SENSOR_TYPE_H_

=== added file 'android/include/private/application/session.h'
--- android/include/private/application/session.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/session.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,95 @@
+/*
+ * 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_SESSION_H_
+#define UBUNTU_APPLICATION_SESSION_H_
+
+#include <private/platform/shared_ptr.h>
+
+#include <utils/Log.h>
+
+namespace ubuntu
+{
+namespace application
+{
+/**
+ * Represents a session with the service providers abstracted by Ubuntu platform API.
+ */
+class Session : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    typedef ubuntu::platform::shared_ptr<Session> Ptr;
+
+protected:
+    Session() {}
+    virtual ~Session() {}
+
+    Session(const Session&) = delete;
+    Session& operator=(const Session&) = delete;
+};
+
+/**
+ * Represents a session lifecycle delegate.
+ */
+class LifecycleDelegate : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    typedef ubuntu::platform::shared_ptr<LifecycleDelegate> Ptr;
+
+    virtual void on_application_started() = 0;
+    virtual void on_application_about_to_stop() = 0;
+
+protected:
+    LifecycleDelegate() {}
+
+    virtual ~LifecycleDelegate() {}
+
+    LifecycleDelegate(const LifecycleDelegate&) = delete;
+    LifecycleDelegate& operator=(const LifecycleDelegate&) = delete;
+};
+
+class Id : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    typedef ubuntu::platform::shared_ptr<Id> Ptr;
+    
+    Id(const char *string, size_t size)
+    {
+        this->size = size;
+        this->string = (char*) malloc(sizeof (char) * (size+1));
+        memcpy(this->string, string, (size+1));
+    }
+
+    ~Id()
+    {
+        free(this->string);
+    }
+
+    char *string;
+    size_t size;
+
+protected:
+    Id() {}
+
+    Id(const Id&) = delete;
+    Id& operator=(const Id&) = delete;
+};
+}
+}
+
+#endif // UBUNTU_APPLICATION_SESSION_H_

=== added file 'android/include/private/application/session_delegates.h'
--- android/include/private/application/session_delegates.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/session_delegates.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,48 @@
+/*
+ * 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_UI_SESSION_DELEGATES_H_
+#define UBUNTU_APPLICATION_UI_SESSION_DELEGATES_H_
+
+#include <session/lifecycle_delegate.h>
+
+#include <cstdio>
+
+namespace ubuntu
+{
+namespace application
+{
+class LifecycleDelegate : public platform::ReferenceCountedBase
+{
+public:
+    typedef platform::shared_ptr<LifecycleDelegate> Ptr;
+
+    virtual void on_application_started() = 0;
+    virtual void on_application_about_to_stop() = 0;
+
+protected:
+    LifecycleDelegate() {}
+    virtual ~LifecycleDelegate() {}
+
+    LifecycleDelegate(const LifecycleDelegate&) = delete;
+    LifecycleDelegate& operator=(const LifecycleDelegate&) = delete;
+};
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_SESSION_DELEGATES_H_

=== added directory 'android/include/private/application/ui'
=== added file 'android/include/private/application/ui/clipboard.h'
--- android/include/private/application/ui/clipboard.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/clipboard.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright © 2012 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
+ * 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.
+ *
+ * You should have received a copy of the GNU 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_CLIPBOARD_H_
+#define UBUNTU_APPLICATION_UI_CLIPBOARD_H_
+
+#include "private/platform/shared_ptr.h"
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+/** Models a system-wide clipboard. 
+ * \deprecated This is a temporary solution and is likely to be removed or subject to significant changes in upcoming revisions.
+ */
+class Clipboard : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    typedef ubuntu::platform::shared_ptr<Clipboard> Ptr;
+
+    struct Content
+    {
+        static const int MAX_MIME_TYPE_SIZE=32;
+
+        Content() : data(NULL),
+                    data_size(0)
+        {
+        }
+        
+        Content(const char* mime,
+                void* _data,
+                size_t size) :   data(malloc(size)),
+                                 data_size(size)
+        {
+            memcpy(mime_type, mime, MAX_MIME_TYPE_SIZE);
+            memcpy(data, _data, size);
+        }
+
+        Content(const Content& rhs) : data(malloc(rhs.data_size)),
+                                      data_size(rhs.data_size)
+        {
+            memcpy(mime_type, rhs.mime_type, MAX_MIME_TYPE_SIZE);
+            memcpy(data, rhs.data, data_size);
+        }
+
+        Content& operator=(const Content& rhs)
+        {
+            memcpy(mime_type, rhs.mime_type, MAX_MIME_TYPE_SIZE);
+            data = realloc(data, rhs.data_size);
+            memcpy(data, rhs.data, data_size);
+            data_size = rhs.data_size;
+
+            return *this;
+        }
+
+        char mime_type[MAX_MIME_TYPE_SIZE];
+        void* data;
+        size_t data_size;
+    };
+
+    virtual void set_content(const Content& content) = 0;
+    virtual Content get_content() = 0;
+
+protected:
+    Clipboard() {}
+    virtual ~Clipboard() {}
+
+    Clipboard(const Clipboard&) = delete;
+    Clipboard& operator=(const Clipboard&) = delete;
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_CLIPBOARD_H_

=== added file 'android/include/private/application/ui/form_factor_hint.h'
--- android/include/private/application/ui/form_factor_hint.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/form_factor_hint.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,44 @@
+/*
+ * 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_FORM_FACTOR_HINT_H_
+#define UBUNTU_APPLICATION_UI_FORM_FACTOR_HINT_H_
+
+#include "private/application/ui/ubuntu_application_ui.h"
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+/** Provides applications with a hint about the form factor it is running on. */
+enum FormFactorHint
+{
+    desktop_form_factor = DESKTOP_FORM_FACTOR_HINT, ///< An ordinary desktop or laptop form factor.
+    phone_form_factor = PHONE_FORM_FACTOR_HINT, ///< A phone form factor.
+    tablet_form_factor = TABLET_FORM_FACTOR_HINT ///< A tablet form factor.
+};
+
+/** Bitfield as multiple form factor hints can be applied in a converged scenario. */
+typedef unsigned int FormFactorHintFlags;
+
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_FORM_FACTOR_HINT_H_

=== added file 'android/include/private/application/ui/init.h'
--- android/include/private/application/ui/init.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/init.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,35 @@
+/*
+ * 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_INIT_H_
+#define UBUNTU_APPLICATION_UI_INIT_H_
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+/** Initializes internals with the given command line arguments. 
+ *  \attention Has to be called before any other function is called.
+ */
+void init(int argc, char** argv);
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_INIT_H_

=== added directory 'android/include/private/application/ui/input'
=== added file 'android/include/private/application/ui/input/event.h'
--- android/include/private/application/ui/input/event.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/input/event.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,106 @@
+/*
+ * 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_

=== added file 'android/include/private/application/ui/input/listener.h'
--- android/include/private/application/ui/input/listener.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/input/listener.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,53 @@
+/*
+ * 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_LISTENER_H_
+#define UBUNTU_APPLICATION_UI_INPUT_LISTENER_H_
+
+#include "private/application/ui/input/event.h"
+#include "private/platform/shared_ptr.h"
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+namespace input
+{
+/** Models a listener for classic input event originating from input devices like mice or touchpads. */
+class Listener : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    typedef ubuntu::platform::shared_ptr<Listener> Ptr;
+
+    /** Invoked whenever a new event is available. */
+    virtual void on_new_event(const Event& event) = 0;
+
+protected:
+    Listener() {}
+    virtual ~Listener() {}
+
+    Listener(const Listener&) = delete;
+    Listener& operator=(const Listener&) = delete;
+};
+}
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_INPUT_LISTENER_H_

=== added file 'android/include/private/application/ui/physical_display_info.h'
--- android/include/private/application/ui/physical_display_info.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/physical_display_info.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,77 @@
+/*
+ * 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_PHYSICAL_DISPLAY_INFO_H_
+#define UBUNTU_APPLICATION_UI_PHYSICAL_DISPLAY_INFO_H_
+
+#include "private/platform/shared_ptr.h"
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+
+/**
+ * Marks physical displays connected to the system
+ */
+enum PhysicalDisplayIdentifier
+{
+    first_physical_display = 0,
+    second_physical_display = 1,
+    third_physical_display = 2,
+    fourth_physical_display = 3,
+    fifth_physical_display = 4,
+    sixth_physical_display = 5,
+    seventh_physical_display = 6,
+    eigth_physical_display = 7,
+    ninth_physical_display = 8,
+    tenth_physical_display = 9,
+
+    primary_physical_display = first_physical_display
+};
+
+/**
+ * Models information about a physical display.
+ */
+class PhysicalDisplayInfo : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    typedef ubuntu::platform::shared_ptr<PhysicalDisplayInfo> Ptr;
+
+    /** Access to the horizontal dpi of the physical display. */
+    virtual float horizontal_dpi() = 0;
+    /** Access to the vertical dpi of the physical display. */
+    virtual float vertical_dpi() = 0;
+    /** Access to the horizontal resolution of the physical display. */
+    virtual int horizontal_resolution() = 0;
+    /** Access to the vertical resolution of the physical display. */
+    virtual int vertical_resolution() = 0;
+
+protected:
+    PhysicalDisplayInfo() {}
+    virtual ~PhysicalDisplayInfo() {}
+
+    PhysicalDisplayInfo(const PhysicalDisplayInfo&) = delete;
+    PhysicalDisplayInfo& operator=(const PhysicalDisplayInfo&) = delete;
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_PHYSICAL_DISPLAY_INFO_H_

=== added file 'android/include/private/application/ui/session.h'
--- android/include/private/application/ui/session.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/session.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,88 @@
+/*
+ * 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_SESSION_INTERNAL_H_
+#define UBUNTU_APPLICATION_UI_SESSION_INTERNAL_H_
+
+#include <private/ui/session_enumerator.h>
+#include <private/application/session.h>
+#include <private/application/ui/clipboard.h>
+#include <private/application/ui/physical_display_info.h>
+#include <private/application/ui/surface.h>
+#include <private/application/ui/surface_properties.h>
+#include <private/platform/shared_ptr.h>
+
+#include <EGL/egl.h>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+/**
+ * Represents a session with the service providers abstracted by
+ * Ubuntu platform API and allows for accessing ui-specific
+ * functionality.
+ */
+class Session : public ubuntu::application::Session
+{
+public:
+    typedef ubuntu::platform::shared_ptr<Session> Ptr;
+
+    /** Provides access to the system-wide clipboard. */
+    static Clipboard::Ptr clipboard();
+
+    /** Provides system-wide access to the physical displays known to the system. 
+     *  \sa PhysicalDisplayIdentifier
+     *  \sa PhysicalDisplayInfo
+     */
+    static PhysicalDisplayInfo::Ptr physical_display_info(PhysicalDisplayIdentifier id);
+
+    /** Requests a surface from the system.
+     *  \param [in] props Requested properties for the surface
+     *  \param [in] listener Event receiver for input events
+     *  \return Pointer to the surface instance or NULL.
+     */
+    virtual Surface::Ptr create_surface(
+        const SurfaceProperties& props,
+        const ubuntu::application::ui::input::Listener::Ptr& listener) = 0;
+
+    /** Requests the PID for the running session. */ 
+    virtual int get_session_pid() = 0;
+
+    /** Destroys the surface and renders it unusable. */
+    virtual void destroy_surface(const Surface::Ptr& surface) = 0;
+
+    /** Requests the surface to be shown in fullscreen. 
+     *  \param [in] surface The surface to transition to fullscreen.
+     */
+    virtual void toggle_fullscreen_for_surface(const Surface::Ptr& surface) = 0;
+
+protected:
+    Session() {}
+    virtual ~Session() {}
+
+    Session(const Session&) = delete;
+    Session& operator=(const Session&) = delete;
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_SESSION_INTERNAL_H_

=== added file 'android/include/private/application/ui/session_credentials.h'
--- android/include/private/application/ui/session_credentials.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/session_credentials.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,86 @@
+/*
+ * 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_SESSION_CREDENTIALS_H_
+#define UBUNTU_APPLICATION_UI_SESSION_CREDENTIALS_H_
+
+#include "ubuntu_application_ui.h"
+
+#include <cstdio>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+/**
+ * Specifies the session type.  
+ * \attention System sessions require special privileged to be registered with the service providers.
+ */
+enum SessionType
+{
+    user_session_type = USER_SESSION_TYPE,
+    system_session_type = SYSTEM_SESSION_TYPE
+};
+
+enum RunningState
+{
+    process_stopped = PROCESS_STOPPED,
+    process_running = PROCESS_RUNNING,
+    process_suspended = PROCESS_SUSPENDED,
+    process_destroyed = PROCESS_DESTROYED
+};
+
+/**
+ * Specifies whether the application tolerates a menubar when in fullscreen mode.
+ */
+enum MenuBarSupport
+{
+    application_supports_overlayed_menubar = APPLICATION_SUPPORTS_OVERLAYED_MENUBAR,
+    application_does_not_support_overlayed_menubar = APPLICATION_DOES_NOT_SUPPORT_OVERLAYED_MENUBAR
+};
+
+/**
+ * Bundles information about an application instance.
+ */
+class SessionCredentials
+{
+public:
+    SessionCredentials(::SessionCredentials* parent) : parent(parent)
+    {
+    }
+
+    SessionType session_type() const
+    {
+        return static_cast<SessionType>(parent->session_type);
+    }
+
+    const char* application_name() const
+    {
+        return parent->application_name;
+    }
+
+    
+private:
+    ::SessionCredentials* parent;
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_SESSION_CREDENTIALS_H_

=== added file 'android/include/private/application/ui/session_delegates.h'
--- android/include/private/application/ui/session_delegates.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/session_delegates.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,45 @@
+/*
+ * 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: Ricardo Mendoza <[e-mail]>
+ */
+#ifndef UBUNTU_APPLICATION_UI_SESSION_DELEGATES_H_
+#define UBUNTU_APPLICATION_UI_SESSION_DELEGATES_H_
+
+#include <cstdio>
+
+namespace ubuntu
+{
+namespace application
+{
+class LifecycleDelegate : public platform::ReferenceCountedBase
+{
+public:
+    typedef platform::shared_ptr<LifecycleDelegate> Ptr;
+
+    virtual void on_application_started() = 0;
+    virtual void on_application_about_to_stop() = 0;
+
+protected:
+    LifecycleDelegate() {}
+    virtual ~LifecycleDelegate() {}
+
+    LifecycleDelegate(const LifecycleDelegate&) = delete;
+    LifecycleDelegate& operator=(const LifecycleDelegate&) = delete;
+};
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_SESSION_DELEGATES_H_

=== added file 'android/include/private/application/ui/setup.h'
--- android/include/private/application/ui/setup.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/setup.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,59 @@
+/*
+ * 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_SETUP_H_
+#define UBUNTU_APPLICATION_UI_SETUP_H_
+
+#include "private/application/ui/stage_hint.h"
+#include "private/application/ui/form_factor_hint.h"
+#include "private/platform/shared_ptr.h"
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+/** Provides access to the setup of the application instance as specified by command line/desktop file. */
+class Setup : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    typedef ubuntu::platform::shared_ptr<Setup> Ptr;
+
+    static const Ptr& instance();
+
+    /** Provides access the stage the stage hint that the application should live in. */
+    virtual StageHint stage_hint() = 0;
+
+    /** Provides access to the form factors that the application instance is currently running on. */
+    virtual FormFactorHintFlags form_factor_hint() = 0;
+
+    /** Provides access to the desktop file that describes the current application instance. */
+    virtual const char* desktop_file_hint() = 0;
+
+protected:
+    Setup() {}
+    virtual ~Setup() {}
+
+    Setup(const Setup&) = delete;
+    Setup& operator=(const Setup&) = delete;
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_SETUP_H_

=== added file 'android/include/private/application/ui/stage_hint.h'
--- android/include/private/application/ui/stage_hint.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/stage_hint.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,42 @@
+/*
+ * 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_STAGE_HINT_H_
+#define UBUNTU_APPLICATION_UI_STAGE_HINT_H_
+
+#include "private/application/ui/ubuntu_application_ui.h"
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+enum StageHint
+{
+    main_stage = MAIN_STAGE_HINT,
+    integration_stage = INTEGRATION_STAGE_HINT,
+    share_stage = SHARE_STAGE_HINT,
+    content_picking_stage = CONTENT_PICKING_STAGE_HINT,
+    side_stage = SIDE_STAGE_HINT,
+    configuration_stage = CONFIGURATION_STAGE_HINT
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_STAGE_HINT_H_

=== added file 'android/include/private/application/ui/surface.h'
--- android/include/private/application/ui/surface.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/surface.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,74 @@
+/*
+ * 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_SURFACE_H_
+#define UBUNTU_APPLICATION_UI_SURFACE_H_
+
+#include "private/platform/shared_ptr.h"
+
+#include "private/application/ui/session.h"
+#include "private/application/ui/input/listener.h"
+
+#include <EGL/egl.h>
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+/**
+ * A surface is a rectangular region on screen.
+ */
+class Surface : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    typedef ubuntu::platform::shared_ptr<Surface> Ptr;
+
+    // Default surface API
+    /** Toggles the visibility of the surface. */
+    virtual void set_visible(int id, bool visible) = 0;
+    /** Adjusts the alpha channel of a surface. */
+    virtual void set_alpha(float alpha) = 0;
+    /** Moves the surface to the specified coordinates. */
+    virtual void move_to(int x, int y) = 0;
+    /** Resizes the surface to the specified width and height. */
+    virtual void resize(int w, int h) = 0;
+
+    /** Binds to EGL/GL rendering API. */
+    virtual EGLNativeWindowType to_native_window_type() = 0;
+
+protected:
+    Surface(const input::Listener::Ptr& input_listener) : input_listener(input_listener) {}
+    virtual ~Surface() {}
+
+    Surface(const Surface&) = delete;
+    Surface& operator=(const Surface&) = delete;
+
+    const input::Listener::Ptr& registered_input_listener() const
+    {
+        return input_listener;
+    }
+
+private:
+    input::Listener::Ptr input_listener;
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_SURFACE_H_

=== added file 'android/include/private/application/ui/surface_factory.h'
--- android/include/private/application/ui/surface_factory.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/surface_factory.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,53 @@
+/*
+ * 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_SURFACE_FACTORY_H_
+#define UBUNTU_APPLICATION_UI_SURFACE_FACTORY_H_
+
+#include "private/platform/shared_ptr.h"
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+class SurfaceProperties;
+
+class SurfaceFactory : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    typedef ubuntu::platform::shared_ptr<SurfaceFactory> Ptr;
+
+    static const Ptr& instance();
+
+    virtual Surface::Ptr create_surface(
+        const ubuntu::application::ui::SurfaceProperties& props,
+        const ubuntu::application::ui::input::Listener::Ptr& listener) = 0;
+
+protected:
+    SurfaceFactory() {}
+    virtual ~SurfaceFactory() {}
+
+    SurfaceFactory(const SurfaceFactory&) = delete;
+    SurfaceFactory& operator=(const SurfaceFactory&) = delete;
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_SURFACE_FACTORY_H_

=== added file 'android/include/private/application/ui/surface_properties.h'
--- android/include/private/application/ui/surface_properties.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/surface_properties.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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_SURFACE_PROPERTIES_H_
+#define UBUNTU_APPLICATION_UI_SURFACE_PROPERTIES_H_
+
+#include "private/application/ui/surface_role.h"
+#include "private/application/ui/ubuntu_application_ui.h"
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+
+/**
+ * \enum SurfaceFlags 
+ * Flags that can be specified for a surface 
+ * \attention Requires privileged access to the ui service provider 
+ */
+enum SurfaceFlags
+{
+    is_opaque_flag = IS_OPAQUE_FLAG ///< Specifies that a surface is opaque
+};
+
+/** 
+ * \struct SurfaceProperties surface_properties.h
+ * Bundles the properties for surface creation.
+ */
+struct SurfaceProperties
+{
+    enum
+    {
+        max_surface_title_length = 512 ///< Maximum length of the surface title
+    };
+
+    const char title[max_surface_title_length]; ///< Surface title
+    int width; ///< Requested width
+    int height; ///< Requested height
+    SurfaceRole role; ///< Requested role \sa ubuntu::application::ui::SurfaceRole
+    uint32_t flags; ///< Requested flags \sa ubuntu::application::ui::SurfaceFlags
+    bool is_opaque; ///< Signals that the surface should be opaque
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_SURFACE_PROPERTIES_H_

=== added file 'android/include/private/application/ui/surface_role.h'
--- android/include/private/application/ui/surface_role.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/surface_role.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,49 @@
+/*
+ * 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_SURFACE_ROLE_H_
+#define UBUNTU_APPLICATION_UI_SURFACE_ROLE_H_
+
+#include "private/application/ui/ubuntu_application_ui.h"
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+/**
+ * Describes the role of a surface.
+ * \attention Reserved roles require special privileges.
+ */
+enum SurfaceRole
+{
+    main_actor_role = MAIN_ACTOR_ROLE, ///< An application's main surface
+
+    dash_actor_role = DASH_ACTOR_ROLE, ///< Reserved for the shell's dash
+    indicator_actor_role = INDICATOR_ACTOR_ROLE, ///< Reserved for the shell's indicators
+    notifications_actor_role = NOTIFICATIONS_ACTOR_ROLE, ///< Reserved for the shell's notifications
+    greeter_actor_role = GREETER_ACTOR_ROLE, ///< Reserved for the greeter
+    launcher_actor_role = LAUNCHER_ACTOR_ROLE, ///< Reserved for the launcher
+    on_screen_keyboard_actor_role = ON_SCREEN_KEYBOARD_ACTOR_ROLE, ///< Reserved for the onscreen-keyboard
+    shutdown_dialog_actor_role = SHUTDOWN_DIALOG_ACTOR_ROLE ///< Reserved for the shutdown dialog
+};
+}
+}
+}
+
+#endif // UBUNTU_APPLICATION_UI_SURFACE_ROLE_H_

=== added file 'android/include/private/application/ui/ubuntu_application_ui.h'
--- android/include/private/application/ui/ubuntu_application_ui.h	1970-01-01 00:00:00 +0000
+++ android/include/private/application/ui/ubuntu_application_ui.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,373 @@
+/*
+ * 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_H_
+#define UBUNTU_APPLICATION_UI_H_
+
+#include "ubuntu/application/ui/input/event.h"
+
+#include <EGL/egl.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /** \defgroup require_session_functions Functions that require an active session registered with the application manager/service providers.
+     * \defgroup ui_access Functions that provide access to UI-specific functionality.
+     */
+
+    /**
+     * Specifies the session type.
+     * \ingroup ui_access
+     * \attention System sessions require special privileges to be registered with the service providers.
+     */
+    typedef enum
+    {
+        USER_SESSION_TYPE = 0, /**< An ordinary app. */
+        SYSTEM_SESSION_TYPE = 1 /**< A system session that requires elevated privileges.*/
+    } SessionType;
+
+    /** Models the running state of a process. */
+    typedef enum
+    {
+        PROCESS_STOPPED = 0, /**< Process is Stopped (Not in memory, valid-state stored). */
+        PROCESS_RUNNING = 1, /**< Process is running normally. */
+        PROCESS_SUSPENDED = 2, /**< Process is Suspended (SIGSTOP). */
+        PROCESS_DESTROYED = 3, /**< Process is Destroyed or Stateless (Not in memory, invalid state). */
+    } RunningState;
+
+    /**
+     * Specifies whether the application tolerates a menubar when in fullscreen mode.
+     * \ingroup ui_access
+     */
+    typedef enum
+    {
+        APPLICATION_SUPPORTS_OVERLAYED_MENUBAR = 0, /**< App allows for an overlayed menubar in fullscreen mode. */
+        APPLICATION_DOES_NOT_SUPPORT_OVERLAYED_MENUBAR = 1 /**< App does not allow an overlayer menubar in fullscreen mode, i.e., a user pinning the menubar results in the app being maximized. */
+    } MenuBarSupport;
+
+    /**
+     * Describes the different stages an application can run in.
+     * \ingroup ui_access
+     */
+    typedef enum
+    {
+        MAIN_STAGE_HINT = 0, /**< Default stage, normal operation mode. */
+        INTEGRATION_STAGE_HINT = 1, /**< Integration stage for reusing parts of an app's views. */
+        SHARE_STAGE_HINT = 2, /**< Share stage for sharing data between apps. */
+        CONTENT_PICKING_STAGE_HINT = 3, /**< Placeholder, not used yet. */
+        SIDE_STAGE_HINT = 4, /**< Side stage for displaying apps alongside other apps running in the main stage. */
+        CONFIGURATION_STAGE_HINT = 5 /**< Placeholder, not used yet. */
+    } StageHint;
+
+    /** 
+     * Provides applications with a hint about the form factor it is running on. 
+     * \ingroup ui_access
+     */
+    typedef enum
+    {
+        DESKTOP_FORM_FACTOR_HINT = 0, /**< An ordinary desktop or laptop form factor. */
+        PHONE_FORM_FACTOR_HINT = 1, /**< A phone form factor. */
+        TABLET_FORM_FACTOR_HINT = 2 /**< A tablet form factor. */
+    } FormFactorHint;
+
+    /**
+     * Describes the role of a surface.
+     * \ingroup ui_access
+     * \attention Reserved roles require special privileges.
+     */
+    typedef enum
+    {
+        MAIN_ACTOR_ROLE = 1, /**< An application's main surface */
+        DASH_ACTOR_ROLE = 0, /**< Reserved for the shell's dash */
+        INDICATOR_ACTOR_ROLE = 2, /**< Reserved for the shell's indicators */
+        NOTIFICATIONS_ACTOR_ROLE = 3, /**< Reserved for the shell's notifications */
+        GREETER_ACTOR_ROLE = 4, /**< Reserved for the greeter */
+        LAUNCHER_ACTOR_ROLE = 5, /**< Reserved for the launcher */
+        ON_SCREEN_KEYBOARD_ACTOR_ROLE = 6, /**< Reserved for the onscreen-keyboard */
+        SHUTDOWN_DIALOG_ACTOR_ROLE = 7 /**< Reserved for the shutdown dialog */
+    } SurfaceRole;
+
+    /**
+     * Flags that can be specified for a surface 
+     * \ingroup ui_access
+     * \attention Requires privileged access to the ui service provider 
+     */
+    typedef enum
+    {
+        IS_OPAQUE_FLAG = 1
+    } SurfaceFlags;
+
+    enum
+    {
+        MAX_APPLICATION_NAME_LENGTH = 512
+    };
+
+    typedef void (*on_application_resumed)(void* ctx);
+    typedef void (*on_application_suspended)(void* ctx);
+
+    typedef void (*on_application_focused)(void* ctx);
+    typedef void (*on_application_unfocused)(void* ctx);
+
+    /**
+     * Bundles information about an application instance.
+     * \ingroup ui_access
+     */    
+    typedef struct
+    {
+        /** Specifies the session type */
+        SessionType session_type;
+        /** Per-application instance menu-bar support */
+        MenuBarSupport menu_bar_support;
+        /** The name of the application */
+        char application_name[MAX_APPLICATION_NAME_LENGTH]; 
+
+        void* context; 
+    } SessionCredentials;
+
+    typedef void (*input_event_cb)(void* ctx, const Event* ev);
+
+    typedef void* ubuntu_application_ui_physical_display_info;
+    typedef void* ubuntu_application_ui_session;
+    typedef void* ubuntu_application_ui_surface;
+
+    typedef const void* u_application_archive;
+    typedef const void* u_application_options;
+
+    typedef void (*application_started_cb)(u_application_archive archive, u_application_options options, void* context);
+    typedef void (*application_about_to_stop_cb)(u_application_archive archive, void* context);
+
+    typedef struct
+    {
+        application_started_cb on_application_started;
+        application_about_to_stop_cb on_application_about_to_stop;
+
+        void *context;
+    } ubuntu_application_ui_lifecycle_delegates;
+
+    /** Initializes the Ubuntu Platform API. Has to be called before any other function is called.
+     * \ingroup ui_access
+     * \param argc [in] Argument count.
+     * \param argv [in, out] Array of string arguments.
+     */
+    void
+    ubuntu_application_ui_init(
+        int argc,
+        char**argv);
+
+    /** 
+     * Returns the stage this application instance is running in. 
+     * \ingroup ui_access
+     */
+    StageHint
+    ubuntu_application_ui_setup_get_stage_hint();
+
+    /** 
+     * Returns the form factor this application instance is running on. 
+     * \ingroup ui_access
+     */
+    FormFactorHint
+    ubuntu_application_ui_setup_get_form_factor_hint();
+
+    /** 
+     * Opens up a new session with the service providers.
+     * \ingroup ui_access
+     * \param creds [in] Credentials describing the instance's setup.
+     */
+    void
+    ubuntu_application_ui_start_a_new_session(SessionCredentials* creds);
+
+    /**
+     * Installs the application lifecycle delegates
+     * \ingroup ui_access
+     * \attention Needs an existing session.
+     * \ingroup require_session_functions
+     */
+    void 
+    ubuntu_application_ui_install_lifecycle_delegates(ubuntu_application_ui_lifecycle_delegates* delegates);
+
+    /** 
+     * Sets the clipboard content.
+     * \ingroup ui_access 
+     * \attention Needs an existing session.
+     * \ingroup require_session_functions 
+     */
+    void
+    ubuntu_application_ui_set_clipboard_content(
+        void* data,
+        size_t size); 
+
+    /** 
+     * Reads the clipboard content. 
+     * \ingroup ui_access
+     * \attention Needs an existing session.
+     * \ingroup require_session_functions 
+     */
+    void
+    ubuntu_application_ui_get_clipboard_content(
+        void** data,
+        size_t* size); 
+
+    /** 
+     * Queries information about a physical display with index index.
+     * \ingroup ui_access
+     * \attention Needs an existing session.
+     * \ingroup require_session_functions 
+     */
+    void
+    ubuntu_application_ui_create_display_info(
+        ubuntu_application_ui_physical_display_info* info,
+        size_t index);
+
+    /** 
+     * Destroy information about a physical display. 
+     * \ingroup ui_access
+     */
+    void
+    ubuntu_application_ui_destroy_display_info(
+        ubuntu_application_ui_physical_display_info info);
+
+    /** 
+     * Queries the horizontal resolution in [px] of a physical display. 
+     * \ingroup ui_access
+     */
+    int32_t
+    ubuntu_application_ui_query_horizontal_resolution(
+        ubuntu_application_ui_physical_display_info info);
+
+    /** 
+     * Queries the vertical resolution in [px] of a physical display. 
+     * \ingroup ui_access
+     */
+    int32_t
+    ubuntu_application_ui_query_vertical_resolution(
+        ubuntu_application_ui_physical_display_info info);
+
+    /** 
+     * Queries the horizontal dpi of a physical display.
+     * \ingroup ui_access
+     */
+    float
+    ubuntu_application_ui_query_horizontal_dpi(
+        ubuntu_application_ui_physical_display_info info);
+
+    /** 
+     * Queries the vertical dpi of a physical display.
+     * \ingroup ui_access
+     */
+    float
+    ubuntu_application_ui_query_vertical_dpi(
+        ubuntu_application_ui_physical_display_info info);
+
+    /** 
+     * Creates a new surface and registers it for this application instance.
+     * \attention Needs an existing session.
+     * \ingroup require_session_functions 
+     * \ingroup ui_access
+     * \param out_surface [out] The resulting surface is placed here.
+     * \param title [in] The title of the surface.
+     * \param width [in] Requested width, will be clamped to available geometry.
+     * \param height [in] Requested height, will be clamped to available geometry.
+     * \param role [in] Role of the surface.
+     * \param cb [in] Callback to be invoked for input events.
+     * \param ctx [in] Context for the input event callback.
+     */
+    void
+    ubuntu_application_ui_create_surface(
+        ubuntu_application_ui_surface* out_surface,
+        const char* title,
+        int width,
+        int height,
+        SurfaceRole role,
+        uint32_t flags,
+        input_event_cb cb,
+        void* ctx);
+
+    /** 
+     * Requests to switch to fullscreen for the specified surface. 
+     * \ingroup ui_access
+     */
+    void
+    ubuntu_application_ui_request_fullscreen_for_surface(
+        ubuntu_application_ui_surface surface);
+
+    /** 
+     * Destroys the specified surface.
+     * \ingroup ui_access
+     */
+    void
+    ubuntu_application_ui_destroy_surface(
+        ubuntu_application_ui_surface surface);
+
+    /** 
+     * Translates a surface to an EGLNativeWindowType. 
+     * \ingroup ui_access
+     */
+    EGLNativeWindowType
+    ubuntu_application_ui_surface_to_native_window_type(
+        ubuntu_application_ui_surface surface);
+
+    /** 
+     * Forces the specified surface to be shown on screen. 
+     * \ingroup ui_access
+     */
+    void
+    ubuntu_application_ui_show_surface(
+        ubuntu_application_ui_surface surface);
+
+    /** 
+     * Forces the specified surface to be hidden. 
+     * \ingroup ui_access
+     */
+    void
+    ubuntu_application_ui_hide_surface(
+        ubuntu_application_ui_surface surface);
+
+    /** 
+     * Moves the specified surface.
+     * \ingroup ui_access
+     * \param surface [in] The surface to be moved.
+     * \param x [in] The new x coordinate.
+     * \param y [in] The new y coordinate.
+     */
+    void
+    ubuntu_application_ui_move_surface_to(
+        ubuntu_application_ui_surface surface,
+        int x,
+        int y);
+
+    /** 
+     * Resizes the specified surface.
+     * \ingroup ui_access
+     * \param surface [in] The surface to be moved.
+     * \param w [in] The new width of the surface.
+     * \param h [in] The new height of the surface.
+     */
+    void
+    ubuntu_application_ui_resize_surface_to(
+        ubuntu_application_ui_surface surface,
+        int w,
+        int h);
+
+    /** \example test_c_api.cpp */
+    /** \example test_multiple_surfaces_event_delivery.cpp */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* UBUNTU_APPLICATION_UI_H_ */

=== added directory 'android/include/private/platform'
=== added file 'android/include/private/platform/empty_base.h'
--- android/include/private/platform/empty_base.h	1970-01-01 00:00:00 +0000
+++ android/include/private/platform/empty_base.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,37 @@
+/*
+ * 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_PLATFORM_EMPTY_BASE_H_
+#define UBUNTU_PLATFORM_EMPTY_BASE_H_
+
+namespace ubuntu
+{
+namespace platform
+{
+class EmptyBase
+{
+public:
+    virtual ~EmptyBase() {}
+protected:
+    EmptyBase() {}
+    EmptyBase(const EmptyBase&) = delete;
+    EmptyBase& operator=(const EmptyBase&) = delete;
+};
+}
+}
+
+#endif // UBUNTU_PLATFORM_EMPTY_BASE_H_

=== added file 'android/include/private/platform/shared_ptr.h'
--- android/include/private/platform/shared_ptr.h	1970-01-01 00:00:00 +0000
+++ android/include/private/platform/shared_ptr.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,58 @@
+/*
+ * 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_PLATFORM_SHARED_PTR_H_
+#define UBUNTU_PLATFORM_SHARED_PTR_H_
+
+#ifdef ANDROID
+#include <utils/RefBase.h>
+#include <utils/StrongPointer.h>
+#else
+#include <memory>
+#endif
+
+#include "empty_base.h"
+
+namespace ubuntu
+{
+namespace platform
+{
+
+#ifdef ANDROID
+typedef android::RefBase ReferenceCountedBase;
+
+template<typename T>
+struct shared_ptr : public android::sp<T>
+{
+    shared_ptr() : android::sp<T>()
+    {
+    }
+
+    template<typename Y>
+    shared_ptr(Y* p) : android::sp<T>(p)
+    {
+    }
+};
+#else
+typedef ubuntu::platform::EmptyBase ReferenceCountedBase;
+using std::shared_ptr;
+#endif
+
+}
+}
+
+#endif // UBUNTU_PLATFORM_SHARED_PTR_H_

=== added directory 'android/include/private/ui'
=== added file 'android/include/private/ui/config.h'
--- android/include/private/ui/config.h	1970-01-01 00:00:00 +0000
+++ android/include/private/ui/config.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,24 @@
+/*
+ * 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: Michael Terry <[e-mail]>
+ */
+
+#ifndef UBUNTU_UI_CONFIG_H_
+#define UBUNTU_UI_CONFIG_H_
+
+#define UBUNTU_USE_GLES 1
+
+#endif // UBUNTU_UI_CONFIG_H_

=== added file 'android/include/private/ui/session_enumerator.h'
--- android/include/private/ui/session_enumerator.h	1970-01-01 00:00:00 +0000
+++ android/include/private/ui/session_enumerator.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,117 @@
+/*
+ * 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_UI_SESSION_ENUMERATOR_H_
+#define UBUNTU_UI_SESSION_ENUMERATOR_H_
+
+#include "private/platform/shared_ptr.h"
+#include "private/ui/config.h"
+#include "private/ui/well_known_applications.h"
+
+#if UBUNTU_USE_GLES
+#include <GLES2/gl2.h>
+#else
+#include <GL/gl.h>
+#include <GL/glext.h>
+#endif
+
+namespace ubuntu
+{
+namespace ui
+{
+
+class SessionProperties : public platform::ReferenceCountedBase
+{
+public:
+    static const char* key_application_instance_id();
+    static const char* key_application_stage_hint();
+    static const char* key_application_name();
+    static const char* key_desktop_file_hint();
+
+    typedef platform::shared_ptr<SessionProperties> Ptr;
+
+    virtual const char* value_for_key(const char* key) const = 0;
+
+    virtual int application_stage_hint() const
+    {
+        return atoi(value_for_key(SessionProperties::key_application_stage_hint()));
+    }
+
+    virtual int application_instance_id() const
+    {
+        return atoi(value_for_key(SessionProperties::key_application_instance_id()));
+    }
+
+    const char* application_name() const
+    {
+        return value_for_key(SessionProperties::key_application_name());
+    }
+
+    virtual const char* desktop_file_hint() const
+    {
+        return value_for_key(SessionProperties::key_desktop_file_hint());
+    }
+
+protected:
+    SessionProperties() {}
+    virtual ~SessionProperties() {}
+
+    SessionProperties(const SessionProperties&) = delete;
+    SessionProperties& operator=(const SessionProperties&) = delete;
+};
+
+class SessionLifeCycleObserver : public platform::ReferenceCountedBase
+{
+public:
+    typedef platform::shared_ptr<SessionLifeCycleObserver> Ptr;
+    
+    virtual void on_session_requested(WellKnownApplication app) = 0;
+    virtual void on_session_born(const SessionProperties::Ptr& props) = 0;
+    virtual void on_session_unfocused(const SessionProperties::Ptr& props) = 0;
+    virtual void on_session_focused(const SessionProperties::Ptr& props) = 0;
+    virtual void on_keyboard_geometry_changed(int x, int y, int width, int height) = 0;
+    virtual void on_session_requested_fullscreen(const SessionProperties::Ptr& props) = 0;
+    virtual void on_session_died(const SessionProperties::Ptr& props) = 0;
+
+protected:
+    SessionLifeCycleObserver() {}
+    virtual ~SessionLifeCycleObserver() {}
+
+    SessionLifeCycleObserver(const SessionLifeCycleObserver&) = delete;
+    SessionLifeCycleObserver& operator=(const SessionLifeCycleObserver&) = delete;
+};
+
+class SessionPreviewProvider : public platform::ReferenceCountedBase
+{
+public:
+    typedef platform::shared_ptr<SessionPreviewProvider> Ptr;
+
+    virtual bool get_or_update_session_preview(GLuint texture, unsigned int& width, unsigned int& height) = 0;
+
+protected:
+    SessionPreviewProvider() {}
+    virtual ~SessionPreviewProvider() {}
+
+    SessionPreviewProvider(const SessionPreviewProvider&) = delete;
+    SessionPreviewProvider& operator=(const SessionPreviewProvider&) = delete;
+};
+
+}
+}
+
+#endif // UBUNTU_UI_SESSION_ENUMERATOR_H_

=== added file 'android/include/private/ui/session_service.h'
--- android/include/private/ui/session_service.h	1970-01-01 00:00:00 +0000
+++ android/include/private/ui/session_service.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,80 @@
+/*
+ * 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_UI_SESSION_SERVICE_H_
+#define UBUNTU_UI_SESSION_SERVICE_H_
+
+#include "private/application/ui/session.h"
+#include "private/platform/shared_ptr.h"
+#include "private/ui/session_enumerator.h"
+#include "private/ui/session_snapshot.h"
+#include "private/ui/well_known_applications.h"
+
+namespace ubuntu
+{
+namespace application
+{
+namespace ui
+{
+class Session;
+class SessionCredentials;
+}
+}
+namespace ui
+{
+class SessionService : public platform::ReferenceCountedBase
+{
+public:
+    typedef platform::shared_ptr<SessionService> Ptr;
+
+    static const Ptr& instance();
+
+    virtual ~SessionService() {}
+
+    virtual const ubuntu::application::ui::Session::Ptr& start_a_new_session(const ubuntu::application::ui::SessionCredentials& cred) = 0;
+
+    virtual void trigger_switch_to_well_known_application(WellKnownApplication app) = 0;
+
+    virtual void install_session_lifecycle_observer(const SessionLifeCycleObserver::Ptr& observer) = 0;
+
+    virtual void unfocus_running_sessions() = 0;
+
+    virtual void focus_running_session_with_id(int id) = 0;
+
+    virtual ubuntu::ui::SessionSnapshot::Ptr snapshot_running_session_with_id(int id) = 0;
+
+    virtual int32_t set_surface_trap(int32_t x, int32_t y, int32_t width, int32_t height) = 0;
+
+    virtual void unset_surface_trap(int32_t handle) = 0;
+
+    virtual void report_osk_visible(int x, int y, int width, int height) = 0;
+    
+    virtual void report_osk_invisible() = 0;
+
+    virtual void report_notification_visible() = 0;
+    
+    virtual void report_notification_invisible() = 0;
+    
+protected:
+    SessionService() {}
+    SessionService(const SessionService&) = delete;
+    SessionService& operator=(const SessionService&) = delete;
+};
+}
+}
+
+#endif // UBUNTU_UI_SESSION_SERVICE_H_

=== added file 'android/include/private/ui/session_snapshot.h'
--- android/include/private/ui/session_snapshot.h	1970-01-01 00:00:00 +0000
+++ android/include/private/ui/session_snapshot.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,50 @@
+/*
+ * 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_UI_SESSION_SNAPSHOT_H_
+#define UBUNTU_UI_SESSION_SNAPSHOT_H_
+
+namespace ubuntu
+{
+namespace ui
+{
+class SessionSnapshot : public ubuntu::platform::ReferenceCountedBase
+{
+public:
+    typedef ubuntu::platform::shared_ptr<SessionSnapshot> Ptr;
+
+    virtual const void * pixel_data() = 0;
+
+    virtual unsigned int x() = 0;
+    virtual unsigned int y() = 0;
+    virtual unsigned int source_width() = 0;
+    virtual unsigned int source_height() = 0;
+    virtual unsigned int width() = 0;
+    virtual unsigned int height() = 0;
+    virtual unsigned int stride() = 0;
+
+protected:
+    SessionSnapshot() {}
+    virtual ~SessionSnapshot() {}
+
+    SessionSnapshot(const SessionSnapshot&) = delete;
+    SessionSnapshot& operator=(const SessionSnapshot&) = delete;
+};
+}
+}
+
+#endif // UBUNTU_UI_SESSION_SNAPSHOT_H_

=== added file 'android/include/private/ui/well_known_applications.h'
--- android/include/private/ui/well_known_applications.h	1970-01-01 00:00:00 +0000
+++ android/include/private/ui/well_known_applications.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,41 @@
+/*
+ * 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_UI_WELL_KNOWN_APPLICATIONS_H_
+#define UBUNTU_UI_WELL_KNOWN_APPLICATIONS_H_
+
+#include <ubuntu/ui/ubuntu_ui_session_service.h>
+
+namespace ubuntu
+{
+namespace ui
+{
+enum WellKnownApplication
+{
+    unknown_app = UNKNOWN_APP,
+    gallery_app = CAMERA_APP,
+    camera_app = GALLERY_APP,
+    browser_app = BROWSER_APP,
+    share_app = SHARE_APP,
+    phone_app = PHONE_APP,
+    messages_app = MESSAGES_APP,
+    contacts_app = CONTACTS_APP
+};
+}
+}
+
+#endif // UBUNTU_UI_WELL_KNOWN_APPLICATIONS_H_

=== modified file 'android/mock/mock.cpp'
--- android/mock/mock.cpp	2013-02-05 07:46:29 +0000
+++ android/mock/mock.cpp	2013-05-28 11:49:27 +0000
@@ -15,18 +15,18 @@
  *
  * Authored by: Thomas Voß <[e-mail]>
  */
-#include <ubuntu/application/ui/init.h>
-#include <ubuntu/application/ui/session.h>
-#include <ubuntu/application/ui/session_credentials.h>
-#include <ubuntu/application/ui/setup.h>
-#include <ubuntu/application/ui/surface.h>
-#include <ubuntu/application/ui/surface_factory.h>
-#include <ubuntu/application/ui/surface_properties.h>
+#include <private/application/ui/init.h>
+#include <private/application/ui/session.h>
+#include <private/application/ui/session_credentials.h>
+#include <private/application/ui/setup.h>
+#include <private/application/ui/surface.h>
+#include <private/application/ui/surface_factory.h>
+#include <private/application/ui/surface_properties.h>
 
-#include <ubuntu/ui/session_service.h>
+#include <private/ui/session_service.h>
 
 // C apis
-#include <ubuntu/application/ui/ubuntu_application_ui.h>
+#include <private/application/ui/ubuntu_application_ui.h>
 
 #include <set>
 

=== added directory 'include/ubuntu'
=== removed directory 'include/ubuntu'
=== added directory 'include/ubuntu/application'
=== removed directory 'include/ubuntu/application'
=== added directory 'include/ubuntu/application/sensors'
=== removed directory 'include/ubuntu/application/sensors'
=== removed file 'include/ubuntu/application/sensors/sensor.h'
--- include/ubuntu/application/sensors/sensor.h	2013-02-13 12:04:07 +0000
+++ include/ubuntu/application/sensors/sensor.h	1970-01-01 00:00:00 +0000
@@ -1,83 +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_SENSOR_H_
-#define UBUNTU_APPLICATION_SENSORS_SENSOR_H_
-
-#include "ubuntu/platform/shared_ptr.h"
-
-#include "ubuntu/application/sensors/sensor_listener.h"
-#include "ubuntu/application/sensors/sensor_type.h"
-
-#include <cstdint>
-
-namespace ubuntu
-{
-namespace application
-{
-namespace sensors
-{
-/** A data acquisition device that samples a device's environment. */
-class Sensor : public ubuntu::platform::ReferenceCountedBase
-{
-public:
-    typedef ubuntu::platform::shared_ptr<Sensor> Ptr;
-
-    /** Accesses the name of the sensor. Returned pointer is owned by the implementation. */
-    virtual const char* name() = 0;
-
-    /** Accesses the vendor of the sensor. Returned pointer is owned by the implementation. */
-    virtual const char* vendor() = 0;
-
-    /** Accesses the numeric id of the sensor. Should be as stable as possible. */
-    virtual int32_t id() = 0;
-
-    /** Registers the provided listener with the sensor and integrates it with the reporting of sensor readings. */
-    virtual void register_listener(const SensorListener::Ptr& listener) = 0;
-
-    /** Enables the sensor and starts the data acquisition. */
-    virtual void enable() = 0;
-    /** Disables the sensor and stops the data acquisition. */
-    virtual void disable() = 0;
-
-    virtual SensorType type() = 0;
-
-    /** Returns the minimum numeric value of a sensor reading. */
-    virtual float min_value() = 0;
-    /** Returns the maximum numeric value of a sensor reading. */
-    virtual float max_value() = 0;
-    /** Returns the numerical resolution of a sensor reading. */
-    virtual float resolution() = 0;
-
-    /** Returns an estimate of the sensor's power consumption, normalized to [0,1]. */
-    virtual float power_consumption() = 0;
-
-    /** Returns the minimum delay between two consecutive sensor readings. */
-    virtual int32_t min_delay() = 0;
-
-protected:
-    Sensor() {}
-    virtual ~Sensor() {}
-
-    Sensor(const Sensor&) = delete;
-    Sensor& operator=(const Sensor&) = delete;
-};
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_SENSORS_SENSOR_H_

=== removed file 'include/ubuntu/application/sensors/sensor_listener.h'
--- include/ubuntu/application/sensors/sensor_listener.h	2013-02-13 12:04:07 +0000
+++ include/ubuntu/application/sensors/sensor_listener.h	1970-01-01 00:00:00 +0000
@@ -1,53 +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_SENSOR_LISTENER_H_
-#define UBUNTU_APPLICATION_SENSORS_SENSOR_LISTENER_H_
-
-#include "ubuntu/platform/shared_ptr.h"
-
-#include "ubuntu/application/sensors/sensor_reading.h"
-
-namespace ubuntu
-{
-namespace application
-{
-namespace sensors
-{
-/** Extension point to allow for observing a sensor's readings. */
-class SensorListener : public ubuntu::platform::ReferenceCountedBase
-{
-public:
-    typedef ubuntu::platform::shared_ptr<SensorListener> Ptr;
-
-    /** Invoked whenever a new reading is available from the sensor.
-     * \param [in] reading The new reading.
-     */
-    virtual void on_new_reading(const SensorReading::Ptr& reading) = 0;
-
-protected:
-    SensorListener() {}
-    virtual ~SensorListener() {}
-
-    SensorListener(const SensorListener&) = delete;
-    SensorListener& operator=(const SensorListener&) = delete;
-};
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_SENSORS_SENSOR_LISTENER_H_

=== removed file 'include/ubuntu/application/sensors/sensor_reading.h'
--- include/ubuntu/application/sensors/sensor_reading.h	2013-02-13 12:04:07 +0000
+++ include/ubuntu/application/sensors/sensor_reading.h	1970-01-01 00:00:00 +0000
@@ -1,78 +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_SENSOR_READING_H_
-#define UBUNTU_APPLICATION_SENSORS_SENSOR_READING_H_
-
-#include "ubuntu/platform/shared_ptr.h"
-
-#include <cstddef>
-#include <cstdint>
-
-namespace ubuntu
-{
-namespace application
-{
-namespace sensors
-{
-
-/** A vector of static size. */
-template<size_t size, typename NumericType = float>
-struct Vector
-{
-    NumericType v[size];
-
-    /** Accesses the element at index index. */
-    NumericType& operator[](size_t index)
-    {
-        return v[index];
-    }
-
-    /** Accesses the element at index index. */
-    const NumericType& operator[](size_t index) const
-    {
-        return v[index];
-    }
-};
-
-/** A timestamped reading from a sensor. */
-struct SensorReading : public ubuntu::platform::ReferenceCountedBase
-{
-    typedef ubuntu::platform::shared_ptr<SensorReading> Ptr;
-
-    SensorReading() : timestamp(-1)
-    {
-    }
-
-    int64_t timestamp; ///< The timestamp of the reading in [ns], CLOCK_MONOTONIC.
-    /** A union of different possible sensor readings. */
-    union
-    {
-        Vector<3> vector; ///< Arbitrary vector, orientation and linear acceleration readings are reported here.
-        Vector<3> acceleration; ///< Acceleration vector containing acceleration readings for the three axis.
-        Vector<3> magnetic; ///< Readings from magnetometer, in three dimensions.
-        float temperature; ///< Ambient temperature.
-        float distance; ///< Discrete distance, everything > 5 is considered far, everything < 5 is considered near.
-        float light; ///< Ambient light conditions.
-        float pressure; ///< Ambient pressure.
-    };
-};
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_SENSORS_SENSOR_READING_H_

=== removed file 'include/ubuntu/application/sensors/sensor_service.h'
--- include/ubuntu/application/sensors/sensor_service.h	2013-02-13 12:04:07 +0000
+++ include/ubuntu/application/sensors/sensor_service.h	1970-01-01 00:00:00 +0000
@@ -1,48 +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_SENSOR_SERVICE_H_
-#define UBUNTU_APPLICATION_SENSORS_SENSOR_SERVICE_H_
-
-#include "ubuntu/platform/shared_ptr.h"
-
-#include "ubuntu/application/sensors/sensor.h"
-
-namespace ubuntu
-{
-namespace application
-{
-namespace sensors
-{
-/** Local stub that allows for instantiating sensor instances given a type. */
-class SensorService : public ubuntu::platform::ReferenceCountedBase
-{
-public:
-    /** Returns a sensor instance for the provided type or NULL. */
-    static Sensor::Ptr sensor_for_type(SensorType type);
-protected:
-    SensorService() {}
-    virtual ~SensorService() {}
-
-    SensorService(const SensorService&) = delete;
-    SensorService& operator=(const SensorService&) = delete;
-};
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_SENSORS_SENSOR_SERVICE_H_

=== removed file 'include/ubuntu/application/sensors/sensor_type.h'
--- include/ubuntu/application/sensors/sensor_type.h	2013-02-13 12:04:07 +0000
+++ include/ubuntu/application/sensors/sensor_type.h	1970-01-01 00:00:00 +0000
@@ -1,45 +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_SENSOR_TYPE_H_
-#define UBUNTU_APPLICATION_SENSORS_SENSOR_TYPE_H_
-
-namespace ubuntu
-{
-namespace application
-{
-namespace sensors
-{
-/** Models a special type of a sensor */
-enum SensorType
-{
-    first_defined_sensor_type = 0,
-    sensor_type_accelerometer = first_defined_sensor_type, ///< An accelerometer
-    sensor_type_magnetic_field, ///< A magnetic field sensor, i.e., a compass
-    sensor_type_gyroscope, ///< A gyroscope
-    sensor_type_light, ///< An ambient light sensor
-    sensor_type_proximity, ///< A proximity sensor, used to blank the screen when making a call
-    sensor_type_orientation, ///< Virtual sensor, reports sensor fusion results regarding a device's orientation
-    sensor_type_linear_acceleration, ///< Virtual sensor, reports sensor fusion results regarding a device's linear acceleration
-    sensor_type_rotation_vector, ///< Virtual sensor, reports sensor fusion results regarding a device's rotation vector
-    undefined_sensor_type
-};
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_SENSORS_SENSOR_TYPE_H_

=== added file 'include/ubuntu/application/sensors/ubuntu_application_sensors.h'
--- include/ubuntu/application/sensors/ubuntu_application_sensors.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/sensors/ubuntu_application_sensors.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,155 @@
+/*
+ * 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 <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;
+
+    void ubuntu_sensor_initialize_observer(ubuntu_sensor_observer* observer);
+    /** Installs the supplied observer. 
+     * \ingroup sensor_access
+     */
+    void ubuntu_sensor_install_observer(ubuntu_sensor_observer* observer);
+    /** Uninstalls the supplied observer. 
+     * \ingroup sensor_access
+     */
+    void ubuntu_sensor_uninstall_observer(ubuntu_sensor_observer* observer);
+
+    /** Enables the specified sensor type and starts data acquisition. 
+     * \ingroup sensor_access
+     */
+    void ubuntu_sensor_enable_sensor(ubuntu_sensor_type sensor_type);
+    /** Disables the specified sensor type and starts data acquisition. 
+     * \ingroup sensor_access
+     */
+    void ubuntu_sensor_disable_sensor(ubuntu_sensor_type sensor_type);
+    /** Returns the minimum sensor sampling delay in Hz.
+     * \ingroup sensor_access
+     */
+    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
+     */
+    float ubuntu_sensor_get_sensor_min_value(ubuntu_sensor_type sensor_type);
+    /** Returns the maximum valid value for the sensor_type.
+     * \ingroup sensor_access
+     */
+    float ubuntu_sensor_get_sensor_max_value(ubuntu_sensor_type sensor_type);
+    /** Returns the resolution of valid values for the sensor_type.
+     * \ingroup sensor_access
+     */
+    float ubuntu_sensor_get_sensor_resolution(ubuntu_sensor_type sensor_type);
+
+    /** \example test_sensors_api.cpp */
+#ifdef __cplusplus
+}
+#endif
+
+#endif // UBUNTU_APPLICATION_SENSORS_C_API_H_

=== removed file 'include/ubuntu/application/sensors/ubuntu_application_sensors.h'
--- include/ubuntu/application/sensors/ubuntu_application_sensors.h	2013-02-28 14:29:36 +0000
+++ include/ubuntu/application/sensors/ubuntu_application_sensors.h	1970-01-01 00:00:00 +0000
@@ -1,155 +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 <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;
-
-    void ubuntu_sensor_initialize_observer(ubuntu_sensor_observer* observer);
-    /** Installs the supplied observer. 
-     * \ingroup sensor_access
-     */
-    void ubuntu_sensor_install_observer(ubuntu_sensor_observer* observer);
-    /** Uninstalls the supplied observer. 
-     * \ingroup sensor_access
-     */
-    void ubuntu_sensor_uninstall_observer(ubuntu_sensor_observer* observer);
-
-    /** Enables the specified sensor type and starts data acquisition. 
-     * \ingroup sensor_access
-     */
-    void ubuntu_sensor_enable_sensor(ubuntu_sensor_type sensor_type);
-    /** Disables the specified sensor type and starts data acquisition. 
-     * \ingroup sensor_access
-     */
-    void ubuntu_sensor_disable_sensor(ubuntu_sensor_type sensor_type);
-    /** Returns the minimum sensor sampling delay in Hz.
-     * \ingroup sensor_access
-     */
-    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
-     */
-    float ubuntu_sensor_get_sensor_min_value(ubuntu_sensor_type sensor_type);
-    /** Returns the maximum valid value for the sensor_type.
-     * \ingroup sensor_access
-     */
-    float ubuntu_sensor_get_sensor_max_value(ubuntu_sensor_type sensor_type);
-    /** Returns the resolution of valid values for the sensor_type.
-     * \ingroup sensor_access
-     */
-    float ubuntu_sensor_get_sensor_resolution(ubuntu_sensor_type sensor_type);
-
-    /** \example test_sensors_api.cpp */
-#ifdef __cplusplus
-}
-#endif
-
-#endif // UBUNTU_APPLICATION_SENSORS_C_API_H_

=== removed file 'include/ubuntu/application/session.h'
--- include/ubuntu/application/session.h	2013-02-13 12:04:07 +0000
+++ include/ubuntu/application/session.h	1970-01-01 00:00:00 +0000
@@ -1,45 +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_SESSION_H_
-#define UBUNTU_APPLICATION_SESSION_H_
-
-#include "ubuntu/platform/shared_ptr.h"
-
-namespace ubuntu
-{
-namespace application
-{
-/**
- * Represents a session with the service providers abstracted by Ubuntu platform API.
- */
-class Session : public ubuntu::platform::ReferenceCountedBase
-{
-public:
-    typedef ubuntu::platform::shared_ptr<Session> Ptr;
-
-protected:
-    Session() {}
-    virtual ~Session() {}
-
-    Session(const Session&) = delete;
-    Session& operator=(const Session&) = delete;
-};
-}
-}
-
-#endif // UBUNTU_APPLICATION_SESSION_H_

=== added file 'include/ubuntu/application/ubuntu_application_gps.h'
--- include/ubuntu/application/ubuntu_application_gps.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/ubuntu_application_gps.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,408 @@
+/*
+ * 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: Daniel d'Andrada <[e-mail]>
+ */
+#ifndef UBUNTU_APPLICATION_GPS_H_
+#define UBUNTU_APPLICATION_GPS_H_
+
+#include <stdint.h>
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \defgroup gps_access Functions and types for accessing location services. */
+
+/** 
+ * Maximum number of SVs for gps_sv_status_callback(). 
+ * \ingroup gps_access
+ */
+#define UBUNTU_GPS_MAX_SVS 32
+
+enum
+{
+    /** GPS status unknown. */
+    UBUNTU_GPS_STATUS_NONE = 0,
+    /** GPS has begun navigating. */
+    UBUNTU_GPS_STATUS_SESSION_BEGIN = 1,
+    /** GPS has stopped navigating. */
+    UBUNTU_GPS_STATUS_SESSION_END = 2,
+    /** GPS has powered on but is not navigating. */
+    UBUNTU_GPS_STATUS_ENGINE_ON = 3,
+    /** GPS is powered off. */
+    UBUNTU_GPS_STATUS_ENGINE_OFF = 4
+};
+
+/** 
+ * Flags for the gps_set_capabilities callback.
+ * \ingroup gps_access
+ * GPS HAL schedules fixes for UBUNTU_GPS_POSITION_RECURRENCE_PERIODIC mode.
+ * If this is not set, then the framework will use 1000ms for min_interval
+ * and will start and call start() and stop() to schedule the GPS.
+ */
+#define UBUNTU_GPS_CAPABILITY_SCHEDULING       0x0000001
+/** GPS supports MS-Based AGPS mode */
+#define UBUNTU_GPS_CAPABILITY_MSB              0x0000002
+/** GPS supports MS-Assisted AGPS mode */
+#define UBUNTU_GPS_CAPABILITY_MSA              0x0000004
+/** GPS supports single-shot fixes */
+#define UBUNTU_GPS_CAPABILITY_SINGLE_SHOT      0x0000008
+/** GPS supports on demand time injection */
+#define UBUNTU_GPS_CAPABILITY_ON_DEMAND_TIME   0x0000010
+
+/**
+ * UbuntuGpsNiNotifyFlags constants
+ * \ingroup gps_access
+ */
+typedef uint32_t UbuntuGpsNiNotifyFlags;
+/** NI requires notification */
+#define UBUNTU_GPS_NI_NEED_NOTIFY          0x0001
+/** NI requires verification */
+#define UBUNTU_GPS_NI_NEED_VERIFY          0x0002
+/** NI requires privacy override, no notification/minimal trace */
+#define UBUNTU_GPS_NI_PRIVACY_OVERRIDE     0x0004
+
+/**
+ * GPS NI responses, used to define the response in
+ * NI structures
+ * \ingroup gps_access
+ */
+typedef int UbuntuGpsUserResponseType;
+enum
+{
+    UBUNTU_UBUNTU_GPS_NI_RESPONSE_ACCEPT = 1,
+    UBUNTU_UBUNTU_GPS_NI_RESPONSE_DENY = 2,
+    UBUNTU_UBUNTU_GPS_NI_RESPONSE_NORESP = 3
+};
+
+enum
+{
+    UBUNTU_GPS_NI_TYPE_VOICE = 1,
+    UBUNTU_GPS_NI_TYPE_UMTS_SUPL = 2,
+    UBUNTU_GPS_NI_TYPE_UMTS_CTRL_PLANE = 3
+};
+
+/**
+ * String length constants
+ * \ingroup gps_access
+ */
+#define UBUNTU_GPS_NI_SHORT_STRING_MAXLEN      256
+#define UBUNTU_GPS_NI_LONG_STRING_MAXLEN       2048
+
+/**
+ * NI data encoding scheme
+ * \ingroup gps_access
+ */
+typedef int UbuntuGpsNiEncodingType;
+enum
+{
+    UBUNTU_GPS_ENC_NONE = 0,
+    UBUNTU_GPS_ENC_SUPL_GSM_DEFAULT = 1,
+    UBUNTU_GPS_ENC_SUPL_UTF8 = 2,
+    UBUNTU_GPS_ENC_SUPL_UCS2 = 3,
+    UBUNTU_GPS_ENC_UNKNOWN   = -1
+};
+
+enum
+{
+    UBUNTU_AGPS_TYPE_SUPL = 1,
+    UBUNTU_AGPS_TYPE_C2K = 2
+};
+
+
+enum
+{
+    /** Mode for running GPS standalone (no assistance). */
+    UBUNTU_GPS_POSITION_MODE_STANDALONE = 0,
+    /** AGPS MS-Based mode. */
+    UBUNTU_GPS_POSITION_MODE_MS_BASED = 1,
+    /** AGPS MS-Assisted mode. */
+    UBUNTU_GPS_POSITION_MODE_MS_ASSISTED = 2
+};
+
+enum
+{
+    /** Receive GPS fixes on a recurring basis at a specified period. */
+    UBUNTU_GPS_POSITION_RECURRENCE_PERIODIC = 0,
+    /** Request a single shot GPS fix. */
+    UBUNTU_GPS_POSITION_RECURRENCE_SINGLE = 1
+};
+
+enum
+{
+    /** GPS requests data connection for AGPS. */
+    UBUNTU_GPS_REQUEST_AGPS_DATA_CONN = 1,
+    /** GPS releases the AGPS data connection. */
+    UBUNTU_GPS_RELEASE_AGPS_DATA_CONN = 2,
+    /** AGPS data connection initiated */
+    UBUNTU_GPS_AGPS_DATA_CONNECTED = 3,
+    /** AGPS data connection completed */
+    UBUNTU_GPS_AGPS_DATA_CONN_DONE = 4,
+    /** AGPS data connection failed */
+    UBUNTU_GPS_AGPS_DATA_CONN_FAILED = 5
+};
+
+/** UbuntuGpsLocation has valid latitude and longitude. */
+#define UBUNTU_GPS_LOCATION_HAS_LAT_LONG   0x0001
+/** UbuntuGpsLocation has valid altitude. */
+#define UBUNTU_GPS_LOCATION_HAS_ALTITUDE   0x0002
+/** UbuntuGpsLocation has valid speed. */
+#define UBUNTU_GPS_LOCATION_HAS_SPEED      0x0004
+/** UbuntuGpsLocation has valid bearing. */
+#define UBUNTU_GPS_LOCATION_HAS_BEARING    0x0008
+/** UbuntuGpsLocation has valid accuracy. */
+#define UBUNTU_GPS_LOCATION_HAS_ACCURACY   0x0010
+
+typedef struct UbuntuGps_* UbuntuGps;
+
+/**
+ * Models a location as reported by the GPS HAL.
+ * \ingroup gps_access
+ */
+typedef struct
+{
+    /** set to sizeof(UbuntuGpsLocation) */
+    size_t          size;
+    /** Contains UBUNTU_GPS_LOCATION_* flags bits. */
+    uint16_t        flags;
+    /** Represents latitude in degrees. */
+    double          latitude;
+    /** Represents longitude in degrees. */
+    double          longitude;
+    /** Represents altitude in meters above the WGS 84 reference
+     * ellipsoid. */
+    double          altitude;
+    /** Represents speed in meters per second. */
+    float           speed;
+    /** Represents heading in degrees. */
+    float           bearing;
+    /** Represents expected accuracy in meters. */
+    float           accuracy;
+    /** Timestamp for the location fix, in milliseconds since January 1, 1970 */
+    int64_t        timestamp;
+} UbuntuGpsLocation;
+
+/** 
+ * Represents space vehicle (satellite) information. 
+ * \ingroup gps_access
+ */
+typedef struct {
+    /** set to sizeof(UbuntuGpsSvInfo) */
+    size_t          size;
+    /** Pseudo-random number for the SV. */
+    int     prn;
+    /** Signal to noise ratio. */
+    float   snr;
+    /** Elevation of SV in degrees. */
+    float   elevation;
+    /** Azimuth of SV in degrees. */
+    float   azimuth;
+} UbuntuGpsSvInfo;
+
+/** 
+ * Represents SV (Space Vehicle) status. 
+ * \ingroup gps_access
+ */
+typedef struct {
+    /** set to sizeof(GpsSvStatus) */
+    size_t          size;
+
+    /** Number of SVs currently visible. */
+    int         num_svs;
+
+    /** Contains an array of SV information. */
+    UbuntuGpsSvInfo   sv_list[UBUNTU_GPS_MAX_SVS];
+
+    /** Represents a bit mask indicating which SVs
+     * have ephemeris data.
+     */
+    uint32_t    ephemeris_mask;
+
+    /** Represents a bit mask indicating which SVs
+     * have almanac data.
+     */
+    uint32_t    almanac_mask;
+
+    /**
+     * Represents a bit mask indicating which SVs
+     * were used for computing the most recent position fix.
+     */
+    uint32_t    used_in_fix_mask;
+} UbuntuGpsSvStatus;
+
+/** 
+ * Represents the status of AGPS. 
+ * \ingroup gps_access
+ */
+typedef struct {
+    /** set to sizeof(UbuntuAgpsStatus) */
+    size_t size;
+
+    uint16_t type;
+    uint16_t status;
+    uint32_t ipaddr;
+} UbuntuAgpsStatus;
+
+/** 
+ * Represents an NI request 
+ * \ingroup gps_access
+ */
+typedef struct {
+    /** set to sizeof(UbuntuGpsNiNotification) */
+    size_t          size;
+
+    /**
+     * An ID generated by HAL to associate NI notifications and UI
+     * responses
+     */
+    int             notification_id;
+
+    /**
+     * An NI type used to distinguish different categories of NI
+     * events, such as UBUNTU_GPS_NI_TYPE_VOICE, UBUNTU_GPS_NI_TYPE_UMTS_SUPL, ...
+     */
+    uint32_t       ni_type;
+
+    /**
+     * Notification/verification options, combinations of UbuntuGpsNiNotifyFlags constants
+     */
+    UbuntuGpsNiNotifyFlags notify_flags;
+
+    /**
+     * Timeout period to wait for user response.
+     * Set to 0 for no time out limit.
+     */
+    int             timeout;
+
+    /**
+     * Default response when time out.
+     */
+    UbuntuGpsUserResponseType default_response;
+
+    /**
+     * Requestor ID
+     */
+    char            requestor_id[UBUNTU_GPS_NI_SHORT_STRING_MAXLEN];
+
+    /**
+     * Notification message. It can also be used to store client_id in some cases
+     */
+    char            text[UBUNTU_GPS_NI_LONG_STRING_MAXLEN];
+
+    /**
+     * Client name decoding scheme
+     */
+    UbuntuGpsNiEncodingType requestor_id_encoding;
+
+    /**
+     * Client name decoding scheme
+     */
+    UbuntuGpsNiEncodingType text_encoding;
+
+    /**
+     * A pointer to extra data. Format:
+     * key_1 = value_1
+     * key_2 = value_2
+     */
+    char           extras[UBUNTU_GPS_NI_LONG_STRING_MAXLEN];
+
+} UbuntuGpsNiNotification;
+
+typedef void (* UbuntuGpsLocationCallback)(UbuntuGpsLocation* location, void* context);
+typedef void (* UbuntuGpsStatusCallback)(uint16_t status, void* context);
+typedef void (* UbuntuGpsSvStatusCallback)(UbuntuGpsSvStatus* sv_info, void* context);
+typedef void (* UbuntuGpsNmeaCallback)(int64_t timestamp, const char* nmea, int length, void* context);
+typedef void (* UbuntuGpsSetCapabilities)(uint32_t capabilities, void* context);
+typedef void (* UbuntuGpsRequestUtcTime)(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().
+ */
+typedef void (* UbuntuGpsXtraDownloadRequest)(void* context);
+
+/** Callback with AGPS status information.
+ */
+typedef void (* UbuntuAgpsStatusCallback)(UbuntuAgpsStatus* status, void* context);
+
+/** Callback with NI notification.
+ */
+typedef void (*UbuntuGpsNiNotifyCallback)(UbuntuGpsNiNotification *notification, void* context);
+
+/*
+ Callback for AGPS RIL (Radio Interface Library) set id
+*/
+typedef void (*UbuntuAgpsRilRequestSetId)(uint32_t flags, void* context);
+typedef void (*UbuntuAgpsRilRequestRefLoc)(uint32_t flags, void* context);
+
+typedef struct
+{
+
+    UbuntuGpsLocationCallback location_cb;
+    UbuntuGpsStatusCallback status_cb;
+    UbuntuGpsSvStatusCallback sv_status_cb;
+    UbuntuGpsNmeaCallback nmea_cb;
+    UbuntuGpsSetCapabilities set_capabilities_cb;
+    UbuntuGpsRequestUtcTime request_utc_time_cb;
+
+    UbuntuGpsXtraDownloadRequest xtra_download_request_cb;
+
+    UbuntuAgpsStatusCallback agps_status_cb;
+
+    UbuntuGpsNiNotifyCallback gps_ni_notify_cb;
+
+    UbuntuAgpsRilRequestSetId request_setid_cb;
+    UbuntuAgpsRilRequestRefLoc request_refloc_cb;
+
+    void* context;
+} UbuntuGpsParams;
+
+/*
+ You must create only one instance per process/application.
+*/
+UbuntuGps ubuntu_gps_new(UbuntuGpsParams* params);
+void ubuntu_gps_delete(UbuntuGps handle);
+
+bool ubuntu_gps_start(UbuntuGps self);
+bool ubuntu_gps_stop(UbuntuGps 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.
+ */
+void ubuntu_gps_inject_time(UbuntuGps self, int64_t time, int64_t time_reference, int uncertainty);
+
+void ubuntu_gps_inject_location(UbuntuGps self, double latitude, double longitude, float accuracy);
+void ubuntu_gps_delete_aiding_data(UbuntuGps self, uint16_t flags);
+
+/*
+    \param mode One of the UBUNTU_GPS_POSITION_MODE_* values
+    \param recurrence One of the UBUNTU_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.
+ */
+bool ubuntu_gps_set_position_mode(UbuntuGps self, uint32_t mode, uint32_t recurrence,
+                                  uint32_t min_interval, uint32_t preferred_accuracy,
+                                  uint32_t preferred_time);
+void ubuntu_gps_inject_xtra_data(UbuntuGps self, char* data, int length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // UBUNTU_APPLICATION_GPS_H_

=== removed file 'include/ubuntu/application/ubuntu_application_gps.h'
--- include/ubuntu/application/ubuntu_application_gps.h	2013-02-13 12:04:07 +0000
+++ include/ubuntu/application/ubuntu_application_gps.h	1970-01-01 00:00:00 +0000
@@ -1,408 +0,0 @@
-/*
- * 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: Daniel d'Andrada <[e-mail]>
- */
-#ifndef UBUNTU_APPLICATION_GPS_H_
-#define UBUNTU_APPLICATION_GPS_H_
-
-#include <stdint.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** \defgroup gps_access Functions and types for accessing location services. */
-
-/** 
- * Maximum number of SVs for gps_sv_status_callback(). 
- * \ingroup gps_access
- */
-#define UBUNTU_GPS_MAX_SVS 32
-
-enum
-{
-    /** GPS status unknown. */
-    UBUNTU_GPS_STATUS_NONE = 0,
-    /** GPS has begun navigating. */
-    UBUNTU_GPS_STATUS_SESSION_BEGIN = 1,
-    /** GPS has stopped navigating. */
-    UBUNTU_GPS_STATUS_SESSION_END = 2,
-    /** GPS has powered on but is not navigating. */
-    UBUNTU_GPS_STATUS_ENGINE_ON = 3,
-    /** GPS is powered off. */
-    UBUNTU_GPS_STATUS_ENGINE_OFF = 4
-};
-
-/** 
- * Flags for the gps_set_capabilities callback.
- * \ingroup gps_access
- * GPS HAL schedules fixes for UBUNTU_GPS_POSITION_RECURRENCE_PERIODIC mode.
- * If this is not set, then the framework will use 1000ms for min_interval
- * and will start and call start() and stop() to schedule the GPS.
- */
-#define UBUNTU_GPS_CAPABILITY_SCHEDULING       0x0000001
-/** GPS supports MS-Based AGPS mode */
-#define UBUNTU_GPS_CAPABILITY_MSB              0x0000002
-/** GPS supports MS-Assisted AGPS mode */
-#define UBUNTU_GPS_CAPABILITY_MSA              0x0000004
-/** GPS supports single-shot fixes */
-#define UBUNTU_GPS_CAPABILITY_SINGLE_SHOT      0x0000008
-/** GPS supports on demand time injection */
-#define UBUNTU_GPS_CAPABILITY_ON_DEMAND_TIME   0x0000010
-
-/**
- * UbuntuGpsNiNotifyFlags constants
- * \ingroup gps_access
- */
-typedef uint32_t UbuntuGpsNiNotifyFlags;
-/** NI requires notification */
-#define UBUNTU_GPS_NI_NEED_NOTIFY          0x0001
-/** NI requires verification */
-#define UBUNTU_GPS_NI_NEED_VERIFY          0x0002
-/** NI requires privacy override, no notification/minimal trace */
-#define UBUNTU_GPS_NI_PRIVACY_OVERRIDE     0x0004
-
-/**
- * GPS NI responses, used to define the response in
- * NI structures
- * \ingroup gps_access
- */
-typedef int UbuntuGpsUserResponseType;
-enum
-{
-    UBUNTU_UBUNTU_GPS_NI_RESPONSE_ACCEPT = 1,
-    UBUNTU_UBUNTU_GPS_NI_RESPONSE_DENY = 2,
-    UBUNTU_UBUNTU_GPS_NI_RESPONSE_NORESP = 3
-};
-
-enum
-{
-    UBUNTU_GPS_NI_TYPE_VOICE = 1,
-    UBUNTU_GPS_NI_TYPE_UMTS_SUPL = 2,
-    UBUNTU_GPS_NI_TYPE_UMTS_CTRL_PLANE = 3
-};
-
-/**
- * String length constants
- * \ingroup gps_access
- */
-#define UBUNTU_GPS_NI_SHORT_STRING_MAXLEN      256
-#define UBUNTU_GPS_NI_LONG_STRING_MAXLEN       2048
-
-/**
- * NI data encoding scheme
- * \ingroup gps_access
- */
-typedef int UbuntuGpsNiEncodingType;
-enum
-{
-    UBUNTU_GPS_ENC_NONE = 0,
-    UBUNTU_GPS_ENC_SUPL_GSM_DEFAULT = 1,
-    UBUNTU_GPS_ENC_SUPL_UTF8 = 2,
-    UBUNTU_GPS_ENC_SUPL_UCS2 = 3,
-    UBUNTU_GPS_ENC_UNKNOWN   = -1
-};
-
-enum
-{
-    UBUNTU_AGPS_TYPE_SUPL = 1,
-    UBUNTU_AGPS_TYPE_C2K = 2
-};
-
-
-enum
-{
-    /** Mode for running GPS standalone (no assistance). */
-    UBUNTU_GPS_POSITION_MODE_STANDALONE = 0,
-    /** AGPS MS-Based mode. */
-    UBUNTU_GPS_POSITION_MODE_MS_BASED = 1,
-    /** AGPS MS-Assisted mode. */
-    UBUNTU_GPS_POSITION_MODE_MS_ASSISTED = 2
-};
-
-enum
-{
-    /** Receive GPS fixes on a recurring basis at a specified period. */
-    UBUNTU_GPS_POSITION_RECURRENCE_PERIODIC = 0,
-    /** Request a single shot GPS fix. */
-    UBUNTU_GPS_POSITION_RECURRENCE_SINGLE = 1
-};
-
-enum
-{
-    /** GPS requests data connection for AGPS. */
-    UBUNTU_GPS_REQUEST_AGPS_DATA_CONN = 1,
-    /** GPS releases the AGPS data connection. */
-    UBUNTU_GPS_RELEASE_AGPS_DATA_CONN = 2,
-    /** AGPS data connection initiated */
-    UBUNTU_GPS_AGPS_DATA_CONNECTED = 3,
-    /** AGPS data connection completed */
-    UBUNTU_GPS_AGPS_DATA_CONN_DONE = 4,
-    /** AGPS data connection failed */
-    UBUNTU_GPS_AGPS_DATA_CONN_FAILED = 5
-};
-
-/** UbuntuGpsLocation has valid latitude and longitude. */
-#define UBUNTU_GPS_LOCATION_HAS_LAT_LONG   0x0001
-/** UbuntuGpsLocation has valid altitude. */
-#define UBUNTU_GPS_LOCATION_HAS_ALTITUDE   0x0002
-/** UbuntuGpsLocation has valid speed. */
-#define UBUNTU_GPS_LOCATION_HAS_SPEED      0x0004
-/** UbuntuGpsLocation has valid bearing. */
-#define UBUNTU_GPS_LOCATION_HAS_BEARING    0x0008
-/** UbuntuGpsLocation has valid accuracy. */
-#define UBUNTU_GPS_LOCATION_HAS_ACCURACY   0x0010
-
-typedef struct UbuntuGps_* UbuntuGps;
-
-/**
- * Models a location as reported by the GPS HAL.
- * \ingroup gps_access
- */
-typedef struct
-{
-    /** set to sizeof(UbuntuGpsLocation) */
-    size_t          size;
-    /** Contains UBUNTU_GPS_LOCATION_* flags bits. */
-    uint16_t        flags;
-    /** Represents latitude in degrees. */
-    double          latitude;
-    /** Represents longitude in degrees. */
-    double          longitude;
-    /** Represents altitude in meters above the WGS 84 reference
-     * ellipsoid. */
-    double          altitude;
-    /** Represents speed in meters per second. */
-    float           speed;
-    /** Represents heading in degrees. */
-    float           bearing;
-    /** Represents expected accuracy in meters. */
-    float           accuracy;
-    /** Timestamp for the location fix, in milliseconds since January 1, 1970 */
-    int64_t        timestamp;
-} UbuntuGpsLocation;
-
-/** 
- * Represents space vehicle (satellite) information. 
- * \ingroup gps_access
- */
-typedef struct {
-    /** set to sizeof(UbuntuGpsSvInfo) */
-    size_t          size;
-    /** Pseudo-random number for the SV. */
-    int     prn;
-    /** Signal to noise ratio. */
-    float   snr;
-    /** Elevation of SV in degrees. */
-    float   elevation;
-    /** Azimuth of SV in degrees. */
-    float   azimuth;
-} UbuntuGpsSvInfo;
-
-/** 
- * Represents SV (Space Vehicle) status. 
- * \ingroup gps_access
- */
-typedef struct {
-    /** set to sizeof(GpsSvStatus) */
-    size_t          size;
-
-    /** Number of SVs currently visible. */
-    int         num_svs;
-
-    /** Contains an array of SV information. */
-    UbuntuGpsSvInfo   sv_list[UBUNTU_GPS_MAX_SVS];
-
-    /** Represents a bit mask indicating which SVs
-     * have ephemeris data.
-     */
-    uint32_t    ephemeris_mask;
-
-    /** Represents a bit mask indicating which SVs
-     * have almanac data.
-     */
-    uint32_t    almanac_mask;
-
-    /**
-     * Represents a bit mask indicating which SVs
-     * were used for computing the most recent position fix.
-     */
-    uint32_t    used_in_fix_mask;
-} UbuntuGpsSvStatus;
-
-/** 
- * Represents the status of AGPS. 
- * \ingroup gps_access
- */
-typedef struct {
-    /** set to sizeof(UbuntuAgpsStatus) */
-    size_t size;
-
-    uint16_t type;
-    uint16_t status;
-    uint32_t ipaddr;
-} UbuntuAgpsStatus;
-
-/** 
- * Represents an NI request 
- * \ingroup gps_access
- */
-typedef struct {
-    /** set to sizeof(UbuntuGpsNiNotification) */
-    size_t          size;
-
-    /**
-     * An ID generated by HAL to associate NI notifications and UI
-     * responses
-     */
-    int             notification_id;
-
-    /**
-     * An NI type used to distinguish different categories of NI
-     * events, such as UBUNTU_GPS_NI_TYPE_VOICE, UBUNTU_GPS_NI_TYPE_UMTS_SUPL, ...
-     */
-    uint32_t       ni_type;
-
-    /**
-     * Notification/verification options, combinations of UbuntuGpsNiNotifyFlags constants
-     */
-    UbuntuGpsNiNotifyFlags notify_flags;
-
-    /**
-     * Timeout period to wait for user response.
-     * Set to 0 for no time out limit.
-     */
-    int             timeout;
-
-    /**
-     * Default response when time out.
-     */
-    UbuntuGpsUserResponseType default_response;
-
-    /**
-     * Requestor ID
-     */
-    char            requestor_id[UBUNTU_GPS_NI_SHORT_STRING_MAXLEN];
-
-    /**
-     * Notification message. It can also be used to store client_id in some cases
-     */
-    char            text[UBUNTU_GPS_NI_LONG_STRING_MAXLEN];
-
-    /**
-     * Client name decoding scheme
-     */
-    UbuntuGpsNiEncodingType requestor_id_encoding;
-
-    /**
-     * Client name decoding scheme
-     */
-    UbuntuGpsNiEncodingType text_encoding;
-
-    /**
-     * A pointer to extra data. Format:
-     * key_1 = value_1
-     * key_2 = value_2
-     */
-    char           extras[UBUNTU_GPS_NI_LONG_STRING_MAXLEN];
-
-} UbuntuGpsNiNotification;
-
-typedef void (* UbuntuGpsLocationCallback)(UbuntuGpsLocation* location, void* context);
-typedef void (* UbuntuGpsStatusCallback)(uint16_t status, void* context);
-typedef void (* UbuntuGpsSvStatusCallback)(UbuntuGpsSvStatus* sv_info, void* context);
-typedef void (* UbuntuGpsNmeaCallback)(int64_t timestamp, const char* nmea, int length, void* context);
-typedef void (* UbuntuGpsSetCapabilities)(uint32_t capabilities, void* context);
-typedef void (* UbuntuGpsRequestUtcTime)(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().
- */
-typedef void (* UbuntuGpsXtraDownloadRequest)(void* context);
-
-/** Callback with AGPS status information.
- */
-typedef void (* UbuntuAgpsStatusCallback)(UbuntuAgpsStatus* status, void* context);
-
-/** Callback with NI notification.
- */
-typedef void (*UbuntuGpsNiNotifyCallback)(UbuntuGpsNiNotification *notification, void* context);
-
-/*
- Callback for AGPS RIL (Radio Interface Library) set id
-*/
-typedef void (*UbuntuAgpsRilRequestSetId)(uint32_t flags, void* context);
-typedef void (*UbuntuAgpsRilRequestRefLoc)(uint32_t flags, void* context);
-
-typedef struct
-{
-
-    UbuntuGpsLocationCallback location_cb;
-    UbuntuGpsStatusCallback status_cb;
-    UbuntuGpsSvStatusCallback sv_status_cb;
-    UbuntuGpsNmeaCallback nmea_cb;
-    UbuntuGpsSetCapabilities set_capabilities_cb;
-    UbuntuGpsRequestUtcTime request_utc_time_cb;
-
-    UbuntuGpsXtraDownloadRequest xtra_download_request_cb;
-
-    UbuntuAgpsStatusCallback agps_status_cb;
-
-    UbuntuGpsNiNotifyCallback gps_ni_notify_cb;
-
-    UbuntuAgpsRilRequestSetId request_setid_cb;
-    UbuntuAgpsRilRequestRefLoc request_refloc_cb;
-
-    void* context;
-} UbuntuGpsParams;
-
-/*
- You must create only one instance per process/application.
-*/
-UbuntuGps ubuntu_gps_new(UbuntuGpsParams* params);
-void ubuntu_gps_delete(UbuntuGps handle);
-
-bool ubuntu_gps_start(UbuntuGps self);
-bool ubuntu_gps_stop(UbuntuGps 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.
- */
-void ubuntu_gps_inject_time(UbuntuGps self, int64_t time, int64_t time_reference, int uncertainty);
-
-void ubuntu_gps_inject_location(UbuntuGps self, double latitude, double longitude, float accuracy);
-void ubuntu_gps_delete_aiding_data(UbuntuGps self, uint16_t flags);
-
-/*
-    \param mode One of the UBUNTU_GPS_POSITION_MODE_* values
-    \param recurrence One of the UBUNTU_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.
- */
-bool ubuntu_gps_set_position_mode(UbuntuGps self, uint32_t mode, uint32_t recurrence,
-                                  uint32_t min_interval, uint32_t preferred_accuracy,
-                                  uint32_t preferred_time);
-void ubuntu_gps_inject_xtra_data(UbuntuGps self, char* data, int length);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // UBUNTU_APPLICATION_GPS_H_

=== added directory 'include/ubuntu/application/ui'
=== removed directory 'include/ubuntu/application/ui'
=== removed file 'include/ubuntu/application/ui/clipboard.h'
--- include/ubuntu/application/ui/clipboard.h	2013-02-13 12:04:07 +0000
+++ include/ubuntu/application/ui/clipboard.h	1970-01-01 00:00:00 +0000
@@ -1,91 +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 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.
- *
- * You should have received a copy of the GNU 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_CLIPBOARD_H_
-#define UBUNTU_APPLICATION_UI_CLIPBOARD_H_
-
-#include "ubuntu/platform/shared_ptr.h"
-
-namespace ubuntu
-{
-namespace application
-{
-namespace ui
-{
-/** Models a system-wide clipboard. 
- * \deprecated This is a temporary solution and is likely to be removed or subject to significant changes in upcoming revisions.
- */
-class Clipboard : public ubuntu::platform::ReferenceCountedBase
-{
-public:
-    typedef ubuntu::platform::shared_ptr<Clipboard> Ptr;
-
-    struct Content
-    {
-        static const int MAX_MIME_TYPE_SIZE=32;
-
-        Content() : data(NULL),
-                    data_size(0)
-        {
-        }
-        
-        Content(const char* mime,
-                void* _data,
-                size_t size) :   data(malloc(size)),
-                                 data_size(size)
-        {
-            memcpy(mime_type, mime, MAX_MIME_TYPE_SIZE);
-            memcpy(data, _data, size);
-        }
-
-        Content(const Content& rhs) : data(malloc(rhs.data_size)),
-                                      data_size(rhs.data_size)
-        {
-            memcpy(mime_type, rhs.mime_type, MAX_MIME_TYPE_SIZE);
-            memcpy(data, rhs.data, data_size);
-        }
-
-        Content& operator=(const Content& rhs)
-        {
-            memcpy(mime_type, rhs.mime_type, MAX_MIME_TYPE_SIZE);
-            data = realloc(data, rhs.data_size);
-            memcpy(data, rhs.data, data_size);
-            data_size = rhs.data_size;
-
-            return *this;
-        }
-
-        char mime_type[MAX_MIME_TYPE_SIZE];
-        void* data;
-        size_t data_size;
-    };
-
-    virtual void set_content(const Content& content) = 0;
-    virtual Content get_content() = 0;
-
-protected:
-    Clipboard() {}
-    virtual ~Clipboard() {}
-
-    Clipboard(const Clipboard&) = delete;
-    Clipboard& operator=(const Clipboard&) = delete;
-};
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_UI_CLIPBOARD_H_

=== removed file 'include/ubuntu/application/ui/form_factor_hint.h'
--- include/ubuntu/application/ui/form_factor_hint.h	2013-02-13 12:04:07 +0000
+++ include/ubuntu/application/ui/form_factor_hint.h	1970-01-01 00:00:00 +0000
@@ -1,44 +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_FORM_FACTOR_HINT_H_
-#define UBUNTU_APPLICATION_UI_FORM_FACTOR_HINT_H_
-
-#include "ubuntu/application/ui/ubuntu_application_ui.h"
-
-namespace ubuntu
-{
-namespace application
-{
-namespace ui
-{
-/** Provides applications with a hint about the form factor it is running on. */
-enum FormFactorHint
-{
-    desktop_form_factor = DESKTOP_FORM_FACTOR_HINT, ///< An ordinary desktop or laptop form factor.
-    phone_form_factor = PHONE_FORM_FACTOR_HINT, ///< A phone form factor.
-    tablet_form_factor = TABLET_FORM_FACTOR_HINT ///< A tablet form factor.
-};
-
-/** Bitfield as multiple form factor hints can be applied in a converged scenario. */
-typedef unsigned int FormFactorHintFlags;
-
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_UI_FORM_FACTOR_HINT_H_

=== removed file 'include/ubuntu/application/ui/init.h'
--- include/ubuntu/application/ui/init.h	2013-02-13 12:04:07 +0000
+++ include/ubuntu/application/ui/init.h	1970-01-01 00:00:00 +0000
@@ -1,35 +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_INIT_H_
-#define UBUNTU_APPLICATION_UI_INIT_H_
-
-namespace ubuntu
-{
-namespace application
-{
-namespace ui
-{
-/** Initializes internals with the given command line arguments. 
- *  \attention Has to be called before any other function is called.
- */
-void init(int argc, char** argv);
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_UI_INIT_H_

=== added directory 'include/ubuntu/application/ui/input'
=== removed directory 'include/ubuntu/application/ui/input'
=== added file 'include/ubuntu/application/ui/input/event.h'
--- include/ubuntu/application/ui/input/event.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/ui/input/event.h	2013-05-28 11:49:27 +0000
@@ -0,0 +1,106 @@
+/*
+ * 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_

=== removed file 'include/ubuntu/application/ui/input/event.h'
--- include/ubuntu/application/ui/input/event.h	2013-02-18 13:16:26 +0000
+++ include/ubuntu/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_

=== removed file 'include/ubuntu/application/ui/input/listener.h'
--- include/ubuntu/application/ui/input/listener.h	2013-02-18 12:37:16 +0000
+++ include/ubuntu/application/ui/input/listener.h	1970-01-01 00:00:00 +0000
@@ -1,53 +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_LISTENER_H_
-#define UBUNTU_APPLICATION_UI_INPUT_LISTENER_H_
-
-#include "ubuntu/application/ui/input/event.h"
-#include "ubuntu/platform/shared_ptr.h"
-
-namespace ubuntu
-{
-namespace application
-{
-namespace ui
-{
-namespace input
-{
-/** Models a listener for classic input event originating from input devices like mice or touchpads. */
-class Listener : public ubuntu::platform::ReferenceCountedBase
-{
-public:
-    typedef ubuntu::platform::shared_ptr<Listener> Ptr;
-
-    /** Invoked whenever a new event is available. */
-    virtual void on_new_event(const Event& event) = 0;
-
-protected:
-    Listener() {}
-    virtual ~Listener() {}
-
-    Listener(const Listener&) = delete;
-    Listener& operator=(const Listener&) = delete;
-};
-}
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_UI_INPUT_LISTENER_H_

=== removed file 'include/ubuntu/application/ui/physical_display_info.h'
--- include/ubuntu/application/ui/physical_display_info.h	2013-02-13 12:04:07 +0000
+++ include/ubuntu/application/ui/physical_display_info.h	1970-01-01 00:00:00 +0000
@@ -1,77 +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_PHYSICAL_DISPLAY_INFO_H_
-#define UBUNTU_APPLICATION_UI_PHYSICAL_DISPLAY_INFO_H_
-
-#include "ubuntu/platform/shared_ptr.h"
-
-namespace ubuntu
-{
-namespace application
-{
-namespace ui
-{
-
-/**
- * Marks physical displays connected to the system
- */
-enum PhysicalDisplayIdentifier
-{
-    first_physical_display = 0,
-    second_physical_display = 1,
-    third_physical_display = 2,
-    fourth_physical_display = 3,
-    fifth_physical_display = 4,
-    sixth_physical_display = 5,
-    seventh_physical_display = 6,
-    eigth_physical_display = 7,
-    ninth_physical_display = 8,
-    tenth_physical_display = 9,
-
-    primary_physical_display = first_physical_display
-};
-
-/**
- * Models information about a physical display.
- */
-class PhysicalDisplayInfo : public ubuntu::platform::ReferenceCountedBase
-{
-public:
-    typedef ubuntu::platform::shared_ptr<PhysicalDisplayInfo> Ptr;
-
-    /** Access to the horizontal dpi of the physical display. */
-    virtual float horizontal_dpi() = 0;
-    /** Access to the vertical dpi of the physical display. */
-    virtual float vertical_dpi() = 0;
-    /** Access to the horizontal resolution of the physical display. */
-    virtual int horizontal_resolution() = 0;
-    /** Access to the vertical resolution of the physical display. */
-    virtual int vertical_resolution() = 0;
-
-protected:
-    PhysicalDisplayInfo() {}
-    virtual ~PhysicalDisplayInfo() {}
-
-    PhysicalDisplayInfo(const PhysicalDisplayInfo&) = delete;
-    PhysicalDisplayInfo& operator=(const PhysicalDisplayInfo&) = delete;
-};
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_UI_PHYSICAL_DISPLAY_INFO_H_

=== removed file 'include/ubuntu/application/ui/session.h'
--- include/ubuntu/application/ui/session.h	2013-02-19 12:36:06 +0000
+++ include/ubuntu/application/ui/session.h	1970-01-01 00:00:00 +0000
@@ -1,86 +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_SESSION_H_
-#define UBUNTU_APPLICATION_UI_SESSION_H_
-
-#include "ubuntu/application/session.h"
-#include "ubuntu/application/ui/clipboard.h"
-#include "ubuntu/application/ui/physical_display_info.h"
-#include "ubuntu/application/ui/surface.h"
-#include "ubuntu/application/ui/surface_properties.h"
-#include "ubuntu/platform/shared_ptr.h"
-
-#include <EGL/egl.h>
-
-namespace ubuntu
-{
-namespace application
-{
-namespace ui
-{
-/**
- * Represents a session with the service providers abstracted by
- * Ubuntu platform API and allows for accessing ui-specific
- * functionality.
- */
-class Session : public ubuntu::application::Session
-{
-public:
-    typedef ubuntu::platform::shared_ptr<Session> Ptr;
-
-    /** Provides access to the system-wide clipboard. */
-    static Clipboard::Ptr clipboard();
-
-    /** Provides system-wide access to the physical displays known to the system. 
-     *  \sa PhysicalDisplayIdentifier
-     *  \sa PhysicalDisplayInfo
-     */
-    static PhysicalDisplayInfo::Ptr physical_display_info(PhysicalDisplayIdentifier id);
-
-    /** Requests a surface from the system.
-     *  \param [in] props Requested properties for the surface
-     *  \param [in] listener Event receiver for input events
-     *  \return Pointer to the surface instance or NULL.
-     */
-    virtual Surface::Ptr create_surface(
-        const SurfaceProperties& props,
-        const ubuntu::application::ui::input::Listener::Ptr& listener) = 0;
-
-    /** Requests the PID for the running session. */ 
-    virtual int get_session_pid() = 0;
-
-    /** Destroys the surface and renders it unusable. */
-    virtual void destroy_surface(const Surface::Ptr& surface) = 0;
-
-    /** Requests the surface to be shown in fullscreen. 
-     *  \param [in] surface The surface to transition to fullscreen.
-     */
-    virtual void toggle_fullscreen_for_surface(const Surface::Ptr& surface) = 0;
-
-protected:
-    Session() {}
-    virtual ~Session() {}
-
-    Session(const Session&) = delete;
-    Session& operator=(const Session&) = delete;
-};
-}
-}