diff options
| -rw-r--r-- | libs/gui/SurfaceComposerClient.cpp | 11 | ||||
| -rw-r--r-- | libs/gui/include/gui/SurfaceComposerClient.h | 2 | ||||
| -rw-r--r-- | libs/gui/tests/EndToEndNativeInputTest.cpp | 10 | ||||
| -rw-r--r-- | libs/input/android/FocusRequest.aidl | 2 |
4 files changed, 10 insertions, 15 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index 97c2693f29..4a372bba1e 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -1418,17 +1418,6 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setInput } SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setFocusedWindow( - const sp<IBinder>& token, const sp<IBinder>& focusedToken, nsecs_t timestampNanos, - int32_t displayId) { - FocusRequest request; - request.token = token; - request.focusedToken = focusedToken; - request.timestamp = timestampNanos; - request.displayId = displayId; - return setFocusedWindow(request); -} - -SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setFocusedWindow( const FocusRequest& request) { mInputWindowCommands.focusRequests.push_back(request); return *this; diff --git a/libs/gui/include/gui/SurfaceComposerClient.h b/libs/gui/include/gui/SurfaceComposerClient.h index 48bc5d5398..11db658de2 100644 --- a/libs/gui/include/gui/SurfaceComposerClient.h +++ b/libs/gui/include/gui/SurfaceComposerClient.h @@ -522,8 +522,6 @@ public: #ifndef NO_INPUT Transaction& setInputWindowInfo(const sp<SurfaceControl>& sc, const InputWindowInfo& info); - Transaction& setFocusedWindow(const sp<IBinder>& token, const sp<IBinder>& focusedToken, - nsecs_t timestampNanos, int32_t displayId); Transaction& setFocusedWindow(const FocusRequest& request); Transaction& syncInputWindows(); #endif diff --git a/libs/gui/tests/EndToEndNativeInputTest.cpp b/libs/gui/tests/EndToEndNativeInputTest.cpp index 3965ea0fdb..31cbbdc75c 100644 --- a/libs/gui/tests/EndToEndNativeInputTest.cpp +++ b/libs/gui/tests/EndToEndNativeInputTest.cpp @@ -202,8 +202,14 @@ public: void requestFocus() { SurfaceComposerClient::Transaction t; - t.setFocusedWindow(mInputInfo.token, nullptr, systemTime(SYSTEM_TIME_MONOTONIC), - 0 /* displayId */); + FocusRequest request; + request.token = mInputInfo.token; + request.windowName = mInputInfo.name; + request.focusedToken = nullptr; + request.focusedWindowName = ""; + request.timestamp = systemTime(SYSTEM_TIME_MONOTONIC); + request.displayId = 0; + t.setFocusedWindow(request); t.apply(true); } diff --git a/libs/input/android/FocusRequest.aidl b/libs/input/android/FocusRequest.aidl index 303dd1c349..8812d34a72 100644 --- a/libs/input/android/FocusRequest.aidl +++ b/libs/input/android/FocusRequest.aidl @@ -22,6 +22,7 @@ parcelable FocusRequest { * Input channel token used to identify the window that should gain focus. */ IBinder token; + @utf8InCpp String windowName; /** * The token that the caller expects currently to be focused. If the * specified token does not match the currently focused window, this request will be dropped. @@ -30,6 +31,7 @@ parcelable FocusRequest { * is. */ @nullable IBinder focusedToken; + @utf8InCpp String focusedWindowName; /** * SYSTEM_TIME_MONOTONIC timestamp in nanos set by the client (wm) when requesting the focus * change. This determines which request gets precedence if there is a focus change request |