25346 Commits

Author SHA1 Message Date
Ficus Kirkpatrick
00a50872b0 Quiet down some log spew.
Change-Id: I769247c7b5b0ab4a233932635752ec602442af34
2010-06-16 13:28:39 -07:00
Vasu Nori
8d66d7592f Merge "throw correct exception" 2010-06-16 12:30:48 -07:00
Patrick Scott
a50abf37e3 Merge "Move WebViewDatabase initialization into a background thread." 2010-06-16 11:58:13 -07:00
Robert Greenwalt
820c12c924 Merge "Move the net transition wakelock to ConnService." 2010-06-16 11:07:59 -07:00
Robert Greenwalt
14f2ef4c9d Move the net transition wakelock to ConnService.
When the default network goes down we lose the wake-on-incoming-data capability
until the new net is brought up and apps rebuild their connections.  We fixed this
in Wifi, but it's a general connectivity issue, not a wifi issue so moving the
mechanism to connecitivty so other networks can use it.

bug:2734419
Change-Id: I39b5d825eb6b548bd9bb8f179b89254f4db53147
2010-06-16 11:04:37 -07:00
Adam Powell
1091e00822 Merge "Fix bug 2771204" 2010-06-16 10:52:50 -07:00
Adam Powell
99969da377 Fix bug 2771204
Change-Id: If34cf07b0901c985f8260bcd20c1375ae76a0fa0
2010-06-16 10:51:30 -07:00
Patrick Scott
6e90ddb2d8 Move WebViewDatabase initialization into a background thread.
This isn't the perfect solution as any calls into WebViewDatabase will block
until initialization completes.  It is better than the current model which
blocks when creating the WebViewDatabase.

In order to get a perfect solution, we would need to do initialization in the
background and have a way to interact with the database during initialization
that would not block.

Bug: 2721802
Change-Id: Ibbaf7f97926128de6534fbf2148452099766c6b7
2010-06-16 13:50:45 -04:00
Patrick Scott
97147286d1 Fix a monkey crash when the new WebView is destroyed.
Grab the WebViewCore immediately so that if the Tab is destroyed, we have the
old WebViewCore object and can return the BrowserFrame.

Bug: 2733004
Change-Id: Ic3e4c5417f2165f412f60f05aea3ed403d8cecfd
2010-06-16 13:34:07 -04:00
Kristian Monsen
edb20ac70e Adding a way for native code to get the apps data directory
Change-Id: I9da5376a202cb2d24c2125352efeb9bffcfe357b
2010-06-16 17:24:21 +01:00
Scott Main
f6e39bbfa9 am a0210f76: am c980ba25: am cdeae439: Merge "docs: update dashboard" into froyo
Merge commit 'a0210f76e451a0fede557e704832f605034584c4'

* commit 'a0210f76e451a0fede557e704832f605034584c4':
  docs: update dashboard
2010-06-15 19:48:12 -07:00
Scott Main
a0210f76e4 am c980ba25: am cdeae439: Merge "docs: update dashboard" into froyo
Merge commit 'c980ba25b0916d7c276c23e420195dd7959379a0' into gingerbread-plus-aosp

* commit 'c980ba25b0916d7c276c23e420195dd7959379a0':
  docs: update dashboard
2010-06-15 19:45:00 -07:00
Scott Main
c980ba25b0 am cdeae439: Merge "docs: update dashboard" into froyo
Merge commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8' into gingerbread

* commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8':
  docs: update dashboard
2010-06-15 19:39:32 -07:00
Scott Main
cdeae439a3 Merge "docs: update dashboard" into froyo 2010-06-15 19:33:03 -07:00
Romain Guy
d4824c256c Merge "Add new API to check whether a Bitmap was modified." 2010-06-15 18:06:47 -07:00
Romain Guy
0bbae08364 Add new API to check whether a Bitmap was modified.
Bitmap.getGenerationId() can be used by caches to find out if a Bitmap has been
modified. This simply exposes an existing Skia API.

This change also adds a small test app for Canvas hardware acceleration. The new
Bitmap API is required to implement a texture cache.

