Sungmin Choi
66fe96aa65
Update preloaded-classes
...
Change-Id: I42247e498ad532e3f4699bc87c0d314cde74e3f6
2013-07-30 13:50:27 -07:00
Romain Guy
84956d53f1
Add missing InsetDrawable.getDrawable() method
...
Change-Id: I216b0e8a327f495fd83ebac79013418dbae007b9
2013-07-30 13:01:40 -07:00
Scott Main
e827b0d752
update ALCATEL ONE TOUCH usb driver URL
...
Change-Id: Ie63909e31da0e43812ff328b14ad4b3a87bb9c91
2013-07-30 12:54:04 -07:00
Dianne Hackborn
805f52d4cf
Report more memory tuning info.
...
Change-Id: I243d67189e325eba5ea22e79937f5a858dfceeed
2013-07-30 12:48:12 -07:00
Scott Main
299c5ea31b
Revert "docs: add link to developer survey on main landing pages"
...
This reverts commit da31f2ea9274614da18aa2544fc43fb4ee213741.
2013-07-30 12:28:43 -07:00
Wink Saville
f2c89b9ed6
am 9516ed45: am cfc23ac6: Merge "Add support for MNC=00"
...
* commit '9516ed4598948eea5623c57e443bce08c1f48ab6':
Add support for MNC=00
2013-07-30 12:28:05 -07:00
Wink Saville
9516ed4598
am cfc23ac6: Merge "Add support for MNC=00"
...
* commit 'cfc23ac688be9de1ecd2e659455ea1ebcceb63dc':
Add support for MNC=00
2013-07-30 12:24:39 -07:00
Wink Saville
cfc23ac688
Merge "Add support for MNC=00"
2013-07-30 19:19:47 +00:00
Scott Main
159a5ff708
fix a few bugs.
...
xxhpi bug: 10071401
bitmap code, aosp: 58020
intent code, aosp: 57698
Change-Id: Ice59c52d095d1e173918cae692368bf0f6636a14
2013-07-30 12:15:16 -07:00
Jean-Michel Trivi
fec4a907b1
Merge "Audio focus request managed by FocusRequester class"
2013-07-30 18:54:48 +00:00
Elliott Hughes
5d6e487e43
am f0589d8f: am 8cf1f446: Merge "fix typo: Remove dulplicated comment line"
...
* commit 'f0589d8fc78f7994cd49c64485f51f446c499259':
fix typo: Remove dulplicated comment line
2013-07-30 11:48:36 -07:00
Elliott Hughes
f0589d8fc7
am 8cf1f446: Merge "fix typo: Remove dulplicated comment line"
...
* commit '8cf1f4465bada6b25b47b7d72dc15d216c89de80':
fix typo: Remove dulplicated comment line
2013-07-30 11:45:25 -07:00
Eino-Ville Talvala
92ed645159
Merge "Camera2 API: Rename package to android.hardware.camera2"
2013-07-30 18:42:20 +00:00
Elliott Hughes
8cf1f4465b
Merge "fix typo: Remove dulplicated comment line"
2013-07-30 18:38:00 +00:00
Eino-Ville Talvala
2f1a2e423e
Camera2 API: Rename package to android.hardware.camera2
...
Change-Id: I77b7939e199f9fe8e12a59393c24cff08097448c
2013-07-30 11:37:31 -07:00
Sungmin Choi
f8e0017cdb
fix typo: Remove dulplicated comment line
...
Change-Id: I6b95998b4af5b27c7e1f9040aa5e7b7deb5d8609
2013-07-30 11:31:19 -07:00
Jean-Michel Trivi
783cea4658
Merge "More refactor of audio focus, keep track of focus loss"
2013-07-30 18:31:13 +00:00
Jean-Michel Trivi
83283f23eb
Audio focus request managed by FocusRequester class
...
Move all audio focus request functionality under a new class/file.
Clean up encapsulation of data related to the request.
Change-Id: I989796e1ee1a5fc99799a64e1612294e0e40fa6d
2013-07-30 11:27:08 -07:00
Alan Viverette
39dd5a62ae
Merge "Implement drag to open overflow menu, lift to select"
2013-07-30 18:04:43 +00:00
Alan Viverette
f45bdaf512
Merge "Don't show spinner popup if adapter is null"
2013-07-30 18:04:18 +00:00
Romain Guy
56fbb6362b
Merge "Add path ops API"
2013-07-30 17:53:05 +00:00
Romain Guy
8018c8db82
Add path ops API
...
Path ops can be used to combine two paths instances in a single path
object. The following operations can be used:
- Difference
- Reverse difference
- Union
- XOR
- Intersection
To use the API:
Path p1 = createCircle();
Path p2 = createRect();
Path result = new Path();
result.op(p1, p2, Path.Op.DIFFERENCE);
This code will subtract the rectangle from the circle and generate
the resulting path in "result."
Change-Id: Ic25244665b6691a7df0b0002a09da73d937b553b
2013-07-30 10:51:24 -07:00
Dirk Dougherty
2ffbfba5ad
Doc change: fix typo.
...
Change-Id: I0fad0ddc945362bf260ca2eb247eb9077244c6ae
2013-07-30 10:46:50 -07:00
Marco Nelissen
4d4a137bf5
am 51cf3661: am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"
...
* commit '51cf3661fa658d7cec6a08ed3f916ce98203027c':
MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
2013-07-30 10:28:38 -07:00
Lorenzo Colitti
e7c9482015
am cc4bee55: am 8fcad020: Merge "Make legacy VPN work over stacked interfaces."
...
* commit 'cc4bee55fa58193073f5ba5ccebc0cc24fdb45c7':
Make legacy VPN work over stacked interfaces.
2013-07-30 10:28:35 -07:00
Lorenzo Colitti
997405be19
am 6c3e7b5f: am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point"
...
* commit '6c3e7b5f0578aee0c49fa2bd4c1ba2572a9d0726':
464xlat: use a gatewayed route, not point-to-point
2013-07-30 10:28:32 -07:00
Jean-Baptiste Queru
d248b0a4de
am c2314cf5: am e700a36e: Merge "Update getCheckedItemPositions() documentation"
...
* commit 'c2314cf5f4efa2cc767e0069dcc2a67e12d7cd20':
Update getCheckedItemPositions() documentation
2013-07-30 10:28:24 -07:00
Marco Nelissen
51cf3661fa
am f38b5287: Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"
...
* commit 'f38b528701fd9bfd06adb2c9aeb7d5f951647312':
MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well
2013-07-30 10:17:08 -07:00
Marco Nelissen
f38b528701
Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well"
2013-07-30 17:11:55 +00:00
Scott Main
ec6f327ed0
update sizes/sums for tools 22.0.5 release
...
also update platform version number for doc builds
Change-Id: Ib3e644c3bfe618137516398aebf3f778ebdd1e81
2013-07-30 10:10:22 -07:00
Dirk Dougherty
37ec33741c
Doc change: add v7 mediarouter lib to index and feature summary, with preview notice.
...
Change-Id: I23e4bdec971a982f545c4118b5c154a8949170cf
(cherry picked from commit a32db2f12d2eae0440b575bfd006ee83967ef61c)
2013-07-30 17:07:18 +00:00
Lorenzo Colitti
cc4bee55fa
am 8fcad020: Merge "Make legacy VPN work over stacked interfaces."
...
* commit '8fcad020e0c256be1948e42df19d43f53f9f5804':
Make legacy VPN work over stacked interfaces.
2013-07-30 09:57:21 -07:00
Lorenzo Colitti
6c3e7b5f05
am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point"
...
* commit '158840079a501784c76e9816b215b3a1839074ef':
464xlat: use a gatewayed route, not point-to-point
2013-07-30 09:57:18 -07:00
Yorke Lee
6acfa5d567
Add URI and fields for new pinned position API in ContactsContract.
...
Change-Id: I947e49212750e0042a806d8f16817dc65597f45c
2013-07-30 09:52:36 -07:00
Lorenzo Colitti
8fcad020e0
Merge "Make legacy VPN work over stacked interfaces."
2013-07-30 16:50:41 +00:00
Lorenzo Colitti
158840079a
Merge "464xlat: use a gatewayed route, not point-to-point"
2013-07-30 16:50:05 +00:00
Jean-Baptiste Queru
c2314cf5f4
am e700a36e: Merge "Update getCheckedItemPositions() documentation"
...
* commit 'e700a36e4041a921f880a7c3c5ec6ce96c955a92':
Update getCheckedItemPositions() documentation
2013-07-30 09:22:51 -07:00
Jean-Baptiste Queru
e700a36e40
Merge "Update getCheckedItemPositions() documentation"
2013-07-30 16:16:38 +00:00
Lorenzo Colitti
bc8f82fb1f
Make legacy VPN work over stacked interfaces.
...
On stacked interfaces like 464xlat, Legacy VPN can't find the
default gateway because it uses getRoutes, which only returns
routes for the base link and not for the stacked links. It also
assumes that the interface that the default route points to is
the interface for the base link (e.g., rmnet0) instead of the
interface the route actually points to (e.g., clat4).
Fix this by calling getAllRoutes to find the default IPv4 route,
and get the interface name from the route we find instead of
assuming it's the base interface.
Bug: 9597516
Change-Id: Ia6ce0b6258a421cd22f60dedca7e94176b32176b
2013-07-31 01:14:30 +09:00
Lorenzo Colitti
efa73c05f7
464xlat: use a gatewayed route, not point-to-point
...
Various applications such as Skype and our legacy VPN code
do not understand routes pointed directly at point-to-point
interfaces and require a default gateway IPv4 address in
order to function.
Grudgingly accept that routes without default gateways Are Hard
and use gatewayed routes instead. This causes routing to go from:
default dev clat4 scope link
to:
default via 192.0.0.4 dev clat4 scope link
192.0.0.4 dev clat4 scope link
and those apps now work.
Bug: 9597256
Bug: 9597516
Change-Id: I7b7890873802d3cb99affd6eb70b8ab75e7a2cf6
2013-07-31 01:09:53 +09:00
Baligh Uddin
4ac7a5b42b
Merge "Import translations. DO NOT MERGE"
2013-07-30 15:59:34 +00:00
Baligh Uddin
c5bb50bdf4
Merge "Import translations. DO NOT MERGE"
2013-07-30 15:59:00 +00:00
Matthew Williams
8ac59af92c
Merge "Fix of RTE from SyncOperation.compare()"
2013-07-30 15:57:19 +00:00
Matthew Williams
7986fe490d
Fix of RTE from SyncOperation.compare()
...
Change-Id: I2e291b0c0bb9ae6a190d6cdfa9aef8b4bf33d617
2013-07-30 08:52:31 -07:00
Chris Wren
c743dfd5a9
Merge "insistent heads up should not time out"
2013-07-30 15:37:46 +00:00
Chris Wren
eda110fdf1
insistent heads up should not time out
...
Bug: 10000289
Change-Id: Ic263d9d6e90a61cc766844a8394c71d281f93976
2013-07-30 11:32:52 -04:00
Ben Murdoch
1c8c179dbf
Unhide WebView.evaluateJavascript(..)
...
CTS test is now added, so we are now ready to unhide.
Bug: 9814043
Change-Id: I9970b7010300b1b0644498f0359ca3840410dcea
2013-07-30 11:35:14 +01:00
Michael Wright
97d01407c7
resolved conflicts for merge of c0dbd255 to master
...
Change-Id: I0bc9bb711bae95526921771c9390065631f99c31
2013-07-29 19:37:32 -07:00
Michael Wright
c0dbd255ae
am b7dfa027: Merge "Remove deleted keylayout from Makefile"
...
* commit 'b7dfa02766fef8c32f6217f427a47ad519d1d9f0':
Remove deleted keylayout from Makefile
2013-07-29 19:31:34 -07:00
Michael Wright
b7dfa02766
Merge "Remove deleted keylayout from Makefile"
2013-07-30 02:26:01 +00:00