5503 Commits

Author SHA1 Message Date
Vasu Nori
c65708ef6e am 976ed437: am 6be01bf2: Merge change Ifa1fae13 into eclair-mr2
Merge commit '976ed43786dcf078a0f802716d49644691656a24'

* commit '976ed43786dcf078a0f802716d49644691656a24':
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 18:38:11 -08:00
Leon Scroggins
05c92dbe7f am 0092ee13: am 6761e85d: Merge change Idff5eb2a into eclair-mr2
Merge commit '0092ee13e4490bbd8de522d256fb4d7dab81be60'

* commit '0092ee13e4490bbd8de522d256fb4d7dab81be60':
  Set InputType of WebTextView according to <input> field's type.
2009-12-07 18:37:16 -08:00
Grace Kloba
6180977d11 am 8657978a: am ddcea3d2: Expose onReceivedSslError() so that the WebView client can accept the error and continue.
Merge commit '8657978aabc7141869926a98a0da257255678dd4'

* commit '8657978aabc7141869926a98a0da257255678dd4':
  Expose onReceivedSslError() so that the WebView client
2009-12-07 18:37:00 -08:00
Grace Kloba
d234ad6205 am a49f91a2: am 14467eb2: Merge change I234162b0 into eclair-mr2
Merge commit 'a49f91a2cb0cf39fa07d25ba896f5bf115b768e7'

* commit 'a49f91a2cb0cf39fa07d25ba896f5bf115b768e7':
  Add "res" support for WebView.
2009-12-07 18:36:32 -08:00
Leon Scroggins
4454ac7657 am 0b1a9f76: am 9e3e2d3a: Show search icon for <input type="search"> fields.
Merge commit '0b1a9f7648a9e57b0eaf6766f73810de94136669'

* commit '0b1a9f7648a9e57b0eaf6766f73810de94136669':
  Show search icon for <input type="search"> fields.
2009-12-07 18:31:58 -08:00
Maryam Garrett
081dd1cfd7 am 44e537a8: am 7c427030: Merge change I9088d29b into eclair-mr2
Merge commit '44e537a859966378f1599db5e5d41045e78efd94'

* commit '44e537a859966378f1599db5e5d41045e78efd94':
  Improves the touch-based text selection UI in text boxes.
2009-12-07 18:31:35 -08:00
Bjorn Bringert
c5303c3a55 am 8d962613: am 6dba0680: Merge change I9589f9c2 into eclair-mr2
Merge commit '8d962613464b206f4c0b2323607c5e248543ad24'

* commit '8d962613464b206f4c0b2323607c5e248543ad24':
  Move android.server.search.SearchableInfo to android.app
2009-12-07 14:58:38 -08:00
Vasu Nori
976ed43786 am 6be01bf2: Merge change Ifa1fae13 into eclair-mr2
Merge commit '6be01bf207077ffbdcd3879250171a26ec805835' into eclair-mr2-plus-aosp

* commit '6be01bf207077ffbdcd3879250171a26ec805835':
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 14:58:04 -08:00
Romain Guy
cd9d0242fd am 16c82c34: am d1b3988a: Merge change I4039545e into eclair-mr2
Merge commit '16c82c34edfef70bc74e6d6fdf3f08506bf8f27f'

* commit '16c82c34edfef70bc74e6d6fdf3f08506bf8f27f':
  Fire OnGroupClick events when collapsing a group in ExpandableListView.
2009-12-07 14:56:53 -08:00
Romain Guy
e8a43b2367 am e300deaf: am b6936607: Merge change If3c7d429 into eclair-mr2
Merge commit 'e300deaf2fd2842240ea90fd00296a6e2ceba9d8'

* commit 'e300deaf2fd2842240ea90fd00296a6e2ceba9d8':
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-07 14:55:23 -08:00
Android (Google) Code Review
6be01bf207 Merge change Ifa1fae13 into eclair-mr2
* changes:
  Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
2009-12-07 14:54:36 -08:00
Vasu Nori
fa1fae1355 Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
This reverts commit 6d1ec0d81cd8ecdd390b31e724bac554bb955a94.
2009-12-07 14:38:35 -08:00
Leon Scroggins
0092ee13e4 am 6761e85d: Merge change Idff5eb2a into eclair-mr2
Merge commit '6761e85d41dedf4e783217922a5fedac2b7a654d' into eclair-mr2-plus-aosp

* commit '6761e85d41dedf4e783217922a5fedac2b7a654d':
  Set InputType of WebTextView according to <input> field's type.
