Commit Graph

26019 Commits

Author SHA1 Message Date
Jaikumar Ganesh
000a9e7a7a 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
Jaikumar Ganesh
6f575943a7 Merge "Update status bar icons for BT reverse tethering." into honeycomb 2011-01-11 14:51:01 -08:00
Scott Main
d31ae5ad2f 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
636fffd4a1 am f3792055: am c5602aee: fix bug 3295540
* commit 'f379205596397500b1a07a72e5693bb81457b2e3':
  fix bug 3295540
2011-01-11 14:22:06 -08:00
Yu Shan Emily Lau
954d053567 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
3f9c3f63e1 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
c2c9c641bb am 50cf2106: Merge "Fix network availability reporting" into honeycomb
* commit '50cf2106b77d4009e1cefe11c57c42fe4584345f':
  Fix network availability reporting
2011-01-11 14:17:59 -08:00
Irfan Sheriff
71d3d72801 Merge "Fix network availability reporting" into honeycomb 2011-01-11 14:16:04 -08:00
Jim Miller
bd0e6bb02c 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
ee9a32d01b Merge "Update AndroidClock font for LockScreen and tweak transparency." into honeycomb 2011-01-11 14:13:37 -08:00
Justin Ho
7deed44212 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
49a53e914f Merge "Updated btn default states (MDPI) from Gingerbread" into honeycomb 2011-01-11 14:05:28 -08:00
Huahui Wu
e3d6185b7e 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
71f7274b27 Merge "b/3331379 reduce ping-to-zoom jitter." into honeycomb 2011-01-11 13:59:46 -08:00
Gilles Debunne
407f109d1d 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
d7890bb1cc 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
29694c07d1 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
Justin Ho
e93ca3640f am 2706a1f8: Merge "Updated permission bullet" into honeycomb
* commit '2706a1f8f60f21bc9b483a93a4b694e60bc68888':
  Updated permission bullet
2011-01-11 13:53:33 -08:00
Justin Ho
51f98e937f am 69c3f8c6: Merge "Updated Help icon" into honeycomb
* commit '69c3f8c6720fd320dd7c8ebf2182b02d7d6d9586':
  Updated Help icon
2011-01-11 13:53:27 -08:00
Dianne Hackborn
5a2da31453 am aab969ec: am 3c902a62: Merge "Avoiding cyclic references when unbinding from a service"
* commit 'aab969ec2baff1f2bcd1d002e9e06e385df5af74':
  Avoiding cyclic references when unbinding from a service
2011-01-11 13:53:22 -08:00
Marco Nelissen
30fc803bf6 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 'd1da80a4b3d50c1be120b0e873363da711428a81':
  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:53:11 -08:00
Nick Pelly
44838490c1 am 240cf3d1: am f54ad8da: Clean up transceive().
* commit '240cf3d17e40c012eb4a830d60f4a6a3607373f0':
  Clean up transceive().
2011-01-11 13:53:01 -08:00
Eric Fischer
2335bb35de am 247cd64c: (-s ours) am 06d19ef0: Merge "Import translations for additional languages." into gingerbread
* commit '247cd64c37c8ec1fa48848fd23f02f5c705268e4':
  Import translations for additional languages.
2011-01-11 13:52:52 -08:00
Justin Ho
ef990d69a0 Merge "Updated permission bullet" into honeycomb 2011-01-11 13:51:33 -08:00
Justin Ho
79d2c4ef27 Merge "Updated Help icon" into honeycomb 2011-01-11 13:51:00 -08:00
Xavier Ducrohet
ac38eefab0 am 2d83400e: Merge "LayoutLib: Improve error reporting." into honeycomb
* commit '2d83400e59f939a25c471d87dbdc7a50ce7f2a44':
  LayoutLib: Improve error reporting.
2011-01-11 13:33:05 -08:00
Xavier Ducrohet
edf9a64687 am 9137e54b: Merge "LayoutLib: fix XmlUtils.convertValueToInt" into honeycomb
* commit '9137e54bd462bfb814c8b8b73f20827e1ba5799b':
  LayoutLib: fix XmlUtils.convertValueToInt
2011-01-11 13:33:01 -08:00
Xavier Ducrohet
6274d81801 Merge "LayoutLib: Improve error reporting." into honeycomb 2011-01-11 13:31:19 -08:00
Xavier Ducrohet
fbbc24dc9c Merge "LayoutLib: fix XmlUtils.convertValueToInt" into honeycomb 2011-01-11 13:31:05 -08:00
Xavier Ducrohet
60004323e5 am b2893591: Merge "LayoutLib: only support animator-type animations." into honeycomb
* commit 'b289359170bc957aad14d65f725e9b6ef18a42f4':
  LayoutLib: only support animator-type animations.
