Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,591 Commits 3 Branches 0 Tags
57c1925d8632b94dac4be9f71ce16f3534b618ff
Commit Graph

39591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Huber
57c1925d86 am d22f7149: am 0827e697: Merge "Increase cache size and low-watermark threshold, also" into honeycomb 
* commit 'd22f7149736aba8f8e4ac4c7b1e307c2ddd0fb04':
  Increase cache size and low-watermark threshold, also
 2011-01-11 15:25:29 -08:00
Andreas Huber
6cbc59baa2 am 850e76b4: am 7f92be88: Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb 
* commit '850e76b426be9330a8ef5928e173aa809d62564d':
  Properly parse Matroska lacing flags and extract all frames contained in a block.
 2011-01-11 15:25:26 -08:00
Romain Guy
14cb46ba21 am b497fa65: am b7968896: Merge "Solve translucency issue when drawing paths." into honeycomb 
* commit 'b497fa65a84f22591766c451920ef716a0c16cec':
  Solve translucency issue when drawing paths.
 2011-01-11 15:25:22 -08:00
Andreas Huber
d22f714973 am 0827e697: Merge "Increase cache size and low-watermark threshold, also" into honeycomb 
* commit '0827e697a9965195ca12ba593332c555702aa94a':
  Increase cache size and low-watermark threshold, also
 2011-01-11 15:22:46 -08:00
Andreas Huber
850e76b426 am 7f92be88: Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb 
* commit '7f92be88e0d89a693bed4d620a83aea1a989c68e':
  Properly parse Matroska lacing flags and extract all frames contained in a block.
 2011-01-11 15:22:42 -08:00
Romain Guy
b497fa65a8 am b7968896: Merge "Solve translucency issue when drawing paths." into honeycomb 
* commit 'b796889671c089fb7e2fc4498aa701d3e8e552a3':
  Solve translucency issue when drawing paths.
 2011-01-11 15:22:39 -08:00
Andreas Huber
0827e697a9 Merge "Increase cache size and low-watermark threshold, also" into honeycomb 2011-01-11 15:20:39 -08:00
Gloria Wang
0e89c2ad5f am 3b7983cf: am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes." 
* commit '3b7983cfea8885e394e7d625a31cbd0ae71e8edb':
  DRM Framework bug fixes.
 2011-01-11 15:19:52 -08:00
Scott Main
294cd472d9 resolved conflicts for merge of e15c4e4d to master 
Change-Id: Id4bd0d0aac5603f129a87fdf4dc33831aea3addf
 2011-01-11 15:16:57 -08:00
Andreas Huber
7f92be88e0 Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb 2011-01-11 15:16:04 -08:00
Andreas Huber
52c7832e35 Increase cache size and low-watermark threshold, also 
MediaPlayer now sends out MEDIA_INFO,MEDIA_INFO_VIDEO_TRACK_LAGGING messages
to the JAVA client informing it how much (if at all) the video lags behind
audio (arg2 is the media delay in ms).

Change-Id: I6933f573d8597a35112e4b5ee0fcb826a7f6ddd1
related-to-bug: 3335220
 2011-01-11 15:05:28 -08:00
Romain Guy
b796889671 Merge "Solve translucency issue when drawing paths." into honeycomb 2011-01-11 15:01:02 -08:00
Romain Guy
32228288a9 Solve translucency issue when drawing paths. 
Change-Id: I68ae0e2ccddaca2f76b5b2dd3e3cf1277fddaad6
 2011-01-11 15:02:21 -08:00
Gloria Wang
3b7983cfea am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes." 
* commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d':
  DRM Framework bug fixes.
 2011-01-11 14:55:56 -08:00
Jaikumar Ganesh
1cc72a0a64 am a94aeb31: am 0c848553: Merge "Update status bar icons for BT reverse tethering." into honeycomb 
* commit 'a94aeb3175aca5695030b190a3bca0eae5ef3c4d':
  Update status bar icons for BT reverse tethering.
 2011-01-11 14:54:49 -08:00
Scott Main
e15c4e4d63 Merge "resolved conflicts for merge of ac8d7926 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-01-11 14:53:52 -08:00
Jaikumar Ganesh
a94aeb3175 am 0c848553: Merge "Update status bar icons for BT reverse tethering." into honeycomb 
* commit '0c848553346b0f80c7baa0aa08ec1b9d440e442c':
  Update status bar icons for BT reverse tethering.
 2011-01-11 14:53:21 -08:00
