From 84fc4a549cbc1a2d48967ec975bd3fffe2fc640e Mon Sep 17 00:00:00 2001
From: Andrew Solovay <asolovay@google.com>
Date: Mon, 21 Dec 2015 16:24:21 -0800
Subject: [PATCH] docs: Fixed reference to "android:windowContentTransitions"

Per bug, we should not be telling people to use
android:windowContentTransitions to specify custom transitions;
instead, they should use android:windowActivityTransitions (which
is set to 'true' by default in the Material theme).

See first comment for doc stage location.

bug: 19440221
Change-Id: I35696c595a8424eab27d73b62835ddd79e3ca109
---
 docs/html/training/material/animations.jd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/html/training/material/animations.jd b/docs/html/training/material/animations.jd
index 6f263dba57d12..3375af667707f 100644
--- a/docs/html/training/material/animations.jd
+++ b/docs/html/training/material/animations.jd
@@ -194,16 +194,16 @@ activated between the entering and exiting activities.</p>
   <strong>Figure 2</strong> - A scene transition with one shared element.
 </p>
 
-<h3>Specify custom transitions</h3>
+<h3 id="custom-trans">Specify custom transitions</h3>
 
-<p>First, enable window content transitions with the <code>android:windowContentTransitions</code>
+<p>First, enable window content transitions with the <code>android:windowActivityTransitions</code>
 attribute when you define a style that inherits from the material theme. You can also specify
 enter, exit, and shared element transitions in your style definition:</p>
 
 <pre>
 &lt;style name="BaseAppTheme" parent="android:Theme.Material">
   &lt;!-- enable window content transitions -->
-  &lt;item name="android:windowContentTransitions">true&lt;/item>
+  &lt;item name="android:android:windowActivityTransitions">true&lt;/item>
 
   &lt;!-- specify enter and exit transitions -->
   &lt;item name="android:windowEnterTransition">@transition/explode&lt;/item>