From a95e4cb62f3642cb190d032dbf7dc40d9ecc6973 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Fri, 18 Jun 2010 18:09:33 -0700 Subject: [PATCH] First stab at attaching native event dispatching. Provides the basic infrastructure for a NativeActivity's native code to get an object representing its event stream that can be used to read input events. Still work to do, probably some API changes, and reasonable default key handling (so that for example back will still work). Change-Id: I6db891bc35dc9683181d7708eaed552b955a077e --- api/current.xml | 84 +++++++ core/java/android/app/NativeActivity.java | 16 +- core/java/android/view/InputChannel.java | 5 +- core/java/android/view/InputConsumer.java | 39 +++ core/java/android/view/ViewRoot.java | 24 +- core/java/android/view/Window.java | 7 + .../internal/view/RootViewSurfaceTaker.java | 2 + core/jni/android_app_NativeActivity.cpp | 69 +++++- core/jni/android_view_InputChannel.h | 4 +- include/ui/Input.h | 7 +- include/ui/InputTransport.h | 20 ++ libs/ui/Input.cpp | 163 ------------ libs/ui/InputTransport.cpp | 19 ++ native/android/Android.mk | 26 ++ native/android/activity.cpp | 0 native/android/input.cpp | 233 ++++++++++++++++++ native/include/android/input.h | 36 +++ native/include/android/native_activity.h | 15 ++ .../internal/policy/impl/PhoneWindow.java | 12 + 19 files changed, 606 insertions(+), 175 deletions(-) create mode 100644 core/java/android/view/InputConsumer.java create mode 100644 native/android/Android.mk create mode 100644 native/android/activity.cpp create mode 100644 native/android/input.cpp diff --git a/api/current.xml b/api/current.xml index a21f42b758cd0..2266257d98920 100644 --- a/api/current.xml +++ b/api/current.xml @@ -26306,6 +26306,8 @@ deprecated="not deprecated" visibility="public" > + + + + + + + + + + + + + + + + + + + + + + + + + + #include "JNIHelp.h" +#include "android_view_InputChannel.h" #include #include +#include #include @@ -33,9 +35,13 @@ struct NativeCode { dlhandle = _dlhandle; createActivityFunc = _createFunc; surface = NULL; + inputChannel = NULL; + nativeInputQueue = NULL; } ~NativeCode() { + setSurface(NULL); + setInputChannel(NULL); if (callbacks.onDestroy != NULL) { callbacks.onDestroy(&activity); } @@ -55,6 +61,31 @@ struct NativeCode { } } + status_t setInputChannel(jobject _channel) { + if (inputChannel != NULL) { + delete nativeInputQueue; + activity.env->DeleteGlobalRef(inputChannel); + } + inputChannel = NULL; + nativeInputQueue = NULL; + if (_channel != NULL) { + inputChannel = activity.env->NewGlobalRef(_channel); + sp ic = + android_view_InputChannel_getInputChannel(activity.env, _channel); + if (ic != NULL) { + nativeInputQueue = new input_queue_t(ic); + if (nativeInputQueue->getConsumer().initialize() != android::OK) { + delete nativeInputQueue; + nativeInputQueue = NULL; + return UNKNOWN_ERROR; + } + } else { + return UNKNOWN_ERROR; + } + } + return OK; + } + android_activity_t activity; android_activity_callbacks_t callbacks; @@ -62,6 +93,8 @@ struct NativeCode { android_activity_create_t* createActivityFunc; jobject surface; + jobject inputChannel; + struct input_queue_t* nativeInputQueue; }; static jint @@ -217,6 +250,38 @@ onSurfaceDestroyed_native(JNIEnv* env, jobject clazz, jint handle, jobject surfa } } +static void +onInputChannelCreated_native(JNIEnv* env, jobject clazz, jint handle, jobject channel) +{ + if (handle != 0) { + NativeCode* code = (NativeCode*)handle; + status_t err = code->setInputChannel(channel); + if (err != OK) { + jniThrowException(env, "java/lang/IllegalStateException", + "Error setting input channel"); + return; + } + if (code->callbacks.onInputQueueCreated != NULL) { + code->callbacks.onInputQueueCreated(&code->activity, + code->nativeInputQueue); + } + } +} + +static void +onInputChannelDestroyed_native(JNIEnv* env, jobject clazz, jint handle, jobject channel) +{ + if (handle != 0) { + NativeCode* code = (NativeCode*)handle; + if (code->nativeInputQueue != NULL + && code->callbacks.onInputQueueDestroyed != NULL) { + code->callbacks.onInputQueueDestroyed(&code->activity, + code->nativeInputQueue); + } + code->setInputChannel(NULL); + } +} + static const JNINativeMethod g_methods[] = { { "loadNativeCode", "(Ljava/lang/String;)I", (void*)loadNativeCode_native }, { "unloadNativeCode", "(I)V", (void*)unloadNativeCode_native }, @@ -230,6 +295,8 @@ static const JNINativeMethod g_methods[] = { { "onSurfaceCreatedNative", "(ILandroid/view/SurfaceHolder;)V", (void*)onSurfaceCreated_native }, { "onSurfaceChangedNative", "(ILandroid/view/SurfaceHolder;III)V", (void*)onSurfaceChanged_native }, { "onSurfaceDestroyedNative", "(ILandroid/view/SurfaceHolder;)V", (void*)onSurfaceDestroyed_native }, + { "onInputChannelCreatedNative", "(ILandroid/view/InputChannel;)V", (void*)onInputChannelCreated_native }, + { "onInputChannelDestroyedNative", "(ILandroid/view/InputChannel;)V", (void*)onInputChannelDestroyed_native }, }; static const char* const kNativeActivityPathName = "android/app/NativeActivity"; @@ -248,4 +315,4 @@ int register_android_app_NativeActivity(JNIEnv* env) g_methods, NELEM(g_methods)); } -} +} // namespace android diff --git a/core/jni/android_view_InputChannel.h b/core/jni/android_view_InputChannel.h index ac1defba4829b..fa2d282889233 100644 --- a/core/jni/android_view_InputChannel.h +++ b/core/jni/android_view_InputChannel.h @@ -19,9 +19,9 @@ #include "jni.h" -namespace android { +#include -class InputChannel; +namespace android { typedef void (*InputChannelObjDisposeCallback)(JNIEnv* env, jobject inputChannelObj, const sp& inputChannel, void* data); diff --git a/include/ui/Input.h b/include/ui/Input.h index 979d6e8f42ba7..32f85b3b6eaaf 100644 --- a/include/ui/Input.h +++ b/include/ui/Input.h @@ -40,6 +40,11 @@ enum { */ #define MAX_POINTERS 10 +/* + * Declare a concrete type for the NDK's input event forward declaration. + */ +struct input_event_t { }; + namespace android { /* @@ -128,8 +133,6 @@ struct PointerCoords { /* * Input events. */ -struct input_event_t { }; - class InputEvent : public input_event_t { public: virtual ~InputEvent() { } diff --git a/include/ui/InputTransport.h b/include/ui/InputTransport.h index 7b182f384a96a..d6bded6207868 100644 --- a/include/ui/InputTransport.h +++ b/include/ui/InputTransport.h @@ -330,4 +330,24 @@ private: } // namespace android +/* + * NDK input queue API. + */ +struct input_queue_t { +public: + /* Creates a consumer associated with an input channel. */ + explicit input_queue_t(const android::sp& channel); + + /* Destroys the consumer and releases its input channel. */ + ~input_queue_t(); + + inline android::InputConsumer& getConsumer() { return mConsumer; } + + android::status_t consume(android::InputEvent** event); + +private: + android::InputConsumer mConsumer; + android::PreallocatedInputEventFactory mInputEventFactory; +}; + #endif // _UI_INPUT_TRANSPORT_H diff --git a/libs/ui/Input.cpp b/libs/ui/Input.cpp index 0e6f2f53ee133..4121b5a438c2e 100644 --- a/libs/ui/Input.cpp +++ b/libs/ui/Input.cpp @@ -88,166 +88,3 @@ void MotionEvent::offsetLocation(float xOffset, float yOffset) { } } // namespace android - -// NDK APIs - -using android::InputEvent; -using android::KeyEvent; -using android::MotionEvent; - -int32_t input_event_get_type(const input_event_t* event) { - return reinterpret_cast(event)->getType(); -} - -int32_t input_event_get_device_id(const input_event_t* event) { - return reinterpret_cast(event)->getDeviceId(); -} - -int32_t input_event_get_nature(const input_event_t* event) { - return reinterpret_cast(event)->getNature(); -} - -int32_t key_event_get_action(const input_event_t* key_event) { - return reinterpret_cast(key_event)->getAction(); -} - -int32_t key_event_get_flags(const input_event_t* key_event) { - return reinterpret_cast(key_event)->getFlags(); -} - -int32_t key_event_get_key_code(const input_event_t* key_event) { - return reinterpret_cast(key_event)->getKeyCode(); -} - -int32_t key_event_get_scan_code(const input_event_t* key_event) { - return reinterpret_cast(key_event)->getScanCode(); -} - -int32_t key_event_get_meta_state(const input_event_t* key_event) { - return reinterpret_cast(key_event)->getMetaState(); -} -int32_t key_event_get_repeat_count(const input_event_t* key_event) { - return reinterpret_cast(key_event)->getRepeatCount(); -} - -int64_t key_event_get_down_time(const input_event_t* key_event) { - return reinterpret_cast(key_event)->getDownTime(); -} - -int64_t key_event_get_event_time(const input_event_t* key_event) { - return reinterpret_cast(key_event)->getEventTime(); -} - -int32_t motion_event_get_action(const input_event_t* motion_event) { - return reinterpret_cast(motion_event)->getAction(); -} - -int32_t motion_event_get_meta_state(const input_event_t* motion_event) { - return reinterpret_cast(motion_event)->getMetaState(); -} - -int32_t motion_event_get_edge_flags(const input_event_t* motion_event) { - return reinterpret_cast(motion_event)->getEdgeFlags(); -} - -int64_t motion_event_get_down_time(const input_event_t* motion_event) { - return reinterpret_cast(motion_event)->getDownTime(); -} - -int64_t motion_event_get_event_time(const input_event_t* motion_event) { - return reinterpret_cast(motion_event)->getEventTime(); -} - -float motion_event_get_x_offset(const input_event_t* motion_event) { - return reinterpret_cast(motion_event)->getXOffset(); -} - -float motion_event_get_y_offset(const input_event_t* motion_event) { - return reinterpret_cast(motion_event)->getYOffset(); -} - -float motion_event_get_x_precision(const input_event_t* motion_event) { - return reinterpret_cast(motion_event)->getXPrecision(); -} - -float motion_event_get_y_precision(const input_event_t* motion_event) { - return reinterpret_cast(motion_event)->getYPrecision(); -} - -size_t motion_event_get_pointer_count(const input_event_t* motion_event) { - return reinterpret_cast(motion_event)->getPointerCount(); -} - -int32_t motion_event_get_pointer_id(const input_event_t* motion_event, size_t pointer_index) { - return reinterpret_cast(motion_event)->getPointerId(pointer_index); -} - -float motion_event_get_raw_x(const input_event_t* motion_event, size_t pointer_index) { - return reinterpret_cast(motion_event)->getRawX(pointer_index); -} - -float motion_event_get_raw_y(const input_event_t* motion_event, size_t pointer_index) { - return reinterpret_cast(motion_event)->getRawY(pointer_index); -} - -float motion_event_get_x(const input_event_t* motion_event, size_t pointer_index) { - return reinterpret_cast(motion_event)->getX(pointer_index); -} - -float motion_event_get_y(const input_event_t* motion_event, size_t pointer_index) { - return reinterpret_cast(motion_event)->getY(pointer_index); -} - -float motion_event_get_pressure(const input_event_t* motion_event, size_t pointer_index) { - return reinterpret_cast(motion_event)->getPressure(pointer_index); -} - -float motion_event_get_size(const input_event_t* motion_event, size_t pointer_index) { - return reinterpret_cast(motion_event)->getSize(pointer_index); -} - -size_t motion_event_get_history_size(const input_event_t* motion_event) { - return reinterpret_cast(motion_event)->getHistorySize(); -} - -int64_t motion_event_get_historical_event_time(input_event_t* motion_event, - size_t history_index) { - return reinterpret_cast(motion_event)->getHistoricalEventTime( - history_index); -} - -float motion_event_get_historical_raw_x(input_event_t* motion_event, size_t pointer_index, - size_t history_index) { - return reinterpret_cast(motion_event)->getHistoricalRawX( - pointer_index, history_index); -} - -float motion_event_get_historical_raw_y(input_event_t* motion_event, size_t pointer_index, - size_t history_index) { - return reinterpret_cast(motion_event)->getHistoricalRawY( - pointer_index, history_index); -} - -float motion_event_get_historical_x(input_event_t* motion_event, size_t pointer_index, - size_t history_index) { - return reinterpret_cast(motion_event)->getHistoricalX( - pointer_index, history_index); -} - -float motion_event_get_historical_y(input_event_t* motion_event, size_t pointer_index, - size_t history_index) { - return reinterpret_cast(motion_event)->getHistoricalY( - pointer_index, history_index); -} - -float motion_event_get_historical_pressure(input_event_t* motion_event, size_t pointer_index, - size_t history_index) { - return reinterpret_cast(motion_event)->getHistoricalPressure( - pointer_index, history_index); -} - -float motion_event_get_historical_size(input_event_t* motion_event, size_t pointer_index, - size_t history_index) { - return reinterpret_cast(motion_event)->getHistoricalSize( - pointer_index, history_index); -} diff --git a/libs/ui/InputTransport.cpp b/libs/ui/InputTransport.cpp index 86bbd3782d501..b2842d0aef816 100644 --- a/libs/ui/InputTransport.cpp +++ b/libs/ui/InputTransport.cpp @@ -686,3 +686,22 @@ void InputConsumer::populateMotionEvent(MotionEvent* motionEvent) const { } } // namespace android + +// --- input_queue_t --- + +using android::InputEvent; +using android::InputChannel; +using android::InputConsumer; +using android::sp; +using android::status_t; + +input_queue_t::input_queue_t(const sp& channel) : + mConsumer(channel) { +} + +input_queue_t::~input_queue_t() { +} + +status_t input_queue_t::consume(InputEvent** event) { + return mConsumer.consume(&mInputEventFactory, event); +} diff --git a/native/android/Android.mk b/native/android/Android.mk new file mode 100644 index 0000000000000..8c621b6017369 --- /dev/null +++ b/native/android/Android.mk @@ -0,0 +1,26 @@ +BASE_PATH := $(call my-dir) +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +# our source files +# +LOCAL_SRC_FILES:= \ + activity.cpp \ + input.cpp + +LOCAL_SHARED_LIBRARIES := \ + libandroid_runtime \ + libcutils \ + libutils \ + libbinder \ + libui + +LOCAL_C_INCLUDES += \ + frameworks/base/native/include \ + frameworks/base/core/jni/android \ + dalvik/libnativehelper/include/nativehelper + +LOCAL_MODULE:= libandroid + +include $(BUILD_SHARED_LIBRARY) diff --git a/native/android/activity.cpp b/native/android/activity.cpp new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/native/android/input.cpp b/native/android/input.cpp new file mode 100644 index 0000000000000..38d8567e313ca --- /dev/null +++ b/native/android/input.cpp @@ -0,0 +1,233 @@ +/* + * Copyright (C) 2009 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. + */ + +#define LOG_TAG "input" +#include + +#include +#include +#include + +#include + +using android::InputEvent; +using android::KeyEvent; +using android::MotionEvent; + +int32_t input_event_get_type(const input_event_t* event) { + return static_cast(event)->getType(); +} + +int32_t input_event_get_device_id(const input_event_t* event) { + return static_cast(event)->getDeviceId(); +} + +int32_t input_event_get_nature(const input_event_t* event) { + return static_cast(event)->getNature(); +} + +int32_t key_event_get_action(const input_event_t* key_event) { + return static_cast(key_event)->getAction(); +} + +int32_t key_event_get_flags(const input_event_t* key_event) { + return static_cast(key_event)->getFlags(); +} + +int32_t key_event_get_key_code(const input_event_t* key_event) { + return static_cast(key_event)->getKeyCode(); +} + +int32_t key_event_get_scan_code(const input_event_t* key_event) { + return static_cast(key_event)->getScanCode(); +} + +int32_t key_event_get_meta_state(const input_event_t* key_event) { + return static_cast(key_event)->getMetaState(); +} +int32_t key_event_get_repeat_count(const input_event_t* key_event) { + return static_cast(key_event)->getRepeatCount(); +} + +int64_t key_event_get_down_time(const input_event_t* key_event) { + return static_cast(key_event)->getDownTime(); +} + +int64_t key_event_get_event_time(const input_event_t* key_event) { + return static_cast(key_event)->getEventTime(); +} + +int32_t motion_event_get_action(const input_event_t* motion_event) { + return static_cast(motion_event)->getAction(); +} + +int32_t motion_event_get_meta_state(const input_event_t* motion_event) { + return static_cast(motion_event)->getMetaState(); +} + +int32_t motion_event_get_edge_flags(const input_event_t* motion_event) { + return reinterpret_cast(motion_event)->getEdgeFlags(); +} + +int64_t motion_event_get_down_time(const input_event_t* motion_event) { + return static_cast(motion_event)->getDownTime(); +} + +int64_t motion_event_get_event_time(const input_event_t* motion_event) { + return static_cast(motion_event)->getEventTime(); +} + +float motion_event_get_x_offset(const input_event_t* motion_event) { + return static_cast(motion_event)->getXOffset(); +} + +float motion_event_get_y_offset(const input_event_t* motion_event) { + return static_cast(motion_event)->getYOffset(); +} + +float motion_event_get_x_precision(const input_event_t* motion_event) { + return static_cast(motion_event)->getXPrecision(); +} + +float motion_event_get_y_precision(const input_event_t* motion_event) { + return static_cast(motion_event)->getYPrecision(); +} + +size_t motion_event_get_pointer_count(const input_event_t* motion_event) { + return static_cast(motion_event)->getPointerCount(); +} + +int32_t motion_event_get_pointer_id(const input_event_t* motion_event, size_t pointer_index) { + return static_cast(motion_event)->getPointerId(pointer_index); +} + +float motion_event_get_raw_x(const input_event_t* motion_event, size_t pointer_index) { + return static_cast(motion_event)->getRawX(pointer_index); +} + +float motion_event_get_raw_y(const input_event_t* motion_event, size_t pointer_index) { + return static_cast(motion_event)->getRawY(pointer_index); +} + +float motion_event_get_x(const input_event_t* motion_event, size_t pointer_index) { + return static_cast(motion_event)->getX(pointer_index); +} + +float motion_event_get_y(const input_event_t* motion_event, size_t pointer_index) { + return static_cast(motion_event)->getY(pointer_index); +} + +float motion_event_get_pressure(const input_event_t* motion_event, size_t pointer_index) { + return static_cast(motion_event)->getPressure(pointer_index); +} + +float motion_event_get_size(const input_event_t* motion_event, size_t pointer_index) { + return static_cast(motion_event)->getSize(pointer_index); +} + +size_t motion_event_get_history_size(const input_event_t* motion_event) { + return static_cast(motion_event)->getHistorySize(); +} + +int64_t motion_event_get_historical_event_time(input_event_t* motion_event, + size_t history_index) { + return static_cast(motion_event)->getHistoricalEventTime( + history_index); +} + +float motion_event_get_historical_raw_x(input_event_t* motion_event, size_t pointer_index, + size_t history_index) { + return static_cast(motion_event)->getHistoricalRawX( + pointer_index, history_index); +} + +float motion_event_get_historical_raw_y(input_event_t* motion_event, size_t pointer_index, + size_t history_index) { + return static_cast(motion_event)->getHistoricalRawY( + pointer_index, history_index); +} + +float motion_event_get_historical_x(input_event_t* motion_event, size_t pointer_index, + size_t history_index) { + return static_cast(motion_event)->getHistoricalX( + pointer_index, history_index); +} + +float motion_event_get_historical_y(input_event_t* motion_event, size_t pointer_index, + size_t history_index) { + return static_cast(motion_event)->getHistoricalY( + pointer_index, history_index); +} + +float motion_event_get_historical_pressure(input_event_t* motion_event, size_t pointer_index, + size_t history_index) { + return static_cast(motion_event)->getHistoricalPressure( + pointer_index, history_index); +} + +float motion_event_get_historical_size(input_event_t* motion_event, size_t pointer_index, + size_t history_index) { + return static_cast(motion_event)->getHistoricalSize( + pointer_index, history_index); +} + +int input_queue_get_fd(input_queue_t* queue) { + return queue->getConsumer().getChannel()->getReceivePipeFd(); +} + +int input_queue_has_events(input_queue_t* queue) { + struct pollfd pfd; + + pfd.fd = queue->getConsumer().getChannel()->getReceivePipeFd(); + pfd.events = POLLIN; + pfd.revents = 0; + + int nfd = poll(&pfd, 1, 0); + if (nfd <= 0) return nfd; + return pfd.revents == POLLIN ? 1 : -1; +} + +int32_t input_queue_get_event(input_queue_t* queue, input_event_t** outEvent) { + *outEvent = NULL; + + int32_t res = queue->getConsumer().receiveDispatchSignal(); + if (res != android::OK) { + LOGE("channel '%s' ~ Failed to receive dispatch signal. status=%d", + queue->getConsumer().getChannel()->getName().string(), res); + return -1; + } + + InputEvent* myEvent = NULL; + res = queue->consume(&myEvent); + if (res != android::OK) { + LOGW("channel '%s' ~ Failed to consume input event. status=%d", + queue->getConsumer().getChannel()->getName().string(), res); + queue->getConsumer().sendFinishedSignal(); + return -1; + } + + *outEvent = myEvent; + return 0; +} + +void input_queue_finish_event(input_queue_t* queue, input_event_t* event, + int handled) { + int32_t res = queue->getConsumer().sendFinishedSignal(); + if (res != android::OK) { + LOGW("Failed to send finished signal on channel '%s'. status=%d", + queue->getConsumer().getChannel()->getName().string(), res); + } +} diff --git a/native/include/android/input.h b/native/include/android/input.h index 193cbf3cb3379..2441af0ad8baf 100644 --- a/native/include/android/input.h +++ b/native/include/android/input.h @@ -523,6 +523,42 @@ float motion_event_get_historical_pressure(input_event_t* motion_event, size_t p float motion_event_get_historical_size(input_event_t* motion_event, size_t pointer_index, size_t history_index); +/* + * Input queue + * + * An input queue is the facility through which you retrieve input + * events. + */ +struct input_queue_t; +typedef struct input_queue_t input_queue_t; + +/* + * Return a file descriptor for the queue, which you + * can use to determine if there are events available. This + * is typically used with select() or poll() to multiplex + * with other kinds of events. + */ +int input_queue_get_fd(input_queue_t* queue); + +/* + * Returns true if there are one or more events available in the + * input queue. Returns 1 if the queue has events; 0 if + * it does not have events; and a negative value if there is an error. + */ +int input_queue_has_events(input_queue_t* queue); + +/* + * Returns the next available event from the queue. Returns a negative + * value if no events are available or an error has occurred. + */ +int32_t input_queue_get_event(input_queue_t* queue, input_event_t** outEvent); + +/* + * Report that dispatching has finished with the given event. + * This must be called after receiving an event with input_queue_get_event(). + */ +void input_queue_finish_event(input_queue_t* queue, input_event_t* event, int handled); + #ifdef __cplusplus } #endif diff --git a/native/include/android/native_activity.h b/native/include/android/native_activity.h index 328a4b5ffa89f..a58a7d27c6046 100644 --- a/native/include/android/native_activity.h +++ b/native/include/android/native_activity.h @@ -23,6 +23,8 @@ #include +#include + #ifdef __cplusplus extern "C" { #endif @@ -144,6 +146,19 @@ typedef struct android_activity_callbacks_t { * returning from here. */ void (*onSurfaceDestroyed)(android_activity_t* activity, android_surface_t* surface); + + /** + * The input queue for this native activity's window has been created. + * You can use the given input queue to start retrieving input events. + */ + void (*onInputQueueCreated)(android_activity_t* activity, input_queue_t* queue); + + /** + * The input queue for this native activity's window is being destroyed. + * You should no longer try to reference this object upon returning from this + * function. + */ + void (*onInputQueueDestroyed)(android_activity_t* activity, input_queue_t* queue); /** * The system is running low on memory. Use this callback to release diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 0cb0efc2a094e..78776117e323d 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -56,6 +56,7 @@ import android.util.Log; import android.util.SparseArray; import android.view.Gravity; import android.view.HapticFeedbackConstants; +import android.view.InputConsumer; import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -70,6 +71,7 @@ import android.view.ViewManager; import android.view.VolumePanel; import android.view.Window; import android.view.WindowManager; +import android.view.InputConsumer.Callback; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.view.animation.Animation; @@ -108,6 +110,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { SurfaceHolder.Callback mTakeSurfaceCallback; BaseSurfaceHolder mSurfaceHolder; + InputConsumer.Callback mTakeInputChannelCallback; + private boolean mIsFloating; private LayoutInflater mLayoutInflater; @@ -251,6 +255,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { mTakeSurfaceCallback = callback; } + public void takeInputChannel(InputConsumer.Callback callback) { + mTakeInputChannelCallback = callback; + } + @Override public boolean isFloating() { return mIsFloating; @@ -2037,6 +2045,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { return mFeatureId < 0 ? mTakeSurfaceCallback : null; } + public InputConsumer.Callback willYouTakeTheInputConsumer() { + return mFeatureId < 0 ? mTakeInputChannelCallback : null; + } + public void setSurfaceType(int type) { PhoneWindow.this.setType(type); }