Merge "add new training course for Interaction and Engagement" into klp-docs

3 files changed, 58 insertions, 29 deletions

diff --git a/docs/html/training/best-ui.jd b/docs/html/training/best-ui.jd
new file mode 100644
index 0000000..bf0d7ee
--- /dev/null
+++ b/docs/html/training/best-ui.jd
@@ -0,0 +1,11 @@
+page.title=Best Practices for User Interface
+page.trainingcourse=true
+
+@jd:body
+
+
+
+<p>These classes teach you how to build a user interface using Android layouts for all types of
+devices. Android provides a flexible framework for UI design that allows your app to display
+different layouts for different devices, create custom UI widgets, and even control aspects
+of the system UI outside your app's window.</p>
diff --git a/docs/html/training/best-ux.jd b/docs/html/training/best-ux.jd
index 5f109f6..129535b 100644
--- a/docs/html/training/best-ux.jd
+++ b/docs/html/training/best-ux.jd
@@ -1,12 +1,13 @@
-page.title=Best Practices for User Experience &amp; UI
+page.title=Best Practices for Interaction and Engagement
 page.trainingcourse=true
 
 @jd:body
 
 
 
-<p>These classes focus on the best Android user experience for your app.
-In some cases, the success of your app on Android is heavily
-affected by whether your app conforms to the user's expectations for
-UI and navigation on an Android device. Follow these recommendations to ensure that
-your app looks and behaves in a way that satisfies Android users.</p>
\ No newline at end of file
+<p>These classes teach you how to engage and retain your users by implementing
+the best interaction patterns for Android. For instance, to help users quickly discover content
+in your app, your app should match their expectations for user interaction on Android.
+And to keep your users coming back, you should take advantage of
+platform capabilities that reveal and open your content without
+requiring users to go through the app launcher.</p>
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index d28f37b..c4b9a7a 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -705,7 +705,7 @@ include the action bar on devices running Android 2.1 or higher."
     <div class="nav-section-header">
       <a href="<?cs var:toroot ?>training/best-ux.html">
       <span class="small">Best Practices for</span><br/>
-              User Experience &amp; UI
+              Interaction &amp; Engagement
       </a>
     </div>
     <ul>
@@ -835,6 +835,42 @@ include the action bar on devices running Android 2.1 or higher."
         </ul>
       </li>
 
+     <li class="nav-section">
+        <div class="nav-section-header">
+          <a href="<?cs var:toroot ?>training/app-indexing/index.html"
+             description=
+             "How to enable deep linking and indexing of your application
+content so that users can open this content directly from their mobile search
+results."
+            >Making Your App Content Searchable</a>
+        </div>
+        <ul>
+          <li><a href="<?cs var:toroot ?>training/app-indexing/deep-linking.html">
+            Enabling Deep Links for App Content
+          </a>
+          </li>
+          <li><a href="<?cs var:toroot ?>training/app-indexing/enabling-app-indexing.html">
+            Specifying  App Content for Indexing
+          </a>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <!-- End Interaction and Engagement -->
+
+
+
+
+  <li class="nav-section">
+    <div class="nav-section-header">
+      <a href="<?cs var:toroot ?>training/best-ui.html">
+      <span class="small">Best Practices for</span><br/>
+              User Interface
+      </a>
+    </div>
+    <ul>
+
 
       <li class="nav-section">
         <div class="nav-section-header">
@@ -1001,30 +1037,11 @@ include the action bar on devices running Android 2.1 or higher."
         </ul>
       </li>
 
-     <li class="nav-section">
-        <div class="nav-section-header">
-          <a href="<?cs var:toroot ?>training/app-indexing/index.html"
-             description=
-             "How to enable deep linking and indexing of your application
-content so that users can open this content directly from their mobile search
-results."
-            >Making Your App Content Searchable</a>
-        </div>
-        <ul>
-          <li><a href="<?cs var:toroot ?>training/app-indexing/deep-linking.html">
-            Enabling Deep Links for App Content
-          </a>
-          </li>
-          <li><a href="<?cs var:toroot ?>training/app-indexing/enabling-app-indexing.html">
-            Specifying  App Content for Indexing
-          </a>
-          </li>
-        </ul>
-      </li>
-
     </ul>
   </li>
-  <!-- End best UX and UI -->
+  <!-- End User Interface -->
+
+
 
 
   <li class="nav-section">