diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml index 2464e9e87bb49..741e85c83fb6e 100644 --- a/docs/html/_redirects.yaml +++ b/docs/html/_redirects.yaml @@ -706,7 +706,9 @@ redirects: - from: /training/enterprise/app-compatibility.html to: /work/managed-profiles.html - from: /training/enterprise/app-restrictions.html - to: /work/app-restrictions.html + to: /work/managed-configurations.html +- from: /work/app-restrictions.html + to: /work/managed-configurations.html - from: /training/enterprise/cosu.html to: /work/cosu.html - from: /training/enterprise/device-management-policy.html diff --git a/docs/html/distribute/googleplay/work/about.jd b/docs/html/distribute/googleplay/work/about.jd index 79e8a899f46f0..b60c197a2ee11 100644 --- a/docs/html/distribute/googleplay/work/about.jd +++ b/docs/html/distribute/googleplay/work/about.jd @@ -56,8 +56,8 @@ page.image=images/distribute/gpfw.jpg properly. Businesses are more conscious of data security and employee productivity, especially when it comes to features that share information with other services. -
  • Support the App Configuration framework to let an administrator remotely +
  • Support managed configurations to let an administrator remotely configure app settings such as:

    Provide support and maintenance

    diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js index 4909206d64d71..aa0620aefd0c3 100644 --- a/docs/html/jd_collections.js +++ b/docs/html/jd_collections.js @@ -1881,7 +1881,7 @@ var RESOURCE_COLLECTIONS = { "work/overview.html", "work/guide.html", "https://www.google.com/work/android/developers/applyDevHub/", - "work/app-restrictions.html", + "work/managed-configurations.html", "work/cosu.html", "work/managed-profiles.html" ] @@ -1893,7 +1893,7 @@ var RESOURCE_COLLECTIONS = { "https://www.google.com/work/android/", "https://developers.google.com/android/work/build-dpc", "https://www.youtube.com/watch?v=jQWB_-o1kz4&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX", - "https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX", + "https://www.youtube.com/watch?v=Za0OQo8DRM4", "https://www.youtube.com/watch?v=dH41OutAMNM&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX" ] }, @@ -1901,7 +1901,7 @@ var RESOURCE_COLLECTIONS = { "title": "", "resources": [ "work/managed-profiles.html", - "work/app-restrictions.html", + "work/managed-configurations.html", "work/cosu.html", "https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX", "samples/AppRestrictionSchema/index.html", diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js index 546fcfe479f60..e5347d9704921 100644 --- a/docs/html/jd_extras.js +++ b/docs/html/jd_extras.js @@ -3378,6 +3378,18 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([ "lang":"en", "type":"youtube" }, + { + "title":"Your Apps at Work", + "titleFriendly":"", + "summary":"In this Google I/O 2016 session we’ll give you details for making your app more attractive to businesses.", + "url":"https://www.youtube.com/watch?v=Za0OQo8DRM4", + "group":"", + "keywords": ["work", "enterprise", "emm"], + "tags": [], + "image":"https://i1.ytimg.com/vi/Za0OQo8DRM4/maxresdefault.jpg", + "lang":"en", + "type":"youtube" + }, { "title":"Discover YouTube cards", "titleFriendly":"", diff --git a/docs/html/jd_extras_en.js b/docs/html/jd_extras_en.js index 3aab5bdb56e9f..6295e0efd00ce 100644 --- a/docs/html/jd_extras_en.js +++ b/docs/html/jd_extras_en.js @@ -3266,10 +3266,10 @@ METADATA['en'].extras = METADATA['en'].extras.concat([ "type":"guide" }, { - "title":"Set up App Restrictions", + "title":"Set up Managed Configurations", "titleFriendly":"", - "summary": "Learn how to implement app restrictions and configuration settings that can be changed by other apps on the same device.", - "url":"https://developer.android.com/work/app-restrictions.html", + "summary": "Learn how to implement managed configurations that can be changed by other apps on the same device.", + "url":"https://developer.android.com/work/managed-restrictions.html", "group":"", "keywords": ["work", "enterprise", "emm"], "tags": [], @@ -3397,6 +3397,18 @@ METADATA['en'].extras = METADATA['en'].extras.concat([ "lang":"en", "type":"youtube" }, + { + "title":"Your Apps at Work", + "titleFriendly":"", + "summary":"In this Google I/O 2016 session we’ll give you details for making your app more attractive to businesses.", + "url":"https://www.youtube.com/watch?v=Za0OQo8DRM4", + "group":"", + "keywords": ["work", "enterprise", "emm"], + "tags": [], + "image":"https://i1.ytimg.com/vi/Za0OQo8DRM4/maxresdefault.jpg", + "lang":"en", + "type":"youtube" + }, { "title":"Discover YouTube cards", "category":"google", @@ -5390,7 +5402,7 @@ METADATA['en'].collections = { "work/overview.html", "work/guide.html", "https://www.google.com/work/android/developers/applyDevHub/", - "work/app-restrictions.html", + "work/managed-configurations.html", "work/cosu.html", "work/managed-profiles.html" ] @@ -5402,7 +5414,7 @@ METADATA['en'].collections = { "https://www.google.com/work/android/", "https://developers.google.com/android/work/build-dpc", "https://www.youtube.com/watch?v=jQWB_-o1kz4&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX", - "https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX", + "https://www.youtube.com/watch?v=Za0OQo8DRM4", "https://www.youtube.com/watch?v=dH41OutAMNM&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX" ] }, @@ -5410,7 +5422,7 @@ METADATA['en'].collections = { "title": "", "resources": [ "work/managed-profiles.html", - "work/app-restrictions.html", + "work/managed-configurations.html", "work/cosu.html", "https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX", "samples/AppRestrictionSchema/index.html", diff --git a/docs/html/preview/features/afw.jd b/docs/html/preview/features/afw.jd index 9b94c079cb92c..17cd58ea1b8e5 100644 --- a/docs/html/preview/features/afw.jd +++ b/docs/html/preview/features/afw.jd @@ -47,7 +47,7 @@ page.keywords="android for work", "android N", "enterprise", "QR code"
  • System UI Policy Transparency
  • -
  • App Restrictions Management Enhancements +
  • Managed Configurations Enhancements
  • Location Off Switch @@ -401,11 +401,11 @@ Android N.

  • -

    App Restrictions Management Enhancements

    +

    Managed Configurations Enhancements

    - The device or profile owner can enable another application to manage app - restrictions via the new + The device or profile owner can enable another application to manage + configurations via the new DevicePolicyManager.setApplicationRestrictionsManagingPackage() method. The nominated application can check whether this permission has been granted by calling @@ -413,7 +413,7 @@ Android N.

    - An application nominated to manage app restrictions can call {@link + An application nominated to manage configurations can call {@link android.app.admin.DevicePolicyManager#setApplicationRestrictions setApplicationRestrictions()} and {@link android.app.admin.DevicePolicyManager#getApplicationRestrictions diff --git a/docs/html/work/_book.yaml b/docs/html/work/_book.yaml index 82571f314a95f..1482a4e3db8e9 100644 --- a/docs/html/work/_book.yaml +++ b/docs/html/work/_book.yaml @@ -1,18 +1,132 @@ toc: - title: Android for Work Home path: /work/index.html + path_attributes: + - name: es-lang + value: Página principal de Android for Work + - name: in-lang + value: Beranda Android for Work + - name: ja-lang + value: Android for Work ホーム + - name: ko-lang + value: Android for Work 홈 + - name: pt-br-lang + value: Página inicial do Android for Work + - name: ru-lang + value: Главная – Android for Work + - name: vi-lang + value: Trang chủ Android for Work + - name: zh-cn-lang + value: Android for Work 首页 + - name: zh-tw-lang + value: Android for Work 首頁 - title: Overview path: /work/overview.html + path_attributes: + - name: es-lang + value: Información general + - name: in-lang + value: Ringkasan + - name: ja-lang + value: 概要 + - name: ko-lang + value: 개요 + - name: pt-br-lang + value: Visão geral + - name: ru-lang + value: Обзор + - name: vi-lang + value: Tổng quan + - name: zh-cn-lang + value: 概览 + - name: zh-tw-lang + value: 總覽 - title: Developer Guide path: /work/guide.html + path_attributes: + - name: es-lang + value: Guía para desarrolladores + - name: in-lang + value: Panduan Pengembang + - name: ja-lang + value: デベロッパー ガイド + - name: ko-lang + value: 개발자 가이드 + - name: pt-br-lang + value: Guia do desenvolvedor + - name: ru-lang + value: Руководство для разработчиков + - name: vi-lang + value: Hướng dẫn cho nhà phát triển + - name: zh-cn-lang + value: 开发者指南 + - name: zh-tw-lang + value: 開發人員指南 - title: Set up Managed Profiles path: /work/managed-profiles.html + path_attributes: + - name: es-lang + value: Configurar perfiles administrados + - name: in-lang + value: Menyiapkan Profil Terkelola + - name: ja-lang + value: 管理対象プロファイルの設定 + - name: ko-lang + value: 관리 프로필 설정 + - name: pt-br-lang + value: Configurar perfis gerenciados + - name: ru-lang + value: Настройка управляемых профилей + - name: vi-lang + value: Thiết lập hồ sơ được quản lý + - name: zh-cn-lang + value: 设置托管配置文件 + - name: zh-tw-lang + value: 設定受管理的設定檔 -- title: Set up App Restrictions - path: /work/app-restrictions.html +- title: Set up Managed Configurations + path: /work/managed-configurations.html + path_attributes: + - name: es-lang + value: Configurar ajustes administrados + - name: in-lang + value: Menyiapkan Konfigurasi Terkelola + - name: ja-lang + value: 管理対象構成の設定 + - name: ko-lang + value: 관리 구성 설정 + - name: pt-br-lang + value: Definir configurações gerenciadas + - name: ru-lang + value: Настройка управляемых конфигураций + - name: vi-lang + value: Thiết lập cấu hình được quản lý + - name: zh-cn-lang + value: 设置托管配置 + - name: zh-tw-lang + value: 設置受管理的設定 - title: Set up Single-Purpose Devices path: /work/cosu.html + path_attributes: + - name: es-lang + value: Configurar dispositivos con una sola finalidad + - name: in-lang + value: Menyiapkan Perangkat Tujuan Tunggal + - name: ja-lang + value: 用途に特化した端末の設定 + - name: ko-lang + value: 단일 목적 기기 설정 + - name: pt-br-lang + value: Configurar dispositivos com uma finalidade específica + - name: ru-lang + value: Настройка одноцелевых устройств + - name: vi-lang + value: Thiết lập thiết bị chuyên dùng + - name: zh-cn-lang + value: 设置单一用途设备 + - name: zh-tw-lang + value: 設定單一用途的裝置 diff --git a/docs/html/work/cosu.jd b/docs/html/work/cosu.jd index 3058365a150a4..dfecf008be44a 100644 --- a/docs/html/work/cosu.jd +++ b/docs/html/work/cosu.jd @@ -128,7 +128,7 @@ Prevents restarting in safe mode

    Additional COSU management features launched with Marshmallow make it easier to develop and deploy Android devices as a single-use device. If you want to -enforce server-side app restrictions or server-side profile policy controls, +enforce server-side managed configurations or server-side profile policy controls, you need to use an EMM or make your application a DPC. Follow the instructions below as you create your application.

    @@ -343,7 +343,7 @@ Keep a device’s screen on while plugged in via
  • -Set default user restrictions via +Set default user restriction for managed configurations via {@link android.app.admin.DevicePolicyManager#addUserRestriction addUserRestriction()}
  • @@ -398,7 +398,7 @@ public class CosuActivity extends Activity { } private void setDefaultCosuPolicies(boolean active) { - // set user restrictions + // set managed configurations setUserRestriction(DISALLOW_SAFE_BOOT, active); setUserRestriction(DISALLOW_FACTORY_RESET, active); setUserRestriction(DISALLOW_ADD_USER, active); diff --git a/docs/html/work/guide.jd b/docs/html/work/guide.jd index a93bfa53ab064..30b895bdb66bf 100644 --- a/docs/html/work/guide.jd +++ b/docs/html/work/guide.jd @@ -10,7 +10,7 @@ page.image=images/work/cards/android-studio_600px.png

    In this document

    -

    Best practices for implementing app restrictions

    +

    Best practices for implementing managed configurations

    - The Set up App Restrictions + The Set up Managed Configurations guide is the key source for information on how to build and deploy - app restrictions. After you’ve reviewed this documentation, see + managed configurations. After you’ve reviewed this documentation, see recommendations below for additional guidance.

    When first launching the app

    - As soon as you launch an application, you can see if app - restrictions are already set for this app in onStart() or + As soon as you launch an application, you can see if managed + configurations are already set for this app in onStart() or onResume(). Additionally, you can find out if your application is managed or unmanaged. For example, if getApplicationRestrictions() returns:

    -

    Listen for changes to app restrictions

    +

    Listen for changes to managed configurations

    - IT administrators can change app restrictions and what policies they - want to enforce on their users at any time. Because of this, we - recommend you ensure that your app can accept new restrictions as - follows: + IT administrators can change managed configurations and what + policies they want to enforce on their users at any time. Because of + this, we recommend you ensure that your app can accept new + restrictions for your managed configuration as follows: