55192 Commits

Author SHA1 Message Date
Xavier Ducrohet
ac1fe6f846 am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
* commit '84be06e4ce0778fbf0c1ac72f94795ef8433439b':
  Added Caching for PreProcessed PNGs
2011-07-20 17:49:26 -07:00
Eric Laurent
ae7c092649 Merge "Audio framework: support for audio pre processing" 2011-07-20 17:45:37 -07:00
Xavier Ducrohet
84be06e4ce resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
2011-07-20 17:45:11 -07:00
Jeff Brown
95661d5ece Merge "Remove unimplemented memory pool." 2011-07-20 17:42:36 -07:00
Dirk Dougherty
1bf7dea61d Merge "Cherrypick from honeycomb-mr2: Doc change: diff report for API level 13." 2011-07-20 17:35:28 -07:00
Jeff Brown
2c70d4a372 Untangle MediaScanner error handling.
Bug: 5056917

Change-Id: I1a7a73579e3ba4e9709459329fc1901a28b0f4b1
2011-07-20 17:33:13 -07:00
Dirk Dougherty
75db8a1b1d Cherrypick from honeycomb-mr2: Doc change: diff report for API level 13. 2011-07-20 17:29:48 -07:00
Xavier Ducrohet
e53365f6f1 am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
* commit 'a125c937de06b1cc43368743592f47513eb88b76':
  Add generation of dependency file for .ap_ package
2011-07-20 17:18:04 -07:00
Matthew Xie
e3dc975acb when disconnectHeadsetInternal, allow it when the BT is not disabled
The old code allowed the disconnection only when BT is enabled. This
caused a bug during BT turning off that Headset connection failed
to disconnect.
Change-Id: Iba15a1595b6987064f071ad90bbb126a6edfe6b5
2011-07-20 17:12:52 -07:00
Mathias Agopian
50c24a2000 clean-up. get rid ofunused code and members in Surface[Control].cpp
Change-Id: Ia7790ae28af2c2ac99eae01c2c5044ace4a490a4
2011-07-20 16:53:13 -07:00
Hong Teng
600acf14ff fix for issue 4142219
Don't hard code platform-specific limitations-jni/java part

Change-Id: Icde261b1caf29a8cf552884c97f3c9d0b41741a3
2011-07-20 16:51:39 -07:00
Xavier Ducrohet
a125c937de resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
2011-07-20 16:31:25 -07:00
James Dong
0f4e81df99 Merge "Let the media recording framework release the Camera object when it is the owner" 2011-07-20 16:08:32 -07:00
Xavier Ducrohet
ea9e6d24a4 am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
* commit 'b582af31c74a58922120fdb747c1a3b867d95e90':
  Added Caching for PreProcessed PNGs
2011-07-20 16:02:33 -07:00
Xavier Ducrohet
b582af31c7 am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
* commit '0bc12a0b13719976aff95a801d88e48c64510d11':
  Added Caching for PreProcessed PNGs
2011-07-20 16:00:44 -07:00
Xavier Ducrohet
0bc12a0b13 Merge "Added Caching for PreProcessed PNGs" 2011-07-20 15:55:33 -07:00
Xavier Ducrohet
2c311be720 am 30824495: am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package"
* commit '3082449508a8c574d0476fdb988f98d9554637ae':
  Add generation of dependency file for .ap_ package
2011-07-20 15:27:39 -07:00
Xavier Ducrohet
3082449508 am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package"
* commit '1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554':
  Add generation of dependency file for .ap_ package
2011-07-20 15:23:55 -07:00
Josiah Gaskin
8a39da80b3 Added Caching for PreProcessed PNGs
Added a cache management system for pre-processed PNG files
along with unit tests. The cache system will be used if
the --no-crunch flag is passed to AAPT during the package
phase. The cache can be updated by a call to 'aapt crunch'
(see usage statement). Also put in benchmarking code.

Change-Id: I58271fb2ee2f5f9075fd74d4ff6f15e7afabd05c
2011-07-20 15:20:26 -07:00
Jeff Brown
ac386073df Remove unimplemented memory pool.
dlmalloc does such a great job that we don't need a pool anyways.

