39387 Commits

Author SHA1 Message Date
Xavier Ducrohet
1f1957f50f Merge "LayoutLib: move MockView back into its original package." into honeycomb 2011-01-13 10:22:53 -08:00
Xavier Ducrohet
66a95e4dbe Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb 2011-01-13 10:22:43 -08:00
James Dong
c14b10c306 Merge "Add audio encoding parameters check" into honeycomb 2011-01-13 10:21:28 -08:00
Svetoslav Ganov
06e32b434b Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb 2011-01-13 10:17:02 -08:00
Jaikumar Ganesh
b54fd91d1b Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb 2011-01-13 10:14:40 -08:00
Alex Sakhartchouk
d88ad4ab49 Merge "Documentation" into honeycomb 2011-01-13 10:14:14 -08:00
Robert Greenwalt
495056ab67 Merge "Turn off DUN connection after tethering." into honeycomb 2011-01-13 10:02:29 -08:00
Gilles Debunne
b439221a5a Merge "QuickContactBadge shows its pressed state" into honeycomb 2011-01-13 09:50:40 -08:00
Staffan Lindvall
81f8e3c85f Phone crash when old callback func is woken up when enabling BT.
When the remote Jerry device is powered down the BT link to the
phone is dropped, and the Jerry firmware in the phone quite
immediately tries to re-connect to the Jerry device. Then
SDP and Discover Services is started, fetchRemoteUuids() ->
discoverServicesNative(). This results in an asynchronous dbus
call dbus_func_args_async()  that is provided with a callback
function, onDiscoverServicesResult(), but before this callback
function is used Bluetooth is disabled according to the problem
scenario above. For some reason this discover services activity
is not cleared when Bluetooth is disabled, so when Bluetooth
is enabled again the (old) callback function
onDiscoverServicesResult() is executed, but the following
getAddressFromObjectPath() fails. The reason for this is that
the deviceObjectPath parameter contains an old value,
containg the process id of the old bluetoothd (the one running
before Bluetooth was disabled). Then the new updated
AdapterObjectPath /org/bluez/<new bluetooth hd pid>/hci0/dev_
is not a prefix of the old deviceObjectPath /org/bluez/<old
bluetooth hd pid>/hci0/dev_<BT_ADDR>, which results in that null
will be used as address in sendUuidIntent(), and later on,
ending up in the BluetoothDevice constructor where and
IllegalArgumentExceotion is thrown due to
Bluetooth address = null. Then the phone will crash.

Making sure sendUuidIntent() is not called when address is null
is a work-around for the problem.

Change-Id: I8ff60bad80de3b379cef0970402943dfa4de3cfd
2011-01-13 09:28:48 -08:00
Jason parks
21f62b9e46 Merge "Add a method enable encryption." into honeycomb 2011-01-13 07:41:53 -08:00
Jason parks
ca6777b23b Merge "Remove the APIs for the old encryption scheme." into honeycomb 2011-01-13 07:40:46 -08:00
Marco Nelissen
f679ba7d94 Cherrypick from GB. Do Not Merge.
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

Change-Id: I67deb044800a6cb626c69bf3d54d51df4bf830f2
2011-01-13 07:17:20 -08:00
Ben Murdoch
6b3dc7a29a Merge "Improve error handling (NPE in DRT2)" into honeycomb 2011-01-13 06:46:17 -08:00
Wink Saville
5bf6cc0126 Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb 2011-01-13 06:24:09 -08:00
Philippe Marti
84cc2dbb1d Improve error handling (NPE in DRT2)
Bug: 3284126
Change-Id: I7f8c6259f2932d2b1a10a2f9612866786d425da9
2011-01-13 14:16:20 +00:00
Shih-wei Liao
96100195f0 Fix the build.
Change-Id: I36b523d877c5beadf0fce21b9f7534f0ffc23959
2011-01-13 02:20:51 -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
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
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
37f813443d Merge "change webkit test data path" into honeycomb 2011-01-12 23:29:53 -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
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
James Dong
54815a78af Add audio encoding parameters check
bug - 3345296

Change-Id: If3f33955f5473b0c5ad9c9b85f8b5cb21ddd7e65
2011-01-12 20:45:16 -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
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
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
Chet Haase
ef9932c250 Merge "Supress layout requests while a LayoutTransition is running." into honeycomb 2011-01-12 18:33:05 -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
Chet Haase
b29407faf3 Fix null crash when fragments go away during animations
Change-Id: I239cabce3ce322fcc3f1246486b4bf05f0dd322b
2011-01-12 17:53:20 -08:00
Alex Sakhartchouk
623c54dd16 Documentation
Change-Id: Idb5f87f9d2c0f7fb4677b1b45c232502d66b4668
2011-01-12 17:32:36 -08:00
Carl Shapiro
e9739d09cb Merge "Note the release in which functionality was deprecated." into honeycomb 2011-01-12 17:21:46 -08:00
Carl Shapiro
7e942848ac Note the release in which functionality was deprecated.
Change-Id: Ia0f361986e4232869f7d4123f75081100241638e
2011-01-12 17:17:45 -08:00
Elliott Hughes
f7bb4044e3 Merge "Fix build." into honeycomb 2011-01-12 17:14:43 -08:00
Elliott Hughes
f63e21d9ba Fix build.
False-positive API change. (Removal of throws clauses for unchecked exceptions.)

Change-Id: I2c1fed74a5dc852ec1f3df72240bcfbdb6c77344
2011-01-12 17:13:40 -08:00
Joe Onorato
f4699efb63 Merge "Possibly fix bad notification updates." into honeycomb 2011-01-12 17:07:11 -08:00
Joe Onorato
c9596d6d8e Possibly fix bad notification updates.
I think what was happening is that it was using a different layout but we were trying to reapply the
RemoveViews because of some bad boolean logic.  This fixes that, and adds some better debugging that
might show us what else is happening.

Bug: 3298062
Change-Id: I0984f24cb2960166c79b9f2cc7c6a98bd75e17ba
2011-01-12 17:06:14 -08:00