Commit Graph

40605 Commits

Author SHA1 Message Date
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
a412007eee am ab22f862: Merge "Back to 59fps" into ics-mr1
* commit 'ab22f862a912035ba83591db448806fd81ed74f4':
  Back to 59fps
2011-11-10 07:50:19 +00:00
Dave Burke
09d940c770 Merge "Back to 59fps" into ics-mr1 2011-11-09 23:49:09 -08:00
satok
10c994faef am 114c4d38: Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1
* commit '114c4d3843758a2a1ffb32eb2719d65cdee637f8':
  Introduce an API to cancel pending/running spell check tasks
2011-11-10 05:28:47 +00: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
d784eada4b am bca520a1: Merge "Use platform assets for brightness scrubber." into ics-mr1
* commit 'bca520a170f84c8be840e629841d0dc7d7cb273b':
  Use platform assets for brightness scrubber.
2011-11-10 04:42:15 +00:00
Daniel Sandler
9e479b9bb5 Merge "Use platform assets for brightness scrubber." into ics-mr1 2011-11-09 20:41:03 -08:00
Wink Saville
f3fe9a877d am 08b3ffe6: am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0
* commit '08b3ffe61182b60ded3bfa599778b6f5495e87db':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
2011-11-10 03:44:27 +00: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
e35b865f49 am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1
* commit '34bd596935ccd4574dbf6c6e7bfa24323e3e8e1f':
  Respect user settings for spell checking language if explicitly set
2011-11-10 02:44:24 +00: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
ca6a7d32e0 am 42694dc4: am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
* commit '42694dc4a7af4f38e39cb26a852f3f75e730bb05':
  Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
2011-11-10 00:44:27 +00: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
f795a58c90 am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
* commit '270826a8878b5470d48d93ca3d518ac93860870d':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
2011-11-09 23:21:39 +00:00
Eric Fischer
59f0407aab am 6b992090: am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '6b992090f6eb1e14553be22373799258bb401e3d':
  Import revised translations.  DO NOT MERGE
2011-11-09 23:21:38 +00: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
3f3aca8f5a am 69db5695: am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0
* commit '69db56958fdac41a093cd6cf00cbe200f2885730':
  docs: update samples toc for rs sample
2011-11-09 21:28:23 +00: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
d4e367fb86 am 97ece7a9: Merge "EGL: add deferred saving of the cache" into ics-mr1
* commit '97ece7a95f76ec724633d4f4764291ea4dc20933':
  EGL: add deferred saving of the cache
2011-11-09 19:48:29 +00: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
507396958b am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1
* commit 'e7de36e605e0ccf4552c8ee1db40cb9af3227cf4':
  Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
2011-11-09 19:21:50 +00: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
79f9d1757b am 34dd937b: Merge "Making quicksettings opaque again" into ics-mr1
* commit '34dd937be1a325fd92d6479822960e4ca13f2420':
  Making quicksettings opaque again
2011-11-09 18:59:18 +00:00
Peter Ng
a38d1c8390 Merge "Making quicksettings opaque again" into ics-mr1 2011-11-09 10:57:23 -08:00
John Reck
c8c8c7a9a0 am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1
* commit '36a7f2a9adfa21ec31f00d496fef82e68931c860':
  Fix determining find on page overlap
2011-11-09 17:30:39 +00: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
ef3da468af am eae6c997: Reconcile with ics-mr0-release
* commit 'eae6c9972d91b9af58c3bf7ba0235c0a3e95c408':
2011-11-09 17:03:59 +00: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
72aa4697fa am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1
* commit '20cf0916cc6a4920b1d882a9478615a15fe6b3b0':
  Bug 5585323 New system permission for media decode
2011-11-09 16:59:48 +00: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
0455970132 am b6b44cef: am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
* commit 'b6b44cef94a38b6f403b43f55d77d3602de18a3c':
  Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
2011-11-09 16:44:53 +00:00
Glenn Kasten
d1d81e5874 am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0
* commit 'f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2':
2011-11-09 16:44:51 +00:00
Jake Hamby
d39f857624 am 9c5c97f6: am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
* commit '9c5c97f61818f4d20079616a98d62f888f07d285':
2011-11-09 16:44:49 +00: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
d27ea3e1fe am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1
* commit '2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
  Fix regression for SoundPool playback
2011-11-09 16:29:04 +00:00
Eric Laurent
b2e9b55ecb Merge "Fix regression for SoundPool playback" into ics-mr1 2011-11-09 08:27:20 -08:00
Brian Colonna
56f9109fc6 am 09a56563: am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0
* commit '09a56563cea260f12b5606837f5b01420b920170':
2011-11-09 15:38:45 +00: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
Gilles Debunne
336aee8e81 am 76bb11ca: Merge "Bug 5575396: close spell session on language change" into ics-mr1
* commit '76bb11ca642556673249a6ef8b84ab2813deaa87':
  Bug 5575396: close spell session on language change
2011-11-09 14:36:59 +00:00
Jeff Sharkey
a6ef0fce17 am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1
* commit '630a13bdd88723599a7617ca4df20ab923e7ffbb':
  Bootstrap stats before registering listeners.
2011-11-09 14:36:57 +00:00
Jeff Sharkey
b3f4c21ccf am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1
* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
  Make operation counts monotonically increase.
2011-11-09 14:36:56 +00:00