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
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
Chet Haase
2a47c14e2a
Fix issues from recent glyph caching change
...
There were 2 issues remaining after a recent change to support
glyph caching from multiple textures:
- memory in the GPU for all textures was being allocated automatically.
This is now lazy, being allocated only when those textures are first
needed.
- filtering (applied when a rendered object is transformed) was ignoring
the new multiple-texture structure. Filtering should be applied correctly
whenever we change textures.
Change-Id: I5c8eb8d46c73cd01782a353fc79b11cacc2146ab
2011-12-15 15:43:02 -08:00
Jeff Sharkey
27c751dc00
Merge "Restrict app data on metered networks."
2011-12-15 15:37:21 -08:00
Glenn Kasten
af62dbca02
Simplify enable/disable mixing
...
The MIXING enum isn't needed, and now returns void instead of status_t.
Change-Id: Ibe4ec24081d75ad4ab78b9c7191fc9077959c4e9
2011-12-15 15:00:28 -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
Marco Nelissen
24ef465d7f
Merge "Add ContentProvider.dump()"
2011-12-15 14:41:36 -08:00
Jeff Sharkey
f60d0afd1e
Restrict app data on metered networks.
...
This separates the definition of "metered network" and "network with
limit." For now, all mobile networks are considered metered.
Bug: 5571454
Change-Id: I394cd385bd33add75e53bfc9cf2fefd06a00208a
2011-12-15 14:30:04 -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
a739235aed
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
Scott Main
43834487a1
docs: remove some "new" tags from side navs
...
Change-Id: If1341cdc456ace9037bd2175479d89454e084e22
2011-12-15 13:11:12 -08:00
Glenn Kasten
4b220f0a7b
Improve resistance to leaks for ConfigEvent
...
A Vector of pointers is risky, as there is no ownership (and the
ThreadBase destructor was not deleting them, so if there were any left
over at end it would leak). Replaced by a Vector of values.
Change-Id: Iddde72dc30134adfcf724dec26cbe0a742509b8c
2011-12-15 12:51:52 -08:00
Marco Nelissen
18cb28756c
Add ContentProvider.dump()
...
This is similar to the existing dump() facility for services.
ContentProviders can now implement dump() and that info will be shown
when running "dumpsys activity provider" and when taking a bugreport.
Change-Id: I33b3b132e3c4f920153355cc368eda2f725a715f
2011-12-15 12:13:59 -08:00
Jeff Sharkey
8a0a72c7c1
Merge "Move NMS to CONNECTIVITY_INTERNAL permission."
2011-12-15 11:53:05 -08:00