Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"

Browse Source 
* commit '9feab5f278d8c9e030e72989a7f6f3d2f376748d':
  Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
This commit is contained in:
Michael Wright
2014-04-30 01:19:52 +00:00
committed by Android Git Automerger
parent ad85d5422b 9feab5f278
commit 3e320a0cac
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/input/InputWindow.cpp
View File

@@ -36,6 +36,7 @@ bool InputWindowInfo::frameContainsPoint(int32_t x, int32_t y) const {
bool InputWindowInfo::isTrustedOverlay() const { bool InputWindowInfo::isTrustedOverlay() const {
return layoutParamsType == TYPE_INPUT_METHOD return layoutParamsType == TYPE_INPUT_METHOD
|| layoutParamsType == TYPE_INPUT_METHOD_DIALOG || layoutParamsType == TYPE_INPUT_METHOD_DIALOG
|| layoutParamsType == TYPE_MAGNIFICATION_OVERLAY
|| layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY; || layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY;
} }

1
libs/input/InputWindow.h
View File

@@ -105,6 +105,7 @@ struct InputWindowInfo {
TYPE_NAVIGATION_BAR = FIRST_SYSTEM_WINDOW+19, TYPE_NAVIGATION_BAR = FIRST_SYSTEM_WINDOW+19,
TYPE_VOLUME_OVERLAY = FIRST_SYSTEM_WINDOW+20, TYPE_VOLUME_OVERLAY = FIRST_SYSTEM_WINDOW+20,
TYPE_BOOT_PROGRESS = FIRST_SYSTEM_WINDOW+21, TYPE_BOOT_PROGRESS = FIRST_SYSTEM_WINDOW+21,
TYPE_MAGNIFICATION_OVERLAY = FIRST_SYSTEM_WINDOW+27,
LAST_SYSTEM_WINDOW = 2999, LAST_SYSTEM_WINDOW = 2999,
}; };