ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
40,538 Commits 2 Branches 0 Tags 54 MiB
2c7ae67462
Commit Graph

40538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
2c7ae67462 Reconcile with ics-mr0-release 
Change-Id: Ief57a18b44889bbdfb1bd7bd7c379f49b2f126b8
 2011-11-17 15:36:52 -08:00
Scott Main
f72e7fe2f1 am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussio 
* commit '08d40d71806d482fa92f6a9b952487c3ccc63bb3':
  docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
 2011-11-17 14:49:36 -08:00
Bill Gruber
9b5b1ad416 am 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0 
* commit '69e24843fc89dcdd35802dbb6a2b693650ec8a41':
  Licensing docs: clarifies server response for draft apps Bug 2900690
 2011-11-17 14:49:33 -08:00
Bill Gruber
945d90e332 am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0 
* commit 'ef20eb2595d0c74eabbcafe6ec50387de37e18de':
  Filters docs: removes references to forward-locking Bug 3055286
 2011-11-17 14:49:32 -08:00
Scott Main
bf7d007180 am 7d4c4721: docs: add sums/sizes for adt 15.0.1 
* commit '7d4c4721c6dd5473464d4620749b302a413c7ebd':
  docs: add sums/sizes for adt 15.0.1
 2011-11-17 14:49:28 -08:00
Fred Chung
411c492fbe am 4750cbd9: Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 
* commit '4750cbd9311b763265f8ab6ddee187e0c9a71665':
  DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e
 2011-11-17 14:49:26 -08:00
Robert Ly
ee1d590384 am 4f361741: Merge "docs: adt 15.0.1 rel notes" into ics-mr0 
* commit '4f361741185d523b5469a264521eeeb4eee9344d':
  docs: adt 15.0.1 rel notes
 2011-11-17 14:49:21 -08:00
Christopher Tate
0585366699 Merge "Add a few GC-flexing microbenchmark tests" into ics-mr1 2011-11-17 14:43:17 -08:00
Jake Hamby
43691af572 Merge "Re-enable vril-dump for adb bugreport." into ics-mr1 2011-11-17 13:53:17 -08:00
Matthew Xie
a26d0e3ad2 am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0 
* commit '6da97a24e329851888890d4e380066037d08bcd7':
  Check the bluetooth state for getUuid call
 2011-11-17 13:10:14 -08:00
