Commit Graph

2623 Commits

Author SHA1 Message Date
Sparky Rhode
4ebe916f3f am 165b3cc7: am ea627994: am fc3f8e69: Merge "Remove references to sample application" into ics-mr0
* commit '165b3cc73fdc6fdee1c1ba1272ffd4cdb70b9cab':
  Remove references to sample application
2011-12-15 17:27:36 -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
Sparky Rhode
abe2decb9e Remove references to sample application
Change-Id: If8d6d0a3cc59bd3d3462aa066c861fbcae51baf1
2011-12-15 16:53:35 -08:00
Roman Nurik
a77f1552b7 am eb49c9c3: am eb623347: am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
* commit 'eb49c9c33c7ddeb5150bfea0f432226ff7730bfe':
  Android U Class: Designing Effective and Intuitive App Navigation
2011-12-15 16:52:47 -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
cfabb16ed4 am 52507ccd: am 6aee4582: am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
* commit '52507ccd17787a82cebe3b86e93c6e197b74d9c1':
  docs: Add training homepage, side nav, and title changes
2011-12-15 16:34:21 -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
f15974a37f am 6e37a304: am fc6ac0f2: am 564e8aa4: docs: Android University - Camera class
* commit '6e37a304c6e7eed667c1d692c2ad501ec025a254':
  docs: Android University - Camera class
2011-12-15 16:14:36 -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
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
Scott Main
b408531f00 am a739235a: am 43834487: docs: remove some "new" tags from side navs
* commit 'a739235aed598fbd40c63d5e01e8bf55836b0de0':
  docs: remove some "new" tags from side navs
2011-12-15 13:16:27 -08: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
3766a7a275 am 7e065061: am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience
* commit '7e065061bb47fe88421a6edf62c846144e30fcd8':
  Android U Class: Monetization / Ads without Compromising User Experience
2011-12-15 11:13:31 -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
4fbed59804 am fbc17ecc: am cf927f22: am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
* commit 'fbc17eccea267c7cee344ac7e7898709f86b37df':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
2011-12-15 10:45:50 -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
Scott Main
aed4ced655 Android U Class: Developing Android Applications for the Enterprise.
This class uses a sample app.

Change-Id: I508edbb98c8e9dea1d3ea26c8dcd9da213330d87
2011-12-15 10:38:32 -08:00
Scott Main
ed29dc09bf am ecaee21d: am e4e6c066: am f9cca66e: Docs: Training class on Identifying and Authenticating Users.
* commit 'ecaee21d3050f34bcb8c6d4bafec9764ab1a7027':
  Docs: Training class on Identifying and Authenticating Users.
2011-12-15 10:17:15 -08:00
Scott Main
e4e6c06641 am f9cca66e: Docs: Training class on Identifying and Authenticating Users.
* commit 'f9cca66e8b4acbc8d50713b4ed4b92d8274285c1':
  Docs: Training class on Identifying and Authenticating Users.
2011-12-15 10:13:07 -08:00
Scott Main
f9cca66e8b Docs: Training class on Identifying and Authenticating Users.
Change-Id: Ie2005687ca3baf28d9e01be8c10ee0f6a58a3cc3
2011-12-15 10:07:03 -08:00
Dirk Dougherty
41aeee2807 am 41d90f39: am 26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1
* commit '41d90f39a5c40e3036e15efef5b07789296c8bb9':
  Doc change: add MR1 API summary and updated highlights.
2011-12-14 17:24:46 -08:00
Dirk Dougherty
26bd66df4f Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1 2011-12-14 17:21:13 -08:00
Dirk Dougherty
9a6b4245c9 Doc change: add MR1 API summary and updated highlights.
Change-Id: I9a9b13b9c7b8ae3011772a62735c788762b45f7f
2011-12-14 17:17:09 -08:00
Scott Main
fca4f2d295 am 5ebf8fbb: am d1f2b7cc: am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
* commit '5ebf8fbb1e925d411d928757712c41a7cafe8231':
  docs: add Android U class for "Improving Performance of Layouts"
2011-12-14 15:00:59 -08:00
Scott Main
a253ec52d9 am d8dec142: am b8ea1f93: am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
* commit 'd8dec14201250055fe9bcccead361168c839d9f9':
  doc change: Android U lessons for audio and battery
