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

40273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
69014dbc6b am d59daca8: Reconcile with ics-mr0-release 
* commit 'd59daca890329fb6aee434cacd1136f40e9e487a':
 2011-10-31 22:13:43 +00:00
Tom Taylor
c40601ab7b am adfe6383: Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1 
* commit 'adfe6383ee963b890bfbf319d219a23164804925':
  NPE in Threads.getOrCreateThreadId(Telephony.java:1275)
 2011-10-31 22:13:39 +00:00
The Android Open Source Project
efaa542422 am d7f36121: am 50d0511d: Reconcile with ics-factoryrom-2-release 
* commit 'd7f36121f64fbbfaf640f073e01c43441b149d97':
  Revert "Improve the slow query instrumentation."
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-10-31 22:13:37 +00:00
Adam Powell
b76672f04c am 1759af3b: Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1 
* commit '1759af3bc8a8f1346e3fb95351ed8037f38526d8':
  Bug 5535639 - Monkeys mad at FragmentManager
 2011-10-31 22:13:33 +00:00
Winson Chung
3813ef5b67 am 650ee281: Merge "Using fast-invalidate pattern for screenshot animations." into ics-mr1 
* commit '650ee281ae9e007ce82ea79ff18bab9ef49503de':
  Using fast-invalidate pattern for screenshot animations.
 2011-10-31 22:13:26 +00:00
Marco Nelissen
66877b7b18 am 6d4b9f0b: Merge "Make MediaController use low profile system UI" into ics-mr1 
* commit '6d4b9f0b409dd15d8ada0a990f9c5785bdbd2e9f':
  Make MediaController use low profile system UI
 2011-10-31 22:13:21 +00:00
Alex Sakhartchouk
a20b1d28a4 am 66ce1fce: Merge "Removing changes not meant for MR1" into ics-mr1 
* commit '66ce1fce59d2dc16f1905120e0fe3851ba1add90':
  Removing changes not meant for MR1
 2011-10-31 22:13:19 +00:00
Michael Jurka
a5af86d341 am b4529b0a: Merge "HorizontalScrollView should delay child presses" into ics-mr1 
* commit 'b4529b0adca243644f601c9fe5d419c283bf57c1':
  HorizontalScrollView should delay child presses
 2011-10-31 22:13:16 +00:00
Amith Yamasani
e67e6fb1d3 am 18936d7d: am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0 
* commit '18936d7d1d0964ba3f5112c5e3ce60f31e1ba5bb':
  Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
 2011-10-31 22:13:08 +00:00
Jeff Brown
dcf923732d resolved conflicts for merge of bce45617 to master 
Change-Id: Ieb966e674dca3ec46cd3cd25e4de281f1be747c2
 2011-10-31 15:10:10 -07:00
The Android Open Source Project
6d43afd952 Reconcile with ics-mr0-release 
Change-Id: Ice28e0b55ab17842c9bd01b519b7f4d562822445
 2011-10-31 13:06:22 -07:00
Tom Taylor
4f8eeff7eb Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1 2011-10-31 12:51:19 -07:00
The Android Open Source Project
6936064528 am 50d0511d: Reconcile with ics-factoryrom-2-release 
* commit '50d0511ddbf226255347e95a6382af8b0e7d366b':
  Revert "Improve the slow query instrumentation."
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-10-31 19:45:33 +00:00
The Android Open Source Project
76c5c69255 Reconcile with ics-factoryrom-2-release 
Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662
 2011-10-31 12:43:39 -07:00
Adam Powell
f68912a081 Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1 2011-10-31 12:37:58 -07:00
Winson Chung
552cd78bbb Merge "Using fast-invalidate pattern for screenshot animations." into ics-mr1 2011-10-31 10:54:12 -07:00
Marco Nelissen
96ee2d9464 Merge "Make MediaController use low profile system UI" into ics-mr1 2011-10-31 10:46:33 -07:00
Alex Sakhartchouk
7b33423e8c Merge "Removing changes not meant for MR1" into ics-mr1 2011-10-31 10:30:37 -07:00
Eric Fischer
240544cbff am 94e08f40: (-s ours) am 2cc1c5d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '94e08f40936b6a280f404e8b67cb5ef900747258':
  Import revised translations.  DO NOT MERGE
 2011-10-31 12:26:51 +00:00
Scott Main
f5a0141306 am 5079909b: am 8dbe177c: Merge "docs: fix spell checker client location" into ics-mr0 
* commit '5079909b8b8fe2e629e0a0b86882e6c15b07ae53':
  docs: fix spell checker client location
 2011-10-31 12:26:33 +00:00
Joe Fernandez
e61d755d92 am 74b2b954: am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0 
* commit '74b2b9547329a0b05e0bd5701057696007b854bb':
  docs: add developer guide cross references, Project ACRE, round 3
 2011-10-31 12:26:31 +00:00
Justin Ho
ddc9276708 am 76756a42: am c1cf3b16: Merge "Vertically center the landscape navigation bar." into ics-mr0 
* commit '76756a42dd68062349158f70d9b0ab95db908acc':
  Vertically center the landscape navigation bar.
 2011-10-31 12:26:30 +00:00
