ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
23,050 Commits 2 Branches 0 Tags 54 MiB
6a817e22e4
Commit Graph

23050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
de3b8ebe87 am 6066da89: (-s ours) am 590b73bc: NFC API revision round 2. 
Merge commit '6066da89a464d2bd5f002f5e687d40876ed5ce21'

* commit '6066da89a464d2bd5f002f5e687d40876ed5ce21':
  NFC API revision round 2.
 2010-10-14 21:18:41 -07:00
Jason Sams
fa06278765 Merge "Fix object cast." 2010-10-14 17:58:39 -07:00
Jason Sams
648973bb1a Merge "Async type creation." 2010-10-14 17:52:31 -07:00
Chris Tate
9a0e9202ca Merge "Drag thumbnail fixes / improvements" 2010-10-14 17:14:07 -07:00
Irfan Sheriff
90390366fe Merge "Remove synchronous bluetooth callbacks" 2010-10-14 17:11:13 -07:00
Adam Cohen
c6e0d89af5 Merge "Fixing null pointer exception" 2010-10-14 16:29:29 -07:00
Adam Powell
c2d9a5be00 Merge "Holo styling and metrics; holo spinners" 2010-10-14 16:24:59 -07:00
Jaikumar Ganesh
adcc807c35 Merge "Disconnect PBAP while disconnecting HFP profile." 2010-10-14 16:18:22 -07:00
Jim Miller
540a73eb45 Merge "Fix 3024528: Add owner info to SecureSettings." 2010-10-14 15:54:21 -07:00
Justin Ho
cd4a330ad5 am dfd37a47: (-s ours) am 45738f67: Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 
Merge commit 'dfd37a4748845273d929f24ae5d68032d19f6216'

* commit 'dfd37a4748845273d929f24ae5d68032d19f6216':
  Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
 2010-10-14 15:43:25 -07:00
Hung-ying Tyan
70cc91cd5b am 06e55977: am 907f6f1d: Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread 
Merge commit '06e559779edd93a83100824b36c9bf67a27db178'

* commit '06e559779edd93a83100824b36c9bf67a27db178':
  Fix SipSessionGroup from throwing ConcurrentModificationException
 2010-10-14 15:29:35 -07:00
Adam Powell
a29be9f92d am 2b87dbc3: (-s ours) am c417612a: Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread 
Merge commit '2b87dbc3b89f19bd5cde58b2b178cb7be50d77f9'

* commit '2b87dbc3b89f19bd5cde58b2b178cb7be50d77f9':
  Fix bug 3083631 - Links no longer get tapped during scale gestures
 2010-10-14 15:28:50 -07:00
Chet Haase
5e3eb0c093 Merge "Remove errant minus sign" 2010-10-14 15:07:30 -07:00
Romain Guy
aeec4a8942 Merge "Fix text rendering issue." 2010-10-14 14:54:58 -07:00
Shimeng (Simon) Wang
48b8bb0395 Merge "Remove not-used code." 2010-10-14 14:53:52 -07:00
Chris Tate
50ca4c0e02 Merge "Actually draw the drag thumbnail" 2010-10-14 14:44:06 -07:00
Shimeng (Simon) Wang
53ccc24675 Merge "Fixed viewport enhancement for site with viewport tag." 2010-10-14 14:30:17 -07:00
Nicolas Roard
b5be4d9598 Merge "Fix embed webview" 2010-10-14 14:12:40 -07:00
Raphael Moll
9f986a25fc am 848a2bc4: Merge "MinGW/Cygwin requires open() in O_BINARY mode." into gingerbread 
Merge commit '848a2bc4cc6eab0f1d0bc030616b9305df3aa7da' into gingerbread-plus-aosp

* commit '848a2bc4cc6eab0f1d0bc030616b9305df3aa7da':
  MinGW/Cygwin requires open() in O_BINARY mode.
 2010-10-14 13:41:51 -07:00
