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

40418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
7fbb39960e am 236aea35: Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1 
* commit '236aea3579787961fdd41d87574760b63323c0c1':
  BlobCache: implement cache serialization
  BlobCache: remove the mutex locking
 2011-11-03 18:55:14 +00:00
Jamie Gennis
3aed920fcc Merge changes Ibc99cb1c,Ie1f4f6f8 into ics-mr1 
* changes:
  BlobCache: implement cache serialization
  BlobCache: remove the mutex locking
 2011-11-03 11:51:23 -07:00
Jeff Sharkey
464f048cdd am 3f9ce4c2: Merge "Verify AppWidget ownership during update." into ics-mr1 
* commit '3f9ce4c22ae9b4f0f2208c29f8c93d6ad652a1dc':
  Verify AppWidget ownership during update.
 2011-11-03 18:49:05 +00:00
Teng-Hui Zhu
976b5f23ce am 76b06759: Merge "Create GL texture when it is missing for video layer" into ics-mr1 
* commit '76b067590b2e9dc403c9edac58e414468c5e1104':
  Create GL texture when it is missing for video layer
 2011-11-03 18:46:41 +00:00
Jeff Sharkey
6534d369b7 Merge "Verify AppWidget ownership during update." into ics-mr1 2011-11-03 11:43:52 -07:00
Teng-Hui Zhu
a32ea7fea7 Merge "Create GL texture when it is missing for video layer" into ics-mr1 2011-11-03 11:43:16 -07:00
Andreas Huber
3bbb42ae08 am e395f645: Poll input data with a small timeout and don\'t consume a full core. 
* commit 'e395f645aa4c30a4fad8beb3da6f8fad72338617':
  Poll input data with a small timeout and don't consume a full core.
 2011-11-03 18:12:39 +00:00
Eric Laurent
2bb8b969ba am 1f85f1dc: Merge "Remove unreliable effect tests." into ics-mr1 
* commit '1f85f1dc6ebe3c79ce753f0f9c2f9fa7f29f493d':
  Remove unreliable effect tests.
 2011-11-03 15:49:16 +00:00
Eric Laurent
3f13dd0648 Merge "Remove unreliable effect tests." into ics-mr1 2011-11-03 08:45:43 -07:00
Daniel Sandler
76fee3ce26 am 1f42a3db: Merge "Bring back Android Dreams." into ics-mr1 
* commit '1f42a3db9e09138f92e8eb16c35cf50e92a88a46':
  Bring back Android Dreams.
 2011-11-03 10:59:54 +00:00
Daniel Sandler
8b82413ffa Merge "Bring back Android Dreams." into ics-mr1 2011-11-03 03:56:49 -07:00
satok
8ab5c28b37 am cb1001b2: Merge "Fix a memory leak of a Binder in SpellCheckerService" into ics-mr1 
* commit 'cb1001b2829f7da86f66f2634bd40cbc51ba4998':
  Fix a memory leak of a Binder in SpellCheckerService
 2011-11-03 09:13:13 +00:00
satok
73eb27d22c Merge "Fix a memory leak of a Binder in SpellCheckerService" into ics-mr1 2011-11-03 02:09:32 -07:00
Jeff Sharkey
932cc2e5a0 am 808ee95d: Merge "Correct proc file reader, optimizations." into ics-mr1 
* commit '808ee95dd4244da6ae767d3ddd003ed7b48937d0':
  Correct proc file reader, optimizations.
 2011-11-03 07:36:03 +00:00
Jeff Sharkey
2002b188b4 Merge "Correct proc file reader, optimizations." into ics-mr1 2011-11-03 00:32:22 -07:00
Dianne Hackborn
4a85f3191f am 17bd9a22: Merge "More performance work:" into ics-mr1 
* commit '17bd9a22ec993fc9eba060950bc5cecd1e06ffb1':
  More performance work:
 2011-11-03 05:35:21 +00:00
Dianne Hackborn
76c4bd6a4b Merge "More performance work:" into ics-mr1 2011-11-02 22:31:19 -07:00
Eric Fischer
1cca116b9e am c37f98ea: (-s ours) am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit 'c37f98eab3d6e63f71b1600ea0e4355c6503384b':
  Import revised translations.  DO NOT MERGE
 2011-11-03 00:43:11 +00:00
Katie McCormick
b771ec2c55 am f2158d08: am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 
* commit 'f2158d0820ca6c243fd807224c7e8ebb96cd8d2b':
  Doc change: Update instructions to match ICS UI
 2011-11-03 00:43:09 +00:00
Katie McCormick
c238432aa5 am 31a05f33: Doc change: Update instructions to match ICS UI 
* commit '31a05f336ac99ab4ecfb5e227aca40f8fc7140cb':
  Doc change: Update instructions to match ICS UI
 2011-11-03 00:43:08 +00:00
Eric Fischer
13544d0668 am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '8c49b81b5971c3fd254c4ecd862d1a32b1917edb':
  Import revised translations.  DO NOT MERGE
 2011-11-03 00:04:10 +00:00
Katie McCormick
4dd25d2473 am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 
* commit 'e08be659eba742d117d24f642a95ba65e13bd015':
  Doc change: Update instructions to match ICS UI
 2011-11-03 00:04:09 +00:00
Eric Fischer
d6474254b8 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-02 16:17:03 -07:00
Adam Powell
7bb78b725b am b41d9f8a: Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1 
* commit 'b41d9f8a84a325241440b6e950dea6d240134823':
  Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled
 2011-11-02 22:47:42 +00:00
