ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
22,989 Commits 2 Branches 0 Tags 54 MiB
450ead5beb
Commit Graph

22989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
450ead5beb Merge "Fix deadlock on RS teardown." 2010-10-15 11:28:56 -07:00
Jaikumar Ganesh
1bd44e1c4f resolved conflicts for merge of bbb90d13 to master 
Change-Id: I85de73f6e11e7547a006d41ca49021bca19af14b
 2010-10-15 10:02:57 -07:00
Mindy Pereira
3d929c1095 am baf56089: (-s ours) am 998c6777: Merge "Never show overscroll if the page scrolls at all." into gingerbread 
Merge commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac'

* commit 'baf5608941ae4de2bb5620fc81291f33da9d57ac':
  Never show overscroll if the page scrolls at all.
 2010-10-15 09:29:40 -07:00
Mindy Pereira
574869fa57 am 7d73b706: (-s ours) am 868322ce: Merge "Reduce the time it takes to decay the glow after a pull." into gingerbread 
Merge commit '7d73b7066867368ebb30dd67a1649ae9db04b93e'

* commit '7d73b7066867368ebb30dd67a1649ae9db04b93e':
  Reduce the time it takes to decay the glow after a pull.
 2010-10-15 09:10:52 -07:00
Mathias Agopian
e33a35f025 am 5bfa3a34: am 011b5bcc: Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread 
Merge commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f'

* commit '5bfa3a34eaef759c3ec4def76f646eb1c0bf997f':
  implement part of [3094280] New animation for screen on and screen off
 2010-10-15 08:33:43 -07:00
Andreas Huber
2222fb317a am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread 
Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f'

* commit '27c7fb1a861776b4fdc2632697e4e25eee83617f':
  Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
 2010-10-15 08:33:23 -07:00
Jean-Baptiste Queru
cc0b19dad5 am 0982d8d0: Merge "ignore - a similar change already exists" into gingerbread-plus-aosp 
Merge commit '0982d8d0d3b9d685a3c159519cb0d2eb705e3027'

* commit '0982d8d0d3b9d685a3c159519cb0d2eb705e3027':
  Fix sometimes mExpandedView will appear while screen transforming.
 2010-10-15 08:33:12 -07:00
Dan Morrill
fa834761cf am b58af2b8: am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread 
Merge commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0'

* commit 'b58af2b8b3871436942d0e2c878c906bffaa2fb0':
  Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
 2010-10-15 08:33:00 -07:00
Kenny Root
9197b6f1dc am 89b73a75: am 361a6ad1: Merge "Handle native library deletion in scanPackage" into gingerbread 
Merge commit '89b73a75467d85c58467c5b8c080c77d25860fe0'

* commit '89b73a75467d85c58467c5b8c080c77d25860fe0':
  Handle native library deletion in scanPackage
 2010-10-15 08:32:43 -07:00
Kenny Root
ed35350bab am 2f98a585: am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread 
Merge commit '2f98a585cda066689b1b525322c51fcacbc3770b'

* commit '2f98a585cda066689b1b525322c51fcacbc3770b':
  OBB: Change documentation to reflect reality
 2010-10-15 08:32:30 -07:00
Andreas Huber
1de68317db am bb5d7c21: am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread 
Merge commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b'

* commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b':
  Attempt to derive the avg. bitrate of the entire stream from metadata.
 2010-10-15 08:32:06 -07:00
Andreas Huber
88cb3809df am 8e4f3c76: am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread 
Merge commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160'

* commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160':
  Some webcams output rtp streams but never send any rtcp data in violation of
 2010-10-15 00:08:35 -07:00
Kenny Root
37abeed739 am b4f26a9d: am e6ae5c39: Merge "Add shutdown assurance" into gingerbread 
Merge commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd'

* commit 'b4f26a9d37caf7762b66b68d50825c5b075b42bd':
  Add shutdown assurance
 2010-10-15 00:08:22 -07:00
