3574 Commits

Author SHA1 Message Date
Grace Kloba
4435baa48a am 7745e035: Merge change I94c715d6 into eclair
Merge commit '7745e035c94409815850be4be93a300301da576e' into eclair-plus-aosp

* commit '7745e035c94409815850be4be93a300301da576e':
  Skip requestRectangleOnScreen for WebTextView during
2009-09-29 08:29:16 -07:00
Android (Google) Code Review
7745e035c9 Merge change I94c715d6 into eclair
* changes:
  Skip requestRectangleOnScreen for WebTextView during zoom animation. If it is in edit mode, we already adjust WebTextView in the end of zoom animation.
2009-09-29 11:19:48 -04:00
Bjorn Bringert
c055f86986 am 7db7e6a0: Merge change I17f45d35 into eclair
Merge commit '7db7e6a00c5a0b38bb2077d93a009581941884d3' into eclair-plus-aosp

* commit '7db7e6a00c5a0b38bb2077d93a009581941884d3':
  Unhide SearchManager.SUGGEST_PARAMETER_LIMIT
2009-09-29 00:41:16 -07:00
Android (Google) Code Review
7db7e6a00c Merge change I17f45d35 into eclair
* changes:
  Unhide SearchManager.SUGGEST_PARAMETER_LIMIT
2009-09-29 03:35:53 -04:00
Dianne Hackborn
ce37120df3 am 7eca687c: Fix bug where we would return null with disabled components.
Merge commit '7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9' into eclair-plus-aosp

* commit '7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9':
  Fix bug where we would return null with disabled components.
2009-09-29 00:21:53 -07:00
Bjorn Bringert
86917dbb95 Unhide SearchManager.SUGGEST_PARAMETER_LIMIT
Both GlobalSearch and the search dialog now pass
SearchManager.SUGGEST_PARAMETER_LIMIT as a query parameter to all
suggestion sources. Exposing this allows suggestion sources
to return only the number of results that the client requires.

Fixes http://b/issue?id=2150992

Change-Id: I17f45d35e8f302b11812f4bb6fee40b31dc15707
2009-09-29 08:14:35 +01:00
Dianne Hackborn
7eca687c2e Fix bug where we would return null with disabled components.
Change-Id: I1624a42803f1c4b02736f558a8eeeeba2890667e
2009-09-28 23:57:05 -07:00
Grace Kloba
94c715d662 Skip requestRectangleOnScreen for WebTextView during
zoom animation. If it is in edit mode, we already adjust
WebTextView in the end of zoom animation.

Fix part 1 of http://b/issue?id=2147168
2009-09-28 23:23:53 -07:00
Dianne Hackborn
4df43ab1d8 am ffc16544: Merge change Ib7c1701a into eclair
Merge commit 'ffc165446a7188cadfbc9f99fafac27d11254a54' into eclair-plus-aosp

* commit 'ffc165446a7188cadfbc9f99fafac27d11254a54':
  Fix issue #1930911: Crash in system process
2009-09-28 22:24:03 -07:00
Dianne Hackborn
94d691499b Fix issue #1930911: Crash in system process
Ensure that we do all the work for removing a window's view
hierarchy in that window's thread.

Change-Id: Ib7c1701aee6b541b75fd1a680f6987f959f2ba88
2009-09-28 22:14:42 -07:00
Mike Cleron
e6566064a9 am 0368334d: Merge change Ie1072f12 into eclair
Merge commit '0368334db91e923021df36ae9afb81ed8256abfd' into eclair-plus-aosp

* commit '0368334db91e923021df36ae9afb81ed8256abfd':
  Finish off java API to allow fading scrollbars
2009-09-28 18:38:55 -07:00
Mike Cleron
52f0a64952 Finish off java API to allow fading scrollbars 2009-09-28 18:31:09 -07:00
Jeff Sharkey
0da1a301dc am 8f76734d: Fix docs breakage.
Merge commit '8f76734d1e9a21618ad9762c0716ee93f60902ec' into eclair-plus-aosp

* commit '8f76734d1e9a21618ad9762c0716ee93f60902ec':
  Fix docs breakage.
2009-09-28 18:29:00 -07:00
Jeff Sharkey
8f76734d1e Fix docs breakage. 2009-09-28 18:22:46 -07:00
Jeff Sharkey
7d028a0a97 am ff18bbf8: Separate API for vCards through openAssetFileDescriptor().
Merge commit 'ff18bbf83562b8a827a37c19cdc27e520786119e' into eclair-plus-aosp

* commit 'ff18bbf83562b8a827a37c19cdc27e520786119e':
  Separate API for vCards through openAssetFileDescriptor().
2009-09-28 17:54:46 -07:00
Jeff Sharkey
ff18bbf835 Separate API for vCards through openAssetFileDescriptor().
Previously we overloaded Contacts.CONTENT_URI to return
vCard-formatted Contacts entries.  To fix http://b/2138790
this is a separate API that returns a well-known MIME-type.

