10818 Commits

Author SHA1 Message Date
Nick Pelly
664d035829 am c7bfb13f: am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Merge commit 'c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee'

* commit 'c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee':
  New API stubs: NdefMessage and NdefRecord.
2010-10-06 16:16:56 -07:00
Neel Parekh
03bc711c8a Merge "Fix pressed vs selected typo in onCreateDrawableState" 2010-10-06 11:45:55 -07:00
Neel Parekh
e537858ba7 Fix pressed vs selected typo in onCreateDrawableState
Change-Id: I7a415cacf29ed8c6c558f6b29902edd76fc98ea6
2010-10-06 11:39:53 -07:00
Irfan Sheriff
be93061e2c Merge "Add LinkAddress" 2010-10-06 11:26:44 -07:00
Shimeng (Simon) Wang
e99b0b992a Merge "Add wrapper method for native JNI call." 2010-10-06 11:20:05 -07:00
Irfan Sheriff
ed5d7d17c9 Add LinkAddress
LinkAddress stores IP address + prefix for a network link

Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
2010-10-06 11:04:05 -07:00
Adam Cohen
32e60fbea7 Merge "Fixing AdapterViewAnimator crash when associated adapter is empty" 2010-10-06 10:43:18 -07:00
Adam Cohen
3042944c6e Fixing AdapterViewAnimator crash when associated adapter is empty
Change-Id: I3186452eb93f1141b06531507b13d87804e684d4
2010-10-06 10:39:11 -07:00
Fred Quintana
c8b7971cb3 Merge "Make a separate active sync queue for initialization and regular syncs." 2010-10-06 10:03:19 -07:00
Steve Block
e86b8a18df Merge "Make sure that we send the DeviceOrientation error event only once" 2010-10-06 08:30:13 -07:00
Steve Block
8980343b13 Make sure that we send the DeviceOrientation error event only once
Change-Id: Iff095ad4d282635c567b0c85a286056e23ca38e3
2010-10-06 16:12:06 +01:00
Brian Carlstrom
c9d5b31f84 Fix instance count to be long
Change-Id: I88b17c4ff17a04db6e931f9b25885bdf05d4453c
2010-10-05 22:23:41 -07:00
Brian Carlstrom
c21550a8d1 Adding android.os.Debug.countInstancesOfClass
- Debug.countInstancesOfClass is just a wrapper on
  dalvik.system.VMDebug.countInstancesOfClass to avoid code from
  depending on the dalvik classes directly

- Existing usages of VMDebug.countInstancesOfClass in ActivityThread
  and ViewDebug are converted to the new Debug.countInstancesOfClass

- Existing use of OpenSSLSocketImpl.instanceCount, which is being
  removed, is converted to Debug.countInstancesOfClass(OpenSSLSocketImpl.class)

Bug: 3015791
Change-Id: Iefa781292d5b82a63bad7254c913a09deb3b7888
2010-10-05 21:38:57 -07:00
Robert Greenwalt
759bece170 Merge "Turn on some debugging info" 2010-10-05 19:14:45 -07:00
Robert Greenwalt
ba175a5e13 Turn on some debugging info
bug:3060742
Change-Id: I86f4e0b3f678c80e1bee11abd32ab0b9e0563b09
2010-10-05 19:12:26 -07:00
Dianne Hackborn
0f8ee7439a Merge "Implement permission granting in clipboard." 2010-10-05 17:54:35 -07:00
Fred Quintana
918339ab82 Make a separate active sync queue for initialization and regular syncs.
This entails allowing multiple syncs to happen in parallel, with
different limits for regular and initialization syncs.

Change-Id: I0e47c6515af5c98faf899f91855b342b0d0c708c
2010-10-05 17:25:19 -07:00
Shimeng (Simon) Wang
bf01312965 Add wrapper method for native JNI call.
This is to check whether a given mimeType is supported in Android media
framework.

issue: 2816278
Change-Id: I66d379d039c4e1f4a8528654ece006335fd4463f
2010-10-05 16:59:05 -07:00
Chet Haase
9ff82bf2b3 Adding next/prev to fragment animations and to PreferenceActivity
Adding a new concept of "next" and "previous" to fragment.s Previously, fragments would
either be placed onto or taken off of the stack, or would just replace the current
fragment. The new next/prev capability gives the ability to run a transition that is
specific to next/previous operations, such as navigating forward and backward in a list.
New next/prev animations may be associated with a fragment replace operation to get the
next/prev animations built into the system (next animates things up, prev animates them
down).