Adam Powell
dbc5f6ce5d Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1 2011-11-02 15:44:31 -07:00
Katie McCormick
3ad9593529 Merge "Doc change: Update instructions to match ICS UI" into ics-mr0 2011-11-02 15:42:18 -07:00
Irfan Sheriff
6023c677db am b419abca: am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 
* commit 'b419abcadad79cd908acfe51dc6e8902c16ff728':
  Avoid duplicate dialogs leading to NPE
 2011-11-02 21:42:49 +00:00
Irfan Sheriff
6c9bd888a7 am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 
* commit '7f00c22b7fa7b38b644585c0a3c6faadc5def94c':
  Avoid duplicate dialogs leading to NPE
 2011-11-02 21:38:55 +00:00
Irfan Sheriff
712fd592e0 Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0 2011-11-02 14:37:19 -07:00
Robert Greenwalt
40e3faee15 am 4a113251: am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0 
* commit '4a113251078ad028d1a071ebf5562185275c7039':
  Ignore errors when untethering
 2011-11-02 21:32:26 +00:00
Robert Greenwalt
5333e1f764 am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0 
* commit '451fa13e82ea1226895b41282fdb33bf9fea5d19':
  Ignore errors when untethering
 2011-11-02 21:28:33 +00:00
Robert Greenwalt
a90153f696 Merge "Ignore errors when untethering" into ics-mr0 2011-11-02 14:26:45 -07:00
Eric Fischer
1d242eff29 Merge "Import revised translations." 2011-11-02 14:16:29 -07:00
Tor Norbye
596e302aa3 Merge "Set theme-tag in render log when failing to find style" 2011-11-02 12:48:25 -07:00
Scott Main
488f823359 am 42774dec: am aea8d850: docs: a couple typos bugs 5552478 5553096 
* commit '42774decd903d0bbd1c57c9aa829719f2a683231':
  docs: a couple typos bugs 5552478 5553096
 2011-11-02 19:14:48 +00:00
Scott Main
7b5e2b93be am aea8d850: docs: a couple typos bugs 5552478 5553096 
* commit 'aea8d8500395f7e7dce3f670933f7aaf02be7b11':
  docs: a couple typos bugs 5552478 5553096
 2011-11-02 19:10:21 +00:00
Svetoslav Ganov
c3a04726b2 am 1997fe14: Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1 
* commit '1997fe1482ecf1ca920c7729a1ad9df5340565f3':
  Update KeyBoardView to reflect the interaction model in Latin IME
 2011-11-02 18:55:44 +00:00
Svetoslav Ganov
aba3c0c36c Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1 2011-11-02 11:51:58 -07:00
Peter Ng
8dbda74732 am 779c1b85: Merge "Make the notification panel header opaque." into ics-mr1 
* commit '779c1b8507d939bd3bd6d3e758ded095d91bcd6f':
  Make the notification panel header opaque.
 2011-11-02 18:50:06 +00:00
Peter Ng
8a08bd2b14 am c7dbfc64: Merge "making slide unlock on tablet have a larger radius" into ics-mr1 
* commit 'c7dbfc640bcbc6a238068742aeaa76473e56037e':
  making slide unlock on tablet have a larger radius
 2011-11-02 18:50:03 +00:00
Amith Yamasani
c5ceeb75f2 am dab15d14: Merge "Don\'t expand the SearchView if already expanded." into ics-mr1 
* commit 'dab15d14ca2ce9c3a614e97869824c6337e76d51':
  Don't expand the SearchView if already expanded.
 2011-11-02 18:47:51 +00:00
Peter Ng
c001daee5a Merge "Make the notification panel header opaque." into ics-mr1 2011-11-02 11:47:04 -07:00
Peter Ng
a7c9bbfc08 Merge "making slide unlock on tablet have a larger radius" into ics-mr1 2011-11-02 11:46:32 -07:00
Amith Yamasani
b9afb7b598 Merge "Don't expand the SearchView if already expanded." into ics-mr1 2011-11-02 11:43:53 -07:00
The Android Open Source Project
ae5b983849 am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit '11b49ba933bab7ff8262139141eef0e5f3c45a18':
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
  Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
  Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
 2011-11-02 17:59:05 +00:00
Adam Powell
4cb6ff8dd8 am 7a5a50c1: Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1 
* commit '7a5a50c12f6a6e094d1e8aa7514df37f1176354a':
  Bug 5513073 - IllegalArgumentException: View not attached to window manager
 2011-11-02 17:54:36 +00:00
The Android Open Source Project
d4460f9733 Reconcile with ics-mr0-release ics-factoryrom-2-release 
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
 2011-11-02 10:52:49 -07:00
Svetoslav Ganov
1d150df970 am e5d0f199: Merge "CalendarView title incorrectly updated for different languages." into ics-mr1 
* commit 'e5d0f19953189fdd0e2661ebb7f0ea925f14ea13':
  CalendarView title incorrectly updated for different languages.
 2011-11-02 17:50:50 +00:00
Svetoslav Ganov
d7f06aa9dd am 6e42470f: Merge "Accessibility window query APIs should respect root name space." into ics-mr1 
* commit '6e42470f928bbf60c9fd3d17a2a69a4b96cec170':
  Accessibility window query APIs should respect root name space.
 2011-11-02 17:50:48 +00:00
Svetoslav Ganov
c1cb215ed6 am 7f0c850b: Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1 
* commit '7f0c850b7a4a2b8a135a110a33d053f4d6689559':
  Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes.
 2011-11-02 17:50:46 +00:00