2713 Commits

Author SHA1 Message Date
Bjorn Bringert
7f4c2ea378 Fix SQL generated by updateWithOnConflict()
Before, SQLiteDatabase.updateWithOnConflict() method generated
syntactically invalid SQL if the ConflictAlgorithm was non-null.
For example, it would generate
"UPDATE  OR REPLACEshortcuts SET ...",
when it should be "UPDATE OR REPLACE shortcuts SET ...".

Fixes http://b/issue?id=1995470
2009-07-22 12:49:17 +01:00
Android (Google) Code Review
c309e1509e Merge change 8025
* changes:
  wire appcache to the HTML5 UI
2009-07-22 00:45:05 -07:00
Jeff Sharkey
8a0193e4ca Added StructuredPostal, renamed PACKAGE columns, cleanup.
Changed Postal to StructuredPostal, which is the new type
coming down from GData.  This also prepares us for upcoming
data sources that need a structured version.  Because of the
number of columns required, we added 3 new DATA columns.

Moved PACKAGE back to Data rows to allow multiple apps to
merge their action entries under a single Contact.  Also
renamed to RES_PACKAGE to make clear that these packages are
strictly for loading resources, and do not imply the owner.

Removed RestrictionExceptions since we narrowed the scope
of IS_RESTRICTED for Eclair.  Factored out sync columns from
Groups and Contacts into its own interface.  Fixed general
warnings in comments.
2009-07-21 19:42:08 -07:00
Android (Google) Code Review
a8339dfec9 am 9fc20b0e: Merge change 8126 into donut
Merge commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf'

* commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf':
  First pass at reworking screen density/size APIs.
2009-07-21 19:03:53 -07:00
Dianne Hackborn
9822d2b273 First stab at poly-finger support.
The MotionEvent API should be fairly solid, but there is still a lot of
work to do in the input device code.  In particular, right now we are
really stupid about watching how fingers change -- we just take whatever
the driver reports as down and dump that directly into the motion event.

The big remaning work is to assign pointer IDs so that applications have
help in determine which fingers go up and down, and adding support for
the official multi-touch driver protocol.
2009-07-21 19:02:12 -07:00
Android (Google) Code Review
9fc20b0e38 Merge change 8126 into donut
* changes:
  First pass at reworking screen density/size APIs.
2009-07-21 19:01:28 -07:00
Dianne Hackborn
c4db95c077 First pass at reworking screen density/size APIs.
This changes the names of the directories in aapt, to what you see
in the list of DpiTest resources.  Also adds a new "long" configuration
for wide screens, which the platform sets appropriate, and introduces
a new kind of resizeability for not large but significantly larger
than normal screens which may have compatibility issues.
2009-07-21 18:28:42 -07:00
Mitsuru Oshima
d5d967fbd9 am 38ed7d77: * Adjust canvas size under compatibility mode.
Merge commit '38ed7d7701514ee7127d0430e952930854608c4f'

* commit '38ed7d7701514ee7127d0430e952930854608c4f':
  * Adjust canvas size under compatibility mode.
2009-07-21 18:14:19 -07:00
Mitsuru Oshima
38ed7d7701 * Adjust canvas size under compatibility mode. 2009-07-21 17:41:16 -07:00
Android (Google) Code Review
fead9b8ad0 am fe6f45c8: Merge change 8098 into donut
Merge commit 'fe6f45c81463d2d28e11ac6083f2653e1286c5ef'

* commit 'fe6f45c81463d2d28e11ac6083f2653e1286c5ef':
  cast is floor. Use round instead.
2009-07-21 17:41:10 -07:00
Android (Google) Code Review
fe6f45c814 Merge change 8098 into donut
* changes:
  cast is floor. Use round instead.  This fixes a few layout issues (that was due to smaller widnow size)
2009-07-21 17:39:05 -07:00
Android (Google) Code Review
55616f95af am 74cb705f: Merge change 8121 into donut
Merge commit '74cb705f0c1ee5ccb598b2b676aa50a36e6af7f9'

* commit '74cb705f0c1ee5ccb598b2b676aa50a36e6af7f9':
  Fixes #1818201. Do not attempt to display the popup until after the first layout.
2009-07-21 17:29:43 -07:00
Android (Google) Code Review
74cb705f0c Merge change 8121 into donut
* changes:
  Fixes #1818201. Do not attempt to display the popup until after the first layout.
2009-07-21 17:06:04 -07:00
Romain Guy
9bc9fa1538 Fixes #1818201. Do not attempt to display the popup until after the first layout. 2009-07-21 17:05:09 -07:00
Android (Google) Code Review
fff89ca293 am 7e71fb28: Merge change 8111 into donut
Merge commit '7e71fb284d5997bff7e359edc8e1b19cbfb1c9ca'

