ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
40,172 Commits 2 Branches 0 Tags 54 MiB
ce3b88b145
Commit Graph

40172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mangesh Ghiware
ce3b88b145 Merge "Fix setInitialScale() to take display density into account." into ics-mr1 2011-11-01 14:02:05 -07:00
Eric Fischer
529d127495 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-01 13:53:14 -07:00
Michael Jurka
f641d134a6 Merge "Fix: never show recents over lock screen" into ics-mr1 2011-11-01 13:53:02 -07:00
Peter Ng
a5268c55aa Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1 2011-11-01 13:45:18 -07:00
Fabrice Di Meglio
05c74c26fb Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1 2011-11-01 13:30:24 -07:00
Robert Greenwalt
9f0f58fa6b am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0 
* commit 'bd9b1528051a1b257768fdbc5077a2d4473b02dd':
  Add cdma_rmnet4 to list of monitored interfaces
 2011-11-01 20:29:42 +00:00
Robert Greenwalt
8782f962e6 Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0 2011-11-01 13:27:56 -07:00
Daniel Sandler
72c3a93927 Merge "Bring timestamps back to notifications." into ics-mr1 2011-11-01 13:05:41 -07:00
Jim Miller
5f81b16731 Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1 2011-11-01 12:45:11 -07:00
Fabrice Di Meglio
1d55ff9fdc am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 
* commit '46e327ca32a29432941ba4487077577b10243aed':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
 2011-11-01 19:42:48 +00:00
Fabrice Di Meglio
33ba0be0de Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 2011-11-01 12:41:04 -07:00
Mangesh Ghiware
28e2117ac8 Merge "Clamp initial scale between minimum and maximum values." into ics-mr1 2011-11-01 11:28:01 -07:00
Adam Powell
399a23a3c2 Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1 2011-11-01 10:58:58 -07:00
Dianne Hackborn
770e520a5a Merge "Various performance and other work." into ics-mr1 2011-11-01 10:42:54 -07:00
Peter Ng
3aa6082099 Merge "spinner focused states pumped up" into ics-mr1 2011-11-01 10:29:25 -07:00
The Android Open Source Project
49c742032d am 9eb4c891: Reconcile with ics-factoryrom-2-release 
* commit '9eb4c891a3db118f2546af7593c6251f3210f3ef':
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-11-01 17:10:39 +00:00
The Android Open Source Project
0c60db0bec Reconcile with ics-factoryrom-2-release 
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
 2011-11-01 10:08:15 -07:00
Philip Milne
e0019f711f Merge " Update to fix for bug 5393156" into ics-mr1 2011-11-01 09:30:21 -07:00
Jim Miller
2dd3840a8d am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 
* commit '1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea':
  Fix 5497305: Make sure we show SIM unlock when "None" is selected
 2011-11-01 07:49:46 +00:00
Jim Miller
de783e2fb6 Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 2011-11-01 00:47:44 -07:00
Chih-Chung Chang
30a266754c am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0 
* commit '4b6353ea0265bfed52d0637abd1b17596ce25ff0':
  Update camera continuous autofocus javadoc.
 2011-11-01 04:05:45 +00:00
Chih-Chung Chang
a662648d66 Merge "Update camera continuous autofocus javadoc." into ics-mr0 2011-10-31 21:04:01 -07:00
satok
ea11f562fc Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1 2011-10-31 18:20:48 -07:00
Adam Powell
1785ad2355 Merge "Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1 2011-10-31 18:18:33 -07:00
Stephen Hines
93b431e1e3 am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0 
* commit 'af675222f6340a8a9edbe9e8635014a18521e5e0':
  Fix potential segfault in RS watchdog.
 2011-11-01 00:16:56 +00:00
Stephen Hines
4713ddbc33 Merge "Fix potential segfault in RS watchdog." into ics-mr0 2011-10-31 17:14:58 -07:00
The Android Automerger
50a0b7c3ad Revert "Merge "Improve the slow query instrumentation." into ics-mr0" 
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
 2011-10-31 16:47:11 -07:00
Eric Laurent
b032a4f04e am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0 
* commit '6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
  Fix volume indication in vibrate mode.
 2011-10-31 23:23:15 +00:00
Eric Laurent
38b089498e Merge "Fix volume indication in vibrate mode." into ics-mr0 2011-10-31 16:21:16 -07:00
Martijn Coenen
62d73132c4 am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0 
* commit '1eca250b9dad45893fead128539f112cbc513496':
  Fix disableForegroundNdefPush crash.
 2011-10-31 22:54:43 +00:00
Martijn Coenen
e87e3dddf7 Merge "Fix disableForegroundNdefPush crash." into ics-mr0 2011-10-31 15:53:08 -07:00
Pannag Sanketi
ebb8d42602 Merge "Expose video stabilization API" into ics-mr1 2011-10-31 15:05:19 -07:00
Svetoslav Ganov
a1304a1a8e am aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 
* commit 'aeb11b598877523fd3c530c7a086c38b4a13c7a1':
  Folding Accessibility Service sample into ApiDemos.
 2011-10-31 20:30:30 +00:00
Svetoslav Ganov
89f0560d5f Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 2011-10-31 13:28:57 -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
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
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