Commit Graph

11018 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
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
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
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
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
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
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
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
Adam Powell
8ae0f3f6c7 Fix bug 2988160 - Flinging broken in certain apps/widgets
Change-Id: I89de767cecbbc37cb2fe90a0346e8e1591dec60b
2010-09-09 12:17:54 -07:00
Gilles Debunne
2b88c5c70d am 47fa8e80: Fix for an IndentOutOfBounds in TextField.
Merge commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4' into gingerbread-plus-aosp

* commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4':
  Fix for an IndentOutOfBounds in TextField.
2010-09-09 12:14:59 -07:00
Gilles Debunne
47fa8e800c Fix for an IndentOutOfBounds in TextField.
Bug http://b/issue?id=2971995

Change-Id: Id6a40e81b26e14c1e5f06ed1bd70ee419c501c69
2010-09-09 12:10:41 -07:00
Gilles Debunne
ca1b261509 am 87e215fd: Merge "Made context menu appear when tapping inside selection." into gingerbread
Merge commit '87e215fd54559935649fb07264ece600bbabbdf9' into gingerbread-plus-aosp

* commit '87e215fd54559935649fb07264ece600bbabbdf9':
  Made context menu appear when tapping inside selection.
2010-09-09 12:00:52 -07:00
Gilles Debunne
87e215fd54 Merge "Made context menu appear when tapping inside selection." into gingerbread 2010-09-09 11:56:28 -07:00
Steve Howard
1ed20dc43b am e3692d15: Merge "Hidden API to control sorting of download manager queries." into gingerbread
Merge commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04' into gingerbread-plus-aosp

* commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04':
  Hidden API to control sorting of download manager queries.
2010-09-09 11:26:08 -07:00
Steve Howard
f054e190bb Hidden API to control sorting of download manager queries.
This change adds a hidden API to sort download manager queries by size
rather than by time last modified.  This is necessary for the system
download manager UI but, in the interest of keeping the new public API
as minimal as possible for now, I'm leaving @hide on this method.

This change also changes the DownloadManager.COLUMN_ID column to be
identical to BaseColumns._ID, since some code relies on this (such as
CursorAdapter).

Change-Id: Ib89b614d63e988974d4486b122b39365b35b5269
2010-09-09 11:14:20 -07:00
Gilles Debunne
b189249735 Made context menu appear when tapping inside selection.
Change-Id: I7ca274b007f4daea7d37a3d6b10b9504874b3c49
2010-09-09 10:53:16 -07:00
Jaikumar Ganesh
049912b76f am 9395b465: Merge "Fix to get A2DP to connect after unpairing" into gingerbread
Merge commit '9395b4656aca4b00d080ada89a44631459ad7b85' into gingerbread-plus-aosp

* commit '9395b4656aca4b00d080ada89a44631459ad7b85':
  Fix to get A2DP to connect after unpairing
2010-09-09 10:26:54 -07:00
Jaikumar Ganesh
9395b4656a Merge "Fix to get A2DP to connect after unpairing" into gingerbread 2010-09-09 10:23:55 -07:00
Henrik Backlund
4226415bd9 Fix to get A2DP to connect after unpairing
In this fix, A2DP profile will be connected when pairing with a
previously paired headset. The reason for this error was that the
connection of the A2DP profile was sent before the callback
onCreatePairedDeviceResult was receied in BluetoothEventLoop.java.
By not going to the state BOND_BONDED until after this callback has been
received, the problem is fixed. However the use case is different if the
pairing is initiated by the remote device. In these cases state
BOND_BONDED will be set when onDevicePropertyChanged instead.

Change-Id: I5dedca87d0a6872705ff3a933a99cce6eb37618a
2010-09-09 10:19:55 -07:00
Gilles Debunne
ff54538096 am ab86b782: Merge "Fix for text selection in horizontally scrolled TextViews." into gingerbread
Merge commit 'ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80' into gingerbread-plus-aosp

* commit 'ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80':
  Fix for text selection in horizontally scrolled TextViews.
2010-09-09 10:04:32 -07:00
Gilles Debunne
03789e8d59 Smart word detection in text selection. Manual merge in HC of 63569.
Selecting between words selects the spaces instead of the closest word, facilitating
paste insertion vs word replacement.

Pasting adds/removes space before and after if needed so that pasted text is not appended to
existing text.

Change-Id: Iffa0fb573d3535af72b639d05c5dc0721e80bda5
2010-09-09 10:03:42 -07:00
Gilles Debunne
ab86b782fd Merge "Fix for text selection in horizontally scrolled TextViews." into gingerbread 2010-09-09 10:02:05 -07:00