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

43479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
fe9a8650cc am 07bebe8b: Reconcile with ics-mr1-release 
* commit '07bebe8b12555ea0fb57729e8ee2e7efc343e7e2':
  Don't use SNR in the invalid check.
 2012-02-07 10:11:11 -08:00
The Android Open Source Project
9fd89364ab Reconcile with ics-mr1-release 
Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
 2012-02-07 10:09:08 -08:00
Marco Nelissen
25f45572ab Merge "Make media scanner use new delete-parameter" 2012-02-07 08:28:02 -08:00
Dianne Hackborn
12839bee29 Return information about whether overlays are disabled. 
Change-Id: I85ae42e9f28461f5142cc6b3c8e25ff3f195805a
 2012-02-06 21:21:05 -08:00
Mathias Agopian
619258483f Merge "make sure to ignore SIGPIPE in the write side of BitTube" 2012-02-06 19:18:57 -08:00
Mathias Agopian
99fe3c6d3d make sure to ignore SIGPIPE in the write side of BitTube 
Change-Id: If4f037f4403d3ecbcd5f91248354765fc0fa13cb
 2012-02-06 19:17:56 -08:00
Xavier Ducrohet
492b8611a4 Merge "Fix a setBackgroundDrawable in layoutlib." 2012-02-06 18:07:21 -08:00
Fabrice Di Meglio
bcc4af6355 Merge "Fix bug #5968466 system running out of memory during WebView performance test" 2012-02-06 17:22:06 -08:00
Fabrice Di Meglio
4abb156cb5 Merge "Update BiDiTest app for adding GridLayout unit tests" 2012-02-06 17:21:40 -08:00
John Wang
cbcd55411f am a0da8adf: am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1 
* commit 'a0da8adf5519d0660d6f0f44e7f91b99d6b741d9':
 2012-02-06 17:06:18 -08:00
John Wang
ba7dcb9047 am 7e6295b3: am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1 
* commit '7e6295b32310afddccf5fb030d4c475ed3678e0f':
  Don't use SNR in the invalid check.
 2012-02-06 17:06:16 -08:00
John Wang
1dba562c36 am 397d3ffc: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1 
* commit '397d3ffcbd27d10b9479e58a46ca6ba70838b697':
 2012-02-06 17:04:42 -08:00
Craig Mautner
e549025943 Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods." 2012-02-06 17:04:23 -08:00
John Wang
35455a1f35 am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1 
* commit '9ad528d51c6e7b56e018100897b3c1cd6f9a2c17':
  Don't use SNR in the invalid check.
 2012-02-06 17:04:11 -08:00
Tom Taylor
518877ec0d Merge "CrespoMMS appears after delay in the thread" 2012-02-06 17:03:34 -08:00
John Wang
b4305fb3b2 am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1 
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
  Don't use SNR in the invalid check.
 2012-02-06 17:03:15 -08:00
John Wang
5e7679927c am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1 
* commit '48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
  Don't use SNR in the invalid check.
 2012-02-06 17:02:30 -08:00
John Wang
5245acf270 Merge "Don't use SNR in the invalid check." into ics-mr1 2012-02-06 17:00:49 -08:00
Xavier Ducrohet
81da5884a4 am 82a74bbe: (-s ours) am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '82a74bbe91b7e90ec2fca56650e3d55ebdedeac2':
 2012-02-06 16:48:55 -08:00
Xavier Ducrohet
96e913b915 am c9bcd33a: (-s ours) am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit 'c9bcd33afa5c34e0a49955c30aa875ac8205b65f':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:46:46 -08:00
Xavier Ducrohet
b8c8ae7b70 am 82fc005f: am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '82fc005f579a20b3c7e63603f056ca095c288196':
 2012-02-06 16:45:21 -08:00
Xavier Ducrohet
e3ea59692a am b1f95c6a: (-s ours) am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit 'b1f95c6a938f6eaaa7a3fd28574a14647178059b':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:44:32 -08:00
Xavier Ducrohet
d92740b76f am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:42:56 -08:00
Xavier Ducrohet
62898802ec am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge. 
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
 2012-02-06 16:42:41 -08:00
