51eb29fa9a
This fixes a bug where a View with filterTouchesWhenObscured will have all touches filtered when in magnification accessibility mode. This is due to magnification being a separate Window over top of the running Activity. The method onFilterTouchEventForSecurity in View will then always return false when filterTouchesWhenObscured is enabled on the View. By adding the magnification Window to the list of Trusted Overlays we can ensure that touches will work properly with this property enabled. This corresponds to AOSP change I07706588a625682d05da5cb19f401139eb08a54c Change-Id: Iba095433a1f9045349d1b47a58a33b850ed31c97
73 lines
1.9 KiB
C++
73 lines
1.9 KiB
C++
/*
|
|
* 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_MAGNIFICATION_OVERLAY
|
|
|| 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
|