Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "docs: Fixing malformatted HTML escape" into oc-dev

Browse Source
This commit is contained in:
Andrew Solovay
2017-05-24 17:56:23 +00:00
committed by Android (Google) Code Review
parent 06fe82293e 22ebb54e17
commit 1272847f1d
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
graphics/java/android/graphics/drawable/RippleDrawable.java
View File

@@ -58,11 +58,11 @@ import java.util.Arrays;
* mask using {@code setId(..., android.R.id.mask)} or an existing mask layer * mask using {@code setId(..., android.R.id.mask)} or an existing mask layer
* may be replaced using {@code setDrawableByLayerId(android.R.id.mask, ...)}. * may be replaced using {@code setDrawableByLayerId(android.R.id.mask, ...)}.
* <pre> * <pre>
* <code>&lt!-- A red ripple masked against an opaque rectangle. --/> * <code>&lt;!-- A red ripple masked against an opaque rectangle. --/>
* &ltripple android:color="#ffff0000"> * &lt;ripple android:color="#ffff0000">
* &ltitem android:id="@android:id/mask" * &lt;item android:id="@android:id/mask"
* android:drawable="@android:color/white" /> * android:drawable="@android:color/white" />
* &lt/ripple></code> * &lt;/ripple></code>
* </pre> * </pre>
* <p> * <p>
* If a mask layer is set, the ripple effect will be masked against that layer * If a mask layer is set, the ripple effect will be masked against that layer
@@ -71,15 +71,15 @@ import java.util.Arrays;
* If no mask layer is set, the ripple effect is masked against the composite * If no mask layer is set, the ripple effect is masked against the composite
* of the child layers. * of the child layers.
* <pre> * <pre>
* <code>&lt!-- A green ripple drawn atop a black rectangle. --/> * <code>&lt;!-- A green ripple drawn atop a black rectangle. --/>
* &ltripple android:color="#ff00ff00"> * &lt;ripple android:color="#ff00ff00">
* &ltitem android:drawable="@android:color/black" /> * &lt;item android:drawable="@android:color/black" />
* &lt/ripple> * &lt;/ripple>
* *
* &lt!-- A blue ripple drawn atop a drawable resource. --/> * &lt;!-- A blue ripple drawn atop a drawable resource. --/>
* &ltripple android:color="#ff0000ff"> * &lt;ripple android:color="#ff0000ff">
* &ltitem android:drawable="@drawable/my_drawable" /> * &lt;item android:drawable="@drawable/my_drawable" />
* &lt/ripple></code> * &lt;/ripple></code>
* </pre> * </pre>
* <p> * <p>
* If no child layers or mask is specified and the ripple is set as a View * If no child layers or mask is specified and the ripple is set as a View
@@ -87,8 +87,8 @@ import java.util.Arrays;
* background within the View's hierarchy. In this case, the drawing region * background within the View's hierarchy. In this case, the drawing region
* may extend outside of the Drawable bounds. * may extend outside of the Drawable bounds.
* <pre> * <pre>
* <code>&lt!-- An unbounded red ripple. --/> * <code>&lt;!-- An unbounded red ripple. --/>
* &ltripple android:color="#ffff0000" /></code> * &lt;ripple android:color="#ffff0000" /></code>
* </pre> * </pre>
* *
* @attr ref android.R.styleable#RippleDrawable_color * @attr ref android.R.styleable#RippleDrawable_color