drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,952 Commits 1 Branch 0 Tags
Commit Graph

245952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Hufnagle
c946f9d103 docs: Migrated "key attestation" page to a new location (for N OTA). 
Updated page location, TOC entry, and URL redirect in preparation
for Android Nougat OTA release.

Bug: 28851641
Change-Id: I8be252d79b0b5ad3c7d814175e6bfbfb98e95daf
 2016-07-25 14:33:37 -07:00
TreeHugger Robot
d579d713a5 Merge "docs: updates to Buildilng Your First App doc" into nyc-dev 2016-07-25 18:45:51 +00:00
Mark Lu
08d1bff71f docs: updates to Buildilng Your First App doc 
This commit includes the following updates:
- replaces Basic activity with Empty activity
- uses default values wherever possible
- removes instructions for floating button
- removes SDK instructions. Users must use Android Studio
- updates the SDK version to API 15
- combines some instructions that were too text heavy

Bug: 29766869
Bug: 29768686
Bug: 19154557

Change-Id: Id819cb2dde74b68b5145dfefe7a8502892bb377a
 2016-07-25 10:15:04 -07:00
Dirk Dougherty
fc0bc7bf96 Merge "Fix code tags that contain html encoded characters, and fix at links." into nyc-dev 2016-07-25 17:00:19 +00:00
Android Build Merger (Role)
30588da701 Merge "Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a" into nyc-dev 2016-07-25 15:46:56 +00:00
Android Build Merger (Role)
aa57295104 Merge "docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480" into nyc-dev 2016-07-25 15:46:34 +00:00
Kevin Hufnagle
616ba9d22b Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a 
am: 260e77f68a

Change-Id: Id931a4e007b696368cb7a074e3dcc11d6ac896eb
 2016-07-25 15:45:56 +00:00
Kevin Hufnagle
15865b5c67 docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350 
am: e059c15480

Change-Id: Ic42a2ab9c49b3c40b5743f095d17be90a3414ad9
 2016-07-25 15:45:51 +00:00
Kevin Hufnagle
29df77dd86 Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a 
am: c59557649c

Change-Id: Icfd32ab1899fd098a9afc3532f8c29accf17b56d
 2016-07-25 15:45:47 +00:00
Kevin Hufnagle
b65288fcb5 docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350 
am: 22be9b1a87

Change-Id: Ie27aa01933ac6f8854efb626d8bb776af6d1cf7d
 2016-07-25 15:45:45 +00:00
Kevin Hufnagle
c59557649c Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs 
am: c46ee88f9a

Change-Id: I4197d61f056148f06978c2471b2b1ebf25b37881
 2016-07-25 15:39:27 +00:00
Kevin Hufnagle
22be9b1a87 docs: Fixed option for \"launchMode\" within Android manifest doc. 
am: 7ce51cf350

Change-Id: I1c16676d7a605c8a4c5d7b9bb0b2075c2e0c4355
 2016-07-25 15:39:22 +00:00
Kevin Hufnagle
260e77f68a Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs 
am: c46ee88f9a

Change-Id: Ibdfcea6f97b7969d1cc1a4c1ad13b3274c69a80a
 2016-07-25 15:39:20 +00:00
Kevin Hufnagle
e059c15480 docs: Fixed option for \"launchMode\" within Android manifest doc. 
am: 7ce51cf350

Change-Id: I013c71c0c64ff66ee5deb9810cd97312ed87b2e4
 2016-07-25 15:39:18 +00:00
