summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-02-25 13:26:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-25 13:26:53 +0000
commit7914fa5ce6c521d4aa7b16a37a2f2df9263b123b (patch)
tree25d925c42ad2428b494fda1647bebf8c9dc72056
parentc0c395162ff14b83694158663470ad60e065d9a9 (diff)
parent661b54ae2a55461aa70c07d069550b911c14f800 (diff)
downloadframeworks_base-7914fa5ce6c521d4aa7b16a37a2f2df9263b123b.zip
frameworks_base-7914fa5ce6c521d4aa7b16a37a2f2df9263b123b.tar.gz
frameworks_base-7914fa5ce6c521d4aa7b16a37a2f2df9263b123b.tar.bz2
am 661b54ae: am 7fc5b5a1: am a9ad0fc7: am f2525ed3: am ea2a0648: Explain behavior of boundless ripple projection
* commit '661b54ae2a55461aa70c07d069550b911c14f800': 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