13414 Commits

Author SHA1 Message Date
Vasu Nori
196663234a remove unnecessary synchronization object from SQLiteClosable.
and a couple of other minor SMP fixes

Change-Id: I62bb4dd2fe43fc41074454a25bd84ad1fb4d004d
2010-09-10 14:27:06 -07:00
Vasu Nori
bcd3387eed Merge "Return count of rows in a resultset only once (when startPos = 0)" 2010-09-10 13:45:45 -07:00
Vasu Nori
b18f27dbf4 Return count of rows in a resultset only once (when startPos = 0)
If a query returns 100 rows and say only 10 rows fit in 1MB, then client
receiving the cursor from the ContentProvider needs to paginate.
ContentProvider returns count of total data everytime it returns a page
(= 1MB) of data to the client.
Returning total count causes reading (and skipping unwanted) data
from sqlite.
Instead, it should be sufficient to get total count once
and re-use the count value during the life of the cursor
until a requery is performed on the cursor.
(Count won't change unless data is changed - in which case
the cursor is asked to perform requery anyway. So doing count
once and reusing it should work)
Change-Id: I3520d94524dda07be9bcff56b6fbae5276af1d3b
2010-09-10 13:43:19 -07:00
Joe Onorato
201480c50e Fix the last remaining @deprecated tag without comment warning.
Change-Id: I526707233652e8092b33357d08f8ed81cd3a9e14
2010-09-10 15:55:43 -04:00
Adam Powell
bc234a19f4 Clean up action bar styles
Change-Id: Ib19698e08d643994c4416aac29a43e9197bbe1f3
2010-09-10 11:51:10 -07:00
Leon Scroggins
200c13d37f Do not put the selection on screen for non password fields.
Instead, allow webkit to do it.

Requires a change to external/webkit.

Bug 2679411
Bug 2659028

Change-Id: Ibe5dfc90b13d13f7575649e4c90d5166de10dbb2
2010-09-10 13:09:01 -04:00
Shimeng (Simon) Wang
610d92f4c9 Merge "Use the default scale for text input." 2010-09-10 09:39:34 -07:00
Joseph Wen
94b19d3706 am 94db0238: am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread
Merge commit '94db0238a3b6cba3cbf0e037af74e898a4741204'

* commit '94db0238a3b6cba3cbf0e037af74e898a4741204':
  Fix bug in JNI BitmapFactory
2010-09-10 02:39:10 -07:00
Joseph Wen
94db0238a3 am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread
Merge commit '219eb7ec8403ef9b98125f2b58cc27669ae69712' into gingerbread-plus-aosp

* commit '219eb7ec8403ef9b98125f2b58cc27669ae69712':
  Fix bug in JNI BitmapFactory
2010-09-10 02:35:50 -07:00
Joseph Wen
219eb7ec84 Merge "Fix bug in JNI BitmapFactory" into gingerbread 2010-09-10 02:32:05 -07:00
Joseph Wen
2dcfbefbbe Fix bug in JNI BitmapFactory
In nativeCreateLargeBitmapFromFileDescriptor() if the file descriptor
can not be rewinded isShareable should be set to false.

Change-Id: I7dd545c9d52d21c226e11b8921e35a1d9bba9515
2010-09-10 17:24:15 +08:00
Dianne Hackborn
8615fdc151 am 506d724c: Merge "DO NOT MERGE. I like\'d ctate\'s change so much I\'m doin it myself!" into gingerbread
Merge commit '506d724cc356a7ba73995ef2929c65062277c83d' into gingerbread-plus-aosp

* commit '506d724cc356a7ba73995ef2929c65062277c83d':
  DO NOT MERGE.  I like'd ctate's change so much I'm doin it myself!
2010-09-09 23:14:46 -07:00
Dianne Hackborn
618b8c1e98 DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!
Change-Id: If571d3ff5e73252a0653c30ec40178ec1591ddd9
2010-09-09 23:10:38 -07:00
Dianne Hackborn
203e9529c5 resolved conflicts for merge of 62d005ec to master
Change-Id: I552d7adffe70a2bd94113ffb70cdc3e625fca0bd
2010-09-09 23:06:27 -07:00
Dianne Hackborn
f22c30cd81 am 033b381b: am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread
Merge commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2'

* commit '033b381b4c91aff4bf76481d0b37fb5f39b50ec2':
  Fix doc of fullScreenIntent.