Change-Id: I8547b146cd14c8afe1a2327fcd6d71b1b1cb68fc
2010-06-15 18:03:40 -07:00
Jason Sams
cb8e982754 Merge "Remove InvokeData and add ContextFinish to generate a sync point." 2010-06-15 17:12:51 -07:00
Jeff Brown
8959f1c71b am 2dfd2aa4: am 92266a78: Merge "More work in progress on native events." into gingerbread
Merge commit '2dfd2aa413a91965c1a247980598c795db9b4c38'

* commit '2dfd2aa413a91965c1a247980598c795db9b4c38':
  More work in progress on native events.
2010-06-15 16:50:12 -07:00
Jeff Brown
2dfd2aa413 am 92266a78: Merge "More work in progress on native events." into gingerbread
Merge commit '92266a7894becc1cdf2298fd02380749ab036131' into gingerbread-plus-aosp

* commit '92266a7894becc1cdf2298fd02380749ab036131':
  More work in progress on native events.
2010-06-15 16:48:23 -07:00
Jeff Brown
92266a7894 Merge "More work in progress on native events." into gingerbread 2010-06-15 16:44:23 -07:00
Jeff Brown
9c3cda04d9 More work in progress on native events.
Refactored the code to eliminate potential deadlocks due to re-entrant
calls from the policy into the dispatcher.  Also added some plumbing
that will be used to notify the framework about ANRs.

Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
2010-06-15 16:43:18 -07:00
Wei Huang
ce718947db am 5907ffa4: am a6c52938: Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
Merge commit '5907ffa453cf92f2f0de760354e4013df4ea6b69'

* commit '5907ffa453cf92f2f0de760354e4013df4ea6b69':
  add new video/audio presence icons in the framework resource dirs, and make them public.
2010-06-15 16:01:32 -07:00
Ying Wang
1b37051da1 resolved conflicts for merge of 2f6f6240 to master
Change-Id: Ia91944b5c28a04b6b3f968305266a39a376a0e85
2010-06-15 15:58:28 -07:00
Joe Onorato
79baf11702 am c43f4784: am 987e223d: am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
Merge commit 'c43f4784253f49189f20d131508bdb23da113197'

* commit 'c43f4784253f49189f20d131508bdb23da113197':
  Use the droidcore goal with dist-for-goals.
2010-06-15 15:49:11 -07:00
Joe Onorato
6b56a84ace am 3d6ea3bd: am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28'

* commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
2010-06-15 15:49:05 -07:00
Wei Huang
5907ffa453 am a6c52938: Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
Merge commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3' into gingerbread-plus-aosp

* commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3':
  add new video/audio presence icons in the framework resource dirs, and make them public.
2010-06-15 15:36:41 -07:00
Ying Wang
2f6f6240fd am 3137f8c5: am 6567adf8: Move android-common to framework/ex
Merge commit '3137f8c54d00d8eefe011a0256e2d85a036b207c' into gingerbread-plus-aosp

* commit '3137f8c54d00d8eefe011a0256e2d85a036b207c':
  Move android-common to framework/ex
2010-06-15 15:34:51 -07:00
Wei Huang
a6c52938b1 Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread 2010-06-15 15:34:06 -07:00
Ying Wang
3137f8c54d am 6567adf8: Move android-common to framework/ex
Merge commit '6567adf8b637c36817625cd38d64cd4b8510b097' into gingerbread

* commit '6567adf8b637c36817625cd38d64cd4b8510b097':
  Move android-common to framework/ex
2010-06-15 15:32:10 -07:00
Ying Wang
6567adf8b6 Move android-common to framework/ex
This is one necessary step by unbundling.

Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
2010-06-15 15:28:42 -07:00
Joe Onorato
c43f478425 am 987e223d: am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
Merge commit '987e223df73abe6cca47d09fff3a87be0243a085' into gingerbread-plus-aosp

* commit '987e223df73abe6cca47d09fff3a87be0243a085':
  Use the droidcore goal with dist-for-goals.
2010-06-15 15:23:59 -07:00
Joe Onorato
3d6ea3bd86 am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '9a5fcd1c14dcea951099433885ed3519dee90f48' into gingerbread-plus-aosp

* commit '9a5fcd1c14dcea951099433885ed3519dee90f48':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
2010-06-15 15:23:55 -07:00
Joe Onorato
987e223df7 am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
Merge commit '27357fc08802d796a6b6a1111ac5534d75fc8be7' into gingerbread

