diff options
author | Michael Wright <michaelwr@google.com> | 2014-02-10 14:10:27 -0800 |
---|---|---|
committer | Michael Wright <michaelwr@google.com> | 2014-02-10 14:10:27 -0800 |
commit | 89e5c7ebb37fabc4368e87e17a502db62598bd61 (patch) | |
tree | 5e6352b31d6ac184a54dd34d88ec4cb71072210b /libs/input/InputWindow.cpp | |
parent | a407d6a003d746fa0aff50f7ba5da61f19a85b75 (diff) | |
download | frameworks_base-89e5c7ebb37fabc4368e87e17a502db62598bd61.zip frameworks_base-89e5c7ebb37fabc4368e87e17a502db62598bd61.tar.gz frameworks_base-89e5c7ebb37fabc4368e87e17a502db62598bd61.tar.bz2 |
Move inputservice over to frameworks/native
Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.
Change-Id: Iebef71f3030fb3d26a5f338eb66d75bb37c17734
Diffstat (limited to 'libs/input/InputWindow.cpp')
-rw-r--r-- | libs/input/InputWindow.cpp | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/libs/input/InputWindow.cpp b/libs/input/InputWindow.cpp deleted file mode 100644 index da59159..0000000 --- a/libs/input/InputWindow.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2011 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 "InputWindow" -#define LOG_NDEBUG 0 - -#include "InputWindow.h" - -#include <cutils/log.h> - -#include <ui/Rect.h> -#include <ui/Region.h> - -namespace android { - -// --- InputWindowInfo --- -void InputWindowInfo::addTouchableRegion(const Rect& region) { - touchableRegion.orSelf(region); -} - -bool InputWindowInfo::touchableRegionContainsPoint(int32_t x, int32_t y) const { - return touchableRegion.contains(x,y); -} - -bool InputWindowInfo::frameContainsPoint(int32_t x, int32_t y) const { - return x >= frameLeft && x <= frameRight - && y >= frameTop && y <= frameBottom; -} - -bool InputWindowInfo::isTrustedOverlay() const { - return layoutParamsType == TYPE_INPUT_METHOD - || layoutParamsType == TYPE_INPUT_METHOD_DIALOG - || layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY; -} - -bool InputWindowInfo::supportsSplitTouch() const { - return layoutParamsFlags & FLAG_SPLIT_TOUCH; -} - - -// --- InputWindowHandle --- - -InputWindowHandle::InputWindowHandle(const sp<InputApplicationHandle>& inputApplicationHandle) : - inputApplicationHandle(inputApplicationHandle), mInfo(NULL) { -} - -InputWindowHandle::~InputWindowHandle() { - delete mInfo; -} - -void InputWindowHandle::releaseInfo() { - if (mInfo) { - delete mInfo; - mInfo = NULL; - } -} - -} // namespace android |