2010-09-09 21:39:22 -07:00
Dianne Hackborn
c6ded1ba46 am 195dc210: am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread
Merge commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c'

* commit '195dc210cb59ba3f660e31a95334fc3fa4d3ad2c':
  Small fixes to battery stats.
2010-09-09 21:39:13 -07:00
Dianne Hackborn
62d005ec94 am a7d868d4: Merge "Add toast when an app intercepts the launch of another app." into gingerbread
Merge commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859' into gingerbread-plus-aosp

* commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859':
  Add toast when an app intercepts the launch of another app.
2010-09-09 21:34:44 -07:00
Dianne Hackborn
033b381b4c am 7f07f842: Merge "Fix doc of fullScreenIntent." into gingerbread
Merge commit '7f07f842c9c375648b52de5d8a84c080e9394d71' into gingerbread-plus-aosp

* commit '7f07f842c9c375648b52de5d8a84c080e9394d71':
  Fix doc of fullScreenIntent.
2010-09-09 21:34:38 -07:00
Dianne Hackborn
195dc210cb am a4ce31f5: Merge "Small fixes to battery stats." into gingerbread
Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp

* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
  Small fixes to battery stats.
2010-09-09 21:34:33 -07:00
Dianne Hackborn
a7d868d4f9 Merge "Add toast when an app intercepts the launch of another app." into gingerbread 2010-09-09 21:31:34 -07:00
Dianne Hackborn
7f07f842c9 Merge "Fix doc of fullScreenIntent." into gingerbread 2010-09-09 21:31:08 -07:00
Dianne Hackborn
a4ce31f5e0 Merge "Small fixes to battery stats." into gingerbread 2010-09-09 21:30:52 -07:00
Dianne Hackborn
0dad364adb Add toast when an app intercepts the launch of another app.
The activity manager looks for cases where one app launches immediately
after another.  If this happens, a brief toast is shown telling the user
when app is actually running and what was originally starting.

Change-Id: If94cf5bd393dd0bc0f09789dae044fde1386c481
2010-09-09 21:25:35 -07:00
Adam Cohen
1a28bbb99d Merge "Fixing a bug where StackView wasn't always laid out correctly upon loading" 2010-09-09 18:48:09 -07:00
Adam Cohen
f04e22571f Fixing a bug where StackView wasn't always laid out
correctly upon loading

Change-Id: Iab80262be05dae949998a6193856fb7bbe297117
2010-09-09 18:42:13 -07:00
Winson Chung
2f803bea32 Merge "Adding some error handling to RemoteViewsAdapter, removing artificial loading delay." 2010-09-09 17:53:36 -07:00
Winson Chung
fbc3590f40 Adding some error handling to RemoteViewsAdapter, removing artificial loading delay.
Change-Id: I9cff6045086f0959ace65c2210fa3b9341f5aa5e
2010-09-09 16:45:38 -07:00
Dianne Hackborn
b8071d790a Small fixes to battery stats.
Change-Id: Ibbf7c548a8e787a046de3659094cea64908e3deb
2010-09-09 16:45:15 -07:00
Dianne Hackborn
392fea53ec Fix doc of fullScreenIntent.
Change-Id: Ieb21bb92b4ebf95f831231f2871839fec8a97a86
2010-09-09 16:44:01 -07:00
Jaikumar Ganesh
41506304b8 am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread
Merge commit '166aeb290be234531ba049b6702f558a02317393' into gingerbread-plus-aosp

* commit '166aeb290be234531ba049b6702f558a02317393':
  DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
2010-09-09 16:05:43 -07:00
Christopher Tate
c32e3275fe Merge "Don't crash in batterystats" 2010-09-09 15:53:09 -07:00
Chet Haase
f47f8bc310 Merge "Fix bug with pivot point not including translationXY factors" 2010-09-09 15:39:46 -07:00
Chet Haase
897247b2c4 Fix bug with pivot point not including translationXY factors
Change-Id: Ib16cd0acc007405fea24664327554019e24c2ac9
2010-09-09 15:37:58 -07:00
Mike Lockwood
e611ad410a Merge "Use separate Uris for MTP to the media provider files table" 2010-09-09 15:37:31 -07:00
Jaikumar Ganesh
166aeb290b Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread 2010-09-09 15:18:36 -07:00
Jaikumar Ganesh
cf8905620f DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
Change-Id: I6bc04efd1292784bae5fc4786949d9da79e4aa22
2010-09-09 15:15:42 -07:00
Robert Greenwalt
c7c0acd1f5 Merge "Fix the build" 2010-09-09 14:26:38 -07:00
Gilles Debunne
0706f5058c am 2b88c5c7: am 47fa8e80: Fix for an IndentOutOfBounds in TextField.
Merge commit '2b88c5c70d3a70afb02c9ef32c8cd902a12e9434'