* commit '27357fc08802d796a6b6a1111ac5534d75fc8be7':
  Use the droidcore goal with dist-for-goals.
2010-06-15 15:21:21 -07:00
Joe Onorato
9a5fcd1c14 am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into gingerbread

* commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
2010-06-15 15:21:14 -07:00
Wei Huang
2b24ecfbb2 add new video/audio presence icons in the framework resource dirs, and make them public.
- add definitions for

presence_video_away
presence_video_busy
presence_video_online
presence_audio_away
presence_audio_busy
presence_audio_online

in the public.xml, and update current.xml

- the actual icons for the audio versions are not yet done, so I used the video versions as placeholders.

Change-Id: I9e2be5dd05619cbdbbb61dc231e9da1984ddbb36
2010-06-15 15:19:40 -07:00
Jason Sams
afcc0f8874 Merge "update image processing." 2010-06-15 14:55:02 -07:00
Romain Guy
9295ada0ec Allow the use of styles with LinearLayout, make "useLargestChild" attr public.
Change-Id: I044f3f5bd9b90c684ded7a37ff85e3aa8d15af96
2010-06-15 14:00:52 -07:00
Joe Onorato
27357fc088 Merge "Use the droidcore goal with dist-for-goals." into froyo 2010-06-15 13:59:10 -07:00
Joe Onorato
9d71860e8c Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo 2010-06-15 13:58:33 -07:00
Jason Sams
96ed4cfa62 Remove InvokeData and add ContextFinish to generate a sync point.
Change-Id: I27da8bf5fba2c8a428964cb6a5e66dd7a94958d8
2010-06-15 12:15:57 -07:00
Vasu Nori
daa4e4faff throw correct exception
when an argument is incorrect, throw IllegalArgumentException
not IllegalStateException

Change-Id: I9a33410617ab6a00147c3ab2010ed31251983329
2010-06-15 11:32:27 -07:00
James Dong
7e28c0108b am 56b64c75: am ac8b0d47: Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread
Merge commit '56b64c75c3809c55c2053f77802344a9e035343f'

* commit '56b64c75c3809c55c2053f77802344a9e035343f':
  This patch enables each omx instance to have a separate message dispatcher, and
2010-06-15 11:20:23 -07:00
James Dong
56b64c75c3 am ac8b0d47: Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread
Merge commit 'ac8b0d47011293ef713f4996317bbda579354200' into gingerbread-plus-aosp

* commit 'ac8b0d47011293ef713f4996317bbda579354200':
  This patch enables each omx instance to have a separate message dispatcher, and
2010-06-15 10:50:43 -07:00
Scott Main
f879d62049 am 522d9907: am 0014296b: am 457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Merge commit '522d990741b74b4d79f9675da7f32c482253407b'

* commit '522d990741b74b4d79f9675da7f32c482253407b':
  docs: add information about known issues in resource matching
2010-06-15 10:50:34 -07:00
Scott Main
84b51c8eb7 am fb48f3a2: am e4bca7ee: am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit 'fb48f3a25d821a9037591aa76faa7bae46d1debd'

* commit 'fb48f3a25d821a9037591aa76faa7bae46d1debd':
  docs: fix markup error
2010-06-15 10:50:30 -07:00
James Dong
ac8b0d4701 Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread 2010-06-15 10:48:58 -07:00
Scott Main
522d990741 am 0014296b: am 457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Merge commit '0014296b1faca612134a1daa7f74dd82ed40cc2d' into gingerbread-plus-aosp

* commit '0014296b1faca612134a1daa7f74dd82ed40cc2d':
  docs: add information about known issues in resource matching
2010-06-15 10:47:24 -07:00
Scott Main
fb48f3a25d am e4bca7ee: am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab' into gingerbread-plus-aosp

* commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab':
  docs: fix markup error
2010-06-15 10:47:21 -07:00
Scott Main
0014296b1f am 457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Merge commit '457738e628ee4d165014996bcf4e8d1983ac5929' into gingerbread

* commit '457738e628ee4d165014996bcf4e8d1983ac5929':
  docs: add information about known issues in resource matching
2010-06-15 10:43:10 -07:00
Scott Main
e4bca7ee60 am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into gingerbread

* commit '322e7e477d89aca18d65cbd289343e716c45a699':
  docs: fix markup error
2010-06-15 10:42:52 -07:00