Commit Graph

42682 Commits

Author SHA1 Message Date
Scott Main
f0268e4f13 am 4faca92f: am 36c67785: docs: update homepage for 4.0.3 announcment
* commit '4faca92faa13bcf5d6c2e76b226466066e5562a2':
  docs: update homepage for 4.0.3 announcment
2011-12-15 22:12:08 -08:00
Scott Main
7d6b89e7e1 am 36c67785: docs: update homepage for 4.0.3 announcment
* commit '36c677855c0a54ede9e92aa856cb2250960e922e':
  docs: update homepage for 4.0.3 announcment
2011-12-15 22:09:46 -08:00
The Android Automerger
73ce026418 merge in ics-mr1-release history after reset to ics-mr1 2011-12-15 20:50:02 -08:00
Scott Main
7c104522b9 am b193d241: am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit 'b193d24145d84a1748cfdcffae56ebfe549ef940':
  docs: fix encoding issue or whatever with docs (not showing titles)
2011-12-15 20:24:47 -08:00
Scott Main
e3f5721dc7 am 4cb7d095: am 98af5edc: docs: fix encoding issue or whatever with docs (not showing titles)
* commit '4cb7d0953534587ba2051c6536fdde4b2c9539d5':
  docs: fix encoding issue or whatever with docs (not showing titles)
2011-12-15 20:22:39 -08:00
Scott Main
c3df4ee009 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
d85005d087 am 34e46115: am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
* commit '34e46115a5cee1b0e186b450ef2598df999c5cbe':
  docs: add remembering users class to nav
2011-12-15 20:01:28 -08:00
Scott Main
4e7c034df0 am 8f266b9e: am d9bc2d21: Merge "docs: add remembering users class to nav" into ics-mr0
* commit '8f266b9e348ba69d953568624b8d0e2cea07f99d':
  docs: add remembering users class to nav
2011-12-15 19:59:25 -08:00
Scott Main
bde21511dd am 98e4adf9: am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '98e4adf942fe3ade14225875fdb018efe941e99f':
  Doc merge from master:Training class on Identifying and Authenticating Users.
2011-12-15 19:57:21 -08:00
Scott Main
d8f66098f8 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
b6f7ffd6ad Merge "docs: add remembering users class to nav" into ics-mr0 2011-12-15 19:55:25 -08:00
Scott Main
63752fc830 am 26e461b3: am 5dac1976: Merge "Doc merge from master:Training class on Identifying and Authenticating Users." into ics-mr0
* commit '26e461b34f5f9eef79aa30f1304cca4262ff88ed':
  Doc merge from master:Training class on Identifying and Authenticating Users.
2011-12-15 19:55:00 -08:00
Scott Main
75e12152fd 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
2f92095ec7 am ec09b269: am ce5643c7: am abfcbd16: docs: typo in training orientation
* commit 'ec09b2691ef24e25d28d9946c722d154b6067224':
  docs: typo in training orientation
2011-12-15 19:52:14 -08:00
Scott Main
9827c71df4 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
e872d9213f am ce5643c7: am abfcbd16: docs: typo in training orientation
* commit 'ce5643c7c43c2c680e683c56507ffa1bf5b9a316':
  docs: typo in training orientation
2011-12-15 19:49:50 -08:00
Scott Main
275749e796 am abfcbd16: docs: typo in training orientation
* commit 'abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
  docs: typo in training orientation
2011-12-15 19:47:47 -08:00
Roman Nurik
c007bfe251 am 0bc0e5e3: am 1584a816: am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
* commit '0bc0e5e35ae0939f85da5b79df69a6b6040bf496':
  docs: Minor bugfix to Android U navigation design class
2011-12-15 19:29:27 -08:00
Roman Nurik
fa90d7d9f2 am 1584a816: am 408f94b1: Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0
* commit '1584a816ed2e431ae804954dc6bd2d9dc79a540e':
  docs: Minor bugfix to Android U navigation design class
