DO NOT MERGE - Merge ab/7272582
Bug: 190855093
Merged-In: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd
Change-Id: Ia3f31c621d052d2304c2840b6f4d29eb655317cd
diff --git a/OWNERS b/OWNERS
index 381e5e9..21adf60 100644
--- a/OWNERS
+++ b/OWNERS
@@ -4,6 +4,9 @@
# People who can approve changes for submission
#
+alexchau@google.com
+andraskloczl@google.com
+patmanning@google.com
petrcermak@google.com
pbdr@google.com
kideckel@google.com
diff --git a/quickstep/res/layout/overview_actions_container.xml b/quickstep/res/layout/overview_actions_container.xml
index 258f24a..8ed09ef 100644
--- a/quickstep/res/layout/overview_actions_container.xml
+++ b/quickstep/res/layout/overview_actions_container.xml
@@ -38,7 +38,8 @@
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_screenshot"
android:text="@string/action_screenshot"
- android:theme="@style/ThemeControlHighlightWorkspaceColor" />
+ android:theme="@style/ThemeControlHighlightWorkspaceColor"
+ android:visibility="gone" />
<Space
android:layout_width="0dp"
diff --git a/tests/Android.mk b/tests/Android.mk
index e7e1a49..41130be 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -76,6 +76,9 @@
LOCAL_INSTRUMENTATION_FOR := Launcher3
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
include $(BUILD_PACKAGE)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/dummy_app/Android.mk b/tests/dummy_app/Android.mk
index f4ab582..3472079 100644
--- a/tests/dummy_app/Android.mk
+++ b/tests/dummy_app/Android.mk
@@ -7,6 +7,9 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := Aardwolf
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE
LOCAL_SDK_VERSION := current