2009-12-07 13:40:59 -08:00
Grace Kloba
8657978aab am ddcea3d2: Expose onReceivedSslError() so that the WebView client can accept the error and continue.
Merge commit 'ddcea3d21645bb3037703c84807dae077aae62ce' into eclair-mr2-plus-aosp

* commit 'ddcea3d21645bb3037703c84807dae077aae62ce':
  Expose onReceivedSslError() so that the WebView client
2009-12-07 13:40:53 -08:00
Android (Google) Code Review
6761e85d41 Merge change Idff5eb2a into eclair-mr2
* changes:
  Set InputType of WebTextView according to <input> field's type.
2009-12-07 13:39:22 -08:00
Leon Scroggins
aa7b9d7826 Set InputType of WebTextView according to <input> field's type.
Help fix http://b/issue?id=2150538 and http://b/issue?id=1890360

Use the <input type> information to set the InputType, so that
the IME can show the correct options.  Also consolidate setup
of WebTextView into setType().

Requires a change in external/webkit.
2009-12-07 16:36:34 -05:00
Grace Kloba
ddcea3d216 Expose onReceivedSslError() so that the WebView client
can accept the error and continue.

Fix http://b/issue?id=2299152
2009-12-07 13:20:33 -08:00
Grace Kloba
a49f91a2cb am 14467eb2: Merge change I234162b0 into eclair-mr2
Merge commit '14467eb2eea119b4d71dd7dd149479aa092e6de2' into eclair-mr2-plus-aosp

* commit '14467eb2eea119b4d71dd7dd149479aa092e6de2':
  Add "res" support for WebView.
2009-12-07 13:09:49 -08:00
Grace Kloba
bd5c823e28 Add "res" support for WebView.
http://b/issue?id=2296839
2009-12-07 12:36:05 -08:00
Leon Scroggins
0b1a9f7648 am 9e3e2d3a: Show search icon for <input type="search"> fields.
Merge commit '9e3e2d3a6967301730fd383e8b04d53fdfd008e5' into eclair-mr2-plus-aosp

* commit '9e3e2d3a6967301730fd383e8b04d53fdfd008e5':
  Show search icon for <input type="search"> fields.
2009-12-07 07:39:06 -08:00
Leon Scroggins
9e3e2d3a69 Show search icon for <input type="search"> fields.
Along with a change to external/webkit, fixes http://b/issue?id=2299650
2009-12-07 10:21:41 -05:00
Maryam Garrett
44e537a859 am 7c427030: Merge change I9088d29b into eclair-mr2
Merge commit '7c42703082574638ecaa88ea18b0cc94bfabea2d' into eclair-mr2-plus-aosp

* commit '7c42703082574638ecaa88ea18b0cc94bfabea2d':
  Improves the touch-based text selection UI in text boxes.
2009-12-07 07:17:26 -08:00
Android (Google) Code Review
7c42703082 Merge change I9088d29b into eclair-mr2
* changes:
  Improves the touch-based text selection UI in text boxes.
2009-12-07 07:14:41 -08:00
Bjorn Bringert
8d96261346 am 6dba0680: Merge change I9589f9c2 into eclair-mr2
Merge commit '6dba0680cd3bc0bd987a3d01fc49421897528f20' into eclair-mr2-plus-aosp

* commit '6dba0680cd3bc0bd987a3d01fc49421897528f20':
  Move android.server.search.SearchableInfo to android.app
2009-12-05 10:26:04 -08:00
Android (Google) Code Review
6dba0680cd Merge change I9589f9c2 into eclair-mr2
* changes:
  Move android.server.search.SearchableInfo to android.app
2009-12-05 10:21:01 -08:00
Romain Guy
16c82c34ed am d1b3988a: Merge change I4039545e into eclair-mr2
Merge commit 'd1b3988adfe0b55291d0ebc8479e62ab1d2b9d21' into eclair-mr2-plus-aosp

* commit 'd1b3988adfe0b55291d0ebc8479e62ab1d2b9d21':
  Fire OnGroupClick events when collapsing a group in ExpandableListView.
2009-12-04 17:06:04 -08:00
Romain Guy
4039545ed6 Fire OnGroupClick events when collapsing a group in ExpandableListView. 2009-12-04 16:51:52 -08:00
Romain Guy
e300deaf2f am b6936607: Merge change If3c7d429 into eclair-mr2
Merge commit 'b6936607b61e3115b5924e41be29c0430dd05613' into eclair-mr2-plus-aosp