Change-Id: I105b28c4a5c491543959190c7c0a9de75a5b8052
2011-07-20 15:19:50 -07:00
Jim Miller
83261239b0 Merge "Fix 5056699: GridLayout should maintain static indices for "gone" views." 2011-07-20 15:19:19 -07:00
James Dong
e02802306d Let the media recording framework release the Camera object when it is the owner
related-to-bug: 5050535,5036813,5051707

Change-Id: I88e10f65f087931e7f95ab26a018d59f7361103e
2011-07-20 15:15:31 -07:00
Jim Miller
6235b47cba Fix 5056699: GridLayout should maintain static indices for "gone" views.
GridLayout currently ignores views with visibility="gone" when accounting for rows/columns.
Instead it should count views with visibility="gone" as rows/columns with row/height equal to 0.

This also makes it consistent with other ViewGroups like LinearLayout where "gone" views
don't change order and are still present (but hidden) within a container.

Change-Id: I289d4ee6275d5b49b1e1d79985484216bbf48089
2011-07-20 15:13:49 -07:00
Jesse Wilson
f0e85d3af8 Merge "Appease Doclava for ReferenceQueue.remove()" 2011-07-20 15:11:45 -07:00
Xavier Ducrohet
1e24ccbdd5 Merge "Add generation of dependency file for .ap_ package" 2011-07-20 15:08:23 -07:00
Alex Sakhartchouk
835b8544cc Fixing bitmap invalidation bug.
Change-Id: I47776f2c1a567342f0826850237c15a5d6315f71
2011-07-20 14:45:54 -07:00
Adam Powell
ae5df05f22 Merge "Fix bug 5038368 - Rules for collapsing action views." 2011-07-20 14:30:48 -07:00
Adam Powell
b187cd9c54 Fix bug 5038368 - Rules for collapsing action views.
Make collapsing action views exclusive on small screens with unsplit
action bars.

Change-Id: I11cc220acc7b6acddd25f2500404b47bfb405d5c
2011-07-20 14:27:06 -07:00
Jaikumar Ganesh
d3728cb32f Incoming connection dialog tweaks.
Don't show incoming connection dialog when the device shows
the pairing dialog - this means that the device has already been
trusted by the user.

Change-Id: I98a9f56528f6b62d0f824bbc7612aaa0077ba1e6
2011-07-20 13:44:35 -07:00
Jesse Wilson
1d441dd066 Merge "Acknowledge that the platform guarantees UTF-8 and UTF-16." 2011-07-20 13:41:57 -07:00
Jesse Wilson
a7b6316bff Merge "Skip byte order mark (BOM) in JsonReader" 2011-07-20 13:38:24 -07:00
Jesse Wilson
92d3532b93 Appease Doclava for ReferenceQueue.remove()
Bug: http://b/5050245
Change-Id: I1a5483b01c9e27d990c5ea1758539aa423bf7616
2011-07-20 12:57:38 -07:00
Daniel Sandler
7d62990bad Merge "Fix dancing download notifications on phones." 2011-07-20 12:44:20 -07:00
Dave Santoro
32911e72af Merge "Updates and fixes for the social stream API." 2011-07-20 12:43:26 -07:00
Costin Manolache
7288ebd8e5 Merge "waitWithTimeout() needs to check if the result is already available, like waitForActivity() does." 2011-07-20 12:33:42 -07:00
Chia-chi Yeh
b503b85491 Merge "ConnectivityService: Implement VPN callbacks to update DNS servers." 2011-07-20 12:28:04 -07:00
Jesse Wilson
7a2c813d30 Skip byte order mark (BOM) in JsonReader
Bug: http://code.google.com/p/android/issues/detail?id=18508
Change-Id: I7652080d9ab475c75d0a811a6e2ede4975ebe063
2011-07-20 12:23:23 -07:00
Mike Lockwood
a331cdbb40 Merge "MediaScanner: Do separate bulk inserts for different media types" 2011-07-20 12:15:48 -07:00
Debashish Chatterjee
e23fc20e54 Merge "Removed READ_WRITE_ALL_VOICEMAILS permission from framework." 2011-07-20 11:54:56 -07:00
Daniel Sandler
20cdb151c9 Fix dancing download notifications on phones.
There's always going to be some amount of visual noise when
notifications change order, and this can happen any time a
notification changes its "when" field (as is the case for
download progress bars). But in HC we added an optimization
that will reuse the current row if the download is the last
item in the list (so a fresher "when" will still put it at
the end), and that optimization is re-applied here.