Mathias Agopian
a310993c83 am b0e020ab: Merge "may fix 3097381 and 3097482. don\'t abort on/off if the animation fails" into gingerbread 
Merge commit 'b0e020ab409b725a556f2c5043b08c9bac2c29bf' into gingerbread-plus-aosp

* commit 'b0e020ab409b725a556f2c5043b08c9bac2c29bf':
  may fix 3097381 and 3097482. don't abort on/off if the animation fails
 2010-10-14 13:41:28 -07:00
Jaikumar Ganesh
cf0c0110ea am 8b525c07: Merge "Check for state before disconnecting." into gingerbread 
Merge commit '8b525c076068eb38106dca05513816c01d8bdddb' into gingerbread-plus-aosp

* commit '8b525c076068eb38106dca05513816c01d8bdddb':
  Check for state before disconnecting.
 2010-10-14 13:41:16 -07:00
Raphael Moll
6f3c5bd194 Merge "MinGW/Cygwin requires open() in O_BINARY mode." into gingerbread 2010-10-14 13:01:17 -07:00
Mathias Agopian
295c7002f6 Merge "may fix 3097381 and 3097482. don't abort on/off if the animation fails" into gingerbread 2010-10-14 12:38:51 -07:00
Jaikumar Ganesh
8e1e9df48f Merge "Check for state before disconnecting." into gingerbread 2010-10-14 12:36:00 -07:00
Mathias Agopian
015fb3fb41 may fix 3097381 and 3097482. don't abort on/off if the animation fails 
now that sf handles more of the screen on/off state, we don't want to abort
because/if the animation fails for some reason (which will be the case on the
emulator).

Change-Id: I239e0a39cf8aff3074647e82db92de4a0bf0e494
 2010-10-14 12:24:54 -07:00
Joe Malin
851bdd74d1 am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread 
Merge commit '75d3591b2dd60e50182542045147b9b6033c2b85' into gingerbread-plus-aosp

* commit '75d3591b2dd60e50182542045147b9b6033c2b85':
  DOC CHANGE: Fix bug in Testing doc
 2010-10-14 12:09:33 -07:00
Joe Malin
43233b1a43 Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread 2010-10-14 12:05:33 -07:00
Jeff Brown
b2c3e78597 am 2d441e14: Merge "Make sure EventHub reports added/removed devices immediately." into gingerbread 
Merge commit '2d441e148502bb492816ef84837510397f77a039' into gingerbread-plus-aosp

* commit '2d441e148502bb492816ef84837510397f77a039':
  Make sure EventHub reports added/removed devices immediately.
 2010-10-14 12:03:36 -07:00
Roy West
7f82f9bb3c am 29f28cdc: Merge "Change storage names to match 10-13 decision" into gingerbread 
Merge commit '29f28cdc5315d11919595bf8623d6a67797a34e7' into gingerbread-plus-aosp

* commit '29f28cdc5315d11919595bf8623d6a67797a34e7':
  Change storage names to match 10-13 decision
 2010-10-14 12:03:19 -07:00
Joe Onorato
eb42bb3b23 am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread 
Merge commit '3d828e62c856074334a00ce7c621050b4d7166e4' into gingerbread-plus-aosp

* commit '3d828e62c856074334a00ce7c621050b4d7166e4':
  Do not build pbkdf2gen on non-Linux hosts
 2010-10-14 12:03:07 -07:00
Gilles Debunne
d029b4fcec am 53ea7f58: Merge "Really leave text selection mode when using the trackball." into gingerbread 
Merge commit '53ea7f58c071563b7c5dd0061df39d3b4bf38a63' into gingerbread-plus-aosp

* commit '53ea7f58c071563b7c5dd0061df39d3b4bf38a63':
  Really leave text selection mode when using the trackball.
 2010-10-14 12:02:44 -07:00
