Commit Graph

6053 Commits

Author SHA1 Message Date
Derek Sollenberger
86cf1ad0e5 am d55aa751: am 7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f'

* commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f':
  consolidating to only use one surface per plugin. give plugin access to java context.
2010-01-11 13:23:41 -08:00
Derek Sollenberger
d55aa75138 am 7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db' into eclair-mr2-plus-aosp

* commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db':
  consolidating to only use one surface per plugin. give plugin access to java context.
2010-01-11 13:11:13 -08:00
Vasu Nori
380ae0a6d4 am 9c74295f: am a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
Merge commit '9c74295fb16da0469304a7c04c471915e28d09bd'

* commit '9c74295fb16da0469304a7c04c471915e28d09bd':
  add eventlog message whenever sqlite reports db corruption error
2010-01-11 13:00:28 -08:00
Scott Main
333beab9d6 am c9a26f29: am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering)
Merge commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d'

* commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d':
  javadoc change: fix the selector sample XML in the class
2010-01-11 13:00:14 -08:00
Derek Sollenberger
7c5bf4666c consolidating to only use one surface per plugin. give plugin access to java context.
There is a companion commit in external webkit.
2010-01-11 13:47:54 -05:00
Andrei Popescu
10d268e315 Merge "Allow a video to be correctly resumed programatically after being paused." 2010-01-11 10:47:23 -08:00
Andrei Popescu
a41f97bd77 Allow a video to be correctly resumed programatically after being paused.
Fix for http://b/issue?id=2366241
2010-01-11 18:36:25 +00:00
San Mehat
0f5525ad3b framework: asec: Rename 'Cache' -> 'Container'
Signed-off-by: San Mehat <san@google.com>
2010-01-11 10:15:16 -08:00
Bjorn Bringert
3b06c9f3dd Merge "Copy SearchSourceSelector from QuickSearchBox" 2010-01-11 08:39:24 -08:00
Leon Scroggins
f6298db023 am ff7d33b5: am 04e0a101: Bring up IME after receiving a response from webkit.
Merge commit 'ff7d33b55b799b234f66fdcf65070ef590fee6d9'

* commit 'ff7d33b55b799b234f66fdcf65070ef590fee6d9':
  Bring up IME after receiving a response from webkit.
2010-01-11 06:58:51 -08:00
Leon Scroggins
ff7d33b55b am 04e0a101: Bring up IME after receiving a response from webkit.
Merge commit '04e0a1018f69b38827e63a7f19a4d1e341f9725a' into eclair-mr2-plus-aosp

* commit '04e0a1018f69b38827e63a7f19a4d1e341f9725a':
  Bring up IME after receiving a response from webkit.
2010-01-11 06:42:13 -08:00
Leon Scroggins
04e0a1018f Bring up IME after receiving a response from webkit.
Fix for http://b/issue?id=2361658

Requires a change to external/webkit
2010-01-11 09:10:20 -05:00
Bjorn Bringert
32d580c360 Copy SearchSourceSelector from QuickSearchBox
The widget shows the icon for a search source, and when clicked
fires an intent that shows a search source selection activity.
That intent is handled by the QuickSearchBox app.

This change also adds the source selector to the in-app
search dialog.

An upcoming change to QuickSearchBox will add the search source
selector to the home screen search widget and to the Quick Search Box
activity.

TODO: Add assets for selected and pressed states to the search selector.
TODO: The SearchDialog hides when the soruce selection activity
appears. This will be fixed when SearchDialog is changed from a
system window to a normal app window.

Change-Id: I91eadd60682577614e274ecf5b995b927c70a48a
2010-01-09 13:19:52 +00:00
Ficus Kirkpatrick
71de7851a2 Make Build.UNKNOWN public.
There needs to be a way for apps to determine whether or not
a build property exists.  Exposing UNKNOWN (the value that
Build sets properties to by default) will give apps something
to compare against.
2010-01-08 16:37:43 -08:00
Vasu Nori
9c74295fb1 am a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
Merge commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd' into eclair-plus-aosp

