diff options
| author | Xin Li <delphij@google.com> | 2018-06-08 11:08:00 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-06-08 11:08:00 -0700 |
| commit | dca8bbde29406dcd911d44eccf1a2085890e3704 (patch) | |
| tree | ad670cba15647576904002c7a0c79cd4ac99a8cb | |
| parent | 3f412ec3ef5dbc60beeb57fb37d9e198c6f8049d (diff) | |
| parent | 641273e91b274c8ed57ef9e861cf51423ee1ec2d (diff) | |
| download | Launcher2-temp_p_merge.tar.gz | |
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_merge
Bug: 79597307
Change-Id: I949821fc7c3884feaec2565415b2db0378ed8b20
| -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) |