22691 Commits

Author SHA1 Message Date
Nicolas Roard
865b16c4ba am 796c5fc6: am 3f5d7b83: am b876bdb5: Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo 2010-04-20 13:36:07 -07:00
Nicolas Roard
796c5fc6ab am 3f5d7b83: am b876bdb5: Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo
Merge commit '3f5d7b83ee194db39c5f784146e4abc4f6568854' into kraken

* commit '3f5d7b83ee194db39c5f784146e4abc4f6568854':
  Speed up layers rendering when using animations
2010-04-20 13:29:11 -07:00
Nicolas Roard
3f5d7b83ee am b876bdb5: Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo
Merge commit 'b876bdb52e7c72ced8e7764946e5beb914f17036' into froyo-plus-aosp

* commit 'b876bdb52e7c72ced8e7764946e5beb914f17036':
  Speed up layers rendering when using animations
2010-04-20 13:26:36 -07:00
Nicolas Roard
b876bdb52e Merge "Speed up layers rendering when using animations Cherry-pick from master" into froyo 2010-04-20 13:22:44 -07:00
Daniel Sandler
2c50fee474 am 5272399a: (-s ours) am 29019cb9: (-s ours) am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo 2010-04-20 13:13:03 -07:00
Daniel Sandler
5272399a1c am 29019cb9: (-s ours) am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
Merge commit '29019cb9773dfc7645c9326725a6ac514020eef7' into kraken

* commit '29019cb9773dfc7645c9326725a6ac514020eef7':
  Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
2010-04-20 13:06:57 -07:00
Daniel Sandler
29019cb977 am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo
Merge commit 'c96307efd2829cdd0fa7c835484f2f89edf7d883' into froyo-plus-aosp

* commit 'c96307efd2829cdd0fa7c835484f2f89edf7d883':
  Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)
2010-04-20 13:01:58 -07:00
Daniel Sandler
c96307efd2 Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo 2010-04-20 12:57:54 -07:00
Nicolas Roard
f343a043ef Speed up layers rendering when using animations
Cherry-pick from master

Bug:2522049
Change-Id: I441f00b6e7551930c4f76983681f4cd0c57ce017
2010-04-20 12:05:39 -07:00
Carl Shapiro
43a467ea31 am dbc108a7: am 15feb4de: am 19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo 2010-04-20 11:56:47 -07:00
Grace Kloba
7da0c067b8 am 20fa839d: am 19fa6d45: am 738a0460: Merge "Don\'t inflate the zoom button controller until we are going to show it. This should shave 5% of Browser start up time on Sapphire." into froyo 2010-04-20 11:53:01 -07:00
Carl Shapiro
dbc108a718 am 15feb4de: am 19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo
Merge commit '15feb4defc61c7bded6fdd3ea1c3781f25666275' into kraken

* commit '15feb4defc61c7bded6fdd3ea1c3781f25666275':
  Remove code to pass the nonexistant lockprofsample flag to Dalvik.
2010-04-20 11:50:45 -07:00
Carl Shapiro
15feb4defc am 19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo
Merge commit '19275cb5b028c18228674f87ba4cbc98d8520c5e' into froyo-plus-aosp

* commit '19275cb5b028c18228674f87ba4cbc98d8520c5e':
  Remove code to pass the nonexistant lockprofsample flag to Dalvik.
2010-04-20 11:48:09 -07:00
Grace Kloba
20fa839d2b am 19fa6d45: am 738a0460: Merge "Don\'t inflate the zoom button controller until we are going to show it. This should shave 5% of Browser start up time on Sapphire." into froyo
Merge commit '19fa6d4586df8ff7897fcc73b2228b431502d58e' into kraken

* commit '19fa6d4586df8ff7897fcc73b2228b431502d58e':
  Don't inflate the zoom button controller until we
2010-04-20 11:47:31 -07:00
Nicolas Roard
cc2c842053 Speed up layers rendering when using animations
Bug:2522049
Change-Id: Ib3a79a10d46a234343207f27d6e74587e74be493
2010-04-20 11:47:14 -07:00
Grace Kloba
19fa6d4586 am 738a0460: Merge "Don\'t inflate the zoom button controller until we are going to show it. This should shave 5% of Browser start up time on Sapphire." into froyo
Merge commit '738a0460c5c6b45506f5203b87d62f2ac99a8e7a' into froyo-plus-aosp

* commit '738a0460c5c6b45506f5203b87d62f2ac99a8e7a':
  Don't inflate the zoom button controller until we
2010-04-20 11:43:18 -07:00
Carl Shapiro
19275cb5b0 Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo 2010-04-20 11:42:39 -07:00
Marco Nelissen
03e4b571ea am fe13eebe: am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries in the media database, don\'t update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-I 2010-04-20 11:42:02 -07:00
Grace Kloba
738a0460c5 Merge "Don't inflate the zoom button controller until we are going to show it. This should shave 5% of Browser start up time on Sapphire." into froyo 2010-04-20 11:40:07 -07:00
Marco Nelissen
fe13eebee9 am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries in the media database, don\'t update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d
Merge commit '9d14e3ea22f48173070789951ee6dc64b507e13f' into kraken

