| commit | 25d3f38fac51e455060ad315dad80fe407fa248d | [log] [tgz] |
|---|---|---|
| author | Shan Huang <shanh@google.com> | Thu Apr 29 03:00:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 29 03:00:32 2021 +0000 |
| tree | 6f58fb643fdbc15426838440917067d4a00b719d | |
| parent | 7ed958b1e9ff9aa7c7161257ee65716412a2e3db [diff] | |
| parent | 64fc7543f0b1fa3913c75e4c93927ce65ca1216e [diff] |
Merge "Updated launcher text shadow values." into sc-dev am: 64fc7543f0 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14204932 Change-Id: I7b44f18fd805055550c3dbe1ed0c60ac5843ef9b
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))