Svetoslav Ganov
f79f476fd1
resolved conflicts for merge of c00d2ddc to master
...
Change-Id: I075cc5b5df2909152ee463f8a0c7534344b47c62
2011-10-28 15:40:32 -07:00
Joe Fernandez
09848bc89d
Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
2011-10-28 15:40:11 -07:00
Jesse Wilson
0f28af209a
Interpret '+' as a space char in the URL query params.
...
This changes Uri.decode() to use libcore's implementation
of the same behavior.
Bug: http://code.google.com/p/android/issues/detail?id=21064
Change-Id: If81005492b12d3aaecc745471e0a28679544a391
2011-10-28 18:31:52 -04:00
Eric Fischer
5b9c79f27e
am 220d2b0a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '220d2b0aa126fbe09dee9e7e9afa1999521cf5d2':
Import revised translations. DO NOT MERGE
2011-10-28 22:27:54 +00:00
Gilles Debunne
19b51382a5
am a068e2f1: am 4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0
...
* commit 'a068e2f1d9532e6f005a162adfa295c553873ca5':
Text handles do not handle scroll correctly
2011-10-28 22:27:50 +00:00
The Android Open Source Project
edd6ad8cd4
am 58ba1b61: Reconcile with ics-mr0-release
...
* commit '58ba1b6121a9f11bc1ba40eb5b267033bbf2fafb':
Revert "Clean up CursorWindow code."
Revert "Restore broken CursorWindow.getType behavior."
Revert "Clean up CursorWindow lifetime."
Revert "Fix regression in CursorWindow.copyStingToBuffer."
Revert "Fix regression in CursorWindow.getString()"
Revert "Clean up handrolled Binder proxies."
Revert "Fix ownership of CursorWindows across processes."
Revert "Use ashmem for CursorWindows."
2011-10-28 22:27:47 +00:00
Jeff Sharkey
195ffd3a13
am cc16024f: Merge "Differentiate between system_server and unknown." into ics-mr1
...
* commit 'cc16024f101c0fca211fcd069b3917becf7a3c00':
Differentiate between system_server and unknown.
2011-10-28 22:27:38 +00:00
Daniel Sandler
056f4ea6b7
am 4c7926fa: Merge "Tuning parameters for mobile RSSI." into ics-mr1
...
* commit '4c7926fa27dacb92c8c7f3d57c4a3713dc0e3867':
Tuning parameters for mobile RSSI.
2011-10-28 22:27:37 +00:00
Raphael
b53aab7d81
am 48ba4139: (-s ours) am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.
...
* commit '48ba4139b9dc1f53f996b71f509a9d0c6fd2d72b':
Cherry-pick f51125d from master to ics-mr0. do not merge.
2011-10-28 22:27:22 +00:00
Peter Ng
d714e3a1ff
am 63dd319e: Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
...
* commit '63dd319ebeea0421f8bf901b85b753dde1de74d7':
Lockscreen on tablet is now using the same waveview widget as phone
2011-10-28 22:27:13 +00:00
Adam Powell
1bc7d4b192
am 65793dc0: Merge "Add API for deferring fragment start." into ics-mr1
...
* commit '65793dc043eee43790137f79beeba7ed8b123902':
Add API for deferring fragment start.
2011-10-28 22:27:12 +00:00
Adam Powell
678ed0c5a3
Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
...
Change-Id: I62ea1e982f0d3c92cb504efbae95bce238b12f72
2011-10-28 15:26:50 -07:00
Gilles Debunne
e03ba026c6
Merge "Performance improvement in TextView"
2011-10-28 15:26:22 -07:00
Gilles Debunne
4e13ebed6b
Merge changes I2082e3d0,Ibf8e9827
...
* changes:
Scroll performance improved in multiline TextEdit
Performance improvements for long text edition.
2011-10-28 15:26:07 -07:00
Peter Ng
e10462e384
Merge "Stat_notify visual asset updates" into ics-mr1
2011-10-28 15:20:56 -07:00
Peter Ng
146d018f20
Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1
2011-10-28 15:20:27 -07:00
Mark Wagner
73563ca81b
Merge "bugfix 5513340 Insertion pointer (vertical beam) behaves oddly in Talk's message composition field"
2011-10-28 15:16:37 -07:00
Chet Haase
d568bba507
Merge "Optimize handling of scrolled wallpapers" into ics-mr1
2011-10-28 15:13:27 -07:00
Justin Ho
c1cf3b160b
Merge "Vertically center the landscape navigation bar." into ics-mr0
2011-10-28 15:01:19 -07:00
Jeff Brown
89101cd9d9
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
Mark Wagner
f818511dda
bugfix 5513340 Insertion pointer (vertical beam) behaves oddly in Talk's message composition field
...
Seems like we should be calling makeBlink from setEnabled
Change-Id: I5b0433ba438a693f53d29e8ff7d4d853acc96bba
2011-10-28 14:50:36 -07:00
Chet Haase
a8e5a2bcd6
Optimize handling of scrolled wallpapers
...
Swiping the home screen causes the WindowManagerService to do
a bunch of work to keep the wallpapers in sync. First, it lays out
and places all windows. Also, it notifies the SystemUI process that
the wallpaper position has changed.
The layout/place operation is too much work - we only need to set
the position values for the wallpaper, not relayout the whole system.
The notification mechanism must exist, but should be optional. Most
wallpapers don't care (especially static ImageWallpapers). So we'll
give them a new API (WallpaperService.Engine.setWantsOffsets()) to
allow wallpapers to opt out of this process and avoid the performance
overhead.
Change-Id: I66c38375438937f14f6f5550565b28eb204b1e06
2011-10-28 14:49:23 -07:00
Jack Palevich
b50e2afd67
Destroy and recreate the EGL surface when the surface size changes.
...
Details:
+ Split EGLHelper.createSurface into two methods.
+ Add a separate flag for specifying when to create the GlInterface.
+ destroy and recreate the EGL surface when the surface size changes
+ Remove no-longer-needed work-around for b/2263168.
This fixes b/2263168
Change-Id: I0d2596527e3c8dabacdd8a8e427531eaefe7d266
2011-10-28 14:38:53 -07:00
Romain Guy
e707859415
Load identity matrix when calling Canvas.setMatrix(null)
...
Bug #5446826
Change-Id: I3a7817f266b17e9abe948500816d629edd9a2822
2011-10-28 14:32:20 -07:00
Joe Fernandez
61fd1e8d8c
docs: add developer guide cross references, Project ACRE, round 3
...
Change-Id: I6125315ecdf0f78dd947c514a9944729d723e95d
2011-10-28 14:23:23 -07:00
Svetoslav Ganov
c00d2ddcc3
Merge "Fixing a memory leak in accessibility enteraction APIs." into ics-mr1
2011-10-28 14:20:52 -07:00
Peter Ng
eb5766ca60
Checkbox and radio button assets are sharper and blue
...
Bug: 5527462
Change-Id: Ib3efd5c54ce060319ab5692f74f7002f7c874ee1
2011-10-28 14:15:55 -07:00
Peter Ng
bad9ac70da
Stat_notify visual asset updates
...
Change-Id: If2a5d50801cda32a13890880583611d480be32f9
2011-10-28 14:07:19 -07:00
Eric Fischer
220d2b0aa1
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-10-28 13:59:31 -07:00
Daniel Sandler
9929fa3058
Vertically center the landscape navigation bar.
...
We used the paddingTop parameter in the rot90 layout to
pretend that there was a status bar shifting all the
navigation icons down; by setting this to 0 we now spread
the navigation icons evenly across the entire display.
Bug: 5530481
Bug: 5459659
Change-Id: I7f8663049c597300818549f18d7a419537f44b96
2011-10-28 16:47:09 -04:00
Gilles Debunne
a068e2f1d9
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
Eric Fischer
2bae01b22c
Import revised translations. DO NOT MERGE
...
Change-Id: I0561d6196a615b9918f48f14cfbeb7de0b0c6f9d
2011-10-28 13:44:10 -07:00
Gilles Debunne
4eec98edee
Merge "Text handles do not handle scroll correctly" into ics-mr0
2011-10-28 13:41:01 -07:00
The Android Open Source Project
58ba1b6121
Reconcile with ics-mr0-release
...
Change-Id: I6997b52967863156cd151e368e891b63024ebbb1
2011-10-28 13:05:27 -07:00
Svetoslav Ganov
af5b4f471d
Fixing a memory leak in accessibility enteraction APIs.
...
1. AccessibilityInteractionConnection was non-static inner
class, hence keeping a handle to the enclosing ViewRootImpl
resulting in leaking activities.
bug:5525412
Change-Id: Ie438861663d623d503995844125d9e15d677fc32
2011-10-28 12:41:42 -07:00
Jeff Sharkey
cc16024f10
Merge "Differentiate between system_server and unknown." into ics-mr1
2011-10-28 12:24:44 -07:00
Daniel Sandler
4c7926fa27
Merge "Tuning parameters for mobile RSSI." into ics-mr1
2011-10-28 12:21:22 -07:00
Eric Fischer
ee5954a8fe
Merge "Import revised translations."
2011-10-28 12:10:44 -07:00
Glenn Kasten
8a5c7a9df2
Merge "Bug 5522189 temporary workaround"
2011-10-28 11:57:56 -07:00
Raphael
48ba4139b9
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
Jeff Brown
90c487f0e8
Merge "Optimize fillWindow to improve reverse-seek performance. Bug: 5520301"
2011-10-28 11:52:01 -07:00
Raphael
fe9a2a5471
Cherry-pick f51125d from master to ics-mr0. do not merge.
...
AAPT fix printf %zd crash on Windows.
There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.
SDK bugs: 20395, 20986
Change-Id: Ic201faffd871bd4c1b7d173d84b089e09750cd85
2011-10-28 11:31:31 -07:00
Xavier Ducrohet
12bd956598
Merge "AAPT fix printf %zd crash on Windows."
2011-10-28 11:28:20 -07:00
Jeff Sharkey
a353d2654a
Differentiate between system_server and unknown.
...
Bug: 5531966
Change-Id: I2b64b04f3f5a8760a2314729e8b90e9dd6699cb4
2011-10-28 11:13:27 -07:00
Eric Fischer
26854db6cc
Import revised translations.
...
Change-Id: Ide005a710989450022c6c2e703f7573cc72523e9
2011-10-28 11:13:03 -07:00
Michael Jurka
b7f4327e2d
Fix: never show recents over lock screen
...
Bug # 5150985
Change-Id: I0672c5e2562f1d4a7e45eba444ca186901236af3
2011-10-28 11:11:53 -07:00
Gilles Debunne
93347c24a7
Text handles do not handle scroll correctly
...
A recent patch taking scroll into account was applied at the wrong
level. isVisible() expects positions that already take scroll into
account. isOffsetVisible() is where the initial bug was.
Cherry pick of 144415 from master.
Change-Id: I06ceebfb3d7b24aa4adba886c24fcf9d8dd39d2e
2011-10-28 11:08:56 -07:00
Peter Ng
63dd319ebe
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
65793dc043
Merge "Add API for deferring fragment start." into ics-mr1
2011-10-28 10:43:33 -07:00
Glenn Kasten
c29982ce93
Bug 5522189 temporary workaround
...
Change-Id: I21d91d7a24df7bb6e7fc3d0fbc4786d55391fc0e
2011-10-28 10:26:17 -07:00