* commit '2b88c5c70d3a70afb02c9ef32c8cd902a12e9434':
  Fix for an IndentOutOfBounds in TextField.
2010-09-09 14:23:42 -07:00
Gilles Debunne
a3dac8b1dc am ca1b2615: am 87e215fd: Merge "Made context menu appear when tapping inside selection." into gingerbread
Merge commit 'ca1b26150943829a296bf38e55ff9c55dbd98182'

* commit 'ca1b26150943829a296bf38e55ff9c55dbd98182':
  Made context menu appear when tapping inside selection.
2010-09-09 14:23:20 -07:00
Robert Greenwalt
67fd6c9292 Fix the build
add '*' so javadoc recognizes a comment block and finds the required @hide..

Change-Id: If665ba6549f9e017c063ea2800b7970917c33bdf
2010-09-09 14:22:59 -07:00
Steve Howard
c8532dac21 am 1ed20dc4: am e3692d15: Merge "Hidden API to control sorting of download manager queries." into gingerbread
Merge commit '1ed20dc43b070903597c55738f342bc77f7ab21d'

* commit '1ed20dc43b070903597c55738f342bc77f7ab21d':
  Hidden API to control sorting of download manager queries.
2010-09-09 14:22:12 -07:00
Jaikumar Ganesh
293de3eaf2 am 049912b7: am 9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbread
Merge commit '049912b76f320c55cfe56394e520ee2c35f913b8'

* commit '049912b76f320c55cfe56394e520ee2c35f913b8':
  Fix to get A2DP to connect after unpairing
2010-09-09 14:21:32 -07:00
Gilles Debunne
6eea4cd187 resolved conflicts for merge of ff545380 to master
Change-Id: Ida3b6cec13b03d734bb1ba4e31554eb5226da749
2010-09-09 14:07:56 -07:00
Shimeng (Simon) Wang
6c09ef01da Use the default scale for text input.
The default scale is 1.0 for tablet, instead of the 1.5 reading scale.

For small screen device, the default scale will be 1.5, so the new
code is backward compatible.

issue: 2988531
Change-Id: I8f00b0e9180402b2135573c019bea7d217119dad
2010-09-09 13:56:34 -07:00
Robert Greenwalt
29c1ac170e Merge "resolved conflicts for merge of ec52c98d to master" 2010-09-09 13:37:42 -07:00
Sang-il, Lee
b55df4471e Support MBCS characters in contacts and SMS messages that are stored in SIM cards.
Change-Id: I0438c5748a47512fc2a0e4b89ac85e30e3f5c6de
2010-09-09 13:23:42 -07:00
Robert Greenwalt
ca4306c976 resolved conflicts for merge of ec52c98d to master
Change-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed
2010-09-09 13:15:32 -07:00
Christopher Tate
898c4dc59f Don't crash in batterystats
The number of timers to allocate time shares to is calculated by
disregarding system-UID execution.  However, the actual allocation
of time *was* considering system-UID locks as well.  This wound up
trying to share time across more timers than had been counted in the
first pass, leading to divide-by-zero exceptions.

This patch changes the logic to account the time slice only to
non-system-UID entities, in keeping with the commentary.

Change-Id: I7384a3c269aea44e52bc983927f9417e11613ad5
2010-09-09 13:09:36 -07:00
Mike Lockwood
8490e66f57 Use separate Uris for MTP to the media provider files table
Separating the Uris for local and MTP access to the database will
allow us to handle MTP originated queries differently in the provider.

Change-Id: I78d1c0a0e656eddee1e17212a79157f67ca46b38
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-09 16:00:22 -04:00
Adam Powell
14fdda3196 Merge "Fix bug 2988160 - Flinging broken in certain apps/widgets" 2010-09-09 12:26:16 -07:00