Dianne Hackborn
5eefd98aa3
am a9d8a69a: am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
...
* commit 'a9d8a69a044c8e0c2d3268ed98bd17063faaeb1e':
Referencing of "r.record.name" is occured, when "r.record" is null.
2011-01-12 00:04:18 -08:00
Chris Tate
ba96a561e2
am 69f8d3c6: (-s ours) am bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct
...
* commit '69f8d3c667669dc1858c21ee798c0f836f53235e':
DO NOT MERGE : Ensure that the first post-restore backup pass is correct
2011-01-12 00:04:12 -08:00
Chris Tate
46af781a1c
am 9b1bd2c7: (-s ours) am 6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
...
* commit '9b1bd2c7d1acffa1079d589811450140518e5ce5':
DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
2011-01-12 00:04:04 -08:00
Dianne Hackborn
b0735d86c7
am 412ebd6f: am 433863b1: Fix issue #3333958 : Package Manager can sometimes mistakenly think...
...
* commit '412ebd6f9d18eebc11d8473318316aef1dfc5caa':
Fix issue #3333958 : Package Manager can sometimes mistakenly think...
2011-01-12 00:03:53 -08:00
Dianne Hackborn
248528cc89
am 95db1cfc: am cd23823d: Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread
...
* commit '95db1cfc741c23c7f4192128e3b7bb3c43761bdb':
2011-01-12 00:03:45 -08:00
Wei-Ta Chen
2cd221c929
am 4b9adfbe: Merge "Correct the API comments." into honeycomb
...
* commit '4b9adfbe7d0cf578b82eb7794c506ad1986854b9':
Correct the API comments.
2011-01-11 23:18:29 -08:00
Wei-Ta Chen
4b9adfbe7d
Merge "Correct the API comments." into honeycomb
2011-01-11 23:16:15 -08:00
Wei-Ta Chen
96d3b5e383
Correct the API comments.
...
BitmapRegionDecoder supports PNG as well.
Change-Id: I5f1b95c20c3ae87738f9814cfc16d6a4c5af2bf5
2011-01-11 23:06:56 -08:00
Svetoslav Ganov
d753aea1ad
am 2ad2bf23: Merge "Renaming NumberPicker resources to be consistent." into honeycomb
...
* commit '2ad2bf232714009586c5163e08754886bdd9ea20':
Renaming NumberPicker resources to be consistent.
2011-01-11 21:58:22 -08:00
Svetoslav Ganov
2ad2bf2327
Merge "Renaming NumberPicker resources to be consistent." into honeycomb
2011-01-11 21:56:03 -08:00
Christopher Tate
771fcc5e3d
am 28514f8f: Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb
...
* commit '28514f8f9cdac95799d5654a30fe36ef05443dd3':
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
2011-01-11 20:03:57 -08:00
Christopher Tate
28514f8f9c
Merge "API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"" into honeycomb
2011-01-11 20:02:35 -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
af62958690
am 9688fdf5: am fcf3d12d: Merge "Typo in Javadoc"
...
* commit '9688fdf51edb82a73e1a6d436bf7bce706c049fb':
Typo in Javadoc
2011-01-11 19:34:38 -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
Christopher Tate
02d2b3ba9b
API CHANGE: startDrag() now takes "int flags" instead of "boolean localOnly"
...
There will be, in the future, a flag (View.DRAG_FLAG_GLOBAL) that means
for the drag to be cross-application. For now that flag constant is @hide
and furthermore the server-side implementation strips it, enforcing
local-only drags.
Change-Id: I8db840480ab90e18a5b8ecf29d62b4e6eafd405e
2011-01-11 18:30:23 -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
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
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
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
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
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
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
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
Irfan Sheriff
7ac190d60d
Merge "default wifi sleep policy change" into honeycomb
2011-01-11 17:26:18 -08:00
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