summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-02-25 00:18:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-25 00:18:51 +0000
commitf2525ed3f4fbb61f7a5e28d2673a3557fbb7773f (patch)
treed353bff4315662524c1258159fe44ccb2571ab42
parent30a67cd17af03e53b8be5638f7f70d2989a7cd78 (diff)
parentea2a0648a85a059f7235fbae69df87ba511832cf (diff)
downloadframeworks_base-f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f.zip
frameworks_base-f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f.tar.gz
frameworks_base-f2525ed3f4fbb61f7a5e28d2673a3557fbb7773f.tar.bz2
am ea2a0648: Explain behavior of boundless ripple projection
* commit 'ea2a0648a85a059f7235fbae69df87ba511832cf': Explain behavior of boundless ripple projection
-rw-r--r--docs/html/training/material/animations.jd5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/html/training/material/animations.jd b/docs/html/training/material/animations.jd
index efc0ee3..86e91a7 100644
--- a/docs/html/training/material/animations.jd
+++ b/docs/html/training/material/animations.jd
@@ -46,9 +46,10 @@ between different states with a ripple effect.</p>
background as:</p>
<ul>
-<li><code>?android:attr/selectableItemBackground</code> for a bounded ripple</li>
+<li><code>?android:attr/selectableItemBackground</code> for a bounded ripple.</li>
<li><code>?android:attr/selectableItemBackgroundBorderless</code> for a ripple that extends beyond
-the view</li>
+the view. It will be drawn upon, and bounded by, the nearest parent of the view with a non-null
+background.</li>
</ul>
<p class="note"><strong>Note:</strong> <code>selectableItemBackgroundBorderless</code> is a new