2011-12-14 14:57:50 -08:00
Scott Main
d1f2b7ccb7 am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0
* commit '56a3e326192c7496b67666b29071dc9f38c59da9':
  docs: add Android U class for "Improving Performance of Layouts"
2011-12-14 14:55:44 -08:00
Scott Main
b8ea1f93bb am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0
* commit '4dc763c700f79e33030e96eefabf8e5047cb9cb1':
  doc change: Android U lessons for audio and battery
2011-12-14 14:53:40 -08:00
Scott Main
56a3e32619 Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0 2011-12-14 14:53:04 -08:00
Scott Main
4dc763c700 Merge "doc change: Android U lessons for audio and battery" into ics-mr0 2011-12-14 14:51:30 -08:00
Scott Main
123c3b1eee am fd24af66: am 691fea72: am 70645e36: Docs: Add class for Sharing Content
* commit 'fd24af6620ee346bfbbc29a62290f67141a79245':
  Docs: Add class for Sharing Content
2011-12-14 14:45:46 -08:00
Scott Main
691fea726d am 70645e36: Docs: Add class for Sharing Content
* commit '70645e363e8601550468b726251f4f52f383b9fc':
  Docs: Add class for Sharing Content
2011-12-14 14:40:19 -08:00
Scott Main
70645e363e Docs: Add class for Sharing Content
Change-Id: I078a02d952e652c16f84e1b3f7613f3dc9364c97
2011-12-14 13:18:37 -08:00
Scott Main
604e4ed481 doc change: Android U lessons for audio and battery
Change-Id: I98d83f8458e3ad62be28d09b85fe099916d1b73d
2011-12-14 10:06:34 -08:00
Dirk Dougherty
269be7dd6c am 1451f598: am 2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1
* commit '1451f598ae5da5b8f0e24b4714f7321c2e6f59f5':
  Doc change: API diff report for 15.
2011-12-13 18:37:34 -08:00
Dirk Dougherty
2e335cb028 Merge "Doc change: API diff report for 15." into ics-mr1 2011-12-13 18:33:04 -08:00
Scott Main
09bd797895 am 9a8e7afc: am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit '9a8e7afc53e39e22664c77b3ca6f1a59aac36ee3':
  Created Android University lesson for Multiple APKs.
2011-12-13 13:15:27 -08:00
Scott Main
71786dd191 am 04c6e62c: am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens.
* commit '04c6e62ce4750beb617eb6e4e9cadfd631bfe824':
  AndroidU lesson on designing for multiple screens.
2011-12-13 13:15:25 -08:00
Scott Main
c9295b2069 am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit 'fc279e51c0bca8086b87bd49e95367c400cb61b4':
  Created Android University lesson for Multiple APKs.
2011-12-13 13:10:45 -08:00
Scott Main
37191e1dc7 am 801fda54: AndroidU lesson on designing for multiple screens.
* commit '801fda548c719a8618e7f4cd64cad8404b0970b9':
  AndroidU lesson on designing for multiple screens.
2011-12-13 13:10:42 -08:00
Scott Main
fc279e51c0 Merge "Created Android University lesson for Multiple APKs." into ics-mr0 2011-12-13 12:25:38 -08:00
Dirk Dougherty
3030c8e1db Doc change: API diff report for 15.
Change-Id: Ifbe3cf600d9397dd42d855c4a271d514b008d45b
2011-12-12 18:49:17 -08:00
Scott Main
801fda548c AndroidU lesson on designing for multiple screens.
This change adds the text for the AndroidU lesson "Designing for Multiple
Screens", which shows how to write applications that adapt properly
to screen size, density and orientation for maximum compatibility.
Update makefile and resources-data.js for rendering source in HTML
Add ZIP file for sample

Change-Id: I671bb3063d5bf02681bc547ffe5262a9df22037a
2011-12-12 17:13:31 -08:00
Joe Fernandez
3f6efeaad7 am a4f49ac5: am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
* commit 'a4f49ac5284d7ab97e56e318523652f35d9de0d6':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
2011-12-12 15:30:14 -08:00