Nick Pelly
3d1e8f0610 Merge "Fix NPE on devices that don't have NFC." into ics-mr1 2011-11-17 12:48:48 -08:00
David Brown
2a9e6ac317 Merge "SIP addresses containing "911" shouldn't be considered emergency calls" into ics-mr1 2011-11-17 12:33:00 -08:00
Scott Main
f278e6fdf7 Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917" into ics-mr0 2011-11-17 12:32:11 -08:00
Dave Santoro
52afa59ed0 Merge "Unhide social stream permissions." into ics-mr1 2011-11-17 12:26:17 -08:00
Michael Kolb
60508814e0 Merge "Draw input field focus ring in WebTextView" into ics-mr1 2011-11-17 12:22:58 -08:00
Jeff Sharkey
9916dcfcff Merge "Only write network stats when already loaded." into ics-mr1 2011-11-17 12:10:02 -08:00
Bill Gruber
368f08b208 Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0 2011-11-17 11:35:16 -08:00
Bill Gruber
d6e86111b2 Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0 2011-11-17 11:34:46 -08:00
Amith Yamasani
9ae6c9c4d6 Merge "Don't upgrade some settings from GB to ICS." into ics-mr1 2011-11-17 10:01:00 -08:00
Fred Chung
ae4d8748a8 Merge "DO NOT MERGE: Bluetooth HDP sample. Cherry pick from ics-mr1 Change ID I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e" into ics-mr0 2011-11-17 09:38:10 -08:00
Fred Chung
4fe40af10b Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1 2011-11-17 09:37:15 -08:00
Andreas Huber
7cf8bf90c4 Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 2011-11-17 09:05:17 -08:00
John Reck
2e1032de0d Merge "Fix add single character check" into ics-mr1 2011-11-17 08:48:04 -08:00
John Reck
03503cebdf Merge "Undeprecate LayoutAlgorithm" into ics-mr1 2011-11-17 08:47:29 -08:00
Robert Ly
f74f3239a2 Merge "docs: adt 15.0.1 rel notes" into ics-mr0 2011-11-17 07:17:04 -08:00
The Android Automerger
2f30ae90e6 merge in ics-mr0-release history after reset to ics-mr0 2011-11-17 06:28:25 -08:00
Ben Murdoch
4c0658c898 Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* changes:
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 02:13:19 -08:00
Jeff Sharkey
deca348e76 Merge "Update NTP outside locks, log large trim events." into ics-mr1 2011-11-16 22:59:13 -08:00
Daniel Sandler
795bcc13c7 Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1 2011-11-16 22:33:55 -08:00
Daniel Sandler
d54b32aaf3 Merge "Disable desk dock apps." into ics-mr1 2011-11-16 22:33:44 -08:00
Mathias Agopian
410f141622 Merge "be a bit more defensive when parsing extension strings" into ics-mr1 2011-11-16 20:59:30 -08:00
Nicolas Roard
fa5a800da4 Merge "Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition." into ics-mr1 2011-11-16 19:40:04 -08:00
Matthew Xie
d858f05940 Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 2011-11-16 18:20:50 -08:00
Mathias Agopian
20b52631fa Merge "remove hack that hardcoded the refresh rate" into ics-mr1 2011-11-16 18:19:33 -08:00
Mangesh Ghiware
ae8891278a Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 2011-11-16 18:01:35 -08:00
satok
517dcd273f Merge "Clean up the spell checker framework" into ics-mr1 2011-11-16 17:35:54 -08:00
Daniel Sandler
a974a262ee Merge "Add a default Dreams component." into ics-mr1 2011-11-16 17:13:35 -08:00
Daniel Sandler
c33702f3fb Merge "Remove day of week from phone notification panel." into ics-mr1 2011-11-16 17:13:16 -08:00
Mathias Agopian
f3ae82d813 be a bit more defensive when parsing extension strings 
hopefully this will fix a crash in the emulator.

Bug: 5624674
Change-Id: I96586e29ea20efd73c4ad50870df5b7368bf3c3b
 2011-11-16 16:49:25 -08:00
Mathias Agopian
c554d2b8ad Merge "Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices"" into ics-mr1 2011-11-16 16:13:38 -08:00
Mathias Agopian
c21180ee67 Revert "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" 
This reverts commit e7758be6da85728df6b4215f413660c67c5a9740.

Seemed to cause failures un SurfaceTexture.

Bug: 5627450
 2011-11-16 15:59:13 -08:00
Matthew Xie
e8b051d904 Merge "Check the bluetooth state for getUuid call" into ics-mr0 2011-11-16 15:31:03 -08:00
Marco Nelissen
d1ca738ebc Merge "Change MediaController look b/5584613" into ics-mr1 2011-11-16 14:54:20 -08:00
Dianne Hackborn
41b788368f Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1 2011-11-16 14:03:09 -08:00
Robert Greenwalt
b49ade8057 Merge "Fix TelephonyManager to grab the best context" into ics-mr1 2011-11-16 12:06:53 -08:00
Jamie Gennis
c1ef3c4d7d Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1 2011-11-16 11:34:30 -08:00
Eric Fischer
dfc0992233 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-16 10:57:45 -08:00
Gilles Debunne
d5a6b7eb92 Merge "IME action (done, next...) correctly handled" into ics-mr1 2011-11-16 10:31:40 -08:00
Alex Sakhartchouk
982596d4c4 Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1 2011-11-16 09:40:11 -08:00
Fred Chung
4542525a45 Merge "Bluetooth HDP sample." into ics-mr1 2011-11-16 09:31:54 -08:00