diff options
42 files changed, 95 insertions, 77 deletions
diff --git a/core/jni/android_app_NativeActivity.cpp b/core/jni/android_app_NativeActivity.cpp index 536681b..4b3324b 100644 --- a/core/jni/android_app_NativeActivity.cpp +++ b/core/jni/android_app_NativeActivity.cpp @@ -27,7 +27,7 @@ #include <android_runtime/android_util_AssetManager.h> #include <surfaceflinger/Surface.h> #include <ui/egl/android_natives.h> -#include <ui/InputTransport.h> +#include <androidfw/InputTransport.h> #include <utils/Looper.h> #include "JNIHelp.h" diff --git a/core/jni/android_bluetooth_BluetoothAudioGateway.cpp b/core/jni/android_bluetooth_BluetoothAudioGateway.cpp index 3b8fb79..3b8fb79 100755..100644 --- a/core/jni/android_bluetooth_BluetoothAudioGateway.cpp +++ b/core/jni/android_bluetooth_BluetoothAudioGateway.cpp diff --git a/core/jni/android_bluetooth_c.c b/core/jni/android_bluetooth_c.c index b4c6727..b4c6727 100755..100644 --- a/core/jni/android_bluetooth_c.c +++ b/core/jni/android_bluetooth_c.c diff --git a/core/jni/android_view_InputChannel.cpp b/core/jni/android_view_InputChannel.cpp index 6d783de..8350e73 100644 --- a/core/jni/android_view_InputChannel.cpp +++ b/core/jni/android_view_InputChannel.cpp @@ -21,7 +21,7 @@ #include <android_runtime/AndroidRuntime.h> #include <binder/Parcel.h> #include <utils/Log.h> -#include <ui/InputTransport.h> +#include <androidfw/InputTransport.h> #include "android_view_InputChannel.h" #include "android_util_Binder.h" diff --git a/core/jni/android_view_InputChannel.h b/core/jni/android_view_InputChannel.h index fa2d282..0967021 100644 --- a/core/jni/android_view_InputChannel.h +++ b/core/jni/android_view_InputChannel.h @@ -19,7 +19,7 @@ #include "jni.h" -#include <ui/InputTransport.h> +#include <androidfw/InputTransport.h> namespace android { diff --git a/core/jni/android_view_InputEventReceiver.cpp b/core/jni/android_view_InputEventReceiver.cpp index 9df280d..e7d4244 100644 --- a/core/jni/android_view_InputEventReceiver.cpp +++ b/core/jni/android_view_InputEventReceiver.cpp @@ -28,7 +28,7 @@ #include <utils/Log.h> #include <utils/Looper.h> #include <utils/threads.h> -#include <ui/InputTransport.h> +#include <androidfw/InputTransport.h> #include "android_os_MessageQueue.h" #include "android_view_InputChannel.h" #include "android_view_KeyEvent.h" diff --git a/core/jni/android_view_KeyCharacterMap.cpp b/core/jni/android_view_KeyCharacterMap.cpp index b9f3738..7245d9d 100644 --- a/core/jni/android_view_KeyCharacterMap.cpp +++ b/core/jni/android_view_KeyCharacterMap.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include <ui/KeyCharacterMap.h> -#include <ui/Input.h> +#include <androidfw/KeyCharacterMap.h> +#include <androidfw/Input.h> #include <android_runtime/AndroidRuntime.h> #include <nativehelper/jni.h> diff --git a/core/jni/android_view_KeyEvent.cpp b/core/jni/android_view_KeyEvent.cpp index 27469a2..36a98f9 100644 --- a/core/jni/android_view_KeyEvent.cpp +++ b/core/jni/android_view_KeyEvent.cpp @@ -20,7 +20,7 @@ #include <android_runtime/AndroidRuntime.h> #include <utils/Log.h> -#include <ui/Input.h> +#include <androidfw/Input.h> #include "android_view_KeyEvent.h" namespace android { diff --git a/core/jni/android_view_MotionEvent.cpp b/core/jni/android_view_MotionEvent.cpp index 2def1d1..0fb1b17 100644 --- a/core/jni/android_view_MotionEvent.cpp +++ b/core/jni/android_view_MotionEvent.cpp @@ -20,7 +20,7 @@ #include <android_runtime/AndroidRuntime.h> #include <utils/Log.h> -#include <ui/Input.h> +#include <androidfw/Input.h> #include "android_view_MotionEvent.h" #include "android_util_Binder.h" #include "android/graphics/Matrix.h" diff --git a/core/jni/android_view_VelocityTracker.cpp b/core/jni/android_view_VelocityTracker.cpp index 0da90d7..668d3bb 100644 --- a/core/jni/android_view_VelocityTracker.cpp +++ b/core/jni/android_view_VelocityTracker.cpp @@ -20,7 +20,7 @@ #include <android_runtime/AndroidRuntime.h> #include <utils/Log.h> -#include <ui/Input.h> +#include <androidfw/Input.h> #include "android_view_MotionEvent.h" diff --git a/include/android_runtime/android_app_NativeActivity.h b/include/android_runtime/android_app_NativeActivity.h index 93fcf69..a59677a 100644 --- a/include/android_runtime/android_app_NativeActivity.h +++ b/include/android_runtime/android_app_NativeActivity.h @@ -17,7 +17,7 @@ #ifndef _ANDROID_APP_NATIVEACTIVITY_H #define _ANDROID_APP_NATIVEACTIVITY_H -#include <ui/InputTransport.h> +#include <androidfw/InputTransport.h> #include <utils/Looper.h> #include <android/native_activity.h> diff --git a/include/ui/Input.h b/include/androidfw/Input.h index c2cbe1d..f5db6e2 100644 --- a/include/ui/Input.h +++ b/include/androidfw/Input.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef _UI_INPUT_H -#define _UI_INPUT_H +#ifndef _ANDROIDFW_INPUT_H +#define _ANDROIDFW_INPUT_H /** * Native input event structures. @@ -894,4 +894,4 @@ extern String8 getInputDeviceConfigurationFilePathByName( } // namespace android -#endif // _UI_INPUT_H +#endif // _ANDROIDFW_INPUT_H diff --git a/include/ui/InputTransport.h b/include/androidfw/InputTransport.h index 0facce3..a846e65 100644 --- a/include/ui/InputTransport.h +++ b/include/androidfw/InputTransport.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef _UI_INPUT_TRANSPORT_H -#define _UI_INPUT_TRANSPORT_H +#ifndef _ANDROIDFW_INPUT_TRANSPORT_H +#define _ANDROIDFW_INPUT_TRANSPORT_H /** * Native input transport. @@ -27,11 +27,12 @@ * The InputConsumer is used by the application to receive events from the input dispatcher. */ -#include <ui/Input.h> +#include <androidfw/Input.h> #include <utils/Errors.h> #include <utils/Timers.h> #include <utils/RefBase.h> #include <utils/String8.h> +#include <utils/Vector.h> namespace android { @@ -332,4 +333,4 @@ private: } // namespace android -#endif // _UI_INPUT_TRANSPORT_H +#endif // _ANDROIDFW_INPUT_TRANSPORT_H diff --git a/include/ui/KeyCharacterMap.h b/include/androidfw/KeyCharacterMap.h index be14432..679dd2c 100644 --- a/include/ui/KeyCharacterMap.h +++ b/include/androidfw/KeyCharacterMap.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef _UI_KEY_CHARACTER_MAP_H -#define _UI_KEY_CHARACTER_MAP_H +#ifndef _ANDROIDFW_KEY_CHARACTER_MAP_H +#define _ANDROIDFW_KEY_CHARACTER_MAP_H #include <stdint.h> -#include <ui/Input.h> +#include <androidfw/Input.h> #include <utils/Errors.h> #include <utils/KeyedVector.h> #include <utils/Tokenizer.h> @@ -196,4 +196,4 @@ private: } // namespace android -#endif // _UI_KEY_CHARACTER_MAP_H +#endif // _ANDROIDFW_KEY_CHARACTER_MAP_H diff --git a/include/ui/KeyLayoutMap.h b/include/androidfw/KeyLayoutMap.h index d82d0c8..5a6f550 100644 --- a/include/ui/KeyLayoutMap.h +++ b/include/androidfw/KeyLayoutMap.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef _UI_KEY_LAYOUT_MAP_H -#define _UI_KEY_LAYOUT_MAP_H +#ifndef _ANDROIDFW_KEY_LAYOUT_MAP_H +#define _ANDROIDFW_KEY_LAYOUT_MAP_H #include <stdint.h> #include <utils/Errors.h> @@ -96,4 +96,4 @@ private: } // namespace android -#endif // _UI_KEY_LAYOUT_MAP_H +#endif // _ANDROIDFW_KEY_LAYOUT_MAP_H diff --git a/include/ui/Keyboard.h b/include/androidfw/Keyboard.h index 274f526..ae65198 100644 --- a/include/ui/Keyboard.h +++ b/include/androidfw/Keyboard.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef _UI_KEYBOARD_H -#define _UI_KEYBOARD_H +#ifndef _ANDROIDFW_KEYBOARD_H +#define _ANDROIDFW_KEYBOARD_H -#include <ui/Input.h> +#include <androidfw/Input.h> #include <utils/Errors.h> #include <utils/String8.h> #include <utils/PropertyMap.h> @@ -116,4 +116,4 @@ extern bool isMetaKey(int32_t keyCode); } // namespace android -#endif // _UI_KEYBOARD_H +#endif // _ANDROIDFW_KEYBOARD_H diff --git a/include/ui/KeycodeLabels.h b/include/androidfw/KeycodeLabels.h index c5bd0c5..9e4dfcb 100755 --- a/include/ui/KeycodeLabels.h +++ b/include/androidfw/KeycodeLabels.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef _UI_KEYCODE_LABELS_H -#define _UI_KEYCODE_LABELS_H +#ifndef _ANDROIDFW_KEYCODE_LABELS_H +#define _ANDROIDFW_KEYCODE_LABELS_H #include <android/keycodes.h> @@ -307,4 +307,4 @@ static const KeycodeLabel AXES[] = { { NULL, -1 } }; -#endif // _UI_KEYCODE_LABELS_H +#endif // _ANDROIDFW_KEYCODE_LABELS_H diff --git a/include/ui/PowerManager.h b/include/androidfw/PowerManager.h index dd80318..59e993a 100644 --- a/include/ui/PowerManager.h +++ b/include/androidfw/PowerManager.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef _UI_POWER_MANAGER_H -#define _UI_POWER_MANAGER_H +#ifndef _ANDROIDFW_POWER_MANAGER_H +#define _ANDROIDFW_POWER_MANAGER_H namespace android { @@ -30,4 +30,4 @@ enum { } // namespace android -#endif // _UI_POWER_MANAGER_H +#endif // _ANDROIDFW_POWER_MANAGER_H diff --git a/include/ui/VirtualKeyMap.h b/include/androidfw/VirtualKeyMap.h index 7813d9d..66340e3 100644 --- a/include/ui/VirtualKeyMap.h +++ b/include/androidfw/VirtualKeyMap.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef _UI_VIRTUAL_KEY_MAP_H -#define _UI_VIRTUAL_KEY_MAP_H +#ifndef _ANDROIDFW_VIRTUAL_KEY_MAP_H +#define _ANDROIDFW_VIRTUAL_KEY_MAP_H #include <stdint.h> -#include <ui/Input.h> +#include <androidfw/Input.h> #include <utils/Errors.h> #include <utils/KeyedVector.h> #include <utils/Tokenizer.h> @@ -76,4 +76,4 @@ private: } // namespace android -#endif // _UI_KEY_CHARACTER_MAP_H +#endif // _ANDROIDFW_KEY_CHARACTER_MAP_H diff --git a/libs/ui/Input.cpp b/libs/ui/Input.cpp index 263c8d9..ca09caf 100644 --- a/libs/ui/Input.cpp +++ b/libs/ui/Input.cpp @@ -24,7 +24,7 @@ #include <unistd.h> #include <ctype.h> -#include <ui/Input.h> +#include <androidfw/Input.h> #include <math.h> #include <limits.h> diff --git a/libs/ui/InputTransport.cpp b/libs/ui/InputTransport.cpp index ecb3fb5..1ebd75c 100644 --- a/libs/ui/InputTransport.cpp +++ b/libs/ui/InputTransport.cpp @@ -20,7 +20,7 @@ #include <cutils/log.h> #include <errno.h> #include <fcntl.h> -#include <ui/InputTransport.h> +#include <androidfw/InputTransport.h> #include <unistd.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/libs/ui/KeyCharacterMap.cpp b/libs/ui/KeyCharacterMap.cpp index 485234c..6984084 100644 --- a/libs/ui/KeyCharacterMap.cpp +++ b/libs/ui/KeyCharacterMap.cpp @@ -19,8 +19,8 @@ #include <stdlib.h> #include <string.h> #include <android/keycodes.h> -#include <ui/Keyboard.h> -#include <ui/KeyCharacterMap.h> +#include <androidfw/Keyboard.h> +#include <androidfw/KeyCharacterMap.h> #include <utils/Log.h> #include <utils/Errors.h> #include <utils/Tokenizer.h> diff --git a/libs/ui/KeyLayoutMap.cpp b/libs/ui/KeyLayoutMap.cpp index 44a9420..15d81ee 100644 --- a/libs/ui/KeyLayoutMap.cpp +++ b/libs/ui/KeyLayoutMap.cpp @@ -18,8 +18,8 @@ #include <stdlib.h> #include <android/keycodes.h> -#include <ui/Keyboard.h> -#include <ui/KeyLayoutMap.h> +#include <androidfw/Keyboard.h> +#include <androidfw/KeyLayoutMap.h> #include <utils/Log.h> #include <utils/Errors.h> #include <utils/Tokenizer.h> diff --git a/libs/ui/Keyboard.cpp b/libs/ui/Keyboard.cpp index e4611f7..e97a5eb 100644 --- a/libs/ui/Keyboard.cpp +++ b/libs/ui/Keyboard.cpp @@ -20,10 +20,10 @@ #include <unistd.h> #include <limits.h> -#include <ui/Keyboard.h> -#include <ui/KeycodeLabels.h> -#include <ui/KeyLayoutMap.h> -#include <ui/KeyCharacterMap.h> +#include <androidfw/Keyboard.h> +#include <androidfw/KeycodeLabels.h> +#include <androidfw/KeyLayoutMap.h> +#include <androidfw/KeyCharacterMap.h> #include <utils/Errors.h> #include <utils/Log.h> #include <cutils/properties.h> diff --git a/libs/ui/VirtualKeyMap.cpp b/libs/ui/VirtualKeyMap.cpp index 62d5b59..2ba1673 100644 --- a/libs/ui/VirtualKeyMap.cpp +++ b/libs/ui/VirtualKeyMap.cpp @@ -18,7 +18,7 @@ #include <stdlib.h> #include <string.h> -#include <ui/VirtualKeyMap.h> +#include <androidfw/VirtualKeyMap.h> #include <utils/Log.h> #include <utils/Errors.h> #include <utils/Tokenizer.h> diff --git a/libs/ui/tests/InputChannel_test.cpp b/libs/ui/tests/InputChannel_test.cpp index ee422fe..0e5d19d 100644 --- a/libs/ui/tests/InputChannel_test.cpp +++ b/libs/ui/tests/InputChannel_test.cpp @@ -14,9 +14,10 @@ * limitations under the License. */ -#include <ui/InputTransport.h> +#include <androidfw/InputTransport.h> #include <utils/Timers.h> #include <utils/StopWatch.h> +#include <utils/StrongPointer.h> #include <gtest/gtest.h> #include <unistd.h> #include <time.h> diff --git a/libs/ui/tests/InputEvent_test.cpp b/libs/ui/tests/InputEvent_test.cpp index e21c464..ac5549c 100644 --- a/libs/ui/tests/InputEvent_test.cpp +++ b/libs/ui/tests/InputEvent_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <ui/Input.h> +#include <androidfw/Input.h> #include <gtest/gtest.h> #include <binder/Parcel.h> diff --git a/libs/ui/tests/InputPublisherAndConsumer_test.cpp b/libs/ui/tests/InputPublisherAndConsumer_test.cpp index 3303053..bb45247 100644 --- a/libs/ui/tests/InputPublisherAndConsumer_test.cpp +++ b/libs/ui/tests/InputPublisherAndConsumer_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <ui/InputTransport.h> +#include <androidfw/InputTransport.h> #include <utils/Timers.h> #include <utils/StopWatch.h> #include <gtest/gtest.h> diff --git a/native/android/input.cpp b/native/android/input.cpp index 91671c3..6eb2990 100644 --- a/native/android/input.cpp +++ b/native/android/input.cpp @@ -18,8 +18,8 @@ #include <utils/Log.h> #include <android/input.h> -#include <ui/Input.h> -#include <ui/InputTransport.h> +#include <androidfw/Input.h> +#include <androidfw/InputTransport.h> #include <utils/Looper.h> #include <utils/RefBase.h> #include <utils/Vector.h> diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp index 296c95e..1b74aa6 100644 --- a/services/input/EventHub.cpp +++ b/services/input/EventHub.cpp @@ -36,9 +36,9 @@ #include <errno.h> #include <assert.h> -#include <ui/KeyLayoutMap.h> -#include <ui/KeyCharacterMap.h> -#include <ui/VirtualKeyMap.h> +#include <androidfw/KeyLayoutMap.h> +#include <androidfw/KeyCharacterMap.h> +#include <androidfw/VirtualKeyMap.h> #include <string.h> #include <stdint.h> diff --git a/services/input/EventHub.h b/services/input/EventHub.h index 8a2afd3..4eb47c6 100644 --- a/services/input/EventHub.h +++ b/services/input/EventHub.h @@ -18,11 +18,11 @@ #ifndef _RUNTIME_EVENT_HUB_H #define _RUNTIME_EVENT_HUB_H -#include <ui/Input.h> -#include <ui/Keyboard.h> -#include <ui/KeyLayoutMap.h> -#include <ui/KeyCharacterMap.h> -#include <ui/VirtualKeyMap.h> +#include <androidfw/Input.h> +#include <androidfw/Keyboard.h> +#include <androidfw/KeyLayoutMap.h> +#include <androidfw/KeyCharacterMap.h> +#include <androidfw/VirtualKeyMap.h> #include <utils/String8.h> #include <utils/threads.h> #include <utils/Log.h> diff --git a/services/input/InputApplication.h b/services/input/InputApplication.h index 67ae94b..c04a935 100644 --- a/services/input/InputApplication.h +++ b/services/input/InputApplication.h @@ -17,7 +17,7 @@ #ifndef _UI_INPUT_APPLICATION_H #define _UI_INPUT_APPLICATION_H -#include <ui/Input.h> +#include <androidfw/Input.h> #include <utils/RefBase.h> #include <utils/Timers.h> diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp index e6e28df..149c0d3 100644 --- a/services/input/InputDispatcher.cpp +++ b/services/input/InputDispatcher.cpp @@ -45,7 +45,7 @@ #include "InputDispatcher.h" #include <cutils/log.h> -#include <ui/PowerManager.h> +#include <androidfw/PowerManager.h> #include <stddef.h> #include <unistd.h> diff --git a/services/input/InputDispatcher.h b/services/input/InputDispatcher.h index 5c517f5..4b36480 100644 --- a/services/input/InputDispatcher.h +++ b/services/input/InputDispatcher.h @@ -17,8 +17,8 @@ #ifndef _UI_INPUT_DISPATCHER_H #define _UI_INPUT_DISPATCHER_H -#include <ui/Input.h> -#include <ui/InputTransport.h> +#include <androidfw/Input.h> +#include <androidfw/InputTransport.h> #include <utils/KeyedVector.h> #include <utils/Vector.h> #include <utils/threads.h> diff --git a/services/input/InputListener.h b/services/input/InputListener.h index f920cd1..b1dc0b8 100644 --- a/services/input/InputListener.h +++ b/services/input/InputListener.h @@ -17,7 +17,7 @@ #ifndef _UI_INPUT_LISTENER_H #define _UI_INPUT_LISTENER_H -#include <ui/Input.h> +#include <androidfw/Input.h> #include <utils/RefBase.h> #include <utils/Vector.h> diff --git a/services/input/InputManager.h b/services/input/InputManager.h index df4d299..29584c9 100644 --- a/services/input/InputManager.h +++ b/services/input/InputManager.h @@ -25,8 +25,8 @@ #include "InputReader.h" #include "InputDispatcher.h" -#include <ui/Input.h> -#include <ui/InputTransport.h> +#include <androidfw/Input.h> +#include <androidfw/InputTransport.h> #include <utils/Errors.h> #include <utils/Vector.h> #include <utils/Timers.h> diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp index 4be06e4..eccce29 100644 --- a/services/input/InputReader.cpp +++ b/services/input/InputReader.cpp @@ -39,8 +39,8 @@ #include "InputReader.h" #include <cutils/log.h> -#include <ui/Keyboard.h> -#include <ui/VirtualKeyMap.h> +#include <androidfw/Keyboard.h> +#include <androidfw/VirtualKeyMap.h> #include <stddef.h> #include <stdlib.h> diff --git a/services/input/InputReader.h b/services/input/InputReader.h index ad89a22..9bbe49c 100644 --- a/services/input/InputReader.h +++ b/services/input/InputReader.h @@ -21,7 +21,7 @@ #include "PointerController.h" #include "InputListener.h" -#include <ui/Input.h> +#include <androidfw/Input.h> #include <ui/DisplayInfo.h> #include <utils/KeyedVector.h> #include <utils/threads.h> diff --git a/services/input/InputWindow.h b/services/input/InputWindow.h index 38968f9..824a64b 100644 --- a/services/input/InputWindow.h +++ b/services/input/InputWindow.h @@ -17,8 +17,8 @@ #ifndef _UI_INPUT_WINDOW_H #define _UI_INPUT_WINDOW_H -#include <ui/Input.h> -#include <ui/InputTransport.h> +#include <androidfw/Input.h> +#include <androidfw/InputTransport.h> #include <utils/RefBase.h> #include <utils/Timers.h> #include <utils/String8.h> diff --git a/services/input/PointerController.h b/services/input/PointerController.h index 700ef72..39dbf6b 100644 --- a/services/input/PointerController.h +++ b/services/input/PointerController.h @@ -20,7 +20,7 @@ #include "SpriteController.h" #include <ui/DisplayInfo.h> -#include <ui/Input.h> +#include <androidfw/Input.h> #include <utils/RefBase.h> #include <utils/Looper.h> #include <utils/String8.h> diff --git a/services/jni/com_android_server_PowerManagerService.h b/services/jni/com_android_server_PowerManagerService.h index af10711..cc3b5ef5 100644 --- a/services/jni/com_android_server_PowerManagerService.h +++ b/services/jni/com_android_server_PowerManagerService.h @@ -20,7 +20,7 @@ #include "JNIHelp.h" #include "jni.h" -#include <ui/PowerManager.h> +#include <androidfw/PowerManager.h> namespace android { diff --git a/tools/makekeycodes/makekeycodes.cpp b/tools/makekeycodes/makekeycodes.cpp index 16df774..6ffbfb8 100644 --- a/tools/makekeycodes/makekeycodes.cpp +++ b/tools/makekeycodes/makekeycodes.cpp @@ -1,5 +1,21 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include <stdio.h> -#include <ui/KeycodeLabels.h> +#include <androidfw/KeycodeLabels.h> int main(int argc, char** argv) |