satok
9e067da3ae am 4a6d0879: Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1 
* commit '4a6d0879465ea6eb52b2b75e9fa2a4a84e1b0d86':
  Add a flag for recommended suggestions of the spell checker
 2011-10-31 12:26:23 +00:00
satok
552dcc7a2d am f0fd595f: Merge "Hide ime switcher when the screen is turned off." into ics-mr1 
* commit 'f0fd595f0f3203fb81cb39a367b2a06647db907d':
  Hide ime switcher when the screen is turned off.
 2011-10-31 12:26:21 +00:00
Dianne Hackborn
c6d4283dad am 7801612b: Merge "Add some IO tests." into ics-mr1 
* commit '7801612b4f66e3c9cf58d24cffa8ce72e43adc57':
  Add some IO tests.
 2011-10-31 12:26:19 +00:00
Dianne Hackborn
0c2e0e02bb am e02c88af: Work on process management. 
* commit 'e02c88af7935c72fb90a478375e61e4a94465587':
  Work on process management.
 2011-10-31 12:26:15 +00:00
Adam Powell
bbe7d61bb3 am 678ed0c5: Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances. 
* commit '678ed0c5a32bac1ea18a5ac99b0b814421ea79b4':
  Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
 2011-10-31 12:26:08 +00:00
Michael Jurka
06a4fa4f52 Merge "HorizontalScrollView should delay child presses" into ics-mr1 2011-10-30 19:41:24 -07:00
Amith Yamasani
8eb8a79657 am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0 
* commit '69e640ee84fc218d6318acaf73a1c1841d7fba6b':
  Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
 2011-10-30 21:37:09 +00:00
Jeff Brown
9897b46138 resolved conflicts for merge of 2d280f75 to ics-mr1 
Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
 2011-10-30 14:24:02 -07:00
The Android Automerger
1b47eac28c Revert "Improve the slow query instrumentation." 
This reverts commit 89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2.
 2011-10-30 13:56:11 -07:00
The Android Automerger
3186645df4 merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-10-30 12:35:09 -07:00
The Android Automerger
5b832b92d1 merge in ics-mr0-release history after reset to ics-mr0 2011-10-30 06:29:10 -07:00
Jesse Wilson
ce28bd1b8b Merge "Interpret '+' as a space char in the URL query params." 2011-10-29 10:14:34 -07:00
The Android Automerger
30abcbd93d Revert "Merge "Improve the slow query instrumentation." into ics-mr0" 
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
 2011-10-28 20:40:07 -07:00
Eric Fischer
1e6a30e6bd am 2cc1c5d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '2cc1c5d067736f221554be593c2ba2c96390f847':
  Import revised translations.  DO NOT MERGE
 2011-10-29 03:15:36 +00:00
Scott Main
7033da0789 am 8dbe177c: Merge "docs: fix spell checker client location" into ics-mr0 
* commit '8dbe177c5dda205086f7a353dd1fa09a0c7ab24c':
  docs: fix spell checker client location
 2011-10-29 02:16:15 +00:00
Joe Fernandez
1a4fdeacfd am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0 
* commit '09848bc89de999416e2de82a7693b2deec6bf802':
  docs: add developer guide cross references, Project ACRE, round 3
 2011-10-29 02:16:10 +00:00
Justin Ho
2c767cff58 am c1cf3b16: Merge "Vertically center the landscape navigation bar." into ics-mr0 
* commit 'c1cf3b160b4852e021a45806d496a9f9a76d6683':
  Vertically center the landscape navigation bar.
 2011-10-29 02:16:08 +00:00
Amith Yamasani
001411885a Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0 2011-10-28 18:59:11 -07:00
satok
74fcb682e7 Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1 2011-10-28 18:26:40 -07:00
satok
be8fa9fa50 Merge "Hide ime switcher when the screen is turned off." into ics-mr1 2011-10-28 18:25:28 -07:00
Jeff Brown
6d42e13be4 Merge "Improve the slow query instrumentation." into ics-mr0 2011-10-28 18:21:05 -07:00
Dianne Hackborn
9bbc1b2dfb Merge "Add some IO tests." into ics-mr1 2011-10-28 17:33:39 -07:00
Eric Fischer
5b534dcc2e Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-28 17:29:12 -07:00
Svetoslav Ganov
19889da06c Merge "Fixing the build breakage due to bad merge." 2011-10-28 16:42:06 -07:00
Peter Ng
92e746f8aa resolved conflicts for merge of e10462e3 to master 
Change-Id: I1c5a4fd1573583cd365b375835038e7e4a34f201
 2011-10-28 16:09:36 -07:00
Scott Main
3f89429e48 Merge "docs: fix spell checker client location" into ics-mr0 2011-10-28 15:57:45 -07:00
Peter Ng
dc9007843d am 146d018f: Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1 
* commit '146d018f2083ec435ad76c18302cd9e2496ef4d8':
  Checkbox and radio button assets are sharper and blue
 2011-10-28 22:44:18 +00:00
Chet Haase
fa51d6b809 am d568bba5: Merge "Optimize handling of scrolled wallpapers" into ics-mr1 
* commit 'd568bba507b0f66d4d57c67b08ade894d2c75e53':
  Optimize handling of scrolled wallpapers
 2011-10-28 22:44:16 +00:00