* commit '9d14e3ea22f48173070789951ee6dc64b507e13f':
  When updating existing entries in the media database, don't update
2010-04-20 11:33:21 -07:00
Marco Nelissen
9d14e3ea22 am 9b8b417c: Merge "When updating existing entries in the media database, don\'t update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d6f6e699514169d
Merge commit '9b8b417cd1ddfb81c1b0314f033a1439fd627aa2' into froyo-plus-aosp

* commit '9b8b417cd1ddfb81c1b0314f033a1439fd627aa2':
  When updating existing entries in the media database, don't update
2010-04-20 11:28:59 -07:00
Marco Nelissen
9b8b417cd1 Merge "When updating existing entries in the media database, don't update the is_music, is_ringtone, etc columns. This ensures that custom ringtones will still be shown in the ringtone picker after a rescan. Bug 2594125 Change-Id: I56761240d6f6e699514169d80a445317ba0de9e2" into froyo 2010-04-20 11:24:10 -07:00
Grace Kloba
f4c66efa20 Don't inflate the zoom button controller until we
are going to show it. This should shave 5% of Browser
start up time on Sapphire.

Fix http://b/issue?id=2604295
2010-04-20 11:23:50 -07:00
Eric Laurent
7dc9bcea53 am 5b550c9e: am 11bae140: am 3891c4cc: Fix issue 2602879: camera shutter sound not playing. 2010-04-20 10:31:43 -07:00
Eric Laurent
5b550c9efc am 11bae140: am 3891c4cc: Fix issue 2602879: camera shutter sound not playing.
Merge commit '11bae14009d91c063780b2cafee2fc4fb660c08c' into kraken

* commit '11bae14009d91c063780b2cafee2fc4fb660c08c':
  Fix issue 2602879: camera shutter sound not playing.
2010-04-20 10:22:27 -07:00
Kenny Root
467f25a779 Merge "Refactor Styled utility functions into reusable objects." 2010-04-20 10:20:59 -07:00
Eric Laurent
11bae14009 am 3891c4cc: Fix issue 2602879: camera shutter sound not playing.
Merge commit '3891c4cc918e8062abb97c542a8625d556dccc59' into froyo-plus-aosp

* commit '3891c4cc918e8062abb97c542a8625d556dccc59':
  Fix issue 2602879: camera shutter sound not playing.
2010-04-20 10:18:07 -07:00
Ben Murdoch
26b1f5ef49 Merge "Add 3 touch tests to the ignored result list." 2010-04-20 10:10:24 -07:00
Eric Laurent
1a8597cb51 am e33e9db6: am 3cd1f9f9: am 3b591260: Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking. 2010-04-20 10:02:16 -07:00
Marco Nelissen
c066557378 When updating existing entries in the media database, don't update
the is_music, is_ringtone, etc columns. This ensures that custom
ringtones will still be shown in the ringtone picker after a rescan.
Bug 2594125
Change-Id: I56761240d6f6e699514169d80a445317ba0de9e2
2010-04-20 09:47:31 -07:00
Eric Laurent
3891c4cc91 Fix issue 2602879: camera shutter sound not playing.
The problem occurs if the device is powered down in silent mode. When the device restarts,
AudioService reads current ringer mode from saved settings but does not call setRingerModeInt()
to perform actions required when ringer mode changes.
The volumes of streams affected by ringer mode are actually at 0 because they are also read from settings
but their mute state is not applied correclty. When we later exit from silent mode, the streams
other than STREAM_RING that are affected by ringer mode are not restored as they are not considered
muted. This applies to STREAM_SYSTEM but also to STREAM_NOTIFICATION if its volume is controlled independently
from STREAM_RING.

The fix consists in calling setRingerModeInt() when AudioService starts.

Change-Id: Ica75b9874938dda1bc1b634c3e97db4a650d295c
2010-04-20 09:40:57 -07:00
Eric Laurent
e33e9db6b0 am 3cd1f9f9: am 3b591260: Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.
Merge commit '3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd' into kraken

* commit '3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd':
  Fix issue 2604270  Device auto connects to Car Dock (Media profile) after undocking.
2010-04-20 09:27:40 -07:00
Eric Laurent
3cd1f9f98b am 3b591260: Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.
Merge commit '3b5912602bec6ccbe8eef8a576730b1565f0067c' into froyo-plus-aosp

* commit '3b5912602bec6ccbe8eef8a576730b1565f0067c':
  Fix issue 2604270  Device auto connects to Car Dock (Media profile) after undocking.