* commit 'b6936607b61e3115b5924e41be29c0430dd05613':
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-04 15:54:32 -08:00
Android (Google) Code Review
b6936607b6 Merge change If3c7d429 into eclair-mr2
* changes:
  Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
2009-12-04 15:50:43 -08:00
Romain Guy
f3c7d4294d Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
When the user lifts her finger up, AbsListView computes the fling velocity
and report a SCROLL_STATE_FLING if the velocity is high enough. However,
when the fling is not initiated because the velocity is too low (case of
a normal scroll), the idle state was not set nor reported.
2009-12-04 15:38:22 -08:00
Patrick Scott
057fd95f80 am 73d40332: am c593d607: Merge change I4261c58d into eclair-mr2
Merge commit '73d403324bd8af48b20fc1bbbb2cf3502f1407cd'

* commit '73d403324bd8af48b20fc1bbbb2cf3502f1407cd':
  Check if another Activity wants to intercept an xml mime type.
2009-12-04 11:18:21 -08:00
Patrick Scott
73d403324b am c593d607: Merge change I4261c58d into eclair-mr2
Merge commit 'c593d60787e9abd75c94f70bd929ae13414411e9' into eclair-mr2-plus-aosp

* commit 'c593d60787e9abd75c94f70bd929ae13414411e9':
  Check if another Activity wants to intercept an xml mime type.
2009-12-04 11:12:55 -08:00
Android (Google) Code Review
c593d60787 Merge change I4261c58d into eclair-mr2
* changes:
  Check if another Activity wants to intercept an xml mime type.
2009-12-04 11:08:28 -08:00
Romain Guy
c636fb3bcd am 83086f5a: am f2feb0fa: am 48a65d99: Merge change I8c5f2fc3 into eclair
Merge commit '83086f5abbc84bd3ded576161c1709d0e3611ca4'

