ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
42,507 Commits 2 Branches 0 Tags 54 MiB
d2c5a3cf15
Commit Graph

42507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Scott Main
c55dd46c91 am 564e8aa4: docs: Android University - Camera class 
* commit '564e8aa41c29ebd10cb691851d4ecc347f8eee71':
  docs: Android University - Camera class
 2011-12-15 16:10:10 -08:00
Scott Main
34cb11456f am 608461ff: am 19552e95: am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs 
* commit '608461ffd5f3146c39a69496d275d7dabf1e2f90':
  cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
 2011-12-15 16:00:48 -08:00
Scott Main
35ad6be535 am 19552e95: am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs 
* commit '19552e95db26d96977daa42cda4de8e58c6feb0a':
  cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
 2011-12-15 15:58:33 -08:00
Scott Main
a5261478a0 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
Jeff Sharkey
2291edc1c7 Merge "Restrict app data on metered networks." 2011-12-15 15:37:21 -08:00
Marco Nelissen
fd417f7ed3 Merge "Add ContentProvider.dump()" 2011-12-15 14:41:36 -08:00
Scott Main
b0deb21fb8 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
8cb9834eed am 43834487: docs: remove some "new" tags from side navs 
* commit '43834487a183b69783b0de270f9b761f3afffdc1':
  docs: remove some "new" tags from side navs
 2011-12-15 13:14:41 -08:00
Jeff Sharkey
f10ac2d38b Merge "Move NMS to CONNECTIVITY_INTERNAL permission." 2011-12-15 11:53:05 -08:00
Jeff Sharkey
6cc3338849 Merge "Clear reply before writing exception." 2011-12-15 11:51:32 -08:00
Scott Main
6a680a6e05 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
b85127ab00 am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '481cd5a8938b5055942f3a9ccaeb08f373b8a4ea':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:11:39 -08:00
Scott Main
a44a3f8b82 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
Glenn Kasten
b2362bffc3 Merge "Fix build error when verbose logging is enabled" 2011-12-15 10:46:14 -08:00
Scott Main
97a68be944 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
553d695294 am cf927f22: am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'cf927f229f55849caf3461621023b5bd61908334':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:43:46 -08:00
Scott Main
15cd12dcec 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
Martijn Coenen
565c6f81bf Merge "Fix NPE on mock NDEF tech operations." 2011-12-15 10:32:11 -08:00
Scott Main
5528393b1f 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
a222ebf4fa am e4e6c066: am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'e4e6c06641a6446c0f26a0ac59c665f34476a6b4':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:15:21 -08:00
Scott Main
bff64425b6 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
Victoria Lease
0cd5568135 Merge "URL-decode tel: URIs." 2011-12-15 09:59:42 -08:00
The Android Automerger
6d0a1275e1 merge in ics-mr1-release history after reset to ics-mr1 2011-12-14 22:14:25 -08:00
Romain Guy
b42ea1b237 Merge "Generate even fewer GL commands" 2011-12-14 19:25:20 -08:00