diff options
| author | Xin Li <delphij@google.com> | 2018-08-07 16:51:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-07 16:51:26 +0000 |
| commit | 2530b4f69f079fa27ae19d2db72c3f97d8daa391 (patch) | |
| tree | ad670cba15647576904002c7a0c79cd4ac99a8cb | |
| parent | 00d14bddacb5bcb19c1b31fc258d81820a497134 (diff) | |
| parent | 3fd9aa1528632035552e6584f37eb4efb3ae78c6 (diff) | |
| download | Launcher2-master-cuttlefish-testing-release.tar.gz | |
Merge "Merge Android Pie into master"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
| -rw-r--r-- | src/com/android/launcher2/BubbleTextView.java | 2 | ||||
| -rw-r--r-- | tests/stress/Android.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java index a472225a..f8a78a23 100644 --- a/src/com/android/launcher2/BubbleTextView.java +++ b/src/com/android/launcher2/BubbleTextView.java @@ -306,7 +306,7 @@ public class BubbleTextView extends TextView { // We enhance the shadow by drawing the shadow twice getPaint().setShadowLayer(SHADOW_LARGE_RADIUS, 0.0f, SHADOW_Y_OFFSET, SHADOW_LARGE_COLOUR); super.draw(canvas); - canvas.save(Canvas.CLIP_SAVE_FLAG); + canvas.save(); canvas.clipRect(getScrollX(), getScrollY() + getExtendedPaddingTop(), getScrollX() + getWidth(), getScrollY() + getHeight(), Region.Op.INTERSECT); diff --git a/tests/stress/Android.mk b/tests/stress/Android.mk index a2971585..c1b2069b 100644 --- a/tests/stress/Android.mk +++ b/tests/stress/Android.mk @@ -18,8 +18,8 @@ include $(CLEAR_VARS) # We only want this apk build for tests. LOCAL_MODULE_TAGS := tests -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base +LOCAL_STATIC_JAVA_LIBRARIES := junit LOCAL_SRC_FILES := $(call all-java-files-under, src) |