Kevin Hufnagle
c46ee88f9a Merge "docs: Fixed option for "launchMode" within Android manifest doc." into mnc-io-docs 2016-07-25 15:33:03 +00:00
Andrew Solovay
09f5a77754 docs: Removing N Preview AfW doc, and setting up redirect 
Confirmed with AfW team that the AfW material is being moved into
their developer site
(https://developers.google.com/android/work/overview). Removing
the N docs, and redirecting to their site.

Change-Id: I5174f7dccf6c206af9e091efdab099a04f1cb750
 2016-07-23 14:10:32 -07:00
Andrew Solovay
563c4f1adb docs: Added Android N (API level 24) to the "API levels" table 
Added links based on the assumption that the Nougat overview docs
will be named the same way the Marshmallow ones were.

See first comment for doc stage location.

bug: 30325924

Change-Id: Ic5845a0c301af2462247a6827d9b36c5a0e1b1d3
 2016-07-23 13:58:25 -07:00
Elliot Waite
c4ae7827e2 Fix code tags that contain html encoded characters, and fix at links. 
Change-Id: I1ab2275ac17d75afaa8f3f0039b26633365bcb3a
 2016-07-22 18:29:36 -07:00
Andrew Solovay
c02411f38d docs: Fixed bad link to cloud-backup training class 
The name and URL of the old "Syncing to the Cloud" class had changed.
Fixed a single bad link; also changed the title on other pages where
the class was referred to by the old name.

I know that changing the _toc.cs files is redundant at this point
(since we don't use those files to generate TOCs any more) but I
figured I'd do it for consistency's sake.

See first comment for doc stage location.

bug: 30309375
Change-Id: I0cd8b1442ef3a8dd8a1917e897a3f0555c48e6ef
 2016-07-22 14:44:03 -07:00
Andrew Solovay
6a2782548d docs: Updated support library revision history for 24.1.1 
am: 0b80531b5b

Change-Id: I26c19728affe538d49282d9966fa5d87e55ba076
 2016-07-22 20:14:57 +00:00
Andrew Solovay
0b80531b5b docs: Updated support library revision history for 24.1.1 
See first comment for doc stage location.

bug: 30302654
Change-Id: Icb9a171963b6bf7feec69b6dd36aa6513055bb05
 2016-07-22 11:35:04 -07:00
Benjamin Franz
f97faada5d Merge "Block user from setting safe boot setting via adb" into nyc-dev 2016-07-22 08:37:31 +00:00
Andrew Solovay
adfb20c2f0 Merge \"docs: Replacing curly apostrophes with straight ones\" into nyc-docs 
am: 1d545c4f83

Change-Id: Ia21fd5e04dc0565feea5207951372e6ceaf60e38
 2016-07-21 23:48:00 +00:00
Andrew Solovay
85d40b4feb docs: Replacing curly apostrophes with straight ones 
am: abea4b1dcd

Change-Id: I1fd344ed7087b962a66d577b1c3cb5fa0e81fbaa
 2016-07-21 23:47:58 +00:00
TreeHugger Robot
1d545c4f83 Merge "docs: Replacing curly apostrophes with straight ones" into nyc-docs 2016-07-21 23:07:16 +00:00
Andrew Solovay
abea4b1dcd docs: Replacing curly apostrophes with straight ones 
Need to have a CL ready to go in case that's necessary to force
a docs build on the new branch, so I'm setting up this one. Doing
nothing but changing ’ to ' in a few files.

Change-Id: I408f9152d4898e75ab34a92606620afeaf4d3ab9
 2016-07-21 13:50:23 -07:00
Android Build Merger (Role)
7e9ce5ceaa Merge "Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d am: 9b911b8736" into nyc-dev 2016-07-21 20:39:27 +00:00
Sreevani Sreejith
96b4483984 Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d 
am: 9b911b8736

Change-Id: If294d38647849c51c2ba46b041417346a410c533
 2016-07-21 20:38:53 +00:00
Sreevani Sreejith
daaa7b7e5b Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d 
am: 01f12a9e18

Change-Id: I3c72f75050a4426d4e67fd6a73b7d0f3bc8eff71
 2016-07-21 20:38:48 +00:00
sreevanis
01f12a9e18 Merge \"docs: Fixed typo.\" into mnc-io-docs 
am: 71f742920d

Change-Id: Ia489afb465582c6600d35ffed5826816b4043746
 2016-07-21 20:32:55 +00:00
sreevanis
9b911b8736 Merge \"docs: Fixed typo.\" into mnc-io-docs 
am: 71f742920d

Change-Id: Ife230ca465a93b9cad9367d302fe402e574f3175
 2016-07-21 20:32:51 +00:00
Sreevani Sreejith
71f742920d Merge "docs: Fixed typo." into mnc-io-docs 2016-07-21 20:24:51 +00:00
Amanda Kassay
5a76378471 Merge "Adding projec.yaml files to all top/sub categories." into nyc-dev 2016-07-21 17:02:13 +00:00
Benjamin Franz
662e2a7975 Merge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9 
am: cb805b35f3  -s ours

Change-Id: Icbc3d0dbcce8e079a895f194c13a5fa35957bc09
 2016-07-21 15:27:28 +00:00
Android Build Merger (Role)
7dbcfcadd5 Merge "docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919" into nyc-dev 2016-07-21 15:22:32 +00:00
Billy Lamberta
c5ec6c443d docs: work - Managed configuration bundles am: ef57498142 
am: ba633fc919

Change-Id: I819bc7a7568f4ea753b053338c7f73f64e80ec0e
 2016-07-21 15:21:58 +00:00
Billy Lamberta
c7cffa3e6a docs: work - Managed configuration bundles am: ef57498142 
am: 9684f2cd2f

Change-Id: Idaeea63ba30ecb86a4f60955bb4937357ba4fd1b
 2016-07-21 15:21:52 +00:00
Amanda Kassay
e9d58227bb Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html 
am: 83fb75ded3

Change-Id: Ib5e4d45692c54beb3b4fafe89ebc0a5c19400359
 2016-07-21 15:21:50 +00:00
Benjamin Franz
cb805b35f3 Merge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 
am: 87534f4ac9

Change-Id: I05e37f474e496b41c39b7a160418d9f48a265fa3
 2016-07-21 10:14:59 +00:00
Benjamin Franz
87534f4ac9 Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am: 3e582390b3 
am: 7abd7ba093

Change-Id: I8dd5c0934f135cd567ae6bf2f4edf759ed757dfe
 2016-07-21 10:10:03 +00:00
Benjamin Franz
7abd7ba093 Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev 
am: 3e582390b3

Change-Id: Ibb90e151746d405e1cc8a1eb889ffa91aca35bc8
 2016-07-21 10:05:33 +00:00
Benjamin Franz
3e582390b3 Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev 2016-07-21 09:59:42 +00:00
Billy Lamberta
9684f2cd2f docs: work - Managed configuration bundles 
am: ef57498142

Change-Id: I6186c90e5d7125d678db5c876dc47697e14e60d7
 2016-07-20 22:15:57 +00:00
Billy Lamberta
ba633fc919 docs: work - Managed configuration bundles 
am: ef57498142

Change-Id: I8a874ca63bf3cbfa7c4abc3061f3cb8e19cd7486
 2016-07-20 22:15:39 +00:00
Billy Lamberta
ef57498142 docs: work - Managed configuration bundles 
Update 'Set up Managed Configurations' guide to include
examples for restriction bundles and bundle_arrays.
Include table for restriction entry types and usage.
Link to EMM doc for building DPC. Formatting.

bug: 26151150
bug: 29966701
Change-Id: I89f732709fadd511b968515ab16f07dd46195f0e
 2016-07-20 15:03:44 -07:00
Amanda Kassay
83fb75ded3 Fix for b/30088807 Dashboard page repeating charts three times on mobile. 
Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html

Change-Id: Iff6820353ff6fb3ec678ddfe209b2200ab872812
 2016-07-20 18:12:37 +00:00
Mark Lu
a7ce29962c Merge "docs: fixed '@' signs that were escaped improperly" into nyc-dev 2016-07-20 16:48:26 +00:00
Paul Stewart
a71fe00594 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac am: a09b6ee165 am: 2331eefef7 
am: a20314a28e

Change-Id: I54f5b652c5c5bc148a8058cea665aab5327c61ab
 2016-07-20 03:17:07 +00:00
Paul Stewart
47e801972c Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 am: b3ff6b4437 am: 537535c14a 
am: 6b05e285cc

Change-Id: I85e36294bd68be5da928d96dd7d9742f7fba53d3
 2016-07-20 03:17:01 +00:00
Paul Stewart
d77404a0e5 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 am: d78a14531e am: c77f18b2a3 am: eef477c8b9 
am: cf3595400b  -s ours

Change-Id: I983c0d096671d522f3eed3eb3deacff300b50bb9
 2016-07-20 03:16:50 +00:00