Also helps fix http://b/2078399 by adding OFFICE_LOCATION.
2009-09-28 17:44:53 -07:00
Jeff Hamilton
84eb12bc7e am f36a2bb5: Merge change Ibeb22f37 into eclair
Merge commit 'f36a2bb59b846545946124124d3290bd3eec44f0' into eclair-plus-aosp

* commit 'f36a2bb59b846545946124124d3290bd3eec44f0':
  Call the proper variant of markAsContacted.
2009-09-28 17:14:28 -07:00
Mark Wagner
b74e2ac44c am 1cff7476: Merge change Ie7d26695 into eclair
Merge commit '1cff74761798eba8349a3b9824ae4b11072c11d1' into eclair-plus-aosp

* commit '1cff74761798eba8349a3b9824ae4b11072c11d1':
  Modify the "active chats" uri to not overlap with other uris.
2009-09-28 17:14:21 -07:00
Android (Google) Code Review
f36a2bb59b Merge change Ibeb22f37 into eclair
* changes:
  Call the proper variant of markAsContacted.
2009-09-28 20:09:57 -04:00
Android (Google) Code Review
1cff747617 Merge change Ie7d26695 into eclair
* changes:
  Modify the "active chats" uri to not overlap with other uris.
2009-09-28 20:05:55 -04:00
Jeff Hamilton
56a108220f Call the proper variant of markAsContacted.
Change-Id: Ibeb22f37bd079b1a965f5b350ac7ca6e77eac00f
2009-09-28 16:57:37 -07:00
Daisuke Miyakawa
d0fefb802c am 3f48d31b: Merge change I228d52db into eclair
Merge commit '3f48d31b747a3c5addc1f9d2e737b36e1f70a2d3' into eclair-plus-aosp

* commit '3f48d31b747a3c5addc1f9d2e737b36e1f70a2d3':
  Three changes.
2009-09-28 16:54:12 -07:00
Android (Google) Code Review
3f48d31b74 Merge change I228d52db into eclair
* changes:
  Three changes.
2009-09-28 19:47:28 -04:00
Daisuke Miyakawa
f2e0d7bb78 Three changes.
- Add FOR_EXPORT_ONLY to Data column.
- Make VCardComposer use Contacts instead of RawContacts.
- Make VCardComposer honor FOR_CONTACT_ONLY regardless of
  the intention of any caller, which makes composer unable to
  compose any contact with "is_restricted" flag, which is unseen
  from outside the contacts provider.

Internal Issue number: 2147248, 2143207
2009-09-28 16:44:13 -07:00
Romain Guy
39433f818b am 5d259d3b: Merge change Id29ec50d into eclair
Merge commit '5d259d3bfd4ea79b8cb3e5aeeb3768f769e48a35' into eclair-plus-aosp

* commit '5d259d3bfd4ea79b8cb3e5aeeb3768f769e48a35':
  Do not crash appwdiget host when a pending intent send fails.
2009-09-28 16:28:42 -07:00
Android (Google) Code Review
5d259d3bfd Merge change Id29ec50d into eclair
* changes:
  Do not crash appwdiget host when a pending intent send fails.
2009-09-28 19:25:53 -04:00
Romain Guy
995d8561a6 Do not crash appwdiget host when a pending intent send fails.
Change-Id: Id29ec50dcb4d51589b9732ace6d505fcea9cc787
2009-09-28 16:24:35 -07:00
Dianne Hackborn
ccc624ca9a am ebd45e5c: Merge change I55edce63 into eclair
Merge commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef' into eclair-plus-aosp

* commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef':
  Fix issue #2149145: Safe Mode does not work on Sholes device
2009-09-28 15:18:51 -07:00
Android (Google) Code Review
ebd45e5ca9 Merge change I55edce63 into eclair
* changes:
  Fix issue #2149145: Safe Mode does not work on Sholes device
2009-09-28 18:11:28 -04:00
Mark Wagner
e7d266957d Modify the "active chats" uri to not overlap with other uris. 2009-09-28 15:10:57 -07:00
Mike Cleron
1492b96eb1 am fe81d386: Remove obsolete links; start at a method to turn on fading scrollbars
Merge commit 'fe81d386a818b386ffc0d5a789236531ab4e264f' into eclair-plus-aosp

* commit 'fe81d386a818b386ffc0d5a789236531ab4e264f':
  Remove obsolete links; start at a method to turn on fading scrollbars
2009-09-28 14:41:46 -07:00
Mike Cleron
fe81d386a8 Remove obsolete links; start at a method to turn on fading scrollbars 2009-09-28 14:34:14 -07:00
Romain Guy
ba0167861d am b4c547a5: Fix possible NPE in AbsListView.positionSelector().
Merge commit 'b4c547a56caebb5900c132ec9d5ce953f89de14f' into eclair-plus-aosp

