Chung-yih Wang
48ada99823
am 15f8d75f: am 8df7b060: Merge "Merge "Add auth. username in SipProfile." from gingerbread." into honeycomb
...
* commit '15f8d75f513f9ab411a10bf5352be601c9cc8af9':
Merge "Add auth. username in SipProfile." from gingerbread.
2011-01-11 19:51:49 -08:00
Chung-yih Wang
15f8d75f51
am 8df7b060: Merge "Merge "Add auth. username in SipProfile." from gingerbread." into honeycomb
...
* commit '8df7b060fa8d3eb6d9874af01f2d189d0ceb74d7':
Merge "Add auth. username in SipProfile." from gingerbread.
2011-01-11 19:49:34 -08:00
Chung-yih Wang
8df7b060fa
Merge "Merge "Add auth. username in SipProfile." from gingerbread." into honeycomb
2011-01-11 19:47:48 -08:00
Chung-yih Wang
0f7de88cb9
Merge "Add auth. username in SipProfile." from gingerbread.
...
bug:3326867
Change-Id: Ic67dd7d4858f28224e4f01ad8b65bcd3a3c15f10
2011-01-12 11:43:27 +08:00
Romain Guy
47e9e01f48
am af629586: am 9688fdf5: am fcf3d12d: Merge "Typo in Javadoc"
...
* commit 'af6295869051ad351070354bff9f01e5e65ea824':
Typo in Javadoc
2011-01-11 19:37:04 -08:00
Romain Guy
af62958690
am 9688fdf5: am fcf3d12d: Merge "Typo in Javadoc"
...
* commit '9688fdf51edb82a73e1a6d436bf7bce706c049fb':
Typo in Javadoc
2011-01-11 19:34:38 -08:00
Stephen Hines
1c6cbd551f
am 445fc566: am 78dd1ef3: Merge "Clean up RS math headers." into honeycomb
...
* commit '445fc56682a55a3c0ba8e63970631f48adced7cf':
Clean up RS math headers.
2011-01-11 19:14:35 -08:00
Stephen Hines
445fc56682
am 78dd1ef3: Merge "Clean up RS math headers." into honeycomb
...
* commit '78dd1ef3f70ff80bf9697ba53601bda48451c044':
Clean up RS math headers.
2011-01-11 19:12:23 -08:00
Stephen Hines
78dd1ef3f7
Merge "Clean up RS math headers." into honeycomb
2011-01-11 19:09:47 -08:00
Svetoslav Ganov
b449675905
am 2b6f5210: am 5220834c: Merge "Down arrow on the month can end up at the start of the month" into honeycomb
...
* commit '2b6f5210ec4fe87bfa40f663dd019c7eb6d1552d':
Down arrow on the month can end up at the start of the month
2011-01-11 18:09:25 -08:00
Svetoslav Ganov
2b6f5210ec
am 5220834c: Merge "Down arrow on the month can end up at the start of the month" into honeycomb
...
* commit '5220834c6ccdabf949dfe7160548ad378850d71b':
Down arrow on the month can end up at the start of the month
2011-01-11 18:06:46 -08:00
Svetoslav Ganov
5220834c6c
Merge "Down arrow on the month can end up at the start of the month" into honeycomb
2011-01-11 18:04:42 -08:00
Romain Guy
eb5405762f
am a22bcfb6: am 6ed4a2f7: Merge "Disable the region compositing pipeline for layers." into honeycomb
...
* commit 'a22bcfb6a471946969a33c1637f4460897f5576f':
Disable the region compositing pipeline for layers.
2011-01-11 18:03:04 -08:00
Dianne Hackborn
b540514cb2
am b5637c46: am 45a8f53b: Merge "Get rid of old ParcelFileDescriptor API." into honeycomb
...
* commit 'b5637c467d7ea859f589d2006f3806c5a2c4a27f':
Get rid of old ParcelFileDescriptor API.
2011-01-11 18:02:58 -08:00
Romain Guy
acd5366fb9
am a82444ad: am 5f6e583c: Merge "Don\'t break the build!" into honeycomb
...
* commit 'a82444ad3aa87cc8ce8a585a6e1937ac6cd9ee18':
Don't break the build!
2011-01-11 18:00:47 -08:00
Romain Guy
a22bcfb6a4
am 6ed4a2f7: Merge "Disable the region compositing pipeline for layers." into honeycomb
...
* commit '6ed4a2f72531c2d9f256c19b09414aa9ea5da8c5':
Disable the region compositing pipeline for layers.
2011-01-11 18:00:31 -08:00
Dianne Hackborn
b5637c467d
am 45a8f53b: Merge "Get rid of old ParcelFileDescriptor API." into honeycomb
...
* commit '45a8f53b25c8306c7f2c37f3a1d70ace21956e28':
Get rid of old ParcelFileDescriptor API.
2011-01-11 18:00:26 -08:00
Svetoslav Ganov
d7419986ca
Down arrow on the month can end up at the start of the month
...
bug:3338078
1. The bug was that I was claculating delta month and day from
the current date but was changing the latter in the middle
thus causing inconsistent state.
Change-Id: Id3082b01778fc2b3116aa412aff3f12e9ebf0c97
2011-01-11 17:59:32 -08:00
Romain Guy
6ed4a2f725
Merge "Disable the region compositing pipeline for layers." into honeycomb
2011-01-11 17:58:56 -08:00
Romain Guy
35f24545e5
Disable the region compositing pipeline for layers.
...
This composition mode is affecting Gmail in a bad way. Disabling until
I can figure out the problem.
Change-Id: I00e657ea2d05fc7b4a606242d19dc84dd88c1e35
2011-01-11 18:01:25 -08:00
Romain Guy
a9d0711392
Don't break the build!
...
Change-Id: I42f68c7b023c03adeedc4e979e5f4705188ee9f4
2011-01-11 17:59:10 -08:00
Svetoslav Ganov
4d8939f50a
am 8aba7513: am 147f7df3: Merge "IAE: Service not registered: com.android.server.AccessibilityManagerService" into honeycomb
...
* commit '8aba7513481594611c22d444dde6e666fefd1fc0':
IAE: Service not registered: com.android.server.AccessibilityManagerService
2011-01-11 17:58:41 -08:00
Romain Guy
a82444ad3a
am 5f6e583c: Merge "Don\'t break the build!" into honeycomb
...
* commit '5f6e583cc8c27ac2eb217a7d1065a6aeda00a033':
Don't break the build!
2011-01-11 17:58:18 -08:00
Dianne Hackborn
45a8f53b25
Merge "Get rid of old ParcelFileDescriptor API." into honeycomb
2011-01-11 17:57:19 -08:00
Romain Guy
b0af4188fd
am 65028473: am d139a0ca: Merge "Better backend for hardware layers." into honeycomb
...
* commit '650284739ea5812b25d0c735b3342447d91759af':
Better backend for hardware layers.
2011-01-11 17:56:25 -08:00
Dianne Hackborn
540f86aa42
Get rid of old ParcelFileDescriptor API.
...
Also some new debugging code in AsyncTaskLoader.
Change-Id: Ib13386b7862821cf0ee31b003bedef78f46240f1
2011-01-11 17:56:12 -08:00
Svetoslav Ganov
8aba751348
am 147f7df3: Merge "IAE: Service not registered: com.android.server.AccessibilityManagerService" into honeycomb
...
* commit '147f7df35c554cf24287c732f8b74b0018e1ddbe':
IAE: Service not registered: com.android.server.AccessibilityManagerService
2011-01-11 17:56:11 -08:00
Romain Guy
5f6e583cc8
Merge "Don't break the build!" into honeycomb
2011-01-11 17:56:09 -08:00
Jason Sams
a3386711ba
am ce0e1820: am d345505a: Merge "Add error checks to bitmap uploads. Fix java side calculation for pixel sizes." into honeycomb
...
* commit 'ce0e1820926b3879e080ae00bffaf225815a56a2':
Add error checks to bitmap uploads. Fix java side calculation for pixel sizes.
2011-01-11 17:54:11 -08:00
Svetoslav Ganov
8a10977f29
am 0879ea32: am 49c771c4: Merge "WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content." into honeycomb
...
* commit '0879ea32283a53c08a3df4e9499420a98be44fa7':
WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content.
2011-01-11 17:54:05 -08:00
Romain Guy
650284739e
am d139a0ca: Merge "Better backend for hardware layers." into honeycomb
...
* commit 'd139a0ca25dbabfaeaed6383f3177704fe0183e2':
Better backend for hardware layers.
2011-01-11 17:53:58 -08:00
Romain Guy
6c319ca127
Better backend for hardware layers.
...
With this new backend, a hardware layer is only recreated when
its associated view is udpated. This offers fast composition
in GL and fast update of the layer in GL as well.
Change-Id: I97c43a612f5955c6bf1c192c8ca4af10fdf1d076
2011-01-11 17:53:19 -08:00
Svetoslav Ganov
147f7df35c
Merge "IAE: Service not registered: com.android.server.AccessibilityManagerService" into honeycomb
2011-01-11 17:53:15 -08:00
Romain Guy
d139a0ca25
Merge "Better backend for hardware layers." into honeycomb
2011-01-11 17:52:05 -08:00
Jason Sams
ce0e182092
am d345505a: Merge "Add error checks to bitmap uploads. Fix java side calculation for pixel sizes." into honeycomb
...
* commit 'd345505a32f991ffb74639795451f545141b8890':
Add error checks to bitmap uploads. Fix java side calculation for pixel sizes.
2011-01-11 17:47:42 -08:00
Svetoslav Ganov
0879ea3228
am 49c771c4: Merge "WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content." into honeycomb
...
* commit '49c771c4da8bb7cf135e6afed3a901b1744beb67':
WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content.
2011-01-11 17:45:37 -08:00
Jason Sams
d345505a32
Merge "Add error checks to bitmap uploads. Fix java side calculation for pixel sizes." into honeycomb
2011-01-11 17:44:39 -08:00
Eric Fischer
9b1bef00ae
am 0001f1e8: am 2ea2553b: Merge "Update large-screen translations." into honeycomb
...
* commit '0001f1e8f9ec931d90dfa3ee480ec34bcf570c36':
Update large-screen translations.
2011-01-11 17:43:23 -08:00
Svetoslav Ganov
49c771c4da
Merge "WebView accessibility key bindings do not allow mapping of all meta keys. Exception when turning off acessibility and having a WebView showing content." into honeycomb
2011-01-11 17:43:01 -08:00
Jason Sams
252c07802f
Add error checks to bitmap uploads.
...
Fix java side calculation for pixel sizes.
Change-Id: I2636db2ccdc9a330214fe9d8b26617b33e52ec8e
2011-01-11 17:42:52 -08:00
Eric Fischer
0001f1e8f9
am 2ea2553b: Merge "Update large-screen translations." into honeycomb
...
* commit '2ea2553bda727f60fb05043cd13588091533f551':
Update large-screen translations.
2011-01-11 17:41:01 -08:00
Eric Fischer
2ea2553bda
Merge "Update large-screen translations." into honeycomb
2011-01-11 17:39:12 -08:00
Justin Ho
45ff7c3bd2
am e2d63a47: am 2d2899f9: Merge "Updated expander assets from Gingerbread" into honeycomb
...
* commit 'e2d63a4794d4280c3c562e519c15be2edad869d5':
Updated expander assets from Gingerbread
2011-01-11 17:39:08 -08:00
Justin Ho
e2d63a4794
am 2d2899f9: Merge "Updated expander assets from Gingerbread" into honeycomb
...
* commit '2d2899f9ff292ecb7d1d8564ed52229bdd93819b':
Updated expander assets from Gingerbread
2011-01-11 17:36:38 -08:00
Justin Ho
2d2899f9ff
Merge "Updated expander assets from Gingerbread" into honeycomb
2011-01-11 17:34:34 -08:00
Justin Ho
9c2a702722
Updated expander assets from Gingerbread
...
Change-Id: Ieb5e47bc6907e6805ae55be3a9efa13b47309cdd
2011-01-11 17:33:10 -08:00
Irfan Sheriff
7f338c460f
am f537bbdd: am 7ac190d6: Merge "default wifi sleep policy change" into honeycomb
...
* commit 'f537bbdda0e0b7bd8052d278b8970d59477cd6c1':
default wifi sleep policy change
2011-01-11 17:31:12 -08:00
Irfan Sheriff
f537bbdda0
am 7ac190d6: Merge "default wifi sleep policy change" into honeycomb
...
* commit '7ac190d60d794b5f75b094a0b9a3f666742d42fb':
default wifi sleep policy change
2011-01-11 17:28:39 -08:00
Xavier Ducrohet
45b6fcc543
am 889d91cc: am 3a762f2f: Merge "LayoutLib: Log error when style can\'t be found." into honeycomb
...
* commit '889d91cc302f4afa01f7069a697d3ea9e5108355':
LayoutLib: Log error when style can't be found.
2011-01-11 17:28:00 -08:00
Irfan Sheriff
7ac190d60d
Merge "default wifi sleep policy change" into honeycomb
2011-01-11 17:26:18 -08:00