Commit Graph

40224 Commits

Author SHA1 Message Date
Svetoslav Ganov
19889da06c Merge "Fixing the build breakage due to bad merge." 2011-10-28 16:42:06 -07:00
Peter Ng
92e746f8aa resolved conflicts for merge of e10462e3 to master
Change-Id: I1c5a4fd1573583cd365b375835038e7e4a34f201
2011-10-28 16:09:36 -07:00
Peter Ng
dc9007843d am 146d018f: Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1
* commit '146d018f2083ec435ad76c18302cd9e2496ef4d8':
  Checkbox and radio button assets are sharper and blue
2011-10-28 22:44:18 +00:00
Chet Haase
fa51d6b809 am d568bba5: Merge "Optimize handling of scrolled wallpapers" into ics-mr1
* commit 'd568bba507b0f66d4d57c67b08ade894d2c75e53':
  Optimize handling of scrolled wallpapers
2011-10-28 22:44:16 +00:00
Svetoslav Ganov
9bb9fcaeb1 resolved conflicts for merge of c00d2ddc to master
Change-Id: I075cc5b5df2909152ee463f8a0c7534344b47c62
2011-10-28 15:40:32 -07:00
Eric Fischer
af80315be0 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
9760021768 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
3700e5336d 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
7bfe20fc49 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
b41304bea2 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
6d7b43aa53 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
cc3ba99e43 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
500a165fdf 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
Gilles Debunne
e9a61ff202 Merge "Performance improvement in TextView" 2011-10-28 15:26:22 -07:00
Gilles Debunne
bfe1328912 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
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
Mark Wagner
afc8be9b9a 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
0c920ffb3a Merge "Optimize handling of scrolled wallpapers" into ics-mr1 2011-10-28 15:13:27 -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
Eric Fischer
25111da19d Merge "Import revised translations." 2011-10-28 12:10:44 -07:00
Glenn Kasten
4ba861f6d2 Merge "Bug 5522189 temporary workaround" 2011-10-28 11:57:56 -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
Jeff Brown
4047d62426 Merge "Optimize fillWindow to improve reverse-seek performance. Bug: 5520301" 2011-10-28 11:52:01 -07:00
Xavier Ducrohet
7a362f0406 Merge "AAPT fix printf %zd crash on Windows." 2011-10-28 11:28:20 -07: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
Gilles Debunne
c647307a92 Merge "Cleaning and new constant in ViewConfiguration" 2011-10-28 10:08:32 -07:00
Gilles Debunne
b7267137c3 Merge "Revert "Potential thread concurrency issue with WordIterators."" 2011-10-28 10:08:22 -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
09be18a925 am 43eed003: am b44038fd: docs: platform note typo
* commit '43eed0039c5534e68c82f13bab448fd7dc6845f7':
  docs: platform note typo
2011-10-28 16:44:31 +00: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
c1a72f7659 am 27ed1249: Merge "Properly report that we\'re no longer playing after receiving event" into ics-mr1
* commit '27ed12492dfbec6ec67b66ff3cf60febce370b01':
  Properly report that we're no longer playing after receiving event
2011-10-28 16:17:54 +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
b3bb5126a2 am ae561ae6: Merge "Fix initial Bluetooth icon state." into ics-mr1
* commit 'ae561ae62faf16ecd44b058ef966afd9b84feefe':
  Fix initial Bluetooth icon state.
2011-10-28 13:34:22 +00:00
Daniel Sandler
3b93f94588 Merge "Fix initial Bluetooth icon state." into ics-mr1 2011-10-28 06:29:51 -07:00
Narayan Kamath
20edfb72fe am 7a2f6f38: Merge "Widen permissions on synthesized files." into ics-mr1
* commit '7a2f6f38fe025654614d4c279fcfabf5819638b8':
  Widen permissions on synthesized files.
2011-10-28 09:19:14 +00:00
Narayan Kamath
7916e9add9 Merge "Widen permissions on synthesized files." into ics-mr1 2011-10-28 02:15:04 -07:00
Jeff Brown
20b3da9a01 Optimize fillWindow to improve reverse-seek performance.
Bug: 5520301

When an application requests a row from a SQLiteCursor that
is not in the window, instead of filling from the requested
row position onwards, fill from a little bit ahead of the
requested row position.

This fixes a problem with applications that seek backwards
in large cursor windows.  Previously the application could
end up refilling the window every time it moved back
one position.

We try to fill about 1/3 before the requested position and
2/3 after which substantially improves scrolling responsiveness
when the list is bound to a data set that does not fit
entirely within one cursor window.

Change-Id: I168ff1d3aed1a41ac96267be34a026c108590e52
2011-10-28 01:46:18 -07:00
Jeff Brown
991ddd13a6 am ce6578ac: am 84bee4f8: Merge "Fix copyStringToBuffer row index calculation. Bug: 5515552" into ics-mr0
* commit 'ce6578acc5729f76fc93b6daafede413703a8d19':
  Fix copyStringToBuffer row index calculation. Bug: 5515552
2011-10-28 08:24:11 +00: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
cdb564f2b1 am c1a1cca8: Merge "Fix 5487180: Check for empty plmn/spn strings instead of just null" into ics-mr1
* commit 'c1a1cca866ff76a6dbfa500292593d8031908a9b':
  Fix 5487180: Check for empty plmn/spn strings instead of just null
2011-10-28 07:26:05 +00: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