Now, if you have multiple notifications all competing for
the top spot, I can't help you. But we had that problem
before (it just wasn't as egregious because we didn't have
the shiny animations).

Bug: 4971404
Change-Id: I5bcc905bdb19a8eb5b4494a6ba9825b4d5373caa
2011-07-20 14:41:41 -04:00
Fabrice Di Meglio
1180644280 Fix bug #4772392 Check what needs to be done for RTL specific new attributes that are in public.xml
- cleanup public.xml
- make BiDiTest makefile non visible to the build system
- provide file for injecting the new attributes by hand

Change-Id: I5037ec323066ebd254be51fff7070a5a0101dff7
2011-07-20 11:38:59 -07:00
Dave Santoro
040e6b302c Updates and fixes for the social stream API.
- Social stream photo updates should use the new photo storage
  system instead of storing the image content in BLOBs.
- Package names need to be text, not numbers.  The status update
  documentation was incorrect.
- Social stream photos will include a URI the caller can open to
  get the photo content.
- Removed the max photo bytes from the stream item limit query,
  as we'll do appropriate resizing with the photo storage system.

Change-Id: I103ee1340c1a3772ae37add3684b0658c241a49c
2011-07-20 11:33:31 -07:00
Debashish Chatterjee
cdf95e3102 Removed READ_WRITE_ALL_VOICEMAILS permission from framework.
This permission is meant to be a 'signature' permission and to be used
only by the contacts app. We recently moved it to framework/base as part
of opening up voicemail api into the SDK. However, the signature of
framework is different from contacts app. Consequently the contacts app
is not granted READ_WRITE_ALL_VOICEMAILS permission. This makes the
contacts app crash on start.

This fix removes the READ_WRITE_ALL_iVOICEMAILS from framework/base so
that the one defined in contacts provider is then used by the system.

Bug: 5054221

Change-Id: Iaa7a23fe95b0142978eff124e25fe2291dc7d212
2011-07-20 19:09:37 +01:00
Eric Laurent
5531a3a3cf Merge "Fix issue 5012047: silent mode mutes music" 2011-07-20 11:04:18 -07:00
Mike Lockwood
e19572ccb5 MediaScanner: Do separate bulk inserts for different media types
This should fix a bunch of problems introduced in the original bulk insert implementation

Also reverted two changes that are no longer necessary:

Revert "MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files"

This reverts commit 92e1314ad9ddbacfb806405e9aceeea4a8aae19f.

Revert "MediaScanner: fix breakage in updates"

This reverts commit 45aaa2a345292bb6d600822db602f25e261c0e50.

Change-Id: Ibed66393467761c2c1ce48deb09bcac505b7d221
2011-07-20 10:58:45 -07:00
Jamie Gennis
7f60a81a2a Merge "MediaPlayer: add a disconnect from ANativeWindow" 2011-07-20 10:47:04 -07:00
Robert Greenwalt
47d4caf41b Merge "Start default connections on startup." 2011-07-20 10:10:24 -07:00
Alex Sakhartchouk
eac3503deb Merge "Correctly call glviewport when surface changes." 2011-07-20 09:41:50 -07:00
Gilles Debunne
caed51bcc2 Merge "Insertion handles fades out after being positionned" 2011-07-20 09:12:41 -07:00
Russell Brenner
4dcd82be66 Merge "Replace DroidKufi-Regular with DroidNaskh-Regular" 2011-07-20 08:39:28 -07:00