Wink Saville
261ae1c198 am 94980e0f: am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread 
Merge commit '94980e0f76295de53bd168608d11dba3c39cca9d'

* commit '94980e0f76295de53bd168608d11dba3c39cca9d':
  Fix NPE caused by Change I4df27119.
 2010-10-15 00:07:40 -07:00
Scott Main
6892dcd903 am 5cfa877e: am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494 
Merge commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e'

* commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e':
  docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
 2010-10-15 00:07:26 -07:00
Nick Pelly
0fd0503468 am 67fc4af9: am 527d8bbd: Merge "Add missing native methods to fix boot." into gingerbread 
Merge commit '67fc4af9765d15c4e011c8127f9c06dfd0368bbe'

* commit '67fc4af9765d15c4e011c8127f9c06dfd0368bbe':
  Add missing native methods to fix boot.
 2010-10-15 00:05:29 -07:00
Kenny Root
36c12ad6e5 resolved conflicts for merge of a127c07c to master 
Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
 2010-10-14 23:58:41 -07:00
Andreas Huber
dab5c48231 am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread 
Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0'

* commit '28b93967d0e702304c7edec854a29d5ab88bfce0':
  HTTP Live content that are tagged as complete are now seekable.
 2010-10-14 23:22:21 -07:00
Leon Scroggins
bea75801c4 am c7ee44cb: am dfc07279: Line up WebTextView text with the page. 
Merge commit 'c7ee44cbe155c2272687a0e82133f3e729eac137'

* commit 'c7ee44cbe155c2272687a0e82133f3e729eac137':
  Line up WebTextView text with the page.
 2010-10-14 23:03:23 -07:00
Mike Lockwood
64dff98e91 am 1442818a: am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread 
Merge commit '1442818a10988cc011f55104e997474b5d3d2468'

* commit '1442818a10988cc011f55104e997474b5d3d2468':
  GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
 2010-10-14 22:37:14 -07:00
Justin Ho
589bc941fd am 27023cc5: (-s ours) am e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread 
Merge commit '27023cc5fefc4e56f672ee264289fa319d97585b'

* commit '27023cc5fefc4e56f672ee264289fa319d97585b':
  Updated popup_ 9 patches and removing text_select_handle (hdpi)
 2010-10-14 22:13:37 -07:00
Justin Ho
292902e64a am c42d196f: (-s ours) am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background 
Merge commit 'c42d196f969e1d7f588e5e397176557c4c97575f'

* commit 'c42d196f969e1d7f588e5e397176557c4c97575f':
  Updated lockscreen asset (Hiroshi), new menu background
 2010-10-14 21:48:20 -07:00
Hung-ying Tyan
bd9276b8e0 am 8a362186: am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread 
Merge commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c'

* commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c':
  SipService: mScreenOn is flipped to wrong value.
 2010-10-14 21:19:54 -07:00
Nick Pelly
63beeca752 am 9fae3ecc: am ab39f1ef: Merge "Fix build." into gingerbread 
Merge commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6'

* commit '9fae3eccce6b3f336ecf304f6c15df0edd9ca7e6':
  Fix build.
 2010-10-14 21:19:36 -07:00
Dianne Hackborn
c2cbc954bc am 4ce930da: am 259c8499: Merge "Fix issue #3089800: adb shell am -W causes ActivityManager crash" into gingerbread 
Merge commit '4ce930da993c778c8b75da61a9ee3793f9aa84ea'

* commit '4ce930da993c778c8b75da61a9ee3793f9aa84ea':
  Fix issue #3089800: adb shell am -W causes ActivityManager crash
 2010-10-14 21:19:20 -07:00
Jaikumar Ganesh
e38bc55d45 am 373a6961: am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread 
Merge commit '373a69614e534ae04dddd79c92933b6d8969fad7'

* commit '373a69614e534ae04dddd79c92933b6d8969fad7':
  Bluez doesn't handle disconnect while connecting well.
 2010-10-14 21:19:04 -07:00
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
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
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
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