* commit '7e71fb284d5997bff7e359edc8e1b19cbfb1c9ca':
  Don't start search from a dialog if there is no activity associated with
2009-07-21 16:43:24 -07:00
Mitsuru Oshima
61324e58c5 cast is floor. Use round instead.
This fixes a few layout issues (that was due to smaller widnow size)
2009-07-21 16:42:41 -07:00
Android (Google) Code Review
7e71fb284d Merge change 8111 into donut
* changes:
  Don't start search from a dialog if there is no activity associated with the search manager at that point.
2009-07-21 16:41:41 -07:00
Android (Google) Code Review
078bc317b7 am 43f8d2e5: Merge change 8106 into donut
Merge commit '43f8d2e58ce75d1705ad3ee347ae4eaee5dc9b6a'

* commit '43f8d2e58ce75d1705ad3ee347ae4eaee5dc9b6a':
  Add note to Intent.fillIn javadoc to describe component copying behavior.
2009-07-21 16:34:37 -07:00
Android (Google) Code Review
43f8d2e58c Merge change 8106 into donut
* changes:
  Add note to Intent.fillIn javadoc to describe component copying behavior.
2009-07-21 16:32:14 -07:00
Karl Rosaen
ec0a12cf19 Don't start search from a dialog if there is no activity associated with
the search manager at that point.

Still works:
- hitting search when a managed dialog of an app is showing will dismiss
  the dialog and start in-app search (if it supports it), falling back
  on global search
- hitting search when a dialog of an app (not managed by the activity) will
  dismiss the dialog and start global search
- hitting search when a system dialog is showing will just dismiss the dialog.
2009-07-21 16:21:32 -07:00
Brett Chabot
3e391759d9 Add note to Intent.fillIn javadoc to describe component copying behavior. 2009-07-21 16:09:08 -07:00
Android (Google) Code Review
8487ab3e9f Merge change 8087
* changes:
  Fix the media button style to use dip instead of px.
2009-07-21 15:14:08 -07:00
Android (Google) Code Review
c6a936aa1b Merge change 8084
* changes:
  Fix for enabling auto-switch back to alpha mode from symbols.
2009-07-21 15:10:24 -07:00
Amith Yamasani
b974c7a749 Fix for enabling auto-switch back to alpha mode from symbols.
When switching keyboards in the IME view, make sure that any pending touches
don't generate up events when released.
2009-07-21 15:09:24 -07:00
Marco Nelissen
2fc22398a6 Fix the media button style to use dip instead of px. 2009-07-21 15:07:31 -07:00
Android (Google) Code Review
fe923cf2d6 am 2c25fac2: Merge change 8036 into donut
Merge commit '2c25fac23e5daafd62238f4c3dd031e3f4cd76f1'

* commit '2c25fac23e5daafd62238f4c3dd031e3f4cd76f1':
  * Disable compatibility mode for all cases.
2009-07-21 14:38:32 -07:00
Android (Google) Code Review
71effba5ac am 6fb608ee: Merge change 7854 into donut
Merge commit '6fb608ee67c3ad82baf2253b87b63fff8907992a'

* commit '6fb608ee67c3ad82baf2253b87b63fff8907992a':
  Issue #1884058 (Need to only record frequency and duration for selected Google apps)
