summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-02-25 13:09:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-25 13:09:24 +0000
commit7fc5b5a129a3599c4a213117415e113a85d09745 (patch)
tree44ebe861cb16cb396315575b6b487a6d91dfccd0
parent99142d298213e93f673057c2334b04b38f7e4450 (diff)
parenta9ad0fc793e3479e678441f2ed7abd47994ab74d (diff)
downloadframeworks_base-7fc5b5a129a3599c4a213117415e113a85d09745.zip
frameworks_base-7fc5b5a129a3599c4a213117415e113a85d09745.tar.gz
frameworks_base-7fc5b5a129a3599c4a213117415e113a85d09745.tar.bz2
am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
* commit 'a9ad0fc793e3479e678441f2ed7abd47994ab74d': 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