OSDN Git Service
Svetoslav Ganov [Thu, 13 Jan 2011 20:43:43 +0000 (12:43 -0800)]
am
462433ae: Merge "DatePicker is calling back its listener on init." into honeycomb
* commit '
462433ae94ff33f9591d910b662e63b821549cad':
DatePicker is calling back its listener on init.
Svetoslav Ganov [Thu, 13 Jan 2011 20:41:04 +0000 (12:41 -0800)]
Merge "DatePicker is calling back its listener on init." into honeycomb
Wei-Ta Chen [Thu, 13 Jan 2011 20:38:38 +0000 (12:38 -0800)]
am
62cd5c97: (-s ours) am
61d9ffbf: Merge "Do not merge." into gingerbread
* commit '
62cd5c9788abbd5b715ec2a6eaf64dd3945fdbaf':
Do not merge.
Gloria Wang [Thu, 13 Jan 2011 20:38:29 +0000 (12:38 -0800)]
am
1dac4cdd: am
a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit '
1dac4cdd6faba15426a0b37a7a615c04f5a35394':
Initial OMA DRM forward lock contribution
Dan Morrill [Thu, 13 Jan 2011 20:21:07 +0000 (12:21 -0800)]
Merge "Fix merge conflict for '
c506ab89'" into honeycomb-plus-aosp
Jason parks [Thu, 13 Jan 2011 20:18:40 +0000 (12:18 -0800)]
am
a3cdaa53: Revert "Remove the APIs for the old encryption scheme."
* commit '
a3cdaa5337fa573c4c61770195d6232c2e587090':
Revert "Remove the APIs for the old encryption scheme."
Jason parks [Thu, 13 Jan 2011 20:15:43 +0000 (14:15 -0600)]
Revert "Remove the APIs for the old encryption scheme."
This reverts commit
1125d780a8b61703b8eb28c5c77dac5f3f0022dd.
Romain Guy [Thu, 13 Jan 2011 20:15:35 +0000 (12:15 -0800)]
am
c15c7a79: Merge "Cleanup implementation of hardware layers." into honeycomb
* commit '
c15c7a79a69733bd21d6548fd74c2874fdabe7e8':
Cleanup implementation of hardware layers.
Jamie Gennis [Thu, 13 Jan 2011 20:15:31 +0000 (12:15 -0800)]
am
5865c494: Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb
* commit '
5865c494a571a7e164218857d3b860004c50baf6':
Fix a bug in SurfaceTexture::dequeueBuffer.
Romain Guy [Thu, 13 Jan 2011 20:13:59 +0000 (12:13 -0800)]
Merge "Cleanup implementation of hardware layers." into honeycomb
Jamie Gennis [Thu, 13 Jan 2011 20:13:56 +0000 (12:13 -0800)]
Merge "Fix a bug in SurfaceTexture::dequeueBuffer." into honeycomb
Romain Guy [Thu, 13 Jan 2011 20:13:20 +0000 (12:13 -0800)]
Cleanup implementation of hardware layers.
The new implementation relies on OpenGLRenderer's existing layer
code instead of duplicating it. The new code is much cleaner, with
simpler and better APIs and allows tracking of drawn regions inside
layers. Region tracking is not yet enabled but this will be done
in a future CL.
Change-Id: Ie826121a2227de8252c77b992a61218defea5143
Wei-Ta Chen [Thu, 13 Jan 2011 20:06:38 +0000 (12:06 -0800)]
am
61d9ffbf: Merge "Do not merge." into gingerbread
* commit '
61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
Do not merge.
Eric Laurent [Thu, 13 Jan 2011 20:02:35 +0000 (12:02 -0800)]
am
8eff4524: Merge "Fix issue
3302649." into honeycomb
* commit '
8eff45242180c7dec2b437c3929cb7ea3345f60c':
Fix issue
3302649.
Wei-Ta Chen [Thu, 13 Jan 2011 20:02:32 +0000 (12:02 -0800)]
Merge "Do not merge." into gingerbread
Eric Laurent [Thu, 13 Jan 2011 19:59:13 +0000 (11:59 -0800)]
Merge "Fix issue
3302649." into honeycomb
Dan Morrill [Thu, 13 Jan 2011 19:48:42 +0000 (11:48 -0800)]
Fix merge conflict for '
c506ab89'
Conflicts:
NOTICE
Change-Id: Iace8272fbb0f7b7d9a3adf521dcf3635abfc90e6
Svetoslav Ganov [Thu, 13 Jan 2011 19:33:05 +0000 (11:33 -0800)]
DatePicker is calling back its listener on init.
bug:
3341515
1.Changed the callbeack registration to follow the spinners
initialization.
Change-Id: I3baff68c295993f975beec2b376af88e32b24e20
Jamie Gennis [Thu, 13 Jan 2011 19:31:03 +0000 (11:31 -0800)]
am
9aba2324: Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb
* commit '
9aba2324ac8d7216732b42346bfcaf0be71eb22e':
Add getTransformMatrix to the SurfaceTexture API.
Jamie Gennis [Thu, 13 Jan 2011 19:29:14 +0000 (11:29 -0800)]
Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb
Gloria Wang [Thu, 13 Jan 2011 19:11:51 +0000 (11:11 -0800)]
am
a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit '
a220a2979937700024662be0f8fc166ca65506ed':
Initial OMA DRM forward lock contribution
Eric Fischer [Thu, 13 Jan 2011 19:03:47 +0000 (11:03 -0800)]
am
39d80c38: Merge "Import revised translations." into honeycomb
* commit '
39d80c3846972e6204dfd956263a3fb6a799444d':
Import revised translations.
Eric Fischer [Thu, 13 Jan 2011 18:59:52 +0000 (10:59 -0800)]
Merge "Import revised translations." into honeycomb
Gloria Wang [Thu, 13 Jan 2011 18:51:13 +0000 (10:51 -0800)]
Merge "Initial OMA DRM forward lock contribution"
Xavier Ducrohet [Thu, 13 Jan 2011 18:46:59 +0000 (10:46 -0800)]
am
310a4d81: LAyoutLib: Fix build by adding missing IWindowSession implementation.
* commit '
310a4d815b693e358d151b9aa2823c5022993f9b':
LAyoutLib: Fix build by adding missing IWindowSession implementation.
Xavier Ducrohet [Thu, 13 Jan 2011 18:43:00 +0000 (10:43 -0800)]
LAyoutLib: Fix build by adding missing IWindowSession implementation.
Change-Id: I0af178d149b782cac3ae0c36fa5fc03f4dc6118b
Xavier Ducrohet [Thu, 13 Jan 2011 18:28:05 +0000 (10:28 -0800)]
am
1f1957f5: Merge "LayoutLib: move MockView back into its original package." into honeycomb
* commit '
1f1957f50fec4bc8d8716793d22bb23ee7fb4a7f':
LayoutLib: move MockView back into its original package.
Xavier Ducrohet [Thu, 13 Jan 2011 18:28:02 +0000 (10:28 -0800)]
am
66a95e4d: Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb
* commit '
66a95e4dbeb1c6d33ceb7c320033041e7f8e2aaa':
LayoutLib: Add getViewParent/getViewIndex on RenderSession.
Nick Pelly [Thu, 13 Jan 2011 18:26:28 +0000 (10:26 -0800)]
am
18adceb4: am
a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
* commit '
18adceb4273655b6cf8eaa9c6a2237d6fc1b8881':
New Intent defined for RF ON/OFF events
Brad Fitzpatrick [Thu, 13 Jan 2011 18:26:19 +0000 (10:26 -0800)]
am
54f428a6: am
bdb7aee0: Merge "Fix for crash when setting live wallpaper."
* commit '
54f428a63f33f4722c09b7688e6ca7960394f81f':
Fix for crash when setting live wallpaper.
Kenny Root [Thu, 13 Jan 2011 18:26:13 +0000 (10:26 -0800)]
am
47075079: (-s ours) am
e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit '
470750793b6e930a323ee63cbed05c43dc435ba1':
Add the {get,set}PackageObbPaths calls to API
James Dong [Thu, 13 Jan 2011 18:24:44 +0000 (10:24 -0800)]
am
c14b10c3: Merge "Add audio encoding parameters check" into honeycomb
* commit '
c14b10c3068359b717b3f35b7218ce0e6dcdd08c':
Add audio encoding parameters check
Svetoslav Ganov [Thu, 13 Jan 2011 18:24:38 +0000 (10:24 -0800)]
am
06e32b43: Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb
* commit '
06e32b434b62b22eeee900851ff56f2098ddc019':
Updating the WebView accessibility key bindings after discussion with the access-eng team
Xavier Ducrohet [Thu, 13 Jan 2011 18:22:53 +0000 (10:22 -0800)]
Merge "LayoutLib: move MockView back into its original package." into honeycomb
Xavier Ducrohet [Thu, 13 Jan 2011 18:22:43 +0000 (10:22 -0800)]
Merge "LayoutLib: Add getViewParent/getViewIndex on RenderSession." into honeycomb
James Dong [Thu, 13 Jan 2011 18:21:28 +0000 (10:21 -0800)]
Merge "Add audio encoding parameters check" into honeycomb
Jaikumar Ganesh [Thu, 13 Jan 2011 18:21:15 +0000 (10:21 -0800)]
am
b54fd91d: Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb
* commit '
b54fd91d1b843b7742bf6396cefa6c63b14dc6df':
Phone crash when old callback func is woken up when enabling BT.
Alex Sakhartchouk [Thu, 13 Jan 2011 18:20:28 +0000 (10:20 -0800)]
am
d88ad4ab: Merge "Documentation" into honeycomb
* commit '
d88ad4ab49280a19da6582ba6e776c296be79ec0':
Documentation
Robert Greenwalt [Thu, 13 Jan 2011 18:19:39 +0000 (10:19 -0800)]
am
495056ab: Merge "Turn off DUN connection after tethering." into honeycomb
* commit '
495056ab6709bbf77879a4b556aa1d17446bfe48':
Turn off DUN connection after tethering.
Gilles Debunne [Thu, 13 Jan 2011 18:19:30 +0000 (10:19 -0800)]
am
b439221a: Merge "QuickContactBadge shows its pressed state" into honeycomb
* commit '
b439221a5aa7c36fedb242ee9180ce46e4ad19b7':
QuickContactBadge shows its pressed state
Dan Morrill [Thu, 13 Jan 2011 18:19:29 +0000 (10:19 -0800)]
am
4330b146: Adding ASL2 attribution for VisualOn.
* commit '
4330b1464d26fa693b61d496092e10ce0419ee3d':
Adding ASL2 attribution for VisualOn.
Svetoslav Ganov [Thu, 13 Jan 2011 18:17:02 +0000 (10:17 -0800)]
Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb
Jaikumar Ganesh [Thu, 13 Jan 2011 18:14:40 +0000 (10:14 -0800)]
Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb
Alex Sakhartchouk [Thu, 13 Jan 2011 18:14:14 +0000 (10:14 -0800)]
Merge "Documentation" into honeycomb
Robert Greenwalt [Thu, 13 Jan 2011 18:02:29 +0000 (10:02 -0800)]
Merge "Turn off DUN connection after tethering." into honeycomb
Gilles Debunne [Thu, 13 Jan 2011 17:50:40 +0000 (09:50 -0800)]
Merge "QuickContactBadge shows its pressed state" into honeycomb
Staffan Lindvall [Wed, 27 Oct 2010 08:34:53 +0000 (10:34 +0200)]
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
Dan Morrill [Thu, 13 Jan 2011 17:24:01 +0000 (09:24 -0800)]
Adding ASL2 attribution for VisualOn.
Change-Id: I870133fc366507d95741f8aa234776de58ba60a9
Jason parks [Thu, 13 Jan 2011 15:44:55 +0000 (07:44 -0800)]
am
21f62b9e: Merge "Add a method enable encryption." into honeycomb
* commit '
21f62b9e461416ae61c8471f7199f104f8fe33de':
Add a method enable encryption.
Jason parks [Thu, 13 Jan 2011 15:42:55 +0000 (07:42 -0800)]
am
ca6777b2: Merge "Remove the APIs for the old encryption scheme." into honeycomb
* commit '
ca6777b23bbe9283380efb2ba7e6d0a79d8669db':
Remove the APIs for the old encryption scheme.
Jason parks [Thu, 13 Jan 2011 15:41:53 +0000 (07:41 -0800)]
Merge "Add a method enable encryption." into honeycomb
Jason parks [Thu, 13 Jan 2011 15:40:46 +0000 (07:40 -0800)]
Merge "Remove the APIs for the old encryption scheme." into honeycomb
Marco Nelissen [Thu, 13 Jan 2011 15:31:53 +0000 (07:31 -0800)]
am
f679ba7d: Cherrypick from GB. Do Not Merge.
* commit '
f679ba7d944a403fbdc77926c44978ffd5161f2d':
Cherrypick from GB. Do Not Merge.
Marco Nelissen [Fri, 7 Jan 2011 00:37:03 +0000 (16:37 -0800)]
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
Ben Murdoch [Thu, 13 Jan 2011 14:47:45 +0000 (06:47 -0800)]
am
6b3dc7a2: Merge "Improve error handling (NPE in DRT2)" into honeycomb
* commit '
6b3dc7a29a5c642c6ca2214c47199dec71912d0d':
Improve error handling (NPE in DRT2)
Ben Murdoch [Thu, 13 Jan 2011 14:46:17 +0000 (06:46 -0800)]
Merge "Improve error handling (NPE in DRT2)" into honeycomb
Wink Saville [Thu, 13 Jan 2011 14:26:23 +0000 (06:26 -0800)]
am
5bf6cc01: Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb
* commit '
5bf6cc0126b5e554f629bb4c96716a2a5701d04b':
Initialize mOtaspMode to OTASP_UNKNOWN.
Wink Saville [Thu, 13 Jan 2011 14:24:09 +0000 (06:24 -0800)]
Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb
Philippe Marti [Fri, 17 Dec 2010 14:49:19 +0000 (14:49 +0000)]
Improve error handling (NPE in DRT2)
Bug:
3284126
Change-Id: I7f8c6259f2932d2b1a10a2f9612866786d425da9
Shih-wei Liao [Thu, 13 Jan 2011 10:23:21 +0000 (02:23 -0800)]
Shih-wei Liao [Thu, 13 Jan 2011 10:20:51 +0000 (02:20 -0800)]
Fix the build.
Change-Id: I36b523d877c5beadf0fce21b9f7534f0ffc23959
Shih-wei Liao [Thu, 13 Jan 2011 10:07:53 +0000 (02:07 -0800)]
am
078717be: Merge "Disable on-device linking" into honeycomb
* commit '
078717be074e4f68b9af37d70ecbd63702b2be6c':
Disable on-device linking
Shih-wei Liao [Thu, 13 Jan 2011 10:07:48 +0000 (02:07 -0800)]
am
c758f1c6: Merge "Fix the build." into honeycomb
* commit '
c758f1c6a3bd0a65c85572847903c44307d04237':
Fix the build.
Shih-wei Liao [Thu, 13 Jan 2011 10:07:39 +0000 (02:07 -0800)]
am
f6dd9c53: Merge "On-device linking." into honeycomb
* commit '
f6dd9c539c1b18f65674b495cb23bf2df36da7af':
On-device linking.
Shih-wei Liao [Thu, 13 Jan 2011 10:06:17 +0000 (02:06 -0800)]
Merge "Disable on-device linking" into honeycomb
Shih-wei Liao [Thu, 13 Jan 2011 10:05:34 +0000 (02:05 -0800)]
Disable on-device linking
Change-Id: I7c416c7c9714fae0722e61c4f0368fbdb7d808b3
Shih-wei Liao [Thu, 13 Jan 2011 10:05:32 +0000 (02:05 -0800)]
am
3ae5017b: Merge "convert2uchar3." into honeycomb
* commit '
3ae5017b1bc2910610194cc8790e8d96516ac9b5':
convert2uchar3.
Shih-wei Liao [Thu, 13 Jan 2011 10:04:10 +0000 (02:04 -0800)]
Merge "Fix the build." into honeycomb
Shih-wei Liao [Thu, 13 Jan 2011 10:04:00 +0000 (02:04 -0800)]
Merge "On-device linking." into honeycomb
Shih-wei Liao [Thu, 13 Jan 2011 10:03:51 +0000 (02:03 -0800)]
Merge "convert2uchar3." into honeycomb
Shih-wei Liao [Thu, 13 Jan 2011 10:03:00 +0000 (02:03 -0800)]
Fix the build.
Change-Id: I20ac8700bcc8ccb7905f82bbfea81d007f67a68e
Svetoslav Ganov [Thu, 13 Jan 2011 07:17:13 +0000 (23:17 -0800)]
Updating the WebView accessibility key bindings after discussion with the access-eng team
Change-Id: I39a303864b94a8a11b6cded9b8bb23041ad91502
Adam Powell [Thu, 13 Jan 2011 07:52:25 +0000 (23:52 -0800)]
am
2ea9aaa2: Merge "Fix bugs
3077517 and
3309579 - ListView bugs" into honeycomb
* commit '
2ea9aaa2458ca468b8f127d8c69746a009df12a6':
Fix bugs
3077517 and
3309579 - ListView bugs
Adam Powell [Thu, 13 Jan 2011 07:50:05 +0000 (23:50 -0800)]
Merge "Fix bugs
3077517 and
3309579 - ListView bugs" into honeycomb
Adam Powell [Thu, 13 Jan 2011 05:58:20 +0000 (21:58 -0800)]
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
Guang Zhu [Thu, 13 Jan 2011 07:32:00 +0000 (23:32 -0800)]
am
37f81344: Merge "change webkit test data path" into honeycomb
* commit '
37f813443dbe51277c2d849eb2b53caa137d50f7':
change webkit test data path
Guang Zhu [Thu, 13 Jan 2011 07:29:53 +0000 (23:29 -0800)]
Merge "change webkit test data path" into honeycomb
Justin Ho [Thu, 13 Jan 2011 06:59:33 +0000 (22:59 -0800)]
am
cd0331ab: Fixing broken dropdown asset in Honeycomb as well
* commit '
cd0331abd7eb1e9efff3251caa008492fe5cad35':
Fixing broken dropdown asset in Honeycomb as well
Guang Zhu [Thu, 13 Jan 2011 06:57:41 +0000 (22:57 -0800)]
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
Justin Ho [Thu, 13 Jan 2011 06:56:55 +0000 (22:56 -0800)]
Fixing broken dropdown asset in Honeycomb as well
Change-Id: Ie5a89fbf38dbad8e768c5c7569bd2e9a872fb587
Andy Stadler [Thu, 13 Jan 2011 05:17:03 +0000 (21:17 -0800)]
am
7b0f8f08: API changes to support encryption in DPM
* commit '
7b0f8f08ac7b3ed5cf462b92283713b033d6a64a':
API changes to support encryption in DPM
Andy Stadler [Wed, 12 Jan 2011 22:59:52 +0000 (14:59 -0800)]
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
Jaikumar Ganesh [Thu, 13 Jan 2011 04:48:51 +0000 (20:48 -0800)]
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.
Eric Laurent [Thu, 13 Jan 2011 04:48:44 +0000 (20:48 -0800)]
am
48f400c3: am
bec4abaa: Merge "Fix issue
3302649." into gingerbread
* commit '
48f400c3762bd50603222cb5e7856d6aef4ebc4e':
Fix issue
3302649.
Justin Ho [Thu, 13 Jan 2011 04:48:38 +0000 (20:48 -0800)]
am
58ea9394: (-s ours) am
7b667a0c: Merge "Updated flightmode assets" into gingerbread
* commit '
58ea93945b6cd7b91d2d54845275fd90ee7fb291':
Updated flightmode assets
James Dong [Thu, 13 Jan 2011 04:45:16 +0000 (20:45 -0800)]
Add audio encoding parameters check
bug -
3345296
Change-Id: If3f33955f5473b0c5ad9c9b85f8b5cb21ddd7e65
Chet Haase [Thu, 13 Jan 2011 04:36:59 +0000 (20:36 -0800)]
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
Xavier Ducrohet [Thu, 13 Jan 2011 04:36:02 +0000 (20:36 -0800)]
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
Chet Haase [Thu, 13 Jan 2011 04:34:32 +0000 (20:34 -0800)]
Merge "Fix null crash when fragments go away during animations" into honeycomb
Christopher Tate [Thu, 13 Jan 2011 04:25:32 +0000 (20:25 -0800)]
am
44a94bb5: Merge "Turn off debugging logspam for release" into honeycomb
* commit '
44a94bb5a915922400944f666b218f4bb268c565':
Turn off debugging logspam for release
Christopher Tate [Thu, 13 Jan 2011 04:23:49 +0000 (20:23 -0800)]
Merge "Turn off debugging logspam for release" into honeycomb
Xavier Ducrohet [Thu, 13 Jan 2011 04:16:52 +0000 (20:16 -0800)]
LayoutLib: Add getViewParent/getViewIndex on RenderSession.
Change-Id: If91aa837b71a7329f53b1c4190332c2296166940
Jim Miller [Thu, 13 Jan 2011 04:10:28 +0000 (20:10 -0800)]
am
66707eee: Merge "Fix
3253629: Tweaks to recent apps" into honeycomb
* commit '
66707eee84ee874f60ff5d25c5d2d00769e79616':
Fix
3253629: Tweaks to recent apps
Jim Miller [Thu, 13 Jan 2011 04:07:36 +0000 (20:07 -0800)]
Merge "Fix
3253629: Tweaks to recent apps" into honeycomb
Christopher Tate [Thu, 13 Jan 2011 04:06:07 +0000 (20:06 -0800)]
Turn off debugging logspam for release
Fixes bug
2679101
Change-Id: I94cf1b1d0b732b2030008118eff3534f0e0608f7
Gilles Debunne [Thu, 13 Jan 2011 03:52:56 +0000 (19:52 -0800)]
QuickContactBadge shows its pressed state
Change-Id: I7dfd02cc5c4e0a5ba6a7d65c2c61d650f5aa9249
Jim Miller [Tue, 11 Jan 2011 22:26:03 +0000 (14:26 -0800)]
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
Shih-wei Liao [Thu, 13 Jan 2011 03:14:27 +0000 (19:14 -0800)]
On-device linking.
Change-Id: I609f575f1c2b9e9c3de0d8c16eb06b66b744bcb5
Kenny Root [Thu, 13 Jan 2011 03:01:48 +0000 (19:01 -0800)]
am
0ee29447: am
6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
* commit '
0ee294470d09e1de0ce0fe6e3246e98e450a4d26':
Allow updated system apps to retain priority
Andreas Huber [Thu, 13 Jan 2011 03:01:37 +0000 (19:01 -0800)]
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.