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

63998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
75064f5d12 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
0bc0e5e35a 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
2b6449bbbc 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
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
0cc1e42d74 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
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
Jeff Sharkey
d6451e02ad Merge "Move NMS observers to RemoteCallbackList." 2011-12-15 18:40:21 -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
Dianne Hackborn
bfd89b35ba Don't forget to close files. 
Change-Id: Ibfe465e1d7a947bbe40da17e8e8a2713856f95b5
 2011-12-15 18:22:54 -08:00
Scott Main
a9099eeb24 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
6bbd38e986 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
826350cdc7 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
fe1dd94b76 Merge "Emoji characters for Android" 2011-12-15 17:40:56 -08:00
Scott Main
efc870052b 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
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
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
165b3cc73f 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
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
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
eb49c9c33c 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
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
52507ccd17 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
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
Glenn Kasten
cf45596da3 Merge "Improve resistance to leaks for ConfigEvent" 2011-12-15 16:17:04 -08:00
Glenn Kasten
2efd1184f9 Merge "Use NULL not 0 for pointers" 2011-12-15 16:16:55 -08:00
Joe Onorato
44fcb83b38 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
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
6e37a304c6 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
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
14ed7262e4 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
608461ffd5 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
Glenn Kasten
afb40b5fcf setActiveTrack and setBufferProvider can't fail 
Return void, not status_t, from setActiveTrack and setBufferProvider.

These methods returned status_t, but the callers never checked the
return value.  Since these aren't externally visible APIs, they now
return void, and assert on bad input parameters.

Change-Id: I530ed29484596ae41e8659826ca425149c51c2a1
 2011-12-15 15:55:51 -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
Jeff Sharkey
3df273e458 Move NMS observers to RemoteCallbackList. 
Internally uses Binder.linkToDeath() to handle case where remote
observer dies.

Change-Id: I9ae0ee6e011a9715172fa079098b108f895ae956
 2011-12-15 15:55:00 -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