39370 Commits

Author SHA1 Message Date
Xavier Ducrohet
889d91cc30 am 3a762f2f: Merge "LayoutLib: Log error when style can\'t be found." into honeycomb
* commit '3a762f2fd1447868c028978ef57801f5f246a504':
  LayoutLib: Log error when style can't be found.
2011-01-11 17:25:27 -08:00
Xavier Ducrohet
3a762f2fd1 Merge "LayoutLib: Log error when style can't be found." into honeycomb 2011-01-11 17:24:06 -08:00
Joe Onorato
dc9bcdf45c am 14770e04: Merge "The status bar half of making the status bar resize when hdmi is plugged in." into honeycomb
* commit '14770e049e10377bd963623891ccb0976b2dd6ee':
  The status bar half of making the status bar resize when hdmi is plugged in.
2011-01-11 17:11:09 -08:00
Joe Onorato
1a6e72fd05 am d938e216: Merge "Update AppWidgetHostActivity to work again." into honeycomb
* commit 'd938e216cb24f7c154cf62135e90b8e6f3de2464':
  Update AppWidgetHostActivity to work again.
2011-01-11 17:11:02 -08:00
Xavier Ducrohet
d7cbf3f72c LayoutLib: Log error when style can't be found.
Change-Id: I9a88cdac44a2d31c053e7f0c92a14e69bd82ac83
2011-01-11 17:11:01 -08:00
Joe Onorato
14770e049e Merge "The status bar half of making the status bar resize when hdmi is plugged in." into honeycomb 2011-01-11 17:09:16 -08:00
Joe Onorato
d938e216cb Merge "Update AppWidgetHostActivity to work again." into honeycomb 2011-01-11 17:08:52 -08:00
Joe Onorato
dc10030581 The status bar half of making the status bar resize when hdmi is plugged in.
Change-Id: Ia349413774ba709fb3242780671c7b459850f4a4
2011-01-11 17:07:41 -08:00
Justin Ho
eb23129e77 am 1a6c5b64: Merge "Dropdown, checkboxes, buttons from Gingerbread" into honeycomb
* commit '1a6c5b64deac492bc58eb94ffdb0ba21aa1934f0':
  Dropdown, checkboxes, buttons from Gingerbread
2011-01-11 16:13:06 -08:00
Justin Ho
1a6c5b64de Merge "Dropdown, checkboxes, buttons from Gingerbread" into honeycomb 2011-01-11 16:11:35 -08:00
Justin Ho
6c3c2f9ff7 Dropdown, checkboxes, buttons from Gingerbread
Change-Id: Iec4818958f7a0cf41dab94695a06b9b3d0f72acb
2011-01-11 16:00:39 -08:00
Adam Powell
431845609f am 16ffa6cb: Merge "Fix bug 3338079 - Dialog styled activity decor" into honeycomb
* commit '16ffa6cb2d31d130bb0b58afca31c461c784ce5d':
  Fix bug 3338079 - Dialog styled activity decor
2011-01-11 15:59:54 -08:00
Adam Powell
16ffa6cb2d Merge "Fix bug 3338079 - Dialog styled activity decor" into honeycomb 2011-01-11 15:58:29 -08:00
Adam Powell
32aa2c90ee Fix bug 3338079 - Dialog styled activity decor
Fixed a bug in FastScroller that could cause a crash on an empty list
in always-show mode.

Fix holo light button text color

Change-Id: I7b50043d715b9b870eb34808017d743ba64d2e08
2011-01-11 15:57:07 -08:00
Justin Ho
3bb4a5451e am 9b5b54b7: Merge "List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)" into honeycomb
* commit '9b5b54b72349982213c1482cfdf2908346921ecd':
  List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)
2011-01-11 15:41:37 -08:00
Justin Ho
4f38ffa115 am d5c91fe0: Merge "Updated HDPI btn_default states from Gingerbread" into honeycomb
* commit 'd5c91fe067d7d65d0a5b31954218d2795f2b7f58':
  Updated HDPI btn_default states from Gingerbread
2011-01-11 15:41:34 -08:00
Justin Ho
9b5b54b723 Merge "List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)" into honeycomb 2011-01-11 15:39:40 -08:00
Justin Ho
d5c91fe067 Merge "Updated HDPI btn_default states from Gingerbread" into honeycomb 2011-01-11 15:39:10 -08:00
Xavier Ducrohet
4eca262902 am 85de0087: Merge "LayoutLib: misc fix." into honeycomb
* commit '85de0087fc6a65a66d3994f0b8dd3fecd9db2526':
  LayoutLib: misc fix.
2011-01-11 15:37:21 -08:00
Xavier Ducrohet
85de0087fc Merge "LayoutLib: misc fix." into honeycomb 2011-01-11 15:34:44 -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
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
Xavier Ducrohet
639e1bd352 LayoutLib: misc fix.
Change-Id: I0e2eff376d8f8e7682c28ef771b886d5fab5ff65
2011-01-11 15:14:51 -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
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
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
Justin Ho
a969294f17 List selectors, menu backgrounds, popups, menu backgrounds from Gingerbread (HDPI and MDPI)
Change-Id: I74ecf0133e7b395caa699b41a7e4f8e60772fd13
2011-01-11 14:21:48 -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
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
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
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
Justin Ho
b61d3baf6c Updated HDPI btn_default states from Gingerbread
Change-Id: I3defa049dfe2364fc2cda6dcce50126ad242d0fb
2011-01-11 14:02:13 -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
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