Scott Main
7024a313e4 resolved conflicts for merge of ac8d7926 to honeycomb-plus-aosp 
Change-Id: I873904e7724c3822d6011b507649c9d2d9e9bfef
 2011-01-11 14:51:21 -08:00
Jaikumar Ganesh
0c84855334 Merge "Update status bar icons for BT reverse tethering." into honeycomb 2011-01-11 14:51:01 -08:00
Scott Main
071c988d32 am 9008121c: am 246a01b1: am 3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard 
* commit '9008121c9719c70f581cd48ea206296cbb275153':
  cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
 2011-01-11 14:25:16 -08:00
Scott Main
2630da08cd am 7c7912a6: am f3792055: am c5602aee: fix bug 3295540 
* commit '7c7912a65c5f7e3944c5bd881f6569459f4c568f':
  fix bug 3295540
 2011-01-11 14:25:10 -08:00
Yu Shan Emily Lau
a85a034244 am 513f3ab0: am 5619da8d: am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread 
* commit '513f3ab0500230be5975dee21113a30be1de8a6f':
  Fix the test application orientation. Bug# 3205196
 2011-01-11 14:25:07 -08:00
Gilles Debunne
866670caff am 4051ba8c: am ce77f1b7: (-s ours) am 9ffb0a0d: Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread 
* commit '4051ba8cffba2f2d5fdac9575b1fd85061a64baa':
  Ran fixPngMetaTags on all the core/res assets.
 2011-01-11 14:25:03 -08:00
Scott Main
9008121c97 am 246a01b1: am 3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard 
* commit '246a01b1dedd11e4de4678dedc5cf8eeca922ead':
  cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
 2011-01-11 14:22:14 -08:00
Scott Main
7c7912a65c am f3792055: am c5602aee: fix bug 3295540 
* commit 'f379205596397500b1a07a72e5693bb81457b2e3':
  fix bug 3295540
 2011-01-11 14:22:06 -08:00
Yu Shan Emily Lau
513f3ab050 am 5619da8d: am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread 
* commit '5619da8d8b66337db182a016619efa1f31266a78':
  Fix the test application orientation. Bug# 3205196
 2011-01-11 14:21:59 -08:00
Gilles Debunne
4051ba8cff am ce77f1b7: (-s ours) am 9ffb0a0d: Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread 
* commit 'ce77f1b7ff24a7c867a8274ffb6388ba2a874441':
  Ran fixPngMetaTags on all the core/res assets.
 2011-01-11 14:21:51 -08:00
Irfan Sheriff
49e1e42e50 am 5fe093cd: am 50cf2106: Merge "Fix network availability reporting" into honeycomb 
* commit '5fe093cd1f202233740190804f75555d83fcc350':
  Fix network availability reporting
 2011-01-11 14:19:58 -08:00
Irfan Sheriff
5fe093cd1f am 50cf2106: Merge "Fix network availability reporting" into honeycomb 
* commit '50cf2106b77d4009e1cefe11c57c42fe4584345f':
  Fix network availability reporting
 2011-01-11 14:17:59 -08:00
Jim Miller
ffce0fbcdd am f7528606: am c82c787c: Merge "Update AndroidClock font for LockScreen and tweak transparency." into honeycomb 
* commit 'f75286061bf059baf20fe520f24945ccdd3e5ba3':
  Update AndroidClock font for LockScreen and tweak transparency.
 2011-01-11 14:17:53 -08:00
Irfan Sheriff
50cf2106b7 Merge "Fix network availability reporting" into honeycomb 2011-01-11 14:16:04 -08:00
Jim Miller
f75286061b am c82c787c: Merge "Update AndroidClock font for LockScreen and tweak transparency." into honeycomb 
* commit 'c82c787caa6bf4ef08a81e0a6ed9e12e52f35114':
  Update AndroidClock font for LockScreen and tweak transparency.
 2011-01-11 14:15:55 -08:00
Jim Miller
c82c787caa Merge "Update AndroidClock font for LockScreen and tweak transparency." into honeycomb 2011-01-11 14:13:37 -08:00
Justin Ho
9ce5c02e57 am 6632169d: am 910a347c: Merge "Updated btn default states (MDPI) from Gingerbread" into honeycomb 
* commit '6632169d8413d700a69e59f6d6163a026e7994c0':
  Updated btn default states (MDPI) from Gingerbread
 2011-01-11 14:09:12 -08:00
