Merge lp:~gerboland/platform-api/exposeOrientation into lp:platform-api
- exposeOrientation
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Daniel d'Andrada | ||||
Approved revision: | 262 | ||||
Merged at revision: | 266 | ||||
Proposed branch: | lp:~gerboland/platform-api/exposeOrientation | ||||
Merge into: | lp:platform-api | ||||
Diff against target: |
305 lines (+118/-1) 14 files modified
android/default/default_ubuntu_application_ui.cpp (+11/-0) debian/changelog (+6/-0) debian/libubuntu-application-api2.symbols (+3/-0) include/ubuntu/application/ui/CMakeLists.txt (+1/-0) include/ubuntu/application/ui/input/event.h (+12/-1) include/ubuntu/application/ui/window.h (+5/-0) include/ubuntu/application/ui/window_orientation.h (+27/-0) src/ubuntu/application/common/mirclient/window_mirclient.cpp (+13/-0) src/ubuntu/application/common/mirclient/window_mirclient_priv.h (+1/-0) src/ubuntu/application/common/mircommon/event_helpers_mir.cpp (+28/-0) src/ubuntu/application/common/mircommon/event_helpers_mir.h (+4/-0) src/ubuntu/application/testbackend/test_stubs.cpp (+5/-0) src/ubuntu/application/touch/hybris/ubuntu_application_api_hybris.cpp (+1/-0) src/ubuntu/application/ubuntu_application_api.cpp (+1/-0) |
||||
To merge this branch: | bzr merge lp:~gerboland/platform-api/exposeOrientation | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel d'Andrada (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Gerry Boland | Pending | ||
Review via email: mp+232250@code.launchpad.net |
Commit message
Add readonly notifyable property "orientation" to Window
Description of the change
Add window orientation property
PS Jenkins bot (ps-jenkins) wrote : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:260
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:260
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:260
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Daniel d'Andrada (dandrader) wrote : | # |
"""
ua_ui_
"""
Instead of specifying a version (which is wrong anyway as the date part certainly will change), let the magic release scripts do the trick:
ua_ui_
Gerry Boland (gerboland) wrote : | # |
> """
> ua_ui_window_
> """
>
> Instead of specifying a version (which is wrong anyway as the date part
> certainly will change), let the magic release scripts do the trick:
>
> ua_ui_window_
Ah that's cool, I didn't know that
- 261. By Gerry Boland
-
Add newline to warning message
- 262. By Gerry Boland
-
[debian] symbols file - let magic release scripts figure out new symbol version
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:262
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Daniel d'Andrada (dandrader) : | # |
- 263. By Gerry Boland
-
Merge trunk. Bump to version 2.4.0
Preview Diff
1 | === modified file 'android/default/default_ubuntu_application_ui.cpp' | |||
2 | --- android/default/default_ubuntu_application_ui.cpp 2014-07-15 12:41:35 +0000 | |||
3 | +++ android/default/default_ubuntu_application_ui.cpp 2014-09-19 12:17:12 +0000 | |||
4 | @@ -443,3 +443,14 @@ | |||
5 | 443 | auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window); | 443 | auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window); |
6 | 444 | return p->value->to_native_window_type(); | 444 | return p->value->to_native_window_type(); |
7 | 445 | } | 445 | } |
8 | 446 | |||
9 | 447 | UApplicationUiWindowOrientation | ||
10 | 448 | ua_ui_window_get_orientation( | ||
11 | 449 | UAUiWindow *window) | ||
12 | 450 | { | ||
13 | 451 | ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__); | ||
14 | 452 | |||
15 | 453 | auto p = static_cast<Holder<ubuntu::application::ui::Surface::Ptr>*>(window); | ||
16 | 454 | return p->value->get_orientation(); | ||
17 | 455 | } | ||
18 | 456 | |||
19 | 446 | 457 | ||
20 | === modified file 'debian/changelog' | |||
21 | --- debian/changelog 2014-09-16 19:28:22 +0000 | |||
22 | +++ debian/changelog 2014-09-19 12:17:12 +0000 | |||
23 | @@ -1,3 +1,9 @@ | |||
24 | 1 | platform-api (2.4.0) UNRELEASED; urgency=medium | ||
25 | 2 | |||
26 | 3 | * Add window orientation property (readonly, notifyable) | ||
27 | 4 | |||
28 | 5 | -- Gerry Boland <gerry.boland@canonical.com> Fri, 19 Sep 2014 13:04:51 +0100 | ||
29 | 6 | |||
30 | 1 | platform-api (2.3.0+14.10.20140916.3-0ubuntu1) utopic; urgency=medium | 7 | platform-api (2.3.0+14.10.20140916.3-0ubuntu1) utopic; urgency=medium |
31 | 2 | 8 | ||
32 | 3 | [ Thomas Voß ] | 9 | [ Thomas Voß ] |
33 | 4 | 10 | ||
34 | === modified file 'debian/libubuntu-application-api2.symbols' | |||
35 | --- debian/libubuntu-application-api2.symbols 2014-07-28 02:53:24 +0000 | |||
36 | +++ debian/libubuntu-application-api2.symbols 2014-09-19 12:17:12 +0000 | |||
37 | @@ -57,6 +57,8 @@ | |||
38 | 57 | ua_location_service_session_stop_position_updates@Base 0.18.3+13.10.20130807 | 57 | ua_location_service_session_stop_position_updates@Base 0.18.3+13.10.20130807 |
39 | 58 | ua_location_service_session_stop_velocity_updates@Base 0.18.3+13.10.20130807 | 58 | ua_location_service_session_stop_velocity_updates@Base 0.18.3+13.10.20130807 |
40 | 59 | ua_location_service_session_unref@Base 0.18.3+13.10.20130807 | 59 | ua_location_service_session_unref@Base 0.18.3+13.10.20130807 |
41 | 60 | ua_location_service_try_create_session_for_high_accuracy@Base 2.4.0 | ||
42 | 61 | ua_location_service_try_create_session_for_low_accuracy@Base 2.4.0 | ||
43 | 60 | ua_location_velocity_update_get_timestamp@Base 0.18.3+13.10.20130807 | 62 | ua_location_velocity_update_get_timestamp@Base 0.18.3+13.10.20130807 |
44 | 61 | ua_location_velocity_update_get_velocity_in_meters_per_second@Base 0.18.3+13.10.20130807 | 63 | ua_location_velocity_update_get_velocity_in_meters_per_second@Base 0.18.3+13.10.20130807 |
45 | 62 | ua_location_velocity_update_ref@Base 0.18.3+13.10.20130807 | 64 | ua_location_velocity_update_ref@Base 0.18.3+13.10.20130807 |
46 | @@ -115,6 +117,7 @@ | |||
47 | 115 | ua_ui_set_clipboard_content@Base 0.18.1daily13.06.21 | 117 | ua_ui_set_clipboard_content@Base 0.18.1daily13.06.21 |
48 | 116 | ua_ui_window_destroy@Base 0.18.1daily13.06.21 | 118 | ua_ui_window_destroy@Base 0.18.1daily13.06.21 |
49 | 117 | ua_ui_window_get_native_type@Base 0.18.1daily13.06.21 | 119 | ua_ui_window_get_native_type@Base 0.18.1daily13.06.21 |
50 | 120 | ua_ui_window_get_orientation@Base 0replaceme | ||
51 | 118 | ua_ui_window_get_size@Base 2.0.0+14.10.20140612 | 121 | ua_ui_window_get_size@Base 2.0.0+14.10.20140612 |
52 | 119 | ua_ui_window_hide@Base 0.18.1daily13.06.21 | 122 | ua_ui_window_hide@Base 0.18.1daily13.06.21 |
53 | 120 | ua_ui_window_is_focused@Base 2.2.0+14.10.20140728 | 123 | ua_ui_window_is_focused@Base 2.2.0+14.10.20140728 |
54 | 121 | 124 | ||
55 | === modified file 'include/ubuntu/application/ui/CMakeLists.txt' | |||
56 | --- include/ubuntu/application/ui/CMakeLists.txt 2013-08-18 20:33:22 +0000 | |||
57 | +++ include/ubuntu/application/ui/CMakeLists.txt 2014-09-19 12:17:12 +0000 | |||
58 | @@ -12,6 +12,7 @@ | |||
59 | 12 | session.h | 12 | session.h |
60 | 13 | stage.h | 13 | stage.h |
61 | 14 | window.h | 14 | window.h |
62 | 15 | window_orientation.h | ||
63 | 15 | window_parent.h | 16 | window_parent.h |
64 | 16 | window_properties.h | 17 | window_properties.h |
65 | 17 | window_state.h | 18 | window_state.h |
66 | 18 | 19 | ||
67 | === modified file 'include/ubuntu/application/ui/input/event.h' | |||
68 | --- include/ubuntu/application/ui/input/event.h 2014-08-18 11:01:17 +0000 | |||
69 | +++ include/ubuntu/application/ui/input/event.h 2014-09-19 12:17:12 +0000 | |||
70 | @@ -20,6 +20,7 @@ | |||
71 | 20 | #define UBUNTU_APPLICATION_UI_INPUT_EVENT_H_ | 20 | #define UBUNTU_APPLICATION_UI_INPUT_EVENT_H_ |
72 | 21 | 21 | ||
73 | 22 | #include <ubuntu/visibility.h> | 22 | #include <ubuntu/visibility.h> |
74 | 23 | #include <ubuntu/application/ui/window_orientation.h> | ||
75 | 23 | 24 | ||
76 | 24 | #include <stddef.h> | 25 | #include <stddef.h> |
77 | 25 | #include <stdint.h> | 26 | #include <stdint.h> |
78 | @@ -120,7 +121,8 @@ | |||
79 | 120 | KEY_WEVENT_TYPE, ///< Event originates from a keyboard. | 121 | KEY_WEVENT_TYPE, ///< Event originates from a keyboard. |
80 | 121 | MOTION_WEVENT_TYPE, ///< Event originates from something moving, e.g., a wheel, a mouse, a finger on a touchpad. | 122 | MOTION_WEVENT_TYPE, ///< Event originates from something moving, e.g., a wheel, a mouse, a finger on a touchpad. |
81 | 122 | RESIZE_WEVENT_TYPE, ///< Surface has been resized | 123 | RESIZE_WEVENT_TYPE, ///< Surface has been resized |
83 | 123 | SURFACE_WEVENT_TYPE //< A surface attribute has changed its value | 124 | SURFACE_WEVENT_TYPE, ///< A surface attribute has changed its value |
84 | 125 | ORIENTATION_WEVENT_TYPE, ///< The device orientation changed | ||
85 | 124 | } WindowEventType; | 126 | } WindowEventType; |
86 | 125 | 127 | ||
87 | 126 | /** Information describing an event originating from a keyboard key. */ | 128 | /** Information describing an event originating from a keyboard key. */ |
88 | @@ -197,6 +199,14 @@ | |||
89 | 197 | int32_t height; ///< The new surface height. | 199 | int32_t height; ///< The new surface height. |
90 | 198 | } ResizeEvent; | 200 | } ResizeEvent; |
91 | 199 | 201 | ||
92 | 202 | /** Information describing a surface orientation change event. */ | ||
93 | 203 | typedef struct | ||
94 | 204 | { | ||
95 | 205 | WindowEventType type; | ||
96 | 206 | |||
97 | 207 | UApplicationUiWindowOrientation direction; ///< The new surface orientation | ||
98 | 208 | } OrientationEvent; | ||
99 | 209 | |||
100 | 200 | typedef union | 210 | typedef union |
101 | 201 | { | 211 | { |
102 | 202 | WindowEventType type; | 212 | WindowEventType type; |
103 | @@ -204,6 +214,7 @@ | |||
104 | 204 | MotionEvent motion; | 214 | MotionEvent motion; |
105 | 205 | SurfaceEvent surface; | 215 | SurfaceEvent surface; |
106 | 206 | ResizeEvent resize; | 216 | ResizeEvent resize; |
107 | 217 | OrientationEvent orientation; | ||
108 | 207 | } WindowEvent; | 218 | } WindowEvent; |
109 | 208 | 219 | ||
110 | 209 | #ifdef __cplusplus | 220 | #ifdef __cplusplus |
111 | 210 | 221 | ||
112 | === modified file 'include/ubuntu/application/ui/window.h' | |||
113 | --- include/ubuntu/application/ui/window.h 2014-07-02 00:05:20 +0000 | |||
114 | +++ include/ubuntu/application/ui/window.h 2014-09-19 12:17:12 +0000 | |||
115 | @@ -25,6 +25,7 @@ | |||
116 | 25 | #include <ubuntu/status.h> | 25 | #include <ubuntu/status.h> |
117 | 26 | #include <ubuntu/application/instance.h> | 26 | #include <ubuntu/application/instance.h> |
118 | 27 | #include <ubuntu/application/ui/window_properties.h> | 27 | #include <ubuntu/application/ui/window_properties.h> |
119 | 28 | #include <ubuntu/application/ui/window_orientation.h> | ||
120 | 28 | 29 | ||
121 | 29 | #include <EGL/egl.h> | 30 | #include <EGL/egl.h> |
122 | 30 | 31 | ||
123 | @@ -89,6 +90,10 @@ | |||
124 | 89 | ua_ui_window_is_focused( | 90 | ua_ui_window_is_focused( |
125 | 90 | UAUiWindow *window); | 91 | UAUiWindow *window); |
126 | 91 | 92 | ||
127 | 93 | UBUNTU_DLL_PUBLIC UApplicationUiWindowOrientation | ||
128 | 94 | ua_ui_window_get_orientation( | ||
129 | 95 | UAUiWindow *window); | ||
130 | 96 | |||
131 | 92 | #ifdef __cplusplus | 97 | #ifdef __cplusplus |
132 | 93 | } | 98 | } |
133 | 94 | #endif | 99 | #endif |
134 | 95 | 100 | ||
135 | === added file 'include/ubuntu/application/ui/window_orientation.h' | |||
136 | --- include/ubuntu/application/ui/window_orientation.h 1970-01-01 00:00:00 +0000 | |||
137 | +++ include/ubuntu/application/ui/window_orientation.h 2014-09-19 12:17:12 +0000 | |||
138 | @@ -0,0 +1,27 @@ | |||
139 | 1 | /* | ||
140 | 2 | * Copyright © 2014 Canonical Ltd. | ||
141 | 3 | * | ||
142 | 4 | * This program is free software: you can redistribute it and/or modify | ||
143 | 5 | * it under the terms of the GNU Lesser General Public License version 3 as | ||
144 | 6 | * published by the Free Software Foundation. | ||
145 | 7 | * | ||
146 | 8 | * This program is distributed in the hope that it will be useful, | ||
147 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
148 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
149 | 11 | * GNU Lesser General Public License for more details. | ||
150 | 12 | * | ||
151 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
152 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
153 | 15 | */ | ||
154 | 16 | |||
155 | 17 | #ifndef UBUNTU_APPLICATION_UI_WINDOW_ORIENTATION_H | ||
156 | 18 | #define UBUNTU_APPLICATION_UI_WINDOW_ORIENTATION_H | ||
157 | 19 | |||
158 | 20 | typedef enum { | ||
159 | 21 | U_ORIENTATION_NORMAL = 1, | ||
160 | 22 | U_ORIENTATION_LEFT, | ||
161 | 23 | U_ORIENTATION_RIGHT, | ||
162 | 24 | U_ORIENTATION_INVERTED, | ||
163 | 25 | } UApplicationUiWindowOrientation; | ||
164 | 26 | |||
165 | 27 | #endif // UBUNTU_APPLICATION_UI_WINDOW_ORIENTATION_H | ||
166 | 0 | 28 | ||
167 | === modified file 'src/ubuntu/application/common/mirclient/window_mirclient.cpp' | |||
168 | --- src/ubuntu/application/common/mirclient/window_mirclient.cpp 2014-07-15 12:41:35 +0000 | |||
169 | +++ src/ubuntu/application/common/mirclient/window_mirclient.cpp 2014-09-19 12:17:12 +0000 | |||
170 | @@ -169,6 +169,19 @@ | |||
171 | 169 | *height = parameters.height; | 169 | *height = parameters.height; |
172 | 170 | } | 170 | } |
173 | 171 | 171 | ||
174 | 172 | UApplicationUiWindowOrientation uamc::Window::orientation() const | ||
175 | 173 | { | ||
176 | 174 | UApplicationUiWindowOrientation ubuntu_orientation; | ||
177 | 175 | MirOrientation mir_orientation = mir_surface_get_orientation(surface.get()); | ||
178 | 176 | |||
179 | 177 | if (uaum::orientation_to_ubuntu_orientation(mir_orientation, ubuntu_orientation)) { | ||
180 | 178 | return ubuntu_orientation; | ||
181 | 179 | } else { | ||
182 | 180 | printf("Unknown MirOrientation!\n"); | ||
183 | 181 | return U_ORIENTATION_NORMAL; | ||
184 | 182 | } | ||
185 | 183 | } | ||
186 | 184 | |||
187 | 172 | void uamc::Window::hide() | 185 | void uamc::Window::hide() |
188 | 173 | { | 186 | { |
189 | 174 | state_before_hiding = state(); | 187 | state_before_hiding = state(); |
190 | 175 | 188 | ||
191 | === modified file 'src/ubuntu/application/common/mirclient/window_mirclient_priv.h' | |||
192 | --- src/ubuntu/application/common/mirclient/window_mirclient_priv.h 2014-07-15 12:41:35 +0000 | |||
193 | +++ src/ubuntu/application/common/mirclient/window_mirclient_priv.h 2014-09-19 12:17:12 +0000 | |||
194 | @@ -54,6 +54,7 @@ | |||
195 | 54 | EGLNativeWindowType get_native_type(); | 54 | EGLNativeWindowType get_native_type(); |
196 | 55 | 55 | ||
197 | 56 | UApplicationUiWindowState state() const; | 56 | UApplicationUiWindowState state() const; |
198 | 57 | UApplicationUiWindowOrientation orientation() const; | ||
199 | 57 | 58 | ||
200 | 58 | void hide(); | 59 | void hide(); |
201 | 59 | void show(); | 60 | void show(); |
202 | 60 | 61 | ||
203 | === modified file 'src/ubuntu/application/common/mircommon/event_helpers_mir.cpp' | |||
204 | --- src/ubuntu/application/common/mircommon/event_helpers_mir.cpp 2014-07-15 12:41:35 +0000 | |||
205 | +++ src/ubuntu/application/common/mircommon/event_helpers_mir.cpp 2014-09-19 12:17:12 +0000 | |||
206 | @@ -85,6 +85,13 @@ | |||
207 | 85 | } else { | 85 | } else { |
208 | 86 | return false; | 86 | return false; |
209 | 87 | } | 87 | } |
210 | 88 | case mir_event_type_orientation: | ||
211 | 89 | ubuntu_ev.surface.type = ORIENTATION_WEVENT_TYPE; | ||
212 | 90 | if (orientation_to_ubuntu_orientation(mir_event->orientation.direction, ubuntu_ev.orientation.direction)) { | ||
213 | 91 | return true; | ||
214 | 92 | } else { | ||
215 | 93 | return false; | ||
216 | 94 | } | ||
217 | 88 | default: | 95 | default: |
218 | 89 | return false; | 96 | return false; |
219 | 90 | } | 97 | } |
220 | @@ -144,3 +151,24 @@ | |||
221 | 144 | return false; | 151 | return false; |
222 | 145 | } | 152 | } |
223 | 146 | } | 153 | } |
224 | 154 | |||
225 | 155 | bool uaum::orientation_to_ubuntu_orientation(MirOrientation const mir_orient, | ||
226 | 156 | UApplicationUiWindowOrientation& ubuntu_orient) | ||
227 | 157 | { | ||
228 | 158 | switch (mir_orient) { | ||
229 | 159 | case mir_orientation_normal: | ||
230 | 160 | ubuntu_orient = U_ORIENTATION_NORMAL; | ||
231 | 161 | return true; | ||
232 | 162 | case mir_orientation_left: | ||
233 | 163 | ubuntu_orient = U_ORIENTATION_LEFT; | ||
234 | 164 | return true; | ||
235 | 165 | case mir_orientation_inverted: | ||
236 | 166 | ubuntu_orient = U_ORIENTATION_INVERTED; | ||
237 | 167 | return true; | ||
238 | 168 | case mir_orientation_right: | ||
239 | 169 | ubuntu_orient = U_ORIENTATION_RIGHT; | ||
240 | 170 | return true; | ||
241 | 171 | default: | ||
242 | 172 | return false; | ||
243 | 173 | } | ||
244 | 174 | } | ||
245 | 147 | 175 | ||
246 | === modified file 'src/ubuntu/application/common/mircommon/event_helpers_mir.h' | |||
247 | --- src/ubuntu/application/common/mircommon/event_helpers_mir.h 2014-07-15 12:41:35 +0000 | |||
248 | +++ src/ubuntu/application/common/mircommon/event_helpers_mir.h 2014-09-19 12:17:12 +0000 | |||
249 | @@ -20,6 +20,7 @@ | |||
250 | 20 | #define UBUNTU_EVENT_HELPERS_MIR_COMMON_H_ | 20 | #define UBUNTU_EVENT_HELPERS_MIR_COMMON_H_ |
251 | 21 | 21 | ||
252 | 22 | #include <ubuntu/application/ui/input/event.h> | 22 | #include <ubuntu/application/ui/input/event.h> |
253 | 23 | #include <ubuntu/application/ui/window_orientation.h> | ||
254 | 23 | #include <mir_toolkit/event.h> | 24 | #include <mir_toolkit/event.h> |
255 | 24 | 25 | ||
256 | 25 | namespace ubuntu | 26 | namespace ubuntu |
257 | @@ -32,6 +33,9 @@ | |||
258 | 32 | { | 33 | { |
259 | 33 | bool event_to_ubuntu_event(MirEvent const* mir_event, WindowEvent& ubuntu_ev); | 34 | bool event_to_ubuntu_event(MirEvent const* mir_event, WindowEvent& ubuntu_ev); |
260 | 34 | bool event_to_ubuntu_deprecated_event(MirEvent const* mir_event, Event& ubuntu_ev); | 35 | bool event_to_ubuntu_deprecated_event(MirEvent const* mir_event, Event& ubuntu_ev); |
261 | 36 | |||
262 | 37 | bool orientation_to_ubuntu_orientation(MirOrientation const mir_orient, | ||
263 | 38 | UApplicationUiWindowOrientation& ubuntu_orient); | ||
264 | 35 | } | 39 | } |
265 | 36 | } | 40 | } |
266 | 37 | } | 41 | } |
267 | 38 | 42 | ||
268 | === modified file 'src/ubuntu/application/testbackend/test_stubs.cpp' | |||
269 | --- src/ubuntu/application/testbackend/test_stubs.cpp 2014-07-15 12:41:35 +0000 | |||
270 | +++ src/ubuntu/application/testbackend/test_stubs.cpp 2014-09-19 12:17:12 +0000 | |||
271 | @@ -252,6 +252,11 @@ | |||
272 | 252 | return 0; | 252 | return 0; |
273 | 253 | } | 253 | } |
274 | 254 | 254 | ||
275 | 255 | UApplicationUiWindowOrientation ua_ui_window_get_orientation(UAUiWindow*) | ||
276 | 256 | { | ||
277 | 257 | return U_ORIENTATION_NORMAL; | ||
278 | 258 | } | ||
279 | 259 | |||
280 | 255 | UStatus ua_ui_window_show(UAUiWindow*) | 260 | UStatus ua_ui_window_show(UAUiWindow*) |
281 | 256 | { | 261 | { |
282 | 257 | return U_STATUS_ERROR; | 262 | return U_STATUS_ERROR; |
283 | 258 | 263 | ||
284 | === modified file 'src/ubuntu/application/touch/hybris/ubuntu_application_api_hybris.cpp' | |||
285 | --- src/ubuntu/application/touch/hybris/ubuntu_application_api_hybris.cpp 2014-07-15 12:41:35 +0000 | |||
286 | +++ src/ubuntu/application/touch/hybris/ubuntu_application_api_hybris.cpp 2014-09-19 12:17:12 +0000 | |||
287 | @@ -106,6 +106,7 @@ | |||
288 | 106 | IMPLEMENT_FUNCTION1(UStatus, ua_ui_window_show, UAUiWindow*); | 106 | IMPLEMENT_FUNCTION1(UStatus, ua_ui_window_show, UAUiWindow*); |
289 | 107 | IMPLEMENT_VOID_FUNCTION1(ua_ui_window_request_fullscreen, UAUiWindow*); | 107 | IMPLEMENT_VOID_FUNCTION1(ua_ui_window_request_fullscreen, UAUiWindow*); |
290 | 108 | IMPLEMENT_FUNCTION1(EGLNativeWindowType, ua_ui_window_get_native_type, UAUiWindow*); | 108 | IMPLEMENT_FUNCTION1(EGLNativeWindowType, ua_ui_window_get_native_type, UAUiWindow*); |
291 | 109 | IMPLEMENT_FUNCTION1(UApplicationUiWindowOrientation, ua_ui_window_get_orientation, UAUiWindow*); | ||
292 | 109 | 110 | ||
293 | 110 | /* -------------------------------------------------------------------------- * | 111 | /* -------------------------------------------------------------------------- * |
294 | 111 | * * * * * * * * * * * * * * * Deprecated API * * * * * * * * * * * * * * * * * | 112 | * * * * * * * * * * * * * * * Deprecated API * * * * * * * * * * * * * * * * * |
295 | 112 | 113 | ||
296 | === modified file 'src/ubuntu/application/ubuntu_application_api.cpp' | |||
297 | --- src/ubuntu/application/ubuntu_application_api.cpp 2014-09-15 20:41:36 +0000 | |||
298 | +++ src/ubuntu/application/ubuntu_application_api.cpp 2014-09-19 12:17:12 +0000 | |||
299 | @@ -121,6 +121,7 @@ | |||
300 | 121 | IMPLEMENT_FUNCTION1(UStatus, ua_ui_window_show, UAUiWindow*); | 121 | IMPLEMENT_FUNCTION1(UStatus, ua_ui_window_show, UAUiWindow*); |
301 | 122 | IMPLEMENT_VOID_FUNCTION1(ua_ui_window_request_fullscreen, UAUiWindow*); | 122 | IMPLEMENT_VOID_FUNCTION1(ua_ui_window_request_fullscreen, UAUiWindow*); |
302 | 123 | IMPLEMENT_FUNCTION1(EGLNativeWindowType, ua_ui_window_get_native_type, UAUiWindow*); | 123 | IMPLEMENT_FUNCTION1(EGLNativeWindowType, ua_ui_window_get_native_type, UAUiWindow*); |
303 | 124 | IMPLEMENT_FUNCTION1(UApplicationUiWindowOrientation, ua_ui_window_get_orientation, UAUiWindow*); | ||
304 | 124 | 125 | ||
305 | 125 | // Ubuntu Application Sensors | 126 | // Ubuntu Application Sensors |
306 | 126 | 127 |
FAILED: Continuous integration, rev:260 jenkins. qa.ubuntu. com/job/ platform- api-ci/ 355/ jenkins. qa.ubuntu. com/job/ platform- api-utopic- amd64-ci/ 88 jenkins. qa.ubuntu. com/job/ platform- api-utopic- armhf-ci/ 88/console jenkins. qa.ubuntu. com/job/ platform- api-utopic- i386-ci/ 88/console
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/platform- api-ci/ 355/rebuild
http://