← Back to branch summary

~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

Viewing changes to 3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
3rd_party/android-input/android/frameworks/base/include/androidfw/Input.h
17
17
#ifndef _ANDROIDFW_INPUT_H
18
18
#define _ANDROIDFW_INPUT_H
19
19
 
20
 
#include <androidfw/Platform.h>
21
20
 
22
21
/**
23
22
 * Native input event structures.
24
23
 */
25
24
 
26
25
#include <android/input.h>
27
 
#include ANDROIDFW_UTILS(Vector.h)
28
 
#include ANDROIDFW_UTILS(KeyedVector.h)
29
 
#include ANDROIDFW_UTILS(Timers.h)
30
 
#include ANDROIDFW_UTILS(RefBase.h)
31
 
#include ANDROIDFW_UTILS(String8.h)
 
26
#include <std/Vector.h>
 
27
#include <std/KeyedVector.h>
 
28
#include <std/Timers.h>
 
29
#include <std/RefBase.h>
 
30
#include <std/String8.h>
32
31
 
33
32
#ifdef HAVE_ANDROID_OS
34
33
class SkMatrix;