Change-Id: Ia9f3663bac009376420d845b396ac51b8e4d1647
2010-10-05 15:13:24 -07:00
Dianne Hackborn
90f4aafa33 Implement permission granting in clipboard.
Change-Id: I9a7a949d1aaf4b3beabceaf807fb7d3b040e4ea8
2010-10-05 14:09:08 -07:00
Romain Guy
e21635571e Merge "Code cleanup and disable display lists for now." 2010-10-05 13:44:24 -07:00
Romain Guy
469b1dbeaf Code cleanup and disable display lists for now.
Change-Id: I681213036b5279339cb96a016d1dfb15d74dafc8
2010-10-05 13:42:35 -07:00
Christopher Tate
a0374192b9 Make View.DragThumbnailBuilder a static class
It also now uses a WeakReference to the associated View, not a hard
object pointer.

Change-Id: I37e10b3155ee7e089a72bdf050cc2d323794810f
2010-10-05 13:14:25 -07:00
Dianne Hackborn
38014763a2 am 89230e3b: am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread
Merge commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d'

* commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d':
  Fix issue #3041660: Camera image flips upside down when rotating device
2010-10-05 12:54:41 -07:00
Vasu Nori
54f9ac5880 Merge "STOPSHIP - add illegalStateException to catch potential deadlocks in db" 2010-10-05 12:27:27 -07:00
Adam Cohen
ef52176f12 Changing AdapterViewAnimator to use the new animation APIs
Change-Id: Ifefb83c391914ac623d75e0faca723b95786861d
2010-10-05 11:02:25 -07:00
Vasu Nori
6d970255af STOPSHIP - add illegalStateException to catch potential deadlocks in db
database lock() should not be called from a synchronized methods
in database layer. add code to check.
this will catch potential deadlock situations sooner

Change-Id: I9d913f5e2af304f4d9ad5b2641c3a768c4bc97f9
2010-10-05 10:50:45 -07:00
Patrick Scott
4243a3a6ed Add postSync so that the chrome stack has access.
Bug: 3053149
Change-Id: I75f5422afcacf4ae70a2aa26188446251d7f84da
2010-10-05 09:30:24 -04:00
Romain Guy
2fe9a8f6f6 Correctly invalidate the drawing cache when an invalidate is requested.
Change-Id: Ic78f85d728a14a9f2e4a1925d46b6db9a204bbb1
2010-10-04 20:19:34 -07:00
Christopher Tate
2347b59e58 Merge "Refinements to drag/drop" 2010-10-04 19:40:28 -07:00
Christopher Tate
2c095f3677 Refinements to drag/drop
Thumbnail measurement & drawing has been moved out into a delegate
class called View.DragThumbnailBuilder.  This consolidates the
thumbnail-related code as well as ensuring that the drag initiator
does not have to know a priori where to place the thumbnail relative
to the touch point *before* the thumbnail measurement step, as was
previously the case.

startDrag() no longer needs to be told where the current touch point
is at the time the drag is launched.

Drag events are now dispatched only to VISIBLE views.

Dispatch shouldn't double-recycle events any more when the target
window is local to the system process.

Change-Id: I49419103765a0cad2e18ddfcdd6dacb94daf1ff1
2010-10-04 18:29:09 -07:00
Nick Pelly
c7bfb13fd9 am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Merge commit '15f107b151deff1f25f1255bdbcb630ed576ac8d' into gingerbread-plus-aosp

* commit '15f107b151deff1f25f1255bdbcb630ed576ac8d':
  New API stubs: NdefMessage and NdefRecord.
2010-10-04 18:27:27 -07:00
Nick Pelly
dc993791fc New API stubs: NdefMessage and NdefRecord.
NDEF Messages and NDEF Record data classes.

Change-Id: I9b7114773281b0eb9680f595c95ac79943d2903b
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-04 17:56:23 -07:00
Chet Haase
5d6d7b9c3d Changed LayoutTransition to disable animations when set to null
Change-Id: Ic4d67135a273ea816c3d15bce05da611bd6bae53
2010-10-04 16:58:04 -07:00
Gilles Debunne
8556efe5a3 am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
Merge commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee' into gingerbread-plus-aosp

* commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee':
  DO NOT MERGE. Select word no longer selects spaces between words.
