Commit Graph

17591 Commits

Author SHA1 Message Date
Martijn Coenen
63fc01d044 Merge "Support for getTimeout() (API)." 2011-07-21 00:32:11 -07:00
Jeff Hamilton
33ef62e5c6 Merge "Remove the hidden My Tag APIs." 2011-07-20 21:54:15 -07:00
Jeff Hamilton
a77258b98e Remove the hidden My Tag APIs.
Bug: 5048185
Change-Id: Iaf8a77e301fd378738db632e23674facd2c8fccc
2011-07-20 23:15:51 -05:00
Matthew Xie
7699c18a07 Merge "when disconnectHeadsetInternal, allow it when the BT is not disabled" 2011-07-20 19:08:38 -07:00
Romain Guy
22a72964ed Merge "Convert looper traces to traceview traces" 2011-07-20 18:47:49 -07:00
Romain Guy
648bee18a1 Convert looper traces to traceview traces
Change-Id: If9238e8b00744118c1c4d2182727569f94deb638
2011-07-20 18:47:17 -07:00
Gilles Debunne
317ab3427a Merge "Suggestions are dismissed by back key" 2011-07-20 17:51:36 -07:00
Matthew Xie
e3dc975acb when disconnectHeadsetInternal, allow it when the BT is not disabled
The old code allowed the disconnection only when BT is enabled. This
caused a bug during BT turning off that Headset connection failed
to disconnect.
Change-Id: Iba15a1595b6987064f071ad90bbb126a6edfe6b5
2011-07-20 17:12:52 -07:00
Jim Miller
83261239b0 Merge "Fix 5056699: GridLayout should maintain static indices for "gone" views." 2011-07-20 15:19:19 -07:00
Jim Miller
6235b47cba Fix 5056699: GridLayout should maintain static indices for "gone" views.
GridLayout currently ignores views with visibility="gone" when accounting for rows/columns.
Instead it should count views with visibility="gone" as rows/columns with row/height equal to 0.

This also makes it consistent with other ViewGroups like LinearLayout where "gone" views
don't change order and are still present (but hidden) within a container.

Change-Id: I289d4ee6275d5b49b1e1d79985484216bbf48089
2011-07-20 15:13:49 -07:00
Jesse Wilson
a7b6316bff Merge "Skip byte order mark (BOM) in JsonReader" 2011-07-20 13:38:24 -07:00
Dave Santoro
32911e72af Merge "Updates and fixes for the social stream API." 2011-07-20 12:43:26 -07:00
Costin Manolache
7288ebd8e5 Merge "waitWithTimeout() needs to check if the result is already available, like waitForActivity() does." 2011-07-20 12:33:42 -07:00
Jesse Wilson
7a2c813d30 Skip byte order mark (BOM) in JsonReader
Bug: http://code.google.com/p/android/issues/detail?id=18508
Change-Id: I7652080d9ab475c75d0a811a6e2ede4975ebe063
2011-07-20 12:23:23 -07:00
Mike Lockwood
a331cdbb40 Merge "MediaScanner: Do separate bulk inserts for different media types" 2011-07-20 12:15:48 -07:00
Fabrice Di Meglio
1180644280 Fix bug #4772392 Check what needs to be done for RTL specific new attributes that are in public.xml
- cleanup public.xml
- make BiDiTest makefile non visible to the build system
- provide file for injecting the new attributes by hand

Change-Id: I5037ec323066ebd254be51fff7070a5a0101dff7
2011-07-20 11:38:59 -07:00
Dave Santoro
040e6b302c Updates and fixes for the social stream API.
- Social stream photo updates should use the new photo storage
  system instead of storing the image content in BLOBs.
- Package names need to be text, not numbers.  The status update
  documentation was incorrect.
- Social stream photos will include a URI the caller can open to
  get the photo content.
- Removed the max photo bytes from the stream item limit query,
  as we'll do appropriate resizing with the photo storage system.

Change-Id: I103ee1340c1a3772ae37add3684b0658c241a49c
2011-07-20 11:33:31 -07:00
Mike Lockwood
e19572ccb5 MediaScanner: Do separate bulk inserts for different media types
This should fix a bunch of problems introduced in the original bulk insert implementation

Also reverted two changes that are no longer necessary:

Revert "MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files"

This reverts commit 92e1314ad9.

Revert "MediaScanner: fix breakage in updates"

This reverts commit 45aaa2a345.

Change-Id: Ibed66393467761c2c1ce48deb09bcac505b7d221
2011-07-20 10:58:45 -07:00
Gilles Debunne
caed51bcc2 Merge "Insertion handles fades out after being positionned" 2011-07-20 09:12:41 -07:00
Martijn Coenen
20e62c9f14 Support for getTimeout() (API).
Bug: 4492175
Change-Id: Ibc9a1b78d8c0992f47664d33760e0ce8dca67c64
2011-07-20 16:06:34 +02:00
Debashish Chatterjee
e8c3986b5c Merge "Voicemail content provider API for api council review." 2011-07-20 05:34:01 -07:00
Alon Albert
5a8ca580b0 Merge "Add a getter for the active tag" 2011-07-19 22:06:34 -07:00
Alon Albert
eaef351afc Add a getter for the active tag
Change-Id: I597e041867fba7efae41feea63fa196bc10e4aa2
2011-07-19 22:04:22 -07:00
Adam Cohen
cf4cfc6fc8 Merge "Adding resizeMinWidth/Height to AppWidgetProviderInfo" 2011-07-19 18:43:57 -07:00
Adam Cohen
1bfaf561b7 Adding resizeMinWidth/Height to AppWidgetProviderInfo
Change-Id: I17dc27829938a3f25a664d8255965cf9b67cb17e
2011-07-19 18:39:40 -07:00
Romain Guy
59f13c7dfb Prevent NPE in TextView.getFadeTop()
Bug #5051776

