diff options
| author | Stevie Kideckel <kideckel@google.com> | 2021-02-09 20:39:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-02-09 20:39:19 +0000 |
| commit | d6a8f14a79c8df40cf3e04e9ebffcbeb3642784d (patch) | |
| tree | 38cc64bfa820ff307fd8c1f38464a5ff1dd78e80 /core/java | |
| parent | 0170af7b47c019fae29207fbab94bc5e3af599d5 (diff) | |
| parent | ca127732b89b6e9611449f27bc7b1ba44ab73e84 (diff) | |
Merge "Add the android:clipToOutline attribute for views." into sc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/View.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index e1ccc51c71e1..1273b491d0e1 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -740,6 +740,7 @@ import java.util.function.Predicate; * @attr ref android.R.styleable#View_alpha * @attr ref android.R.styleable#View_background * @attr ref android.R.styleable#View_clickable + * @attr ref android.R.styleable#View_clipToOutline * @attr ref android.R.styleable#View_contentDescription * @attr ref android.R.styleable#View_drawingCacheQuality * @attr ref android.R.styleable#View_duplicateParentState @@ -5968,6 +5969,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, case R.styleable.View_scrollCaptureHint: setScrollCaptureHint((a.getInt(attr, SCROLL_CAPTURE_HINT_AUTO))); break; + case R.styleable.View_clipToOutline: + setClipToOutline(a.getBoolean(attr, false)); + break; } } @@ -17921,6 +17925,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @see #setOutlineProvider(ViewOutlineProvider) * @see #getClipToOutline() + * + * @attr ref android.R.styleable#View_clipToOutline */ @RemotableViewMethod public void setClipToOutline(boolean clipToOutline) { |