James Dong
037cd2964d Merge "Don't call virtual function in destructor of SurfaceMediaSource" 2012-02-06 16:21:24 -08:00
Xavier Ducrohet
71ca517466 Merge "Setup ActionBars in layoutlib the same way the platform does it. do not merge." 2012-02-06 16:17:42 -08:00
Xavier Ducrohet
ff1e263fd4 Merge "Setup ActionBars in layoutlib the same way the platform does it." 2012-02-06 15:52:58 -08:00
Amith Yamasani
b98f339db8 Merge "Check for null ActivityInfo." 2012-02-06 15:39:40 -08:00
Mangesh Ghiware
4766cfcb51 Merge "Use WebKit hit testing result for centering on double-tap zoom." 2012-02-06 15:27:08 -08:00
Scott Main
5bd8758ee8 am f9bb376b: am afaec576: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'f9bb376bd7bfb6bdc77e1621a340122c29afd21c':
 2012-02-06 14:45:41 -08:00
Scott Main
e664c27a8d am dbee29ba: am 5a0fe6fc: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'dbee29ba559a0c16919b5977ed4972481b0a98ec':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:45:39 -08:00
Jean-Baptiste Queru
7d3c1b738f am 33476f7a: am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit '33476f7ad1c3b4dcaefddb306f315e201c4efb33':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:45:36 -08:00
Scott Main
3a0da645cb am afaec576: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'afaec57668551b797505f43d9d9677979dedf0c9':
 2012-02-06 14:15:06 -08:00
Scott Main
f61b86a5f7 am 5a0fe6fc: am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit '5a0fe6fc13bc1102fbc3da8391dd228ed54bba04':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:14:09 -08:00
Scott Main
435d5b6321 am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:12:39 -08:00
Jean-Baptiste Queru
b16e23ba94 am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit 'f79bcd2dd5d82376640661f50aa2e9237af7c02c':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:12:05 -08:00
Scott Main
f20d8ee17f am a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 
* commit 'a9d9fa723a10ae41c047a4e8eba330112d344dc8':
  docs: switch from caps to initial-case for device button names
 2012-02-06 14:12:03 -08:00
Scott Main
3a00a8ad29 Merge "docs: switch from caps to initial-case for device button names" into ics-mr1 2012-02-06 14:10:16 -08:00
Jean-Baptiste Queru
eb7e2d29de am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit '52da99fac85d1e16a3c95bdd9c039801e920e6d1':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:09:36 -08:00
Jean-Baptiste Queru
a6739d66f9 am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library." 
* commit 'a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
  Skia API changes as a result of an update to the Skia library.
 2012-02-06 14:07:31 -08:00
Jean-Baptiste Queru
6ce7188266 Merge "Skia API changes as a result of an update to the Skia library." 2012-02-06 14:01:06 -08:00
Scott Main
59015b369d am 6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit '6f2f42d52a23de0bd639d5e4957331118ccc47b8':
 2012-02-06 13:09:08 -08:00
Scott Main
29a0fb12d8 am 584156ad: am 8e399408: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '584156ad29ec3b62a403ac692b16025c652b984c':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:09:06 -08:00
Scott Main
52d55d8847 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-02-06 13:07:24 -08:00
Scott Main
9f36e61a79 am 8e399408: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '8e399408724f3d18d48d13194e05a80108216fed':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:07:21 -08:00
Scott Main
fa585608f4 am 0654994b: am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '0654994b9e546c50d84b3a9909f190220df65497':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:07:04 -08:00
Scott Main
e2a07c2902 am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:05:28 -08:00
Scott Main
d0b5f04467 am 4ba15efc: Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 
* commit '4ba15efc5b9c884a7651d699a20f9edd7ebd7cb5':
  docs: add Sony USB VID issue 5967572
 2012-02-06 13:05:04 -08:00
Scott Main
5550262cc9 Merge "docs: add Sony USB VID issue 5967572" into ics-mr1 2012-02-06 13:03:16 -08:00
Xavier Ducrohet
78b3490a9a am 9485ca87: am b54f371c: am f8aea993: Make aapt ignore tools-related data. 
* commit '9485ca87edd819e3106a4b8c3d08f1ab73adf818':
 2012-02-06 11:46:49 -08:00