* commit 'a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd':
  add eventlog message whenever sqlite reports db corruption error
2010-01-08 16:33:50 -08:00
Scott Main
c9a26f291b am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering)
Merge commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp

* commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea':
  javadoc change: fix the selector sample XML in the class
2010-01-08 16:33:45 -08:00
Eric Laurent
84b42b8368 am d31d7397: am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.
Merge commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629'

* commit 'd31d7397ba26dcd913e96d06f0a8fd593780d629':
  Fix issue 2361949: A2DP suspend parameters set wrongly.
2010-01-08 16:28:21 -08:00
Romain Guy
9b0b155e60 Merge "Deprecate fill_parent and introduce match_parent. Bug: #2361749." 2010-01-08 15:32:18 -08:00
Charles Chen
714834d757 Merge "Enabling multiple apps to use different speech synthesis engines and not interfere with one another." 2010-01-08 15:26:57 -08:00
Romain Guy
980a938c1c Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
2010-01-08 15:11:38 -08:00
Vasu Nori
a1759ceac2 Merge "add eventlog message whenever sqlite reports db corruption error" into eclair 2010-01-08 15:09:12 -08:00
Charles Chen
60dd360640 Enabling multiple apps to use different speech synthesis engines and not
interfere with one another.
2010-01-08 15:06:57 -08:00
San Mehat
0a02894202 Merge "MountService: Add new Settings for UMS prompting and notification behavior" 2010-01-08 15:05:57 -08:00
San Mehat
ad5a748ea7 Merge "Settings: Add settings for MountService prefs and bump DB version to 46" 2010-01-08 15:03:43 -08:00
Mike Reed
b2924736d7 explicitly initialize static final boolean to fix build 2010-01-08 17:34:58 -05:00
Mike Reed
1df26b1ed2 Merge "optional flag to enable tracker debugging" 2010-01-08 13:34:54 -08:00
Mike Reed
fdc5424b1c optional flag to enable tracker debugging 2010-01-08 16:13:28 -05:00
Tom O'Neill
046dd0111c Merge "ContentResolver.query() includes performance considerations" 2010-01-08 13:04:56 -08:00
San Mehat
1f6301e1ff MountService: Add new Settings for UMS prompting and notification behavior
Signed-off-by: San Mehat <san@google.com>
2010-01-08 12:56:33 -08:00
San Mehat
87734d3bc1 Settings: Add settings for MountService prefs and bump DB version to 46
Adds 4 new Settings:
    Secure.MOUNT_PLAY_NOTIFICATION_SND - Play notification sound on events
    Secure.MOUNT_UMS_AUTOSTART         - Auto-start UMS when host detected
    Secure.MOUNT_UMS_PROMPT            - Show notification when host detected
    Secure.MOUNT_UMS_NOTIFY_ENABLED    - Show notification while UMS enabled

These settings are also added to the Settings backup list

Signed-off-by: San Mehat <san@google.com>
2010-01-08 12:55:22 -08:00
Tom O'Neill
0ba1cb06c6 ContentResolver.query() includes performance considerations
Mention the desirability of using "?"-substitution in the where clause,
and reemphasize the importance of using an explicit projection.

Change-Id: Iaa489d50db409f34e78bcd55253e5a4e53445cf2
2010-01-08 12:53:50 -08:00
Joe Onorato
f5d95cbc1a less log spew 2010-01-08 15:46:24 -05:00
Scott Main
aa3b5961c0 javadoc change: fix the selector sample XML in the class
description (was broken due to improper ordering)
2010-01-08 12:35:11 -08:00
Eric Laurent
d31d7397ba am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.
Merge commit '663ec308801a34de82db9ab993f0e906da690f89' into eclair-plus-aosp

* commit '663ec308801a34de82db9ab993f0e906da690f89':
  Fix issue 2361949: A2DP suspend parameters set wrongly.