Justin Ho
6632169d84 am 910a347c: Merge "Updated btn default states (MDPI) from Gingerbread" into honeycomb 
* commit '910a347cee738bbd8da4b6386bfe95c0bf0566bf':
  Updated btn default states (MDPI) from Gingerbread
 2011-01-11 14:07:14 -08:00
Justin Ho
910a347cee Merge "Updated btn default states (MDPI) from Gingerbread" into honeycomb 2011-01-11 14:05:28 -08:00
Huahui Wu
7cb72bae6b am 0a8fb4b2: am 3ee37b12: Merge "b/3331379 reduce ping-to-zoom jitter." into honeycomb 
* commit '0a8fb4b21aad9b3bd63567c91f5b7cd1959b3392':
  b/3331379 reduce ping-to-zoom jitter.
 2011-01-11 14:05:08 -08:00
Huahui Wu
0a8fb4b21a am 3ee37b12: Merge "b/3331379 reduce ping-to-zoom jitter." into honeycomb 
* commit '3ee37b12d598d7354fddb698bc6bdefb3b390f64':
  b/3331379 reduce ping-to-zoom jitter.
 2011-01-11 14:02:46 -08:00
Huahui Wu
3ee37b12d5 Merge "b/3331379 reduce ping-to-zoom jitter." into honeycomb 2011-01-11 13:59:46 -08:00
Justin Ho
5a999e7729 Updated btn default states (MDPI) from Gingerbread 
Change-Id: I09006ef68d7b17e0a1dde56d24bf90a97cb4069d
 2011-01-11 13:58:24 -08:00
Gilles Debunne
d51fc1eaaa am 6c0694a8: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 
* commit '6c0694a8de2ec9157d018ac3a66606d3e26c1b53':
  Updated permission bullet
  Updated Help icon
 2011-01-11 13:56:37 -08:00
Gilles Debunne
5450c7b194 am bf1f63dd: (-s ours) am f9335c1f: (-s ours) am 97664784: Merge "Asset cleanup. DO NOT MERGE" into gingerbread 
* commit 'bf1f63dd3d696103c92148b4bdfc61f83bae79fa':
  Asset cleanup. DO NOT MERGE
 2011-01-11 13:56:32 -08:00
Marco Nelissen
0605d95921 am 9356e609: am 2888208b: am f13d4501: Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831 
* commit '9356e6093e804931d59ac30bacb2339ad690b2e5':
  Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
 2011-01-11 13:56:29 -08:00
Dianne Hackborn
80a77cd151 am 2a17b9c1: am aab969ec: am 3c902a62: Merge "Avoiding cyclic references when unbinding from a service" 
* commit '2a17b9c1dc7468aad2a66b2c02da7afd338f5122':
  Avoiding cyclic references when unbinding from a service
 2011-01-11 13:56:25 -08:00
Marco Nelissen
e099fcded1 am f61caad0: am d1da80a4: am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831 
* commit 'f61caad0b8e01345fde98b4dff3d110127d5d669':
  Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
 2011-01-11 13:56:21 -08:00
Nick Pelly
878d05e538 am 9667f4d4: am 240cf3d1: am f54ad8da: Clean up transceive(). 
* commit '9667f4d435744799e372537d3b02a692958f5886':
  Clean up transceive().
 2011-01-11 13:56:16 -08:00
Eric Fischer
a9cb06f520 am 95c28021: am 247cd64c: (-s ours) am 06d19ef0: Merge "Import translations for additional languages." into gingerbread 
* commit '95c2802126923f55f1a79d1c53af4ba680d642da':
  Import translations for additional languages.
 2011-01-11 13:56:11 -08:00
Gilles Debunne
6c0694a8de Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-01-11 13:54:03 -08:00
Gilles Debunne
bf1f63dd3d am f9335c1f: (-s ours) am 97664784: Merge "Asset cleanup. DO NOT MERGE" into gingerbread 
* commit 'f9335c1f23270b0b0d2649f6a95fe7f4cc0422ee':
  Asset cleanup. DO NOT MERGE
 2011-01-11 13:53:43 -08:00
Marco Nelissen
9356e6093e am 2888208b: am f13d4501: Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831 
* commit '2888208b0bb38ac93bb6b500992869c8a6bf244c':
  Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
 2011-01-11 13:53:34 -08:00