summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrew Solovay <asolovay@google.com> 2015-06-15 15:48:05 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-06-15 15:48:05 +0000
commitdba3544fe08e9590a5f73fdb3bc6b30de10525a8 (patch)
tree598ce639f93ead1f9cf6eac8abd0dc9cd6fe9e7e
parent974f0d82281f79ac4c163eebaf1a341cf6ebcda2 (diff)
parentecc50268d72f0084a96bf98494229a294be10458 (diff)
am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs
* commit 'ecc50268d72f0084a96bf98494229a294be10458': docs: Added AfW videos to "Android for Work" landing page
-rw-r--r--docs/html/jd_collections.js3
-rw-r--r--docs/html/jd_extras.js38
-rw-r--r--docs/html/training/enterprise/index.jd13
3 files changed, 45 insertions, 9 deletions
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index 2505746e4e8f..82836e267dea 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -1592,6 +1592,7 @@ var RESOURCE_COLLECTIONS = {
"resources": [
"training/enterprise/app-compatibility.html",
"training/enterprise/app-restrictions.html",
+ "https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX",
"samples/AppRestrictionSchema/index.html",
"samples/AppRestrictionEnforcer/index.html"
]
@@ -1636,4 +1637,4 @@ var RESOURCE_COLLECTIONS = {
"tools/performance/batterystats-battery-historian/charts.html"
]
}
-} \ No newline at end of file
+}
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index 87581e9cfa5a..5b2468d749fa 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -2917,6 +2917,42 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
"type":"about"
},
{
+ "title":"App Configurations, Testing and Launchers",
+ "titleFriendly":"",
+ "summary":"With Android for Work you can make your apps remotely configurable. We also cover how to test your app in a managed environment.",
+ "url":"https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX",
+ "group":"",
+ "keywords": ["work", "enterprise", "emm"],
+ "tags": [],
+ "image":"http://i1.ytimg.com/vi/39NkpWkaH8M/maxresdefault.jpg",
+ "lang":"en",
+ "type":"about"
+ },
+ {
+ "title":"Building an enterprise ready app",
+ "titleFriendly":"",
+ "summary":"A holistic view of Android for Work for developers.",
+ "url":"https://www.youtube.com/watch?v=dH41OutAMNM",
+ "group":"",
+ "keywords": ["work", "enterprise", "emm"],
+ "tags": [],
+ "image":"http://i1.ytimg.com/vi/dH41OutAMNM/maxresdefault.jpg",
+ "lang":"en",
+ "type":"develop"
+ },
+ {
+ "title":"Android for Work: Single Use Devices",
+ "titleFriendly":"",
+ "summary":"Single-purpose computers are everywhere, and Android can meet that need.",
+ "url":"https://www.youtube.com/watch?v=j3QC6hcpy90",
+ "group":"",
+ "keywords": ["work", "enterprise", "emm"],
+ "tags": [],
+ "image":"http://i1.ytimg.com/vi/j3QC6hcpy90/maxresdefault.jpg",
+ "lang":"en",
+ "type":"about"
+ },
+ {
"title":"Discover YouTube cards",
"titleFriendly":"",
"summary":"Find out more about YouTube cards, the options available, and how to use them to get the most from your YouTube content.",
@@ -3311,4 +3347,4 @@ var CAROUSEL_OVERRIDE = {
"summary": "We’ve created a downloadable guide to help you find success with your app or game business on Google Play. In it, you’ll find features, tips, and best practices to help you build an effective strategy.",
"tags": []
}
-}; \ No newline at end of file
+};
diff --git a/docs/html/training/enterprise/index.jd b/docs/html/training/enterprise/index.jd
index fce09b94a5f9..d54607c40265 100644
--- a/docs/html/training/enterprise/index.jd
+++ b/docs/html/training/enterprise/index.jd
@@ -6,10 +6,10 @@ page.article=true
@jd:body
-<img src="{@docRoot}images/enterprise/work-launcher.png"
- width="300"
- style="float:right;margin:0 0 20px 20px"
- alt="Android for Work apps in a managed profile">
+<iframe width="448" height="252"
+ src="//www.youtube.com/embed/jQWB_-o1kz4?autohide=1&amp;showinfo=0"
+ frameborder="0" allowfullscreen=""
+ style="float: right; margin: 0 0 20px 20px;"></iframe>
<p>
The Android framework provides features to support the security, data separation, and
@@ -32,7 +32,6 @@ page.article=true
the enterprise environment or build enterprise-specific solutions.
</p>
-
<h2 id="apps">App Development for Enterprises</h2>
<p>
@@ -44,7 +43,7 @@ page.article=true
<div class="dynamic-grid">
<div class="resource-widget resource-flow-layout landing col-12"
data-query="collection:training/work/apps"
- data-cardSizes="9x3"
+ data-cardSizes="6x6"
data-maxResults="6">
</div>
</div>
@@ -60,7 +59,7 @@ page.article=true
<div class="dynamic-grid">
<div class="resource-widget resource-flow-layout landing col-12"
data-query="collection:training/work/admin"
- data-cardSizes="9x3"
+ data-cardSizes="6x6"
data-maxResults="4">
</div>
</div>