ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
40,489 Commits 2 Branches 0 Tags 54 MiB
c17f56fdf1
Commit Graph

40489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Scott Main
3f89429e48 Merge "docs: fix spell checker client location" into ics-mr0 2011-10-28 15:57:45 -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
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
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
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
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