| commit | 8f9830ec05ae995e23a82cbd749106083318521a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Apr 18 00:56:11 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 18 00:56:11 2019 +0000 |
| tree | 3380d7fe4ab27cfb049dc2f86e93044d50786874 | |
| parent | 58ba7c10ec93d14d5b8f391071e4d244d7e2888c [diff] | |
| parent | 799c54a89a841c969f9cf4dd7c35dad7a34df38c [diff] |
Merge "Do not draw anying in FloatingIconView if we are not hiding the original icon" into ub-launcher3-qt-dev
diff --git a/src/com/android/launcher3/util/FlagOp.java b/src/com/android/launcher3/util/FlagOp.java index a012c86..bd40eb9 100644 --- a/src/com/android/launcher3/util/FlagOp.java +++ b/src/com/android/launcher3/util/FlagOp.java
@@ -7,7 +7,7 @@ int apply(int flags); static FlagOp addFlag(int flag) { - return i -> i + flag; + return i -> i | flag; } static FlagOp removeFlag(int flag) {