62160 Commits

Author SHA1 Message Date
Bill Gruber
97aafdf46e Merge "Dev guide for sensors" into ics-mr0 2011-12-16 11:11:46 -08:00
Alexander Lucas
9c093132da Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson
Change-Id: I05c100d583340456eed8d15d555e1f02a38504a8
2011-12-16 11:03:18 -08:00
Dirk Dougherty
8c65ab81e8 Merge "Updated "Designing for Security" documentation" into ics-mr1 2011-12-16 10:56:29 -08:00
Adrian Ludwig
a15562f8fd Updated "Designing for Security" documentation
Change-Id: I1fe5b353d750695f75370ef31ae1b39e50159164
Signed-off-by: Adrian Ludwig <aludwig@google.com>
2011-12-16 10:53:53 -08:00
Scott Main
611d03e693 docs: typos
Change-Id: Iee489eb39029b5d550e37f49b1bd5d4cf30e445c
2011-12-16 10:41:54 -08:00
Dirk Dougherty
8b6ed2d17d Doc change: edits to ICS MR1 API Overview.
Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
2011-12-16 00:11:43 -08:00
Joe Fernandez
5b18c714bb Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 23:11:26 -08:00
Joe Fernandez
71d5c1db17 docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
2011-12-15 23:09:43 -08:00
Fred Chung
14633f1b1e am 48e0617b: Fixed Android U Enterprise lesson pre-requisites and a minor typo.
* commit '48e0617b9e7d06da803c572d6584d68898733d37':
  Fixed Android U Enterprise lesson pre-requisites and a minor typo.
2011-12-15 22:33:31 -08:00
Fred Chung
48e0617b9e Fixed Android U Enterprise lesson pre-requisites and a minor typo.
Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02
2011-12-15 22:25:19 -08:00
Scott Main
8e980c1e4e Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6" into ics-mr1 2011-12-15 22:12:53 -08:00
Scott Main
36c677855c docs: update homepage for 4.0.3 announcment
Change-Id: I54d1d447ac224982f4483afede2087ce18937ed0
2011-12-15 22:04:46 -08:00
Scott Main
4cb7d09535 am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit '98af5edc70b0b418366f5197b9aeef30f135d40e':
  docs: fix encoding issue or whatever with docs (not showing titles)
2011-12-15 20:19:55 -08:00
Scott Main
98af5edc70 docs: fix encoding issue or whatever with docs (not showing titles)
Change-Id: Iac9afc3aa36e86d2f8defc8a7252864c23ecc23b
2011-12-15 20:13:20 -08:00
Scott Main
8f266b9e34 am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
* commit 'd9bc2d21c55e58f83e4209749cc51f0da9869b54':
  docs: add remembering users class to nav
2011-12-15 19:56:47 -08:00
Scott Main
d9bc2d21c5 Merge "docs: add remembering users class to nav" into ics-mr0 2011-12-15 19:55:25 -08:00
Scott Main
26e461b34f am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '5dac1976198e5fa553749cd145c7484f3ff45c6b':
  Doc merge from master:Training class on Identifying and Authenticating Users.
2011-12-15 19:52:50 -08:00
Scott Main
2956f2fd2c docs: add remembering users class to nav
Change-Id: Iedfd5c6580dd2d23df1eaf4da6cf43d77b5866f8
2011-12-15 19:52:33 -08:00
Scott Main
5dac197619 Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0 2011-12-15 19:51:48 -08:00
Scott Main
ce5643c7c4 am abfcbd16: docs: typo in training orientation
* commit 'abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
  docs: typo in training orientation
2011-12-15 19:47:47 -08:00
Dirk Dougherty
3b33cdcbf8 Doc merge from master:Training class on Identifying and Authenticating Users.
Conflicts:

	docs/html/training/id-auth/authenticate.jd
	docs/html/training/id-auth/custom_auth.jd
	docs/html/training/id-auth/identify.jd
	docs/html/training/id-auth/index.jd

Change-Id: I73174b2cb923ec5d28b551f27d0512d427616c69
2011-12-15 19:45:27 -08:00
Scott Main
abfcbd162f docs: typo in training orientation
Change-Id: I9535713d7784146e96df5b347f2be38628ce7d2c
2011-12-15 19:33:04 -08:00
Roman Nurik
1584a816ed am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
* commit '408f94b1478c62f953faf29b02c3af5d8d3c5e05':
  docs: Minor bugfix to Android U navigation design class
2011-12-15 19:25:25 -08:00
Dave Burke
ac279de9d9 Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 2011-12-15 19:23:26 -08:00
Roman Nurik
408f94b147 Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 2011-12-15 19:23:00 -08:00
Roman Nurik
265644e22a docs: Minor bugfix to Android U navigation design class
Change-Id: Icedd7edc33b864d1464797a78a5bb878b84f937f
2011-12-15 19:20:02 -08:00
Jamie Gennis
09fc76664a SurfaceMediaSource: use the HW_TEXTURE usage bit
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a
temporary workaround for what is likely a Gralloc bug.

