Winson Chung
552cd78bbb
Merge "Using fast-invalidate pattern for screenshot animations." into ics-mr1
2011-10-31 10:54:12 -07:00
Marco Nelissen
96ee2d9464
Merge "Make MediaController use low profile system UI" into ics-mr1
2011-10-31 10:46:33 -07:00
Alex Sakhartchouk
7b33423e8c
Merge "Removing changes not meant for MR1" into ics-mr1
2011-10-31 10:30:37 -07:00
Michael Jurka
06a4fa4f52
Merge "HorizontalScrollView should delay child presses" into ics-mr1
2011-10-30 19:41:24 -07:00
Amith Yamasani
8eb8a79657
am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
...
* commit '69e640ee84fc218d6318acaf73a1c1841d7fba6b':
Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
2011-10-30 21:37:09 +00:00
Jeff Brown
9897b46138
resolved conflicts for merge of 2d280f75 to ics-mr1
...
Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
2011-10-30 14:24:02 -07:00
The Android Automerger
1b47eac28c
Revert "Improve the slow query instrumentation."
...
This reverts commit 89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2.
2011-10-30 13:56:11 -07:00
The Android Automerger
3186645df4
merge in ics-factoryrom-2-release history after reset to ics-mr0
2011-10-30 12:35:09 -07:00
The Android Automerger
5b832b92d1
merge in ics-mr0-release history after reset to ics-mr0
2011-10-30 06:29:10 -07:00
The Android Automerger
30abcbd93d
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
...
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-10-28 20:40:07 -07:00
Eric Fischer
1e6a30e6bd
am 2cc1c5d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '2cc1c5d067736f221554be593c2ba2c96390f847':
Import revised translations. DO NOT MERGE
2011-10-29 03:15:36 +00:00
Scott Main
7033da0789
am 8dbe177c: Merge "docs: fix spell checker client location" into ics-mr0
...
* commit '8dbe177c5dda205086f7a353dd1fa09a0c7ab24c':
docs: fix spell checker client location
2011-10-29 02:16:15 +00:00
Joe Fernandez
1a4fdeacfd
am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
...
* commit '09848bc89de999416e2de82a7693b2deec6bf802':
docs: add developer guide cross references, Project ACRE, round 3
2011-10-29 02:16:10 +00:00
Justin Ho
2c767cff58
am c1cf3b16: Merge "Vertically center the landscape navigation bar." into ics-mr0
...
* commit 'c1cf3b160b4852e021a45806d496a9f9a76d6683':
Vertically center the landscape navigation bar.
2011-10-29 02:16:08 +00:00
Amith Yamasani
001411885a
Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
2011-10-28 18:59:11 -07:00
satok
74fcb682e7
Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1
2011-10-28 18:26:40 -07:00
satok
be8fa9fa50
Merge "Hide ime switcher when the screen is turned off." into ics-mr1
2011-10-28 18:25:28 -07:00
Jeff Brown
6d42e13be4
Merge "Improve the slow query instrumentation." into ics-mr0
2011-10-28 18:21:05 -07:00
Dianne Hackborn
9bbc1b2dfb
Merge "Add some IO tests." into ics-mr1
2011-10-28 17:33:39 -07:00
Eric Fischer
5b534dcc2e
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-28 17:29:12 -07:00
Scott Main
3f89429e48
Merge "docs: fix spell checker client location" into ics-mr0
2011-10-28 15:57:45 -07:00
Joe Fernandez
d01e193b78
Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
2011-10-28 15:40:11 -07:00
Peter Ng
89998e62b6
Merge "Stat_notify visual asset updates" into ics-mr1
2011-10-28 15:20:56 -07:00
Peter Ng
dedc016663
Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1
2011-10-28 15:20:27 -07:00
Chet Haase
0c920ffb3a
Merge "Optimize handling of scrolled wallpapers" into ics-mr1
2011-10-28 15:13:27 -07:00
Justin Ho
ea99d4686c
Merge "Vertically center the landscape navigation bar." into ics-mr0
2011-10-28 15:01:19 -07:00
Jeff Brown
27a852b620
Improve the slow query instrumentation.
...
On user-debug and eng builds, you can set the
"db.log.slow_query_threshold" system property to queries that
take longer than the specified number of milliseconds.
Set it to 0 to log all queries.
This property has been around for a while but it was implemented
poorly. In particular, it *changed* the behavior of the query
by calling getCount() while holding the Db connection.
In normal operation, the query will not actually run until later.
By putting the timing logic into fillWindow() instead, we ensure
that we only measure queries that actually ran. We also capture
cases where the cursor window gets filled multiple times.
Bug: 5520301
Change-Id: I174f5e1ea15831a1d22a36e9a804d7755f230b38
2011-10-28 14:58:39 -07:00
Svetoslav Ganov
d7967f79b3
Merge "Fixing a memory leak in accessibility enteraction APIs." into ics-mr1
2011-10-28 14:20:52 -07:00
Eric Fischer
b5dc4c8bb9
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-10-28 13:59:31 -07:00
Gilles Debunne
50fe8f3129
am 4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0
...
* commit '4eec98edee3d6eb516e30a7151da13fd726f93a9':
Text handles do not handle scroll correctly
2011-10-28 20:44:17 +00:00
Gilles Debunne
fc3e05538f
Merge "Text handles do not handle scroll correctly" into ics-mr0
2011-10-28 13:41:01 -07:00
The Android Open Source Project
d211a99952
Reconcile with ics-mr0-release
...
Change-Id: I6997b52967863156cd151e368e891b63024ebbb1
2011-10-28 13:05:27 -07:00
Jeff Sharkey
eea1d1a382
Merge "Differentiate between system_server and unknown." into ics-mr1
2011-10-28 12:24:44 -07:00
Daniel Sandler
3be100bcac
Merge "Tuning parameters for mobile RSSI." into ics-mr1
2011-10-28 12:21:22 -07:00
Raphael
7118ea707b
am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.
...
* commit 'fe9a2a5471616a3267b30013bce36b13a455c0cd':
Cherry-pick f51125d from master to ics-mr0. do not merge.
2011-10-28 18:54:36 +00:00
Peter Ng
ff05f3f03d
Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
2011-10-28 10:53:54 -07:00
Adam Powell
c57268ee93
Merge "Add API for deferring fragment start." into ics-mr1
2011-10-28 10:43:33 -07:00
The Android Automerger
655522fef5
merge in ics-mr0-release history after reset to ics-mr0
2011-10-28 09:53:33 -07:00
Scott Main
868f0128cf
am b44038fd: docs: platform note typo
...
* commit 'b44038fd294382d42070eb60df3bf5132eb4cb29':
docs: platform note typo
2011-10-28 16:39:46 +00:00
Andreas Huber
944d04686a
Merge "Properly report that we're no longer playing after receiving event" into ics-mr1
2011-10-28 09:13:54 -07:00
Daniel Sandler
3b93f94588
Merge "Fix initial Bluetooth icon state." into ics-mr1
2011-10-28 06:29:51 -07:00
Narayan Kamath
7916e9add9
Merge "Widen permissions on synthesized files." into ics-mr1
2011-10-28 02:15:04 -07:00
Jeff Brown
7175809019
am 84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0
...
* commit '84bee4f8746a19428e0ddfd10df1130324dc39fa':
Fix copyStringToBuffer row index calculation. Bug: 5515552
2011-10-28 08:20:20 +00:00
Jeff Brown
a2904e6a57
Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0
2011-10-28 01:18:07 -07:00
Jim Miller
30d35a24dc
Merge "Fix 5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1
2011-10-28 00:22:53 -07:00
Robert Greenwalt
ada031b0c5
am c43b9b6d: Merge "Add SFR DUN configuration." into ics-mr0
...
* commit 'c43b9b6d97ed6dc40e181843aa79159c504e7004':
Add SFR DUN configuration.
2011-10-28 04:06:09 +00:00
Robert Greenwalt
21f0be6b0d
Merge "Add SFR DUN configuration." into ics-mr0
2011-10-27 21:04:17 -07:00
Peter Ng
d55af7cc40
Merge "Removing 2nd background clock font display from statusbar and lock screen" into ics-mr1
2011-10-27 19:17:19 -07:00
Jake Hamby
6fc5e917ab
am 31d157ba: Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0
...
* commit '31d157bad27e4ecbe415f6f581946b6da7cc2ba3':
Fix bug in enabling/disabling SMS cell broadcast activation.
2011-10-28 02:14:08 +00:00
Justin Ho
2738256a40
am 9e7407ed: Merge "Increase navigation icon brightness by 10%" into ics-mr0
...
* commit '9e7407ed2b18800291612fb9fb355ef062801f07':
Increase navigation icon brightness by 10%
2011-10-28 02:14:05 +00:00