Gilles Debunne
29c5ea8fc0
Merge "Visual glitches when starting extracted text" into ics-mr1
2011-11-10 00:48:10 -08:00
Dave Burke
eeb561cc70
am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0
...
* commit 'b96194308dc8678e99564f038872061e4881e65a':
Actually 59 fps DO NOT MERGE
2011-11-10 07:59:32 +00:00
Dave Burke
91d3e052f5
Merge "Actually 59 fps DO NOT MERGE" into ics-mr0
2011-11-09 23:58:09 -08:00
Dave Burke
1f62c75dd3
Actually 59 fps DO NOT MERGE
...
Change-Id: Ic70dbba81c054eaaf21f71b10e329ebf1424d4a2
2011-11-09 23:53:51 -08:00
Dave Burke
09d940c770
Merge "Back to 59fps" into ics-mr1
2011-11-09 23:49:09 -08:00
satok
a77fbd8aac
Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1
2011-11-09 21:26:46 -08:00
Daniel Sandler
9e479b9bb5
Merge "Use platform assets for brightness scrubber." into ics-mr1
2011-11-09 20:41:03 -08:00
Wink Saville
7deb3f9dca
am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0
...
* commit '16ee60a5ae0336a46a417a72bca64a1a04b0fce2':
Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
2011-11-10 03:42:09 +00:00
Wink Saville
4424381fce
Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0
2011-11-09 19:39:39 -08:00
satok
e757bb395c
Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1
2011-11-09 18:42:48 -08:00
Dave Burke
2f78cf1122
Back to 59fps
...
Change-Id: I8d89e5e27f1abc5a2e36cb832eb4db2ca83c2cc6
2011-11-09 17:54:37 -08:00
Mathias Agopian
a36f977278
am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
...
* commit '3e458306b0caf4e21294acc58286b24bda08a242':
Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
2011-11-10 00:41:43 +00:00
Mathias Agopian
1761a32f2e
Set the WM refresh rate to 60 Hz for tuna devices only DO
...
NOT MERGE
This approach is TEMPORARY until we can do this properly.
Change-Id: I81a8f852df501b2faccffdae7cac954855a6c98f
2011-11-09 16:01:07 -08:00
Jim Miller
8e540328fc
Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
2011-11-09 15:19:31 -08:00
Eric Fischer
36fa0af67c
am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '3124bf64404dbb90cc521abf4c7bf8d438346362':
Import revised translations. DO NOT MERGE
2011-11-09 23:18:10 +00:00
Eric Fischer
7818a16c82
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-11-09 15:15:42 -08:00
Robert Ly
3e22d75179
am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0
...
* commit 'bd4bdbec62776b1222b1f202e44f8f127bfb7bab':
docs: update samples toc for rs sample
2011-11-09 21:25:45 +00:00
Robert Ly
341e1624ab
Merge "docs: update samples toc for rs sample" into ics-mr0
2011-11-09 13:23:34 -08:00
Jamie Gennis
72f172e79f
Merge "EGL: add deferred saving of the cache" into ics-mr1
2011-11-09 11:46:45 -08:00
Jeff Brown
412e23044b
Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1
2011-11-09 11:20:24 -08:00
Peter Ng
a38d1c8390
Merge "Making quicksettings opaque again" into ics-mr1
2011-11-09 10:57:23 -08:00
John Reck
d714c83962
Merge "Fix determining find on page overlap" into ics-mr1
2011-11-09 09:28:11 -08:00
The Android Open Source Project
bea63fd645
Reconcile with ics-mr0-release
...
Change-Id: I20113f16c260f8f796a0d370ea105ee17bdaea63
2011-11-09 09:00:40 -08:00
Jean-Michel Trivi
bd33207d68
Merge "Bug 5585323 New system permission for media decode" into ics-mr1
2011-11-09 08:57:43 -08:00
David Brown
394d2b68d0
am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
...
* commit '59882fb8e0ba7c47b780d62c9a9c46b63d779677':
Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
2011-11-09 16:41:20 +00:00
Glenn Kasten
70f3211abb
am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0
...
* commit '19998120f53caceb620f138c6eea182f1e693660':
Bug 5478024 drop after decode if can't drop before
2011-11-09 16:41:19 +00:00
Jake Hamby
f1896025db
am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
...
* commit 'fee5f29b22f99bd2891fb2af54669f20832fb851':
Fix exception when sending multi-page SMS with Turkish characters.
2011-11-09 16:40:59 +00:00
Eric Laurent
b2e9b55ecb
Merge "Fix regression for SoundPool playback" into ics-mr1
2011-11-09 08:27:20 -08:00
Brian Colonna
170e4c4ea7
am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0
...
* commit '04217efb8eaebdbd846671a2f743fa3e960b5dde':
Fix 5514230: preventing null window token from occurring
2011-11-09 15:35:12 +00:00
The Android Automerger
d8be24e84b
merge in ics-mr0-release history after reset to ics-mr0
2011-11-09 06:28:43 -08:00
Gilles Debunne
005c75cc49
Merge "Bug 5575396: close spell session on language change" into ics-mr1
2011-11-09 00:26:46 -08:00
Jeff Sharkey
57a70921a2
Merge "Bootstrap stats before registering listeners." into ics-mr1
2011-11-08 23:43:58 -08:00
Jeff Sharkey
e3ee3fc76c
Merge "Make operation counts monotonically increase." into ics-mr1
2011-11-08 23:43:38 -08:00
Jeff Sharkey
434f9e6c74
Merge "Dispatch alerts through background thread." into ics-mr1
2011-11-08 23:43:23 -08:00
Jeff Sharkey
a04ca4724f
Merge "Make policy data enabled flag static." into ics-mr1
2011-11-08 23:43:12 -08:00
Daniel Sandler
1f272dc236
Merge "Add day of week." into ics-mr1
2011-11-08 20:35:45 -08:00
David Brown
561d427958
Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
2011-11-08 18:25:30 -08:00
Mathias Agopian
ad04253386
Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1
2011-11-08 18:01:21 -08:00
Jamie Gennis
99c3d700d2
EGL: add deferred saving of the cache
...
This change causes any insertions into the EGL cache to trigger an
attempt to save the cache contents to disk. The save operation is
deferred to allow multiple cache insertions to be batched up.
Change-Id: I6cfec9c0dbbef94d3f8880860e2a365dccc296c7
2011-11-08 17:59:36 -08:00
Dianne Hackborn
6cd3075925
Merge "Don't crash if there is no connectivity service." into ics-mr1
2011-11-08 17:58:26 -08:00
Svetoslav Ganov
37adec8a7e
Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1
2011-11-08 17:33:49 -08:00
Glenn Kasten
842caaa0af
Merge "Bug 5478024 drop after decode if can't drop before" into ics-mr0
2011-11-08 17:31:32 -08:00
Jeff Sharkey
0679ce0ae8
Merge "Avoid inconsistent state when remove fails." into ics-mr1
2011-11-08 17:27:03 -08:00
Jeff Brown
d2ab7ea0c5
Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1
2011-11-08 17:22:06 -08:00
Mathias Agopian
d44935fcde
Merge "SensorService now always clamps the requested rate" into ics-mr1
2011-11-08 17:20:59 -08:00
Dianne Hackborn
6804efbfc2
Merge "Add drop box reports of low memory." into ics-mr1
2011-11-08 17:01:05 -08:00
Michael Kolb
47a6101d77
Merge "Remove flicker from WebTextView" into ics-mr1
2011-11-08 16:34:53 -08:00
Jamie Gennis
07289f166a
Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1
2011-11-08 16:15:26 -08:00
Jamie Gennis
63a49a63f7
Merge changes I18e5e789,I5cbaae2d into ics-mr1
...
* changes:
EGL: implement loading and saving the cache
EGL: use an in-memory the blob cache
2011-11-08 16:14:44 -08:00
Mathias Agopian
0fe35d093b
Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1
2011-11-08 15:55:55 -08:00