Commit Graph

10185 Commits

Author SHA1 Message Date
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
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
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
Robert Greenwalt
ec52c98d44 am 0727a865: Merge "Add network condition reporting." into gingerbread
Merge commit '0727a865d83b944c2fecc0bf1228a36976fe5300' into gingerbread-plus-aosp

* commit '0727a865d83b944c2fecc0bf1228a36976fe5300':
  Add network condition reporting.
2010-09-09 09:49:15 -07:00
Robert Greenwalt
0727a865d8 Merge "Add network condition reporting." into gingerbread 2010-09-09 09:41:05 -07:00
Robert Greenwalt
d7085fcf65 Add network condition reporting.
Apps can report if they like their connection to the nets
and we display either not-really-connected or fully-connected
icons.  Final icons TBD.

bug:2978624
Change-Id: I28be52085edfe54571c0d4559aba0df883548654
2010-09-09 09:33:02 -07:00
Gilles Debunne
44c1e4c72d Fix for text selection in horizontally scrolled TextViews.
A left padding and scroll was not taken into account in cursor position.

Bug http://b/issue?id=2970142

Change-Id: Ie76e8d97f3dd5fe3a750aa82cd4b97c98892cb48
2010-09-08 19:33:20 -07:00
Mike LeBeau
1383158687 am 573c5d5e: am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread
Merge commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9'

* commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9':
  Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
2010-09-08 17:49:34 -07:00
Mike LeBeau
573c5d5edc am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread
Merge commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb' into gingerbread-plus-aosp

* commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb':
  Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
2010-09-08 17:46:22 -07:00
Chet Haase
b149f57d5e Merge "Fix bug with LayoutTransition when layouts are just coming on line" 2010-09-08 17:44:39 -07:00
Adam Cohen
3bdc7209b1 Merge "AdapterViewAnimator now properly handles notifyDataSetChanged" 2010-09-08 17:43:17 -07:00
Mike LeBeau
46b84d5b4a Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google's new "listen to" Voice Action." into gingerbread 2010-09-08 17:43:15 -07:00
Mike LeBeau
2fe6fd0558 Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
search and play of music. This is used, for instance, by Google's
new "listen to" Voice Action.

Change-Id: Ibbc81701cc2412ffd57402d34f22d9764e9df7c2
2010-09-08 20:39:05 -04:00
Chet Haase
634a20acf7 Fix bug with LayoutTransition when layouts are just coming on line
Change-Id: Ia7061d8ec138f8f7aea822596f46b3549a996700
2010-09-08 17:17:25 -07:00
Mathias Agopian
62ecf53538 am 3fa7d8af: am 9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread
Merge commit '3fa7d8af6560de07ef673f73308f7e51de64e4ec'

* commit '3fa7d8af6560de07ef673f73308f7e51de64e4ec':
  Force wallpaper surface to 565.
2010-09-08 16:50:13 -07:00
Mathias Agopian
3fa7d8af65 am 9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread
Merge commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8' into gingerbread-plus-aosp

* commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8':
  Force wallpaper surface to 565.
2010-09-08 16:46:46 -07:00
Mathias Agopian
9bfb060ac4 Merge "Force wallpaper surface to 565." into gingerbread 2010-09-08 16:43:42 -07:00
Mathias Agopian
62bf4a0283 Force wallpaper surface to 565.
This is to maintain backward compatibility with badly programmed
GL wallpapers. Wallpapers can call SurfaceHolder.setFormat() to
request a different format.

Change-Id: Ib42b0cf6c7040d1300cad239c3acfd5c4c6cd326
2010-09-08 16:32:27 -07:00
Gilles Debunne
fd1a8945be am de5cfcb6: am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90'

* commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90':
  Fix for a memory leak in TextKeyListener.
2010-09-08 15:50:50 -07:00
Robert Greenwalt
fa01889064 Merge "Some cleanup of Proxy class." 2010-09-08 15:35:40 -07:00
Gilles Debunne
de5cfcb608 am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050' into gingerbread-plus-aosp

* commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050':
  Fix for a memory leak in TextKeyListener.
2010-09-08 15:02:20 -07:00
Gilles Debunne
d9c80ab31a Merge "Fix for a memory leak in TextKeyListener." into gingerbread 2010-09-08 14:58:23 -07:00
Adam Cohen
bd0136a2fd AdapterViewAnimator now properly handles notifyDataSetChanged
Change-Id: Icc22671b76d49c4229f118f77a5c269253a07b84
2010-09-08 14:58:16 -07:00
Dianne Hackborn
467e8e1332 am 5fdacb8a: am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Merge commit '5fdacb8a2818136218afdea4308ad1b10049a201'

* commit '5fdacb8a2818136218afdea4308ad1b10049a201':
  People holding partial wake locks now get blamed for CPU usage.
2010-09-08 14:38:20 -07:00
Jake Hamby
94bf9431e5 am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit 'e75783440a55fb0a5ef75066be94a11898f652f0'

* commit 'e75783440a55fb0a5ef75066be94a11898f652f0':
  Allow incoming SMS until internal storage is almost full.
2010-09-08 14:38:15 -07:00