Merge "Add TYPE_MAGNIFICATION_OVERLAY to isTrustedOverlay"

This commit is contained in:
Conley Owens 2014-04-30 00:09:36 +00:00 committed by Android (Google) Code Review
commit 2eefe69f9e
2 changed files with 2 additions and 0 deletions

View File

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

View File

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