Shih-wei Liao
7e5dc299f3
am c758f1c6: Merge "Fix the build." into honeycomb
...
* commit 'c758f1c6a3bd0a65c85572847903c44307d04237':
Fix the build.
2011-01-13 02:07:48 -08:00
Shih-wei Liao
faf88e2d9d
am f6dd9c53: Merge "On-device linking." into honeycomb
...
* commit 'f6dd9c539c1b18f65674b495cb23bf2df36da7af':
On-device linking.
2011-01-13 02:07:39 -08:00
Shih-wei Liao
078717be07
Merge "Disable on-device linking" into honeycomb
2011-01-13 02:06:17 -08:00
Shih-wei Liao
0394d2495a
Disable on-device linking
...
Change-Id: I7c416c7c9714fae0722e61c4f0368fbdb7d808b3
2011-01-13 02:05:34 -08:00
Shih-wei Liao
9b024b693e
am 3ae5017b: Merge "convert2uchar3." into honeycomb
...
* commit '3ae5017b1bc2910610194cc8790e8d96516ac9b5':
convert2uchar3.
2011-01-13 02:05:32 -08:00
Shih-wei Liao
c758f1c6a3
Merge "Fix the build." into honeycomb
2011-01-13 02:04:10 -08:00
Shih-wei Liao
f6dd9c539c
Merge "On-device linking." into honeycomb
2011-01-13 02:04:00 -08:00
Shih-wei Liao
3ae5017b1b
Merge "convert2uchar3." into honeycomb
2011-01-13 02:03:51 -08:00
Shih-wei Liao
3a3dd2b37c
Fix the build.
...
Change-Id: I20ac8700bcc8ccb7905f82bbfea81d007f67a68e
2011-01-13 02:03:00 -08:00
Svetoslav Ganov
bfc3ce78f4
Updating the WebView accessibility key bindings after discussion with the access-eng team
...
Change-Id: I39a303864b94a8a11b6cded9b8bb23041ad91502
2011-01-13 01:20:39 -08:00
Adam Powell
1fc7c0462e
am 2ea9aaa2: Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb
...
* commit '2ea9aaa2458ca468b8f127d8c69746a009df12a6':
Fix bugs 3077517 and 3309579 - ListView bugs
2011-01-12 23:52:25 -08:00
Adam Powell
2ea9aaa245
Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb
2011-01-12 23:50:05 -08:00
Adam Powell
4032252c99
Fix bugs 3077517 and 3309579 - ListView bugs
...
Fix smoothScrollPositionFromTop scrolling too far on reverse scrolls
Fix an invalid touch mode when smoothScrollBy attempts to scroll off
the end of a list
2011-01-12 23:45:01 -08:00
Guang Zhu
fdc911f237
am 37f81344: Merge "change webkit test data path" into honeycomb
...
* commit '37f813443dbe51277c2d849eb2b53caa137d50f7':
change webkit test data path
2011-01-12 23:32:00 -08:00
Guang Zhu
37f813443d
Merge "change webkit test data path" into honeycomb
2011-01-12 23:29:53 -08:00
Justin Ho
eff3acd77e
am cd0331ab: Fixing broken dropdown asset in Honeycomb as well
...
* commit 'cd0331abd7eb1e9efff3251caa008492fe5cad35':
Fixing broken dropdown asset in Honeycomb as well
2011-01-12 22:59:33 -08:00
Guang Zhu
7171622320
change webkit test data path
...
path changed from "/sdcard/android/" to "/sdcard/webkit/". the
old path clashes with "/sdcard/Android/" and has some odd issues
under FUSE
Change-Id: I57102dca99612bdd7b4d1f196e43436cd1276281
2011-01-12 22:57:41 -08:00
Justin Ho
cd0331abd7
Fixing broken dropdown asset in Honeycomb as well
...
Change-Id: Ie5a89fbf38dbad8e768c5c7569bd2e9a872fb587
2011-01-12 22:56:55 -08:00
Andy Stadler
199ae7dce1
am 7b0f8f08: API changes to support encryption in DPM
...
* commit '7b0f8f08ac7b3ed5cf462b92283713b033d6a64a':
API changes to support encryption in DPM
2011-01-12 21:17:03 -08:00
Andy Stadler
7b0f8f08ac
API changes to support encryption in DPM
...
* New uses-policies value
* Definitions for storage domain and encryption status
* API to get and set encryption status
* Intent to launch encryption changes
* Both new calls bottom out in the DPM service and are suitable for
a device that does not support encryption.
NOTE: Nobody should use ACTION_START_ENCRYPTION yet. It needs a receiver
to be built in Settings (different CL).
Change-Id: I2ae193bedbec59f6ba46c0ec7de12ecf321e5803
2011-01-12 21:11:32 -08:00
Jaikumar Ganesh
f683a357ee
am 471de1f5: (-s ours) am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
...
* commit '471de1f5b3cc629739d8315ff195d6af928e7ae4':
DO NOT MERGE: Remove auto connection on ACL connection.
2011-01-12 20:48:51 -08:00
Eric Laurent
ba035dd049
am 48f400c3: am bec4abaa: Merge "Fix issue 3302649." into gingerbread
...
* commit '48f400c3762bd50603222cb5e7856d6aef4ebc4e':
Fix issue 3302649.
2011-01-12 20:48:44 -08:00
Justin Ho
e7ecc44729
am 58ea9394: (-s ours) am 7b667a0c: Merge "Updated flightmode assets" into gingerbread
...
* commit '58ea93945b6cd7b91d2d54845275fd90ee7fb291':
Updated flightmode assets
2011-01-12 20:48:38 -08:00
James Dong
54815a78af
Add audio encoding parameters check
...
bug - 3345296
Change-Id: If3f33955f5473b0c5ad9c9b85f8b5cb21ddd7e65
2011-01-12 20:45:16 -08:00
Chet Haase
8d38f9d2d8
am 7cc5e1d5: Merge "Fix null crash when fragments go away during animations" into honeycomb
...
* commit '7cc5e1d5488c9e0a3f898a62b626ffb3ae074440':
Fix null crash when fragments go away during animations
2011-01-12 20:36:59 -08:00
Xavier Ducrohet
ee592fe4e6
LayoutLib: move MockView back into its original package.
...
This is used by Eclipse when the custom view is not found.
It couldn't find the view in the new package either.
We should probably move this logic of creating a mock view
into the layout library instead.
Change-Id: Ifa1a717cddf7004a7719bb4d0798cd53b43273ea
2011-01-12 20:36:02 -08:00
Chet Haase
7cc5e1d548
Merge "Fix null crash when fragments go away during animations" into honeycomb
2011-01-12 20:34:32 -08:00
Christopher Tate
3186e0da33
am 44a94bb5: Merge "Turn off debugging logspam for release" into honeycomb
...
* commit '44a94bb5a915922400944f666b218f4bb268c565':
Turn off debugging logspam for release
2011-01-12 20:25:32 -08:00
Christopher Tate
44a94bb5a9
Merge "Turn off debugging logspam for release" into honeycomb
2011-01-12 20:23:49 -08:00
Xavier Ducrohet
162ee1ed3d
LayoutLib: Add getViewParent/getViewIndex on RenderSession.
...
Change-Id: If91aa837b71a7329f53b1c4190332c2296166940
2011-01-12 20:16:52 -08:00
Jim Miller
18c4ef5fc1
am 66707eee: Merge "Fix 3253629: Tweaks to recent apps" into honeycomb
...
* commit '66707eee84ee874f60ff5d25c5d2d00769e79616':
Fix 3253629: Tweaks to recent apps
2011-01-12 20:10:28 -08:00
Jim Miller
66707eee84
Merge "Fix 3253629: Tweaks to recent apps" into honeycomb
2011-01-12 20:07:36 -08:00
Christopher Tate
994ef9296a
Turn off debugging logspam for release
...
Fixes bug 2679101
Change-Id: I94cf1b1d0b732b2030008118eff3534f0e0608f7
2011-01-12 20:06:07 -08:00
Gilles Debunne
5cba862628
QuickContactBadge shows its pressed state
...
Change-Id: I7dfd02cc5c4e0a5ba6a7d65c2c61d650f5aa9249
2011-01-12 19:53:15 -08:00
Jim Miller
85babff4a3
Fix 3253629: Tweaks to recent apps
...
This updates the animation and fixes a few bugs with showing
and hiding recents as well as tweaks from UX in animation
timing, effects and the background protector.
Change-Id: I1c57e566408c7b732a0c902e27125951d0277322
2011-01-12 19:25:57 -08:00
Shih-wei Liao
067e7b261a
On-device linking.
...
Change-Id: I609f575f1c2b9e9c3de0d8c16eb06b66b744bcb5
2011-01-12 19:14:27 -08:00
Kenny Root
62f21d4d11
am 0ee29447: am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
...
* commit '0ee294470d09e1de0ce0fe6e3246e98e450a4d26':
Allow updated system apps to retain priority
2011-01-12 19:01:48 -08:00
Andreas Huber
f97e58efda
am c88b2c44: am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
...
* commit 'c88b2c44117e7e3ff3deb786f7d984f4096a63de':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
2011-01-12 19:01:37 -08:00
Andreas Huber
126410ed9e
am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
...
* commit '0ef0d76a9d5477942d5586933d35d299671fadc5':
DO NOT MERGE: Fix Matroska issues
2011-01-12 19:01:17 -08:00
Chet Haase
dd14ec2e85
am ef9932c2: Merge "Supress layout requests while a LayoutTransition is running." into honeycomb
...
* commit 'ef9932c2505eaf5a4256c6c398aa640bee3b47ea':
Supress layout requests while a LayoutTransition is running.
2011-01-12 18:35:14 -08:00
Chet Haase
ef9932c250
Merge "Supress layout requests while a LayoutTransition is running." into honeycomb
2011-01-12 18:33:05 -08:00
Eric Laurent
41f4d4d847
Fix issue 3302649.
...
The cause of the problem is that AudioTrack::start() can fail if it is called from a newly created
thread that has the same ID as the AudioTrack callback thread that has just been stopped and not yet exited.
This is possible as the thread ID used by the Thread class is not the TID.
The fix consists in clearing the thread ID before exiting the thread loop.
Change-Id: I8b5f6a63feeaeb9a01267380e85f6f1456e7aa01
2011-01-12 18:28:25 -08:00
Xavier Ducrohet
226ec1cb1b
am cb27d4b2: Merge "LayoutLib: use tags in logs." into honeycomb
...
* commit 'cb27d4b2f530033c90432745115b914d8f26c3e7':
LayoutLib: use tags in logs.
2011-01-12 18:24:52 -08:00
Xavier Ducrohet
cb27d4b2f5
Merge "LayoutLib: use tags in logs." into honeycomb
2011-01-12 18:23:04 -08:00
Chet Haase
9c0874408c
Supress layout requests while a LayoutTransition is running.
...
LayoutTransition works by animating layout-related properties
(left, right, top, and bottom). This works great when that animation
is the only thing affecting the layout of the UI. But if there are other things
happening in the application that cause layout to run on that
container or in its parent hierarchy, this can cause the layout properties
on its children to get mis-set during the middle of the transition.
This results in artifacts like animating objects jumping to locations where
they would be were there no animation running.
The fix is to supress layout requests on that container (and its children)
until the transition is complete (then issue a layout request on the container
to make sure that the container has the correct layout data)
Change-Id: I15bf0423a11409f854076f86099233db7fe4edc0
2011-01-12 18:14:40 -08:00
repo sync
b2d782d084
am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
...
* commit 'd439ac396ecb9e909c543424211d563325fea72b':
DO NOT MERGE: Fix parsing of ntp= PLAY response.
2011-01-12 17:58:48 -08:00
Kenny Root
91412cec42
am 4aab4bc2: am 91c459ec: Copy user info from PackageSetting as well
...
* commit '4aab4bc2a3b97e25573e8484d5f5aa8deb812d48':
Copy user info from PackageSetting as well
2011-01-12 17:58:25 -08:00
Chung-yih Wang
00a87d2240
am eb74d1aa: am 65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread
...
* commit 'eb74d1aab5f67ae3a4123fbab9a419595fab081c':
Add auth. username in SipProfile.
2011-01-12 17:58:08 -08:00
Nick Pelly
a21aa37be7
am a058f565: (-s ours) am ca36d863: Update API current.xml to unbreak build.
...
* commit 'a058f565663253077c3118d9aad00e03dcd45684':
Update API current.xml to unbreak build.
2011-01-12 17:57:30 -08:00
Chet Haase
b29407faf3
Fix null crash when fragments go away during animations
...
Change-Id: I239cabce3ce322fcc3f1246486b4bf05f0dd322b
2011-01-12 17:53:20 -08:00