2009-07-21 14:38:26 -07:00
Patrick Scott
9f61732e9b Add text extensions to the extension mime type map.
The Browser used to have a concern around mapping text extensions to various
text/* mime types. If a text extension mapped to an unknown text/* mime type,
the Browser would attempt to download a url instead of just displaying the
content.

There is another change in external/webkit that uses 2 static functions in
DOMImplementation that determine if a mime type is text or xml. The text
function in particular checks for a leading "text/" string in the mime type.
With that change, pruning text mime types is no longer needed.

Bug: 1988375
2009-07-21 15:28:12 -04:00
Android (Google) Code Review
2c25fac23e Merge change 8036 into donut
* changes:
  * Disable compatibility mode for all cases.
2009-07-21 11:37:27 -07:00
Mitsuru Oshima
69fff4a72d * Disable compatibility mode for all cases. 2009-07-21 11:35:18 -07:00
Android (Google) Code Review
6fb608ee67 Merge change 7854 into donut
* changes:
  Issue #1884058 (Need to only record frequency and duration for selected Google apps)
2009-07-21 11:10:16 -07:00
Andrei Popescu
af9c77edbd wire appcache to the HTML5 UI 2009-07-21 18:24:38 +01:00
Android (Google) Code Review
f24239355f Merge change 8008
* changes:
  Allow 205 and 305 to have content.
2009-07-21 10:17:27 -07:00
Dave Sparks
4b5a8f84b1 am da57856d: Add logging to help track down intermittent bug
Merge commit 'da57856d749457e495bd860c4ff45aaaf87c9dab'

* commit 'da57856d749457e495bd860c4ff45aaaf87c9dab':
  Add logging to help track down intermittent bug
2009-07-21 09:22:54 -07:00
Dave Sparks
da57856d74 Add logging to help track down intermittent bug 2009-07-21 08:43:29 -07:00
Patrick Scott
c319c69b12 Allow 205 and 305 to have content.
205 is interpreted by Safari to be like 200 and show the given content. Change
canHaveResponseBody to allow 205 to have a body.

305 is a very rare server response indicating to the client to use the given
Location header as a proxy and reissue the original request. Curl doesn't do
anything with this header and neither does internal networking code. For now,
we will just allow the response body to propagate to webcore.
2009-07-21 07:55:50 -04:00
Mike LeBeau
4f7b7c3cc6 am eb1eab12: Remove unused search dialog layout files.
Merge commit 'eb1eab1214dbe0b25355e7bde4279fca804af9f7'

* commit 'eb1eab1214dbe0b25355e7bde4279fca804af9f7':
  Remove unused search dialog layout files.
2009-07-20 23:34:17 -07:00
Jean-Michel Trivi
c08411cec9 am 1126aad7: Revert the setLanguage() call to its previous implementation as waiting to change the language right before a call to speak can put the engine in an unstable state.
Merge commit '1126aad736f3322559007b8abc49e26f550e4b54'

* commit '1126aad736f3322559007b8abc49e26f550e4b54':
  Revert the setLanguage() call to its previous implementation as
2009-07-20 23:34:10 -07:00
Android (Google) Code Review
6f3512b160 am 2a1aa6ac: Merge change 7970 into donut
Merge commit '2a1aa6acbba5a3a9142d3e8bd6fe6e19d5fae6be'

* commit '2a1aa6acbba5a3a9142d3e8bd6fe6e19d5fae6be':
  Define a broadcast intent for the web search provider changing. Unhide
2009-07-20 23:33:50 -07:00
Android (Google) Code Review
a695d185f1 am ef1a92ab: Merge change 7961 into donut
Merge commit 'ef1a92abe1bebe4feba4ba33cd0c7e25ee83fcc0'

* commit 'ef1a92abe1bebe4feba4ba33cd0c7e25ee83fcc0':
  Bluetooth at command tracking.
2009-07-20 23:33:44 -07:00
Android (Google) Code Review
4a38246b7a am 890231f1: Merge change 7934 into donut
Merge commit '890231f1d5912f5b71371e73f44df2db2e741b1b'

* commit '890231f1d5912f5b71371e73f44df2db2e741b1b':
  Unhide new SearchManager APIs for Donut.
2009-07-20 23:33:31 -07:00
Mike LeBeau
eb1eab1214 Remove unused search dialog layout files. 2009-07-20 22:53:02 -07:00
Ken Shirriff
87d78b5509 resolved conflicts for merge of 732140ce to master 2009-07-20 21:30:46 -07:00
Jean-Michel Trivi
1126aad736 Revert the setLanguage() call to its previous implementation as
waiting to change the language right before a call to speak can
put the engine in an unstable state.
2009-07-20 19:14:18 -07:00
Android (Google) Code Review
2a1aa6acbb Merge change 7970 into donut
* changes:
  Define a broadcast intent for the web search provider changing. Unhide the broadcast intent for searchables changing.
2009-07-20 17:48:25 -07:00
Android (Google) Code Review
ef1a92abe1 Merge change 7961 into donut
* changes:
  Bluetooth at command tracking.
2009-07-20 17:42:21 -07:00
Mike LeBeau
d4fb7a0d90 Define a broadcast intent for the web search provider changing. Unhide
the broadcast intent for searchables changing.
2009-07-20 17:37:38 -07:00
Mike LeBeau
131234c6f1 Unhide new SearchManager APIs for Donut. 2009-07-20 17:14:16 -07:00
Android (Google) Code Review
732140cefa Merge change 7948 into donut
* changes:
  Fix updates from read-only calendar.
2009-07-20 16:22:47 -07:00
Android (Google) Code Review
2f140bdb8a am 592f1a65: Merge change 7933 into donut
Merge commit '592f1a65815598f705260df9dbe5488e3990b45d'

* commit '592f1a65815598f705260df9dbe5488e3990b45d':
  Prevent the setLanguage() method in TextToSpeech to change the language
2009-07-20 16:21:46 -07:00