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

40926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c1bb1bc364 am 1733a3de: Merge "SIP addresses containing "911" shouldn\'t be considered emergency calls" into ics-mr1 
* commit '1733a3de8c4f98ba4df08ab79d1fef6d2684d2c2':
  SIP addresses containing "911" shouldn't be considered emergency calls
 2011-11-17 12:35:26 -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
e16f48b126 am 9be49620: Merge "Unhide social stream permissions." into ics-mr1 
* commit '9be4962060ca67c4fe9bfc391043f6d2829cf720':
  Unhide social stream permissions.
 2011-11-17 12:27:44 -08:00
Dave Santoro
52afa59ed0 Merge "Unhide social stream permissions." into ics-mr1 2011-11-17 12:26:17 -08:00
Michael Kolb
0b596f3383 am 852585c0: Merge "Draw input field focus ring in WebTextView" into ics-mr1 
* commit '852585c034d383ea6afe1b484afa57cbf4d04f95':
  Draw input field focus ring in WebTextView
 2011-11-17 12:25:06 -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
e5f230a92b am 8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1 
* commit '8ac35e30b29f3a3e81ed722621bf7f1de708455f':
  Only write network stats when already loaded.
 2011-11-17 12:11:47 -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
1543c668af am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1 
* commit 'aefc0ed9677233d5e8c991196f970222b4899dc3':
  Don't upgrade some settings from GB to ICS.
 2011-11-17 10:02:16 -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
a0e70be221 am 3a7e2c0b: Merge "Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e." into ics-mr1 
* commit '3a7e2c0ba89b40b61d2322955ab895020a70592c':
  Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.
 2011-11-17 09:39:28 -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
6047cd6408 am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 
* commit 'c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd':
  Make sure not to cancel pending seek/EOS notifications on a cache underrun...
 2011-11-17 09:07:36 -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
9f735eae2b am 775e986e: Merge "Fix add single character check" into ics-mr1 
* commit '775e986ece16b90d3260fe8c7f8e18fc3d0cf492':
  Fix add single character check
 2011-11-17 08:49:50 -08:00
John Reck
6fbb1ed271 am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1 
* commit '1da3d656358ab577f285d06e9db249dfb21cb8e3':
  Undeprecate LayoutAlgorithm
 2011-11-17 08:49:49 -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
0f1439acf7 am fead0e14: Merge changes I59323dc5,I31a01aa3 into ics-mr1 
* commit 'fead0e14b437e80b1c2b0578ec33fc5cbf910ddf':
  WebViewDatabase v11 for ICS.
  Fix a bug in the database upgrade process, and refactor slightly.
 2011-11-17 02:15:40 -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
1b11309907 am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1 
* commit 'b9df01d39692c45b182c429015cc2086ef27db97':
  Update NTP outside locks, log large trim events.
 2011-11-16 23:01:15 -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
1cd383626b am 293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1 
* commit '293f861aab64a0dbae00bb33c90e6e565a7fabfc':
  Activate Dreams (screen saver) when desk-docked.
 2011-11-16 22:35:30 -08:00
Daniel Sandler
10c776af11 am d5decdcc: Merge "Disable desk dock apps." into ics-mr1 
* commit 'd5decdccc64c59ad62de86c70dbe9ead12150cdc':
  Disable desk dock apps.
 2011-11-16 22:35:28 -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
4ecb74ce01 am 8fc3540f: Merge "be a bit more defensive when parsing extension strings" into ics-mr1 
* commit '8fc3540fdf759ff3bb03b00e81d94d6c4102d530':
  be a bit more defensive when parsing extension strings
 2011-11-16 21:00:52 -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
fa92fd7d66 am e88ca718: 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 
* commit 'e88ca718ed9af788f2dc46b5f2db494906bbf41d':
  Hack to workaround the fact that the EGL context can be removed from under us by framework in low memory condition.
 2011-11-16 19:42:07 -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
ae7600c8b3 am 302afb93: Merge "Call notifyIncomingA2dpConnection with correct rejected status" into ics-mr1 
* commit '302afb93d4fd908949ac796eda8343f9683e616a':
  Call notifyIncomingA2dpConnection with correct rejected status
 2011-11-16 18:25:04 -08:00
Mathias Agopian
ddca905c01 am 1125f89e: Merge "remove hack that hardcoded the refresh rate" into ics-mr1 
* commit '1125f89e47b06b12a0e047d64f1ef953d0c48489':
  remove hack that hardcoded the refresh rate
 2011-11-16 18:22:26 -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
92d1396bbf am 4fdfdeed: Merge "Revert change to setInitialScale() to take display density into account." into ics-mr1 
* commit '4fdfdeedc64eef2efe3811198e8fad40aa1b8fc3':
  Revert change to setInitialScale() to take display density into account.
 2011-11-16 18:03:51 -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
b4394bdc70 am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1 
* commit 'e5febfd5bd9b19a01383760b523476ba7f013a5c':
  Clean up the spell checker framework
 2011-11-16 17:37:46 -08:00
satok
517dcd273f Merge "Clean up the spell checker framework" into ics-mr1 2011-11-16 17:35:54 -08:00
Daniel Sandler
0bad94570c am f52a4482: Merge "Add a default Dreams component." into ics-mr1 
* commit 'f52a4482dd3ca336f84fc6c533ea4a99a72b23dd':
  Add a default Dreams component.
 2011-11-16 17:16:54 -08:00
Daniel Sandler
f04df720b6 am 5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1 
* commit '5311917df5fe9804105ff6070346b8fac4b102df':
  Remove day of week from phone notification panel.
 2011-11-16 17:14:30 -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