2011-12-15 19:27:25 -08:00
Dave Burke
e2eb912758 am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
* commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
2011-12-15 19:27:17 -08:00
Roman Nurik
21c8f7b615 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
4c63a75d56 am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
* commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
2011-12-15 19:25:07 -08:00
Dave Burke
5e2c246218 Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 2011-12-15 19:23:26 -08:00
Roman Nurik
d2db6cf3a0 Merge "docs: Minor bugfix to Android U navigation design class" into ics-mr0 2011-12-15 19:23:00 -08:00
Jeff Sharkey
d1d6e210bf Merge "Move NMS observers to RemoteCallbackList." 2011-12-15 18:40:21 -08:00
Scott Main
d3cb0e1399 am 6bbd38e9: am aeb06e34: am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
* commit '6bbd38e98615d6a2d4d4e1401a9316bfe7736486':
  Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
2011-12-15 17:44:00 -08:00
Scott Main
e81ece3465 am aeb06e34: am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
* commit 'aeb06e34085703fe9699cdc3454558d69092bd7c':
  Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
2011-12-15 17:41:58 -08:00
Scott Main
c7bd1c3868 am efc87005: am 5f0df1b8: am 580f0146: docs: add camera and design, remove users update title names for many lessons
* commit 'efc870052b0988446967a6100cf03a51c3b88ce1':
  docs: add camera and design, remove users update title names for many lessons
2011-12-15 17:41:50 -08:00
Bart Sears
626dc5b847 Merge "Emoji characters for Android" 2011-12-15 17:40:56 -08:00
Scott Main
c016595b2a am 5f0df1b8: am 580f0146: docs: add camera and design, remove users update title names for many lessons
* commit '5f0df1b8db25859a1e99425cfd87562ef71e6478':
  docs: add camera and design, remove users update title names for many lessons
2011-12-15 17:39:43 -08:00
Scott Main
0bee144610 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
ef007ca60f 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
bf60c4d34b Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0 2011-12-15 17:36:58 -08:00
Sparky Rhode
ca7e725c54 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
cad9f4d877 am ea627994: am fc3f8e69: Merge "Remove references to sample application" into ics-mr0
* commit 'ea627994c3940711c27e27a6d5d98bb135944710':
  Remove references to sample application
2011-12-15 17:25:28 -08:00
Sparky Rhode
c5d14267a3 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
7f3aac506a Merge "Remove references to sample application" into ics-mr0 2011-12-15 17:21:51 -08:00
Roman Nurik
2fa235e577 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
8b589d0200 am eb623347: am d37e2b35: Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0
* commit 'eb623347f9a0c46e6ccf5791c03f99d37a0b65f8':
  Android U Class: Designing Effective and Intuitive App Navigation
2011-12-15 16:50:23 -08:00
Roman Nurik
a8c593f17d 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
189d5afa91 Merge "Android U Class: Designing Effective and Intuitive App Navigation" into ics-mr0 2011-12-15 16:45:55 -08:00
Scott Main
7304e53bf1 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
425b7f0678 am 6aee4582: am 2cbcdc76: Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0
* commit '6aee4582feae70254094e343412114c0b0abaf2d':
  docs: Add training homepage, side nav, and title changes
2011-12-15 16:31:54 -08:00
Scott Main
c9a175a70f 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
431002d2f7 Merge "docs: Add training homepage, side nav, and title changes" into ics-mr0 2011-12-15 16:28:19 -08:00
Glenn Kasten
7c0abe3a72 Merge "Improve resistance to leaks for ConfigEvent" 2011-12-15 16:17:04 -08:00
Glenn Kasten
33091d6dc0 Merge "Use NULL not 0 for pointers" 2011-12-15 16:16:55 -08:00
Joe Onorato
99c520a069 Add a new ui mode for "appliance"
The idea is that this is a device which is more-or-less headless.  It
might have some limited interaction capabilities, but it's not something
that you want to rely on having.

Change-Id: Ib92f53a120bf83de781728011721a4859def7d9f
2011-12-15 16:16:14 -08:00
Scott Main
bcf44cf65a 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
c8ea2d52f7 am fc6ac0f2: am 564e8aa4: docs: Android University - Camera class
* commit 'fc6ac0f28f9f7d06963fb330b218376099a91596':
  docs: Android University - Camera class
2011-12-15 16:12:23 -08:00