2011-01-11 13:24:52 -08:00
Xavier Ducrohet
73598e6195 Merge "LayoutLib: only support animator-type animations." into honeycomb 2011-01-11 13:22:19 -08:00
Chet Haase
17376125c0 am d8650114: All animator resources moved to res/animator
* commit 'd865011473aae8dcddc4a8a1350c46d6aed4079a':
  All animator resources moved to res/animator
2011-01-11 13:18:47 -08:00
Leon Scroggins
619f01f18a am 9fafe4e0: Merge "Find when pressing enter. Call onClickListener in TextView." into honeycomb
* commit '9fafe4e0ebab270591a505f1f07fd2e5489a16f7':
  Find when pressing enter.  Call onClickListener in TextView.
2011-01-11 12:43:20 -08:00
Leon Scroggins
23700c9eb9 Merge "Find when pressing enter. Call onClickListener in TextView." into honeycomb 2011-01-11 12:41:52 -08:00
Daniel Sandler
2b776ac63d am 033376f6: Merge "Simplify panel animations with an eye to performance." into honeycomb
* commit '033376f6f0cb65f4cf5862c92ca0bf8ad5895566':
  Simplify panel animations with an eye to performance.
2011-01-11 12:31:28 -08:00
Kenny Root
1aef3d5d6c am 2275cd48: Merge "Copy user info from PackageSetting as well" into honeycomb
* commit '2275cd48a23d042d3196ccddbc83afa1630d0a41':
  Copy user info from PackageSetting as well
2011-01-11 12:31:25 -08:00
James Dong
d3042b274d am 53006903: Merge "Fix uninitialized rect structure for retrieving rect cropping information from decoder" into honeycomb
* commit '530069031e177c53b1cc3d3e1bdbd44b8aaa0857':
  Fix uninitialized rect structure for retrieving rect cropping information from decoder
2011-01-11 12:31:17 -08:00
Shimeng (Simon) Wang
c3665971c5 am c1960a60: Merge "Change function parameter from int to float." into honeycomb
* commit 'c1960a602037fc4a421e56794bbc581e650b3bcb':
  Change function parameter from int to float.
2011-01-11 12:30:35 -08:00
Xavier Ducrohet
a023dcfb21 am 7dae72a6: Merge "LayoutLib: fix some issue with resource resolution." into honeycomb
* commit '7dae72a62778f817c174a75b6a355484bbd28344':
  LayoutLib: fix some issue with resource resolution.
2011-01-11 12:30:22 -08:00
Vasu Nori
baebf681c7 am d126d724: Merge "bug:3339065 enable sqlite concurrency enhancing feature on settingsprovider" into honeycomb
* commit 'd126d724f1bcf528775dd14896aa8641cc3b6b97':
  bug:3339065 enable sqlite concurrency enhancing feature on settingsprovider
2011-01-11 12:30:13 -08:00
Daniel Sandler
e7d3882f8d Merge "Simplify panel animations with an eye to performance." into honeycomb 2011-01-11 11:51:59 -08:00
Kenny Root
1808ee1ee6 Merge "Copy user info from PackageSetting as well" into honeycomb 2011-01-11 11:46:19 -08:00
James Dong
52e40df42d Merge "Fix uninitialized rect structure for retrieving rect cropping information from decoder" into honeycomb 2011-01-11 11:23:47 -08:00
Shimeng (Simon) Wang
c288f19855 Merge "Change function parameter from int to float." into honeycomb 2011-01-11 10:54:43 -08:00
Xavier Ducrohet
512db8d8d4 Merge "LayoutLib: fix some issue with resource resolution." into honeycomb 2011-01-11 10:42:37 -08:00
Vasu Nori
bc0e73e741 Merge "bug:3339065 enable sqlite concurrency enhancing feature on settingsprovider" into honeycomb 2011-01-11 10:37:22 -08:00
Robert Greenwalt
1c1593c613 am cef29578: Merge "Change local names for greater clarity." into honeycomb
* commit 'cef295780ade72a26201c0c92ed2b64fde03a261':
  Change local names for greater clarity.
2011-01-11 10:18:05 -08:00
Robert Greenwalt
2331720d85 Merge "Change local names for greater clarity." into honeycomb 2011-01-11 10:15:21 -08:00
Svetoslav Ganov
e364a29d1a am 52b13678: Merge "IOBE while diabling accessibility with some enabled accessibility services." into honeycomb
* commit '52b136783cf7b538aae290b6dc609849f3ad695f':
  IOBE while diabling accessibility with some enabled accessibility services.
2011-01-11 10:03:17 -08:00
Svetoslav Ganov
a88007df6e Merge "IOBE while diabling accessibility with some enabled accessibility services." into honeycomb 2011-01-11 10:01:00 -08:00