2010-10-04 16:45:32 -07:00
Gilles Debunne
8c03723da7 DO NOT MERGE. Select word no longer selects spaces between words.
Bug 3000870

This feature was useful to paste between two words. To do this, all you
have to do now in to first position the cursor between the words, and then
long pressing anywhere to get the pop-up menu with paste.

Not merged into HC since the paste story in HC still has to be determined.

Change-Id: Iea8d87e09b7ad43658ec5526110e609b9735c27a
2010-10-04 16:15:56 -07:00
Adam Powell
b8d3bc5c3c am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread
Merge commit '103f59baa7f7d03cfe22a4b07690cc809185dfe9' into gingerbread-plus-aosp

* commit '103f59baa7f7d03cfe22a4b07690cc809185dfe9':
  Fix bug 3052686 - ScrollView padding treated incorrectly
2010-10-04 15:48:37 -07:00
Adam Powell
103f59baa7 Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread 2010-10-04 15:24:29 -07:00
Chet Haase
5e25c2c145 Add ability to automate animated transitions on View show/hide
Change-Id: Id6ff92c8fd06c3f5fb30c41b020b4de4f567154f
2010-10-04 15:11:36 -07:00
Adam Powell
62a744e17d Fix bug 3052686 - ScrollView padding treated incorrectly
Also allow grabbing scrollviews for dragging outside of content
bounds, which makes a difference for overscroll effects.

Change-Id: I344db4490ad59f393bb6de338009e251a76e6282
2010-10-04 15:06:30 -07:00
Dianne Hackborn
89230e3b7b am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread
Merge commit '458fc5f52e25d7a8b4e482010711aed66f0b4999' into gingerbread-plus-aosp

* commit '458fc5f52e25d7a8b4e482010711aed66f0b4999':
  Fix issue #3041660: Camera image flips upside down when rotating device
2010-10-04 14:55:09 -07:00
Dianne Hackborn
58520b24d4 resolved conflicts for merge of 10d5b096 to master
Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
2010-10-04 14:54:59 -07:00
Adam Powell
a143e83e1e am 7de900f3: am d29e6861: Merge "Fix bug 3058324" into gingerbread
Merge commit '7de900f3629e53e1a05b8d5854cf0164446346ae'

* commit '7de900f3629e53e1a05b8d5854cf0164446346ae':
  Fix bug 3058324
2010-10-04 14:28:08 -07:00
Dianne Hackborn
10d5b0966d am 407f625a: Add new API to find out whether external storage is removable.
Merge commit '407f625a9b8e356e765a5ec587c443af1f3aadb5' into gingerbread-plus-aosp

* commit '407f625a9b8e356e765a5ec587c443af1f3aadb5':
  Add new API to find out whether external storage is removable.
2010-10-04 14:03:06 -07:00
Gilles Debunne
152c7c4091 resolved conflicts for merge of 115b9dc3 to master
Change-Id: I37ee3a50fcafbaa7de510b3af8e133a89bd9e339
2010-10-04 14:02:50 -07:00
Dianne Hackborn
e5439f228f Fix issue #3041660: Camera image flips upside down when rotating device
Apps now must explicitly opt in to having their rotation changed while
forcing landscape mode.  Also add some new orientation constants for other
things apps may want to do.

Change-Id: If64d84b5ef54793ee717ebda9b4c76408efc9bfd
2010-10-04 14:01:39 -07:00
Dianne Hackborn
407f625a9b Add new API to find out whether external storage is removable.
This is implemented based on whether we are using the "nosdcard"
product.  Needed to tweak aapt to allow use of the product attribute
with other resource definition tags besides strings.

Change-Id: I49922d23b52a34183a8e2f4d2515adaf1fc9149a
2010-10-04 13:58:56 -07:00
Romain Guy
95930e13fa Apply all Canvas transformations to ColorDrawable.
Change-Id: I29252c58224b236d0770ec005da9842990ef2c06
2010-10-04 13:46:02 -07:00
Adam Powell
7de900f362 am d29e6861: Merge "Fix bug 3058324" into gingerbread
Merge commit 'd29e6861717a4e762050eb5a30169729e205d651' into gingerbread-plus-aosp

* commit 'd29e6861717a4e762050eb5a30169729e205d651':
  Fix bug 3058324
2010-10-04 12:18:44 -07:00
Adam Powell
d29e686171 Merge "Fix bug 3058324" into gingerbread 2010-10-04 12:15:34 -07:00