Jeff Brown
c04563d340 Merge "Make sure EventHub reports added/removed devices immediately." into gingerbread 2010-10-14 11:52:58 -07:00
Shimeng (Simon) Wang
bda9f77061 Merge "Use real fixed viewport, and let the content width be the overview width." 2010-10-14 11:45:52 -07:00
Roy West
7b379f690b Merge "Change storage names to match 10-13 decision" into gingerbread 2010-10-14 11:15:50 -07:00
Jaikumar Ganesh
90241a102e Merge "Add function to check for AVRCP target to send volume keys." 2010-10-14 11:03:42 -07:00
James Dong
a79369fccf Merge "Remove hard-coded color format for Nvidia's video encoder" 2010-10-14 11:01:15 -07:00
Joe Onorato
1013d9e5df Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread 2010-10-14 10:59:37 -07:00
Gilles Debunne
8aa3f28b6f Merge "Really leave text selection mode when using the trackball." into gingerbread 2010-10-14 10:58:59 -07:00
Romain Guy
9c7ccd1a20 Merge "Remove generics from Animator APIs" 2010-10-14 10:08:12 -07:00
Jaikumar Ganesh
8078459815 Merge "resolved conflicts for merge of 79a5307a to master" 2010-10-14 09:43:00 -07:00
Jaikumar Ganesh
3d9db684e5 resolved conflicts for merge of 79a5307a to master 
Change-Id: I5a524fe53e74df722db003cec6ab62451fe0f899
 2010-10-14 09:39:41 -07:00
Alex Sakhartchouk
c072fc9ff6 Merge "Changing scenegraph sample to use arrays." 2010-10-14 09:34:56 -07:00
Ben Murdoch
4607aedaab Merge "Add support for the complete set of AutoFill profile data." 2010-10-14 07:48:28 -07:00
Steve Block
2898441ad7 Merge "Implement LayoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey')" 2010-10-14 04:46:42 -07:00
Jeff Brown
7e40f36237 Make sure EventHub reports added/removed devices immediately. 
Fixed a bug where EventHub would not report changes in devices
until the next event.

Bug: 3096147
Change-Id: Ie4c3e1d14d0ad806cfaa212611ce06034d1b94d4
 2010-10-14 02:23:43 -07:00
Hung-ying Tyan
f5f4f67704 am bd57eeaf: SipService: add wake lock for multiple components. 
Merge commit 'bd57eeafe034cf850225db403700b5dc5db5ebcc' into gingerbread-plus-aosp

* commit 'bd57eeafe034cf850225db403700b5dc5db5ebcc':
  SipService: add wake lock for multiple components.
 2010-10-14 02:15:23 -07:00
Jeff Brown
d360cccfc8 am 7eb67fb4: am fa3d9557: Merge "Add text selection handles to preloaded drawables." into gingerbread 
Merge commit '7eb67fb44098bf4b26a1a2d20516f632ab747805'

* commit '7eb67fb44098bf4b26a1a2d20516f632ab747805':
  Add text selection handles to preloaded drawables.
 2010-10-13 23:36:10 -07:00
Andy Stadler
e626383be8 am 8a703c77: am 8e2be267: Add versionCode and versionName to dumpsys packages 
Merge commit '8a703c772ef233998fccfbdb159c8879c72fa5d3'

* commit '8a703c772ef233998fccfbdb159c8879c72fa5d3':
  Add versionCode and versionName to dumpsys packages
 2010-10-13 23:35:12 -07:00
Adam Powell
f3086059e3 am 4af1de39: am fb6431c0: Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread 
Merge commit '4af1de39ab36cbff08075e654db516526ff9038d'

* commit '4af1de39ab36cbff08075e654db516526ff9038d':
  Fix bug 3064135 - do not allow text handles on TextViews in sub windows.
 2010-10-13 23:34:54 -07:00
Irfan Sheriff
fe0c4b1957 am a9c2ef84: (-s ours) am e22eb863: Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread 
Merge commit 'a9c2ef8464f6678c21e0cdf9f4cd8f4e1fd20d2e'

* commit 'a9c2ef8464f6678c21e0cdf9f4cd8f4e1fd20d2e':
  fix start driver for corner cases DO NOT MERGE
 2010-10-13 23:34:41 -07:00