Change-Id: I2fc1ac4b31c06cfb224898ff39f6b63bfbcd77e8
2011-07-19 18:35:33 -07:00
Dianne Hackborn
116b208b3a Merge "Fix issue #4976176: Font size setting does not persist" 2011-07-19 18:06:25 -07:00
Gilles Debunne
3784a7f6f8 Insertion handles fades out after being positionned
Change-Id: I08b497222fd585a39cbd04b7be1992acf1a70145
2011-07-19 17:35:58 -07:00
Romain Guy
1003aeb9de Merge "Reduce the fade area to save bandwidth." 2011-07-19 15:20:46 -07:00
Romain Guy
f2fc460a95 Reduce the fade area to save bandwidth.
Change-Id: I8ccea17fc1fb3c132329baa0acc1b3d5a140a5c6
2011-07-19 15:20:03 -07:00
Dianne Hackborn
31ca854cdb Fix issue #4976176: Font size setting does not persist
Change-Id: Id58caf990bdd3aac5ea97aaba45652ffad1f678a
2011-07-19 14:58:28 -07:00
Romain Guy
f2cc48fe8b Merge "Let HardwareRenderer support multiple threads." 2011-07-19 14:14:35 -07:00
Philip Milne
ee4a6478e2 Merge "Expose to the platform the ability to pick up changes in child visibility." 2011-07-19 14:14:34 -07:00
Dianne Hackborn
2af9e1f7b5 Merge "Fix issue #4869092: ResolverActivity occasionally fails to display" 2011-07-19 14:07:54 -07:00
Fabrice Di Meglio
c679e6e7ff Merge "Code cleaning" 2011-07-19 14:04:28 -07:00
Philip Milne
350f0a63c9 Expose to the platform the ability to pick up changes in child visibility.
Also:

. use above, to flsuh GridLayout state when child's GONE state changes.

Change-Id: I8567c24b51b807f0625918d42b6847a5a350311d
2011-07-19 14:00:56 -07:00
Dianne Hackborn
2c1c4aa69f Fix issue #4869092: ResolverActivity occasionally fails to display
Change-Id: Ic632d08fcfa9138caeacb45fa4a00cbd4a943988
2011-07-19 13:52:02 -07:00
Fabrice Di Meglio
f66fdadefb Code cleaning
- follow member name code style

Change-Id: I7a3540ee511aa600c71d2e4b9b7e7f94e47618a9
2011-07-19 13:08:47 -07:00
Doug Zongker
9d29d155c5 Merge "add rebootWipeCache call to RecoverySystem API" 2011-07-19 13:00:30 -07:00
Doug Zongker
3365120137 add rebootWipeCache call to RecoverySystem API
Also remove the never-used encrypted-filesystem-via-recovery stuff
that was stripped out of recovery a while ago.

Change-Id: I3349cba83daa9bc4765bd9b3f96d15000a801824
2011-07-19 12:45:09 -07:00
Chet Haase
db94b0a5b0 Merge "Don't constrain invalidation rect when not clipping children" 2011-07-19 11:40:34 -07:00
Romain Guy
566b3efb25 Let HardwareRenderer support multiple threads.
This change will be useful to create multiples instances of
HardwareRenderer outside of ViewRootImpl. This will allow
the use of hardware accelerated canvas on TextureView or
for live wallpapers.

Change-Id: I877e43a31ba83d98a1a30556813c7e8a8a920eb5
2011-07-19 11:38:36 -07:00
Wu-cheng Li
f55df0e26a Merge "Add camera new picture and new video broadcast intents." 2011-07-19 11:16:20 -07:00
Shimeng (Simon) Wang
50c5d2be63 Merge "Change log msg since viewport can be changed before first layout." 2011-07-19 11:15:49 -07:00
Shimeng (Simon) Wang
a6c5d383a8 Change log msg since viewport can be changed before first layout.
Change-Id: I137a897844953bf6b8510b6ee5d6eb89b4b78a6a
2011-07-19 11:07:47 -07:00
Chet Haase
a3db866056 Don't constrain invalidation rect when not clipping children
View.setClipChidlren(false) allows children to draw outside of their containers.
But logic in ViewGroup.invalidateChildInParent() constrains the invalidation
rectangle to the bounds of the parent, making the flag useless in some situations.
Avoid intersecting the dirty rect with the parent bounds when the parent
is set to not clip its children.

Change-Id: Icc485b539758c96da0bd62ef57974a1bcb94f866
2011-07-19 10:53:36 -07:00
Philip Milne
9c79becb48 Merge "Fix build breakage." 2011-07-19 10:36:46 -07:00
Philip Milne
e7dda0bb3d Fix build breakage.
Change-Id: Ifdc2c02c8c18d3d372e6d2043c4819a0a7384c97
2011-07-19 10:35:56 -07:00
Todd Kennedy
783123f79d Add getBlob() to MatrixCursor
Change-Id: I1abfd2fd117a2a31f99e77bd0b395c4ad0cfc6d2
2011-07-19 10:33:41 -07:00
Shimeng (Simon) Wang
ba6e855453 Merge "Add in i18n TLDs and new TLDs to the URL RegEx matcher." 2011-07-19 10:31:52 -07:00