Bug: 5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
2011-12-15 18:36:08 -08:00
Scott Main
aeb06e3408 am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
* commit '6fbddffc83312b825e888fcdb8b6e52dade05b3e':
  Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
2011-12-15 17:39:35 -08:00
Scott Main
5f0df1b8db am 580f0146: docs: add camera and design, remove users update title names for many lessons
* commit '580f0146535e7daed83aef721f505270f7b040e1':
  docs: add camera and design, remove users update title names for many lessons
2011-12-15 17:37:36 -08:00
Scott Main
6fbddffc83 Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0 2011-12-15 17:36:58 -08:00
Scott Main
580f014653 docs: add camera and design, remove users
update title names for many lessons

Change-Id: I7a3d30bcb9786a351c04f05fcee39bb42954d2e8
2011-12-15 17:32:05 -08:00
Sparky Rhode
ea627994c3 am fc3f8e69: Merge "Remove references to sample application" into ics-mr0
* commit 'fc3f8e69546ff2ea672b2c66e861424a8cf2348f':
  Remove references to sample application
2011-12-15 17:23:11 -08:00
Sparky Rhode
fc3f8e6954 Merge "Remove references to sample application" into ics-mr0 2011-12-15 17:21:51 -08:00
Joe Fernandez
e4f2031758 docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
Change-Id: Ia8e14c1ab4dad7c51677e759d10891bd75cbe7b1
2011-12-15 17:07:33 -08:00
Sparky Rhode
abe2decb9e Remove references to sample application
Change-Id: If8d6d0a3cc59bd3d3462aa066c861fbcae51baf1
2011-12-15 16:53:35 -08:00
Roman Nurik
eb623347f9 am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
* commit 'd37e2b35b4ad80352eca9e77b59d78f1bcf65b8c':
  Android U Class: Designing Effective and Intuitive App Navigation
2011-12-15 16:48:25 -08:00
Roman Nurik
d37e2b35b4 Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0 2011-12-15 16:45:55 -08:00
Roman Nurik
a303065925 Android U Class: Designing Effective and Intuitive App Navigation
Change-Id: Ic05d73c27a4ae4b18fd682e1f193acd73b8d9dc5
2011-12-15 16:41:27 -08:00
Scott Main
6aee4582fe am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
* commit '2cbcdc760cfe2af622ccb9ef41514954dab537f0':
  docs: Add training homepage, side nav, and title changes
2011-12-15 16:29:42 -08:00
Scott Main
2cbcdc760c Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0 2011-12-15 16:28:19 -08:00
Scott Main
fc6ac0f28f am 564e8aa4: docs: Android University - Camera class
* commit '564e8aa41c29ebd10cb691851d4ecc347f8eee71':
  docs: Android University - Camera class
2011-12-15 16:10:10 -08:00
Scott Main
564e8aa41c docs: Android University - Camera class
Change-Id: Idc0c6ca88b42908289701c8367cd5c403d85f71e
2011-12-15 16:01:59 -08:00
Scott Main
19552e95db am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
* commit 'd25ad2fdbb4cf86e2a05dbc6b8afb50760c0fe1b':
  cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
2011-12-15 15:55:31 -08:00
Scott Main
7736f96d0e docs: Add training homepage, side nav, and title changes
Change-Id: I2ac6047faa7a70e06ced47665813ace4aa974af8
2011-12-15 15:49:32 -08:00
Scott Main
d25ad2fdbb cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22
docs: remove some "new" tags from side navs

Change-Id: I1ca718d1e54f7726db93cb3ab5cce410ee942ed5
2011-12-15 15:43:21 -08:00
Adam Koch
909fe93021 Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
Change-Id: If456e812e8627d2cc361e1ad0d42439cbd53d43c
2011-12-15 17:56:31 -05:00
Scott Main
43834487a1 docs: remove some "new" tags from side navs
Change-Id: If1341cdc456ace9037bd2175479d89454e084e22
2011-12-15 13:11:12 -08:00
Scott Main
481cd5a893 am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
* commit '3d672e1e789e171e913605945efe95a477ab0505':
  Android U Class: Monetization / Ads without Compromising User Experience
2011-12-15 11:08:51 -08:00
Scott Main
3d672e1e78 Android U Class: Monetization / Ads without Compromising User Experience
Change-Id: I1aaddc6bbbc9fc2b53119893f2b70260f1b0d9a7
2011-12-15 10:44:11 -08:00
Scott Main
cf927f229f am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
* commit 'aed4ced6556383483209f454c9e4872e8ad28ebf':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
2011-12-15 10:41:18 -08:00