2010-04-20 09:22:32 -07:00
Eric Laurent
3b5912602b Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.
There was a regression introduced by change 4c637b9e34f4c8db69a64ad21a4e2bcfa7485b5f
fixing issue 2578813. As the A2DP device disconnection is notified to the audio policy manager
after a delay, there is a period during which the A2DP device is actually not connected but the
A2DP output is considered present by audio framework. If a playback is started during this period,
The A2DP output requests the activation of the A2DP sink which in turn triggers a reconnection
of the A2DP sink.

The fix consists in suspending the A2DP output immediately when receiving the A2DP disconnection
intent so that any activity on A2DP output is ignored until the output is actually closed by the
audio policy manager.

Change-Id: I16eaace45e12bfc970f50836b46a73b756b493f0
2010-04-20 07:01:00 -07:00
Daisuke Miyakawa
6db2c6cab5 Refactoring vCard: remove Shift_JIS information from flags.
Change-Id: I34ef498b3312178e7d358b0c8ebc34703abfc771
2010-04-20 18:27:10 +09:00
Carl Shapiro
8ba73ac72c Remove code to pass the nonexistant lockprofsample flag to Dalvik.
Change-Id: If334e21d770bc21a9b7c4f04d0fb652f53359231
2010-04-20 01:27:50 -07:00
Daisuke Miyakawa
394026c53e Refactor vCard: clean up test code.
Bug: 2605996
Change-Id: Icdd8f56c1c21af35c55305cb9cc124cbf43174fc
2010-04-20 16:38:49 +09:00
Daisuke Miyakawa
1c0e873916 Merge "Refactor vCard: move utilities for unit tests to test_utils directory." 2010-04-19 21:08:54 -07:00
Daisuke Miyakawa
8e798cf71e Refactor vCard: move utilities for unit tests to test_utils directory.
Change-Id: I4ef92633fb5eedc05f13ba53ca4ebc7e3e7ef8ce
2010-04-20 13:08:23 +09:00
Mathias Agopian
20f5a2fa88 am 732c73e1: am 26f61635: am 0a4ab1b9: Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo 2010-04-19 19:39:04 -07:00
Mathias Agopian
732c73e1e7 am 26f61635: am 0a4ab1b9: Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo
Merge commit '26f6163557980062dbb203388b3d0794ee0d06f7' into kraken

* commit '26f6163557980062dbb203388b3d0794ee0d06f7':
  fix [2599939] "cannot play video" after open/close a video player a dozen of times
2010-04-19 19:29:22 -07:00
Mathias Agopian
26f6163557 am 0a4ab1b9: Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo
Merge commit '0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa' into froyo-plus-aosp

* commit '0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa':
  fix [2599939] "cannot play video" after open/close a video player a dozen of times
2010-04-19 19:26:31 -07:00
Jack Palevich
8ca856c445 am 15d484a7: am 06798769: am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo 2010-04-19 19:24:19 -07:00
Mathias Agopian
0a4ab1b9b4 Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo 2010-04-19 19:23:45 -07:00
Jack Palevich
15d484a7ef am 06798769: am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo
Merge commit '0679876997a5523a7539b8fe2c74a39434b17820' into kraken

* commit '0679876997a5523a7539b8fe2c74a39434b17820':
  Quietly handle EGL_BAD_NATIVE_WINDOW errors
2010-04-19 19:15:12 -07:00
Daisuke Miyakawa
236c35b2ba am 72c0a3cf: (-s ours) am e3172405: am c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data. 2010-04-19 19:13:12 -07:00
Jack Palevich
0679876997 am 7305f416: Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo
Merge commit '7305f4166306dac08fc63056f2c85e91015df879' into froyo-plus-aosp

* commit '7305f4166306dac08fc63056f2c85e91015df879':
  Quietly handle EGL_BAD_NATIVE_WINDOW errors
2010-04-19 19:10:13 -07:00
Mathias Agopian
92c3b39327 fix [2599939] "cannot play video" after open/close a video player a dozen of times
get rid off the MAP_ONCE flag is MemoryHeapBase (as well as it's functionality),
this feature should not be used anymore.

the software renderer was incorrectly using the default ctor which set MAP_ONCE,
causing the leak. the software renderer itself is incorrectly used while coming
back from sleep.

Change-Id: I123621f8d140550b864f352bbcd8a5729db12b57
2010-04-19 19:09:03 -07:00
Jack Palevich
7305f41663 Merge "Quietly handle EGL_BAD_NATIVE_WINDOW errors" into froyo 2010-04-19 19:06:35 -07:00
Daisuke Miyakawa
72c0a3cf28 am e3172405: am c86f0779: Make vCard allow users to refrain image export. Useful when receivers cannot accept image data.
Merge commit 'e31724050041b4be41b7c868d531a6c00fd94587' into kraken

* commit 'e31724050041b4be41b7c868d531a6c00fd94587':
  Make vCard allow users to refrain image export. Useful when
2010-04-19 18:59:20 -07:00