commit | 0b489ceeb5a75813f59c624f96d471ec87fbd53e | [log] [tgz] |
---|---|---|
author | Steven Ng <stevenckng@google.com> | Thu Apr 29 14:06:36 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 29 14:06:36 2021 +0000 |
tree | 4c6b626d98d7f383bae0e1dcfb690e2d9890b773 | |
parent | 0928e5a4e363c248cd3a0e0e267f247f9797c87c [diff] | |
parent | 99d4010c6edf7750687bf6586ce7010b413e908a [diff] |
Merge "Use widget picker color surface for WidgetsBottomSheet" into sc-dev am: 99d4010c6e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14339830 Change-Id: Id9857754ed06ce82b981bf3b811ea63edacaf538
diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java index 7c8041c..c8a72cd 100644 --- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java +++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java
@@ -111,11 +111,6 @@ public void initialize(Task task) { mTask = task; - if (task.key.userId != UserHandle.myUserId()) { - setNoLimit(); - return; - } - THREAD_POOL_EXECUTOR.execute(() -> { final AppUsageLimit usageLimit = mLauncherApps.getAppUsageLimit( task.getTopComponent().getPackageName(),
diff --git a/tests/Android.mk b/tests/Android.mk index 2c7d30a..883a69e 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))