2010-01-08 12:17:08 -08:00
Erik Pasternak
660cc3461a Merge "b/2293263 Finished removing busyBits references." 2010-01-08 10:45:35 -08:00
Evan Millar
431f5fd9e8 Unhide WebView#emulateShiftHeld() so that gmail can do select-to-copy 2010-01-08 10:17:02 -08:00
Vasu Nori
dd1b39be1e add eventlog message whenever sqlite reports db corruption error 2010-01-08 10:11:24 -08:00
Andrei Popescu
b816377fed Merge "Fix a bug where the usage for an origin shows up as 0 in Website Settings when the origin uses app cache but not database." 2010-01-08 09:49:31 -08:00
Patrick Scott
29eadcf376 Merge "Deprecate onTooManyRedirects." 2010-01-08 09:23:44 -08:00
Vasu Nori
02a018f0b5 Merge "when finalizing SQLiteCursor, close it but don't throw exceptions." 2010-01-08 09:21:31 -08:00
Eric Laurent
663ec30880 Fix issue 2361949: A2DP suspend parameters set wrongly.
Move reset of A2DP suspend state from handleSinkStateChange() in BluetoothA2dpService to
BluetoothA2dp.ACTION_SINK_STATE_CHANGED intent receiver in AudioService.
Previous implementation could cause a false reset of suspend state if a new sink attempted to
connect while A2DP was suspended.
New implementation only resets A2DP suspend state when a new sink is actually connected.
2010-01-08 08:48:18 -08:00
Andrei Popescu
9840970413 Fix a bug where the usage for an origin shows up as 0 in Website Settings when the origin
uses app cache but not database.
2010-01-08 16:41:23 +00:00
Doug Zongker
c2a5d96b5d Merge "remove Settings.Gservices" 2010-01-08 08:41:17 -08:00
San Mehat
595ae28dab Merge "Environment: Catch *all* exceptions from MountService" 2010-01-08 07:19:56 -08:00
Patrick Scott
6a5b0ecae5 Deprecate onTooManyRedirects.
The method was added a long time ago but has never been called. Rather than
spend time implementing and testing this feature, deprecate the function.

Bug: 2257857
2010-01-08 10:16:33 -05:00
Leon Scroggins
0d05539533 am 4e9a9d8e: am c89b13b9: Use Calendar.add() instead of Calendar.roll()
Merge commit '4e9a9d8ea8a31578b936b17f66177f4c1b18cddb'

* commit '4e9a9d8ea8a31578b936b17f66177f4c1b18cddb':
  Use Calendar.add() instead of Calendar.roll()
2010-01-08 06:48:21 -08:00
Cary Clark
b0470f67a1 am 2110bb02: am affa5d2c: remove unused jni interfaces
Merge commit '2110bb024eafe4578bb9acace9f1ad4ae55ff9fd'

* commit '2110bb024eafe4578bb9acace9f1ad4ae55ff9fd':
  remove unused jni interfaces
2010-01-08 06:48:08 -08:00
Leon Scroggins
4e9a9d8ea8 am c89b13b9: Use Calendar.add() instead of Calendar.roll()
Merge commit 'c89b13b962c6634db536e563a42d058702ce045b' into eclair-mr2-plus-aosp

* commit 'c89b13b962c6634db536e563a42d058702ce045b':
  Use Calendar.add() instead of Calendar.roll()
2010-01-08 06:43:36 -08:00
Leon Scroggins
c89b13b962 Use Calendar.add() instead of Calendar.roll()
Calendar.roll() breaks the year at the beginning of the year, so
use add() instead, which changes larger fields.

Also, only use 4 bins, since the last bin's boundary is not relevant.

Lastly, no need to return Calendar in beginningOfDay.

Fixes http://b/issue?id=2361382
2010-01-08 09:18:37 -05:00
San Mehat
a6a72814e0 Environment: Catch *all* exceptions from MountService
Signed-off-by: San Mehat <san@google.com>
2010-01-07 22:39:53 -08:00