Jim Miller
f1e22e5c78
Fix 3354590: Add back button to dismiss RecentAppsPanel
...
Change-Id: I65337e8ebf823e7a92f810cd670b23edf8e70067
2011-01-26 15:39:51 -08:00
Fabrice Di Meglio
f728411ba4
Merge "Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)" into honeycomb
2011-01-26 15:39:24 -08:00
Jason Chen
330e298ddd
am bb03e3b7: am b61440b4: Merge "Cherry-pick of f5e4f208b9ed73 to honeycomb" into honeycomb
...
* commit 'bb03e3b779ec2f5abfd8e07bf92001b229becc0f':
Cherry-pick of f5e4f208b9ed73 to honeycomb
2011-01-26 15:36:25 -08:00
Fabrice Di Meglio
dc2dd88249
Fix bug #3395355 ("adb shell dumpsys content" should present human readable failure messages instead of error codes)
...
- add human readable error messages
Change-Id: Ib6937684e61aca80b2c3bc78fd67b93c3df61d17
2011-01-26 15:35:47 -08:00
Jason Chen
bb03e3b779
am b61440b4: Merge "Cherry-pick of f5e4f208b9ed73 to honeycomb" into honeycomb
...
* commit 'b61440b440ab6cd89ea1462121302f0c4896a109':
Cherry-pick of f5e4f208b9ed73 to honeycomb
2011-01-26 15:34:18 -08:00
Mike Lockwood
82cb6731a0
am bd65c065: am a13732e1: Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
...
* commit 'bd65c065b2dcb54dde563a8a21c9f92da947c7dd':
MTP: Fix month off by one error in date parsing and formatting code
2011-01-26 15:34:15 -08:00
Mike Lockwood
bd65c065b2
am a13732e1: Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
...
* commit 'a13732e17a0f3d69df9c418407985b3ad64b1852':
MTP: Fix month off by one error in date parsing and formatting code
2011-01-26 15:32:11 -08:00
Jason Chen
b61440b440
Merge "Cherry-pick of f5e4f208b9ed73 to honeycomb" into honeycomb
2011-01-26 15:30:56 -08:00
Mike Lockwood
a13732e17a
Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
2011-01-26 15:30:07 -08:00
Mike Lockwood
2107d23fc9
MTP: Fix month off by one error in date parsing and formatting code
...
BUG: 3379100
Change-Id: Ib386f0def9d611529ce0528b8159cef48df9cd85
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-26 15:11:48 -08:00
Jeff Brown
91f2dbb782
am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
...
* commit '7b448b8a6c1ababc3a3e4553ebe9bac7473051c8':
Move keymaps from sdk/emulator/keymaps.
2011-01-26 15:03:32 -08:00
Shih-wei Liao
88523f3757
am dde78c2b: am 79204b98: Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb
...
* commit 'dde78c2b1c2c2ea28b6799ac135477386ae5df93':
Part II of fixing b/2943524: On-device linking rs_core.
2011-01-26 15:00:44 -08:00
Shih-wei Liao
dde78c2b1c
am 79204b98: Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb
...
* commit '79204b98d260d8f5e8419f5149b31b336424aec5':
Part II of fixing b/2943524: On-device linking rs_core.
2011-01-26 14:58:57 -08:00
Scott Main
f4f05b8f24
Update package descriptions with editorial revisions.
...
Notably, this removes exessive info about resources
from the content package, because it's not a good location
and the info is avilable in the dev guide, but also
added some of the info to the Resources class description.
Change-Id: Ie78af26c9cec66314deb98e53078f48e16c08e70
2011-01-26 14:58:19 -08:00
Shih-wei Liao
79204b98d2
Merge "Part II of fixing b/2943524: On-device linking rs_core." into honeycomb
2011-01-26 14:56:41 -08:00
John Wang
890932eccb
am 9c90f6d9: am 7b4ba9d8: Merge "Enable recovery in RIL wakelock release check." into honeycomb
...
* commit '9c90f6d9fdaf128bbe07d4aca35ed08c5326b7c5':
Enable recovery in RIL wakelock release check.
2011-01-26 14:52:10 -08:00
James Dong
804d8798d5
am 8bea1d55: am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
...
* commit '8bea1d5585822bb62996e789f59c7629dfd9ac50':
Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
2011-01-26 14:49:23 -08:00
John Wang
9c90f6d9fd
am 7b4ba9d8: Merge "Enable recovery in RIL wakelock release check." into honeycomb
...
* commit '7b4ba9d80d2cdde310c29d01d0e22c7815d84261':
Enable recovery in RIL wakelock release check.
2011-01-26 14:48:34 -08:00
Shih-wei Liao
f5a16efcc3
Part II of fixing b/2943524: On-device linking rs_core.
...
Change-Id: I1db1f8a2c9e8afabd9961c0effca60b10c9ed4dc
2011-01-26 14:47:17 -08:00
James Dong
8bea1d5585
am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
...
* commit '7fb232c40cde91d0958be1694db2d97a126b95f9':
Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
2011-01-26 14:45:41 -08:00
John Wang
7b4ba9d80d
Merge "Enable recovery in RIL wakelock release check." into honeycomb
2011-01-26 14:45:24 -08:00
James Dong
7fb232c40c
Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
2011-01-26 14:43:59 -08:00
Svetoslav Ganov
2d65afb7c4
am 54fc7807: am df467264: Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
...
* commit '54fc78072fec46933ca5ee96c7642bd4b9fc540f':
Final polish of WebView accessibility support for no JavaScript case.
2011-01-26 14:43:18 -08:00
Svetoslav Ganov
54fc78072f
am df467264: Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
...
* commit 'df4672643b92208b4ab7f9ab995dca8b69d3c458':
Final polish of WebView accessibility support for no JavaScript case.
2011-01-26 14:41:33 -08:00
John Wang
4376538c47
Enable recovery in RIL wakelock release check.
...
This is a cherry-pick Change 91968 from GB branch.
Wakelock will get released while
1) no request pending to be sent out, in which mRequestMessagesPending increases
before calling EVENT_SEND and decreases while handling EVENT_SEND.
and
2) no waiting requests sent to RIL but no replied, in which mRequestMessagesWaiting
increases while sending request and decreases while handling response.
Both will be cleared while WAKE_LOCK_TIMEOUT occurs to recovery from out of sync situation.
bug: 3369427, 3370827
Change-Id: Ibbcc95d67a292ffe20339ea9bdb0f2e4a4988da0
2011-01-26 14:40:36 -08:00
Svetoslav Ganov
df4672643b
Merge "Final polish of WebView accessibility support for no JavaScript case." into honeycomb
2011-01-26 14:39:47 -08:00
Jeff Brown
7b448b8a6c
Merge "Move keymaps from sdk/emulator/keymaps."
2011-01-26 14:25:08 -08:00
Dianne Hackborn
3a40182c77
am 49295e53: am ccd79399: am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit '49295e5379472c22af8975e32271f9659c016531':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:17:37 -08:00
Robert Greenwalt
61940a937f
Merge "Get rid of manual int->ipv4 string generation"
2011-01-26 14:16:42 -08:00
Jean-Michel Trivi
d83e548dd4
am b8efdf7f: (-s ours) am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit 'b8efdf7f80d9aa2cbeff881f22d283cf5045c379':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:15:15 -08:00
Dianne Hackborn
49295e5379
am ccd79399: am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit 'ccd79399cc2a28d79287fd1558c5f5a530356003':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:15:08 -08:00
Stephen Hines
6b193fed09
am 203107d4: am 8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb
...
* commit '203107d4901704c33eca2e5f7e5cd967fd372bbe':
Hook up tgammaf properly for RS.
2011-01-26 14:13:06 -08:00
Jean-Michel Trivi
b8efdf7f80
am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit '1155efdc715413cd7a881e5226b5f5f0b2db8f71':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:12:45 -08:00
Stephen Hines
203107d490
am 8fc7690f: Merge "Hook up tgammaf properly for RS." into honeycomb
...
* commit '8fc7690f2b42c27f9f609647b96c17234aa9d78e':
Hook up tgammaf properly for RS.
2011-01-26 14:10:58 -08:00
Dianne Hackborn
3a985aed11
Cherry-pick of f5e4f208b9ed73 to honeycomb
...
Original change description:
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:09:45 -08:00
Stephen Hines
8fc7690f2b
Merge "Hook up tgammaf properly for RS." into honeycomb
2011-01-26 14:08:49 -08:00
Dianne Hackborn
ccd79399cc
am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-26 14:08:30 -08:00
Jean-Michel Trivi
1155efdc71
am 2ba92c71: do not merge bug 3370834 Cherrypick from master
...
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug 3370834 Cherrypick from master
2011-01-26 14:05:18 -08:00
Dianne Hackborn
1d07b5bc9b
Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
2011-01-26 13:59:42 -08:00
Robert Greenwalt
70d2c4d82c
Get rid of manual int->ipv4 string generation
...
bug:2542681
Change-Id: I67919d7b5dc8d72eeb2dfb9e3906210b1951d4fb
2011-01-26 13:57:24 -08:00
Romain Guy
cf5afe9299
am 08cdf6fd: am 940df6dd: Merge "Remove unused API" into honeycomb
...
* commit '08cdf6fd9ac9bbbd77024518c45034d66b5830c6':
Remove unused API
2011-01-26 13:44:35 -08:00
Romain Guy
2b1847ea60
Remove unused API
...
Change-Id: I1714fd82a64b752f0350ef4ef9179ce19e089c6a
2011-01-26 13:43:01 -08:00
Romain Guy
08cdf6fd9a
am 940df6dd: Merge "Remove unused API" into honeycomb
...
* commit '940df6dd83624e5f46b147837d848853a1dab9b2':
Remove unused API
2011-01-26 13:42:53 -08:00
Romain Guy
940df6dd83
Merge "Remove unused API" into honeycomb
2011-01-26 13:41:10 -08:00
Gilles Debunne
cff0ade069
am 9aa5b8da: am 12b2dc23: Merge "Holo theme for error popups in TextViews." into honeycomb
...
* commit '9aa5b8dad015f08251a3a75c9f790e86670c6914':
Holo theme for error popups in TextViews.
2011-01-26 13:37:07 -08:00
Gilles Debunne
9aa5b8dad0
am 12b2dc23: Merge "Holo theme for error popups in TextViews." into honeycomb
...
* commit '12b2dc23cc3cdd9dcd6bac91adc8e4198502bab5':
Holo theme for error popups in TextViews.
2011-01-26 13:35:28 -08:00
Gilles Debunne
12b2dc23cc
Merge "Holo theme for error popups in TextViews." into honeycomb
2011-01-26 13:33:24 -08:00
Adam Cohen
f95bc64438
am eca572f5: am 10f27c5a: Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb
...
* commit 'eca572f5d9c073b789de027df2971860eb393d6d':
Fixing bug where widgets would go dead after moving to another screen
2011-01-26 13:30:44 -08:00
Adam Cohen
eca572f5d9
am 10f27c5a: Merge "Fixing bug where widgets would go dead after moving to another screen" into honeycomb
...
* commit '10f27c5a42e6da262d178d426944b2b31c185f4a':
Fixing bug where widgets would go dead after moving to another screen
2011-01-26 13:29:07 -08:00
Shimeng (Simon) Wang
af58bdaa8e
am c1df157a: am 07837862: Merge "Fine tune the high memory threshold and usage delta for v8 GC." into honeycomb
...
* commit 'c1df157a60164e23ac45701d9e5da6d4edcc756c':
Fine tune the high memory threshold and usage delta for v8 GC.
2011-01-26 13:28:34 -08:00