Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dba3544f authored by Andrew Solovay's avatar Andrew Solovay Committed by Android Git Automerger
Browse files

am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work"... 

am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs

* commit 'ecc50268':
  docs: Added AfW videos to "Android for Work" landing page
parents 974f0d82 ecc50268

docs/html/jd_collections.js

+2 −1
Original line number Diff line number Diff line
@@ -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"

    ]

docs/html/jd_extras.js

+37 −1
Original line number Diff line number Diff line
@@ -2916,6 +2916,42 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([ 
    "lang":"en",

    "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":"",

docs/html/training/enterprise/index.jd

+6 −7
Original line number Diff line number Diff line
@@ -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>