* commit 'b4c547a56caebb5900c132ec9d5ce953f89de14f':
  Fix possible NPE in AbsListView.positionSelector().
2009-09-28 13:55:30 -07:00
Romain Guy
b4c547a56c Fix possible NPE in AbsListView.positionSelector().
ListView was being reckless and calling the method with a null object in some
situations.

Change-Id: Ibb595a1ff6f916c699e4af55450966dd7fd8c156
2009-09-28 13:45:00 -07:00
Dianne Hackborn
6af0d50a8e Fix issue #2149145: Safe Mode does not work on Sholes device
The APIs for checking whether keys are held down now also look
at virtual keys.

However it turns out there is less than a second between the time we
start the input thread and check for safe mode, so there is not enough
time to actually open all of the devices and get the data from them
about the finger being down to determine if a virtual key is down.

So now you can also hold DPAD center, trackball center, or s to
enter safe mode.  Also give some vibrator feedback.

Change-Id: I55edce63bc0c375813bd3751766b8070beeb0153
2009-09-28 13:40:45 -07:00
Nick Pelly
3083a3c11a am aef439e6: Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Merge commit 'aef439e6f825c0cb99a2ac08c8207f48b7a9fe10' into eclair-plus-aosp

* commit 'aef439e6f825c0cb99a2ac08c8207f48b7a9fe10':
  Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
2009-09-28 13:19:15 -07:00
Nick Pelly
aef439e6f8 Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Change-Id: I564429d5c5b6a5372b6ff26a53b0d7e518b53631
2009-09-28 13:06:22 -07:00
Bjorn Bringert
575d73a15b am 2dfa6edc: Merge change Ida50e915 into eclair
Merge commit '2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc' into eclair-plus-aosp

* commit '2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc':
  Pass limit=50 to all suggestion sources.
2009-09-28 12:54:37 -07:00
Android (Google) Code Review
2dfa6edcd0 Merge change Ida50e915 into eclair
* changes:
  Pass limit=50 to all suggestion sources.
2009-09-28 15:47:56 -04:00
Bjorn Bringert
3fc7c67de1 Pass limit=50 to all suggestion sources.
Should mitigate http://b/issue?id=2149158
"Bad suggestions behavior within contacts app
search for 10k contact db"

Change-Id: Ida50e9157c3ce46fc7892ef09a67da9f4008e665
2009-09-28 20:32:13 +01:00
Bjorn Bringert
385a39d322 am 9d686c93: Merge change 27474 into eclair
Merge commit '9d686c9384cad2bccb3db27eb19bb089bf05041c' into eclair-plus-aosp

* commit '9d686c9384cad2bccb3db27eb19bb089bf05041c':
  Don't crash search when getKeyDispatcherState() is null
2009-09-28 11:49:43 -07:00
Mike Cleron
1ca9b13bf4 am 3ecd58c6: Fix build
Merge commit '3ecd58c650371206008efd687933c370e4e28a34' into eclair-plus-aosp

* commit '3ecd58c650371206008efd687933c370e4e28a34':
  Fix build
2009-09-28 11:49:36 -07:00
Android (Google) Code Review
9d686c9384 Merge change 27474 into eclair
* changes:
  Don't crash search when getKeyDispatcherState() is null
2009-09-28 14:46:43 -04:00
Mike Cleron
3ecd58c650 Fix build 2009-09-28 11:44:36 -07:00
Bjorn Bringert
5b6b41241d Don't crash search when getKeyDispatcherState() is null
Fixes http://b/editIssue?id=2150672

Change-Id: I6fb87c1a59b4b3a945822932047a66c4116e6391
2009-09-28 19:37:29 +01:00
Amith Yamasani
e086e1d177 am fedb3269: Merge change 27349 into eclair
Merge commit 'fedb32696ace93afeefa216b2a5e90b2793ec85f' into eclair-plus-aosp

* commit 'fedb32696ace93afeefa216b2a5e90b2793ec85f':
  Fix 2143297: Fix transition from password -> visible password
2009-09-28 11:16:53 -07:00
Nick Pelly
75ce6b1038 am 96e42b3a: Merge change 27462 into eclair
Merge commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce' into eclair-plus-aosp

* commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce':
  Add an API to request a system activity to turn on Bluetooth.
2009-09-28 11:16:45 -07:00
Android (Google) Code Review
fedb32696a Merge change 27349 into eclair
* changes:
  Fix 2143297: Fix transition from password -> visible password
2009-09-28 14:12:03 -04:00
Android (Google) Code Review
96e42b3a54 Merge change 27462 into eclair
* changes:
  Add an API to request a system activity to turn on Bluetooth.
2009-09-28 14:09:47 -04:00
Amith Yamasani
a8c0edb8fb Fix 2143297: Fix transition from password -> visible password 2009-09-28 11:08:57 -07:00