* commit '83086f5abbc84bd3ded576161c1709d0e3611ca4':
  Fix invalidate code path (#2273209).
2009-12-04 10:47:28 -08:00
Romain Guy
83086f5abb am f2feb0fa: am 48a65d99: Merge change I8c5f2fc3 into eclair
Merge commit 'f2feb0faa266e5e0844c20a8adb9cdb5f360322f' into eclair-mr2-plus-aosp

* commit 'f2feb0faa266e5e0844c20a8adb9cdb5f360322f':
  Fix invalidate code path (#2273209).
2009-12-04 10:42:21 -08:00
Romain Guy
f2feb0faa2 am 48a65d99: Merge change I8c5f2fc3 into eclair
Merge commit '48a65d99cba33db3af2e05982a6825b883be2030' into eclair-mr2

* commit '48a65d99cba33db3af2e05982a6825b883be2030':
  Fix invalidate code path (#2273209).
2009-12-04 10:37:59 -08:00
Android (Google) Code Review
48a65d99cb Merge change I8c5f2fc3 into eclair
* changes:
  Fix invalidate code path (#2273209).
2009-12-04 10:22:47 -08:00
Romain Guy
ecd80ee31c Fix invalidate code path (#2273209).
Cached views would, in some situations, not update if they contained an
animating child. This was caused by clearing the dirty cache flag too
early in View.buildDrawingCache().

Approved by Dr. No mcleron.

Change-Id: I8c5f2fc3e6605657e0da625d60d50b55bb133666
2009-12-04 10:21:55 -08:00
Patrick Scott
7c24ed6904 Check if another Activity wants to intercept an xml mime type.
WebCore treats */*+xml as content that it can render. This prevents Activities
from intercepting those mime types. Check the same regular expression as
DOMImplementation and then use the PackageManager to look for a matching
Activity.

Requires a change to webcore.

Bug: 2256744
2009-12-04 13:19:52 -05:00
Bjorn Bringert
2126aac7f9 Move android.server.search.SearchableInfo to android.app
We need to expose SearchableInfo in the SDK in order to unbundle
Quick Search Box. Since the android.server.search package is
hidden, I'm moving SearchableInfo to android.app, where
SearchManager lives.

This change doesn't actually expose SearchableInfo. I'll do
that in a separate change to keep the change that
api-council needs to review small.

This is part of the fix for: http://b/issue?id=2270838

Change-Id: I9589f9c2c11d36c958beedff8245fe0c3319c6ba
2009-12-04 12:52:51 +00:00
Daisuke Miyakawa
9946639f74 am 8ad6ec2e: am 8280c2b1: Implement new MockContentProvider. Also make ContentProvider aware of the class.
Merge commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4'

* commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4':
  Implement new MockContentProvider. Also make ContentProvider aware of the class.
2009-12-04 04:33:05 -08:00
Fred Quintana
5ff9239f4f am a8dd0a54: am 298de218: am 0ce8431c: Merge change Iaa7edda4 into eclair
Merge commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6'

* commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6':
  don't reschedule syncs that failed with a tooManyRetries error
2009-12-04 04:31:52 -08:00
Daisuke Miyakawa
830f24f42e am 0f6357d8: am 67d9aa15: Merge change I6173d7c7 into eclair-mr2
Merge commit '0f6357d855a328eb62210feccff5e44c81578553'

* commit '0f6357d855a328eb62210feccff5e44c81578553':
  Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.
2009-12-04 04:27:48 -08:00
Ken Shirriff
762c0b8a7d am 208364d3: am 4850b5cd: Merge change I20d77880 into eclair-mr2
Merge commit '208364d304d332241301870bd75b69e181f72446'

* commit '208364d304d332241301870bd75b69e181f72446':
  Make Gservices setting constants public.
2009-12-04 04:26:59 -08:00
Jaikumar Ganesh
ab4a32d8d8 am 0b18c94f: am 11a2853e: am 8c411fb1: Merge change I79420b02 into eclair
Merge commit '0b18c94f765d8e98be3da037ce9757f099b541b2'

* commit '0b18c94f765d8e98be3da037ce9757f099b541b2':
  Add support for Car Dock.
2009-12-04 04:26:46 -08:00
Mike Lockwood
626c77e021 am 20e7c267: am 44000eb2: am 678c2e35: Merge change I9ef88863 into eclair
Merge commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997'

* commit '20e7c267c8f8d2de8f121bbf20f5d34487f17997':
  Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
2009-12-04 04:26:04 -08:00
Vasu Nori
1ff9ceb01e am 25bd4f29: am 6d1ec0d8: dealloc compiled-sql statements before deref\'ing them from SQLiteDatabase obj.
Merge commit '25bd4f29e1720d78d164c9749f786a2add6cafe9'

* commit '25bd4f29e1720d78d164c9749f786a2add6cafe9':
  dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
2009-12-04 04:25:34 -08:00
Daisuke Miyakawa
8ad6ec2eb4 am 8280c2b1: Implement new MockContentProvider. Also make ContentProvider aware of the class.
Merge commit '8280c2b15f6875b2d387c05df23d264864eb9cd5' into eclair-mr2-plus-aosp

* commit '8280c2b15f6875b2d387c05df23d264864eb9cd5':
  Implement new MockContentProvider. Also make ContentProvider aware of the class.
2009-12-04 00:53:53 -08:00
Daisuke Miyakawa
8280c2b15f Implement new MockContentProvider. Also make ContentProvider aware of the class.
Rename the old MockContentProvider to MockIContentProvider since it is
more appropriate name.

Detail:
Current developers inevitably depend on the backend used by ContentProvider,
which is useful but not ideal nor "testable" from the view of them.

Current MockContentResolver only accepts exact "ContentProvider" class, not
IContentProvider interface, since we want to hide "IContentProvider" while
the old MockContentProvider implements IContentProvider and as a result some
methods we want to hide may be exposed to the public SDK now and probably
for the future.

On the other hand, ContentProvider is not interface but an exact class
heavily depends on the internal logic and not suitable for external
developers to use for tests.

The new MockContentProvider introduces the mock implementation
for ContentProvider.
It extends ContentProvider, so "is" ContentProvider, but tries to avoid
depending on any backend System like IPC in Android, etc.
This should be useful from the view of application developers who do not
want to be confused with ContentProvider/ContentResolver backend
implementation "at all" and want to use MockContentResolver without
any other ContentProvider implementations tightly connected to the
external worlds.
2009-12-04 17:48:44 +09:00
Fred Quintana
a8dd0a5454 am 298de218: am 0ce8431c: Merge change Iaa7edda4 into eclair
Merge commit '298de218c540eab6c4e6c3415ab8a5c985c57772' into eclair-mr2-plus-aosp

* commit '298de218c540eab6c4e6c3415ab8a5c985c57772':
  don't reschedule syncs that failed with a tooManyRetries error
2009-12-03 17:25:36 -08:00