diff options
author | 2022-03-23 16:01:29 -0700 | |
---|---|---|
committer | 2022-03-31 10:34:04 -0700 | |
commit | 2f01d772a56167b21b23c8dd4bfaa6cb5f667443 (patch) | |
tree | c07e5a5bab48f726a48fa779589b25eb8559e889 /libs/gui/WindowInfo.cpp | |
parent | c8df26e4e2e010f192d9111b543f9b27c4bab6d4 (diff) |
FTL: Pull Flags into namespace
Bug: 185536303
Test: Build
Change-Id: Ia9aafc78565414815dfc14732ce85b06fa96e17b
Diffstat (limited to 'libs/gui/WindowInfo.cpp')
-rw-r--r-- | libs/gui/WindowInfo.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libs/gui/WindowInfo.cpp b/libs/gui/WindowInfo.cpp index 2312a8cf0d..804ce4fac0 100644 --- a/libs/gui/WindowInfo.cpp +++ b/libs/gui/WindowInfo.cpp @@ -14,10 +14,11 @@ * limitations under the License. */ -#include <type_traits> #define LOG_TAG "WindowInfo" #define LOG_NDEBUG 0 +#include <type_traits> + #include <binder/Parcel.h> #include <gui/WindowInfo.h> @@ -25,8 +26,7 @@ namespace android::gui { -// --- WindowInfo --- -void WindowInfo::setInputConfig(Flags<InputConfig> config, bool value) { +void WindowInfo::setInputConfig(ftl::Flags<InputConfig> config, bool value) { if (value) { inputConfig |= config; return; @@ -182,18 +182,16 @@ status_t WindowInfo::readFromParcel(const android::Parcel* parcel) { return status; } - layoutParamsFlags = Flags<Flag>(lpFlags); + layoutParamsFlags = ftl::Flags<Flag>(lpFlags); layoutParamsType = static_cast<Type>(lpType); transform.set({dsdx, dtdx, tx, dtdy, dsdy, ty, 0, 0, 1}); touchOcclusionMode = static_cast<TouchOcclusionMode>(touchOcclusionModeInt); - inputConfig = Flags<InputConfig>(inputConfigInt); + inputConfig = ftl::Flags<InputConfig>(inputConfigInt); touchableRegionCropHandle = touchableRegionCropHandleSp; return OK; } -// --- WindowInfoHandle --- - WindowInfoHandle::WindowInfoHandle() {} WindowInfoHandle::~WindowInfoHandle() {} |