OSDN Git Service
Teng-Hui Zhu [Thu, 3 Nov 2011 18:43:16 +0000 (11:43 -0700)]
Merge "Create GL texture when it is missing for video layer" into ics-mr1
Eric Laurent [Thu, 3 Nov 2011 15:45:43 +0000 (08:45 -0700)]
Merge "Remove unreliable effect tests." into ics-mr1
Daniel Sandler [Thu, 3 Nov 2011 10:56:49 +0000 (03:56 -0700)]
Merge "Bring back Android Dreams." into ics-mr1
satok [Thu, 3 Nov 2011 09:09:32 +0000 (02:09 -0700)]
Merge "Fix a memory leak of a Binder in SpellCheckerService" into ics-mr1
Jeff Sharkey [Thu, 3 Nov 2011 07:32:22 +0000 (00:32 -0700)]
Merge "Correct proc file reader, optimizations." into ics-mr1
Dianne Hackborn [Thu, 3 Nov 2011 05:31:19 +0000 (22:31 -0700)]
Merge "More performance work:" into ics-mr1
Eric Fischer [Thu, 3 Nov 2011 00:04:10 +0000 (00:04 +0000)]
am
8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
8c49b81b5971c3fd254c4ecd862d1a32b1917edb':
Import revised translations. DO NOT MERGE
Katie McCormick [Thu, 3 Nov 2011 00:04:09 +0000 (00:04 +0000)]
am
e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0
* commit '
e08be659eba742d117d24f642a95ba65e13bd015':
Doc change: Update instructions to match ICS UI
Eric Fischer [Wed, 2 Nov 2011 23:17:03 +0000 (16:17 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Adam Powell [Wed, 2 Nov 2011 22:44:31 +0000 (15:44 -0700)]
Merge "Fix bug
5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1
Katie McCormick [Wed, 2 Nov 2011 22:42:18 +0000 (15:42 -0700)]
Merge "Doc change: Update instructions to match ICS UI" into ics-mr0
Irfan Sheriff [Wed, 2 Nov 2011 21:38:55 +0000 (21:38 +0000)]
am
7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
* commit '
7f00c22b7fa7b38b644585c0a3c6faadc5def94c':
Avoid duplicate dialogs leading to NPE
Irfan Sheriff [Wed, 2 Nov 2011 21:37:19 +0000 (14:37 -0700)]
Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
Robert Greenwalt [Wed, 2 Nov 2011 21:28:33 +0000 (21:28 +0000)]
am
451fa13e: Merge "Ignore errors when untethering" into ics-mr0
* commit '
451fa13e82ea1226895b41282fdb33bf9fea5d19':
Ignore errors when untethering
Robert Greenwalt [Wed, 2 Nov 2011 21:26:45 +0000 (14:26 -0700)]
Merge "Ignore errors when untethering" into ics-mr0
Scott Main [Wed, 2 Nov 2011 19:10:21 +0000 (19:10 +0000)]
Svetoslav Ganov [Wed, 2 Nov 2011 18:51:58 +0000 (11:51 -0700)]
Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1
Peter Ng [Wed, 2 Nov 2011 18:47:04 +0000 (11:47 -0700)]
Merge "Make the notification panel header opaque." into ics-mr1
Peter Ng [Wed, 2 Nov 2011 18:46:32 +0000 (11:46 -0700)]
Merge "making slide unlock on tablet have a larger radius" into ics-mr1
Amith Yamasani [Wed, 2 Nov 2011 18:43:53 +0000 (11:43 -0700)]
Merge "Don't expand the SearchView if already expanded." into ics-mr1
The Android Open Source Project [Wed, 2 Nov 2011 17:52:48 +0000 (10:52 -0700)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
Adam Powell [Wed, 2 Nov 2011 17:33:52 +0000 (10:33 -0700)]
Merge "Bug
5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1
Svetoslav Ganov [Wed, 2 Nov 2011 17:14:46 +0000 (10:14 -0700)]
Merge "CalendarView title incorrectly updated for different languages." into ics-mr1
Svetoslav Ganov [Wed, 2 Nov 2011 17:13:55 +0000 (10:13 -0700)]
Merge "Accessibility window query APIs should respect root name space." into ics-mr1
Svetoslav Ganov [Wed, 2 Nov 2011 17:13:17 +0000 (10:13 -0700)]
Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1
The Android Automerger [Wed, 2 Nov 2011 17:05:33 +0000 (10:05 -0700)]
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit
2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to
2cc1c5d067736f221554be593c2ba2c96390f847.
The Android Automerger [Wed, 2 Nov 2011 16:48:55 +0000 (09:48 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Wed, 2 Nov 2011 13:28:40 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Irfan Sheriff [Wed, 2 Nov 2011 04:18:14 +0000 (04:18 +0000)]
am
953005e8: Merge "Specify component name for provisioning" into ics-mr0
* commit '
953005e8243e4dc898a00d9a1612ae82772913b9':
Specify component name for provisioning
Jeff Sharkey [Wed, 2 Nov 2011 04:16:13 +0000 (04:16 +0000)]
am
db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
* commit '
db0ab2e731d755f64583c5704fa406bc0e7a2af4':
Process AMS events in NetworkPolicy handler.
Irfan Sheriff [Wed, 2 Nov 2011 04:15:26 +0000 (21:15 -0700)]
Merge "Specify component name for provisioning" into ics-mr0
Jeff Sharkey [Wed, 2 Nov 2011 04:14:35 +0000 (21:14 -0700)]
Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
Dianne Hackborn [Wed, 2 Nov 2011 04:11:18 +0000 (21:11 -0700)]
Merge "Add new OOM adjustment for the "previous" process." into ics-mr1
Fabrice Di Meglio [Wed, 2 Nov 2011 02:17:48 +0000 (02:17 +0000)]
am
bcf05a69: Fix bug #
5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
* commit '
bcf05a69090f342d328f1537d1d83406b883290b':
Fix bug #
5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
Dianne Hackborn [Wed, 2 Nov 2011 01:02:44 +0000 (18:02 -0700)]
Merge "Some optimizations." into ics-mr1
Adam Powell [Wed, 2 Nov 2011 00:27:26 +0000 (17:27 -0700)]
Merge "Fix bug
5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on" into ics-mr1
Katie McCormick [Wed, 2 Nov 2011 00:11:01 +0000 (00:11 +0000)]
am
d5b25ecc: Merge "Doc Update: Update list of widget classes" into ics-mr0
* commit '
d5b25ecc07efb9d7f725731f29241217266b4c0c':
Doc Update: Update list of widget classes
Katie McCormick [Wed, 2 Nov 2011 00:09:44 +0000 (17:09 -0700)]
Merge "Doc Update: Update list of widget classes" into ics-mr0
Dima Zavin [Tue, 1 Nov 2011 22:32:06 +0000 (22:32 +0000)]
am
f0ad147f: Merge "BatteryService(jni): properly handle read\'s return value" into ics-mr0
* commit '
f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3':
BatteryService(jni): properly handle read's return value
Dima Zavin [Tue, 1 Nov 2011 22:29:42 +0000 (15:29 -0700)]
Merge "BatteryService(jni): properly handle read's return value" into ics-mr0
The Android Open Source Project [Tue, 1 Nov 2011 21:28:57 +0000 (14:28 -0700)]
Reconcile with ics-mr0-release
Change-Id: I14f9c7648ae8cc7403a6c605d12aba8eec553e80
Mangesh Ghiware [Tue, 1 Nov 2011 21:02:05 +0000 (14:02 -0700)]
Merge "Fix setInitialScale() to take display density into account." into ics-mr1
Eric Fischer [Tue, 1 Nov 2011 20:53:14 +0000 (13:53 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Michael Jurka [Tue, 1 Nov 2011 20:53:02 +0000 (13:53 -0700)]
Merge "Fix: never show recents over lock screen" into ics-mr1
Peter Ng [Tue, 1 Nov 2011 20:45:18 +0000 (13:45 -0700)]
Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1
Fabrice Di Meglio [Tue, 1 Nov 2011 20:30:24 +0000 (13:30 -0700)]
Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1
Robert Greenwalt [Tue, 1 Nov 2011 20:29:42 +0000 (20:29 +0000)]
am
bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
* commit '
bd9b1528051a1b257768fdbc5077a2d4473b02dd':
Add cdma_rmnet4 to list of monitored interfaces
Robert Greenwalt [Tue, 1 Nov 2011 20:27:56 +0000 (13:27 -0700)]
Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
Daniel Sandler [Tue, 1 Nov 2011 20:05:41 +0000 (13:05 -0700)]
Merge "Bring timestamps back to notifications." into ics-mr1
Jim Miller [Tue, 1 Nov 2011 19:45:11 +0000 (12:45 -0700)]
Merge "Fix
5404916: Make layout fit on 480x800 hdpi device" into ics-mr1
Fabrice Di Meglio [Tue, 1 Nov 2011 19:42:48 +0000 (19:42 +0000)]
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
Fabrice Di Meglio [Tue, 1 Nov 2011 19:41:04 +0000 (12:41 -0700)]
Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
Mangesh Ghiware [Tue, 1 Nov 2011 18:28:01 +0000 (11:28 -0700)]
Merge "Clamp initial scale between minimum and maximum values." into ics-mr1
Adam Powell [Tue, 1 Nov 2011 17:58:58 +0000 (10:58 -0700)]
Merge "Fix bug
5534667 - Action bar icons need more space on tablet" into ics-mr1
Dianne Hackborn [Tue, 1 Nov 2011 17:42:54 +0000 (10:42 -0700)]
Merge "Various performance and other work." into ics-mr1
Peter Ng [Tue, 1 Nov 2011 17:29:25 +0000 (10:29 -0700)]
Merge "spinner focused states pumped up" into ics-mr1
The Android Open Source Project [Tue, 1 Nov 2011 17:10:39 +0000 (17:10 +0000)]
am
9eb4c891: Reconcile with ics-factoryrom-2-release
* commit '
9eb4c891a3db118f2546af7593c6251f3210f3ef':
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
The Android Open Source Project [Tue, 1 Nov 2011 17:08:14 +0000 (10:08 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
Philip Milne [Tue, 1 Nov 2011 16:30:21 +0000 (09:30 -0700)]
Merge " Update to fix for bug
5393156" into ics-mr1
The Android Automerger [Tue, 1 Nov 2011 13:28:37 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jim Miller [Tue, 1 Nov 2011 07:49:46 +0000 (07:49 +0000)]
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
Jim Miller [Tue, 1 Nov 2011 07:47:44 +0000 (00:47 -0700)]
Merge "Fix
5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
Chih-Chung Chang [Tue, 1 Nov 2011 04:05:45 +0000 (04:05 +0000)]
am
4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '
4b6353ea0265bfed52d0637abd1b17596ce25ff0':
Update camera continuous autofocus javadoc.
Chih-Chung Chang [Tue, 1 Nov 2011 04:04:01 +0000 (21:04 -0700)]
Merge "Update camera continuous autofocus javadoc." into ics-mr0
satok [Tue, 1 Nov 2011 01:20:48 +0000 (18:20 -0700)]
Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1
Adam Powell [Tue, 1 Nov 2011 01:18:33 +0000 (18:18 -0700)]
Merge "Fix bug
5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1
Stephen Hines [Tue, 1 Nov 2011 00:16:56 +0000 (00:16 +0000)]
am
af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0
* commit '
af675222f6340a8a9edbe9e8635014a18521e5e0':
Fix potential segfault in RS watchdog.
Stephen Hines [Tue, 1 Nov 2011 00:14:58 +0000 (17:14 -0700)]
Merge "Fix potential segfault in RS watchdog." into ics-mr0
The Android Automerger [Mon, 31 Oct 2011 23:47:11 +0000 (16:47 -0700)]
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit
2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to
2cc1c5d067736f221554be593c2ba2c96390f847.
Eric Laurent [Mon, 31 Oct 2011 23:23:15 +0000 (23:23 +0000)]
am
6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0
* commit '
6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
Fix volume indication in vibrate mode.
Eric Laurent [Mon, 31 Oct 2011 23:21:16 +0000 (16:21 -0700)]
Merge "Fix volume indication in vibrate mode." into ics-mr0
Martijn Coenen [Mon, 31 Oct 2011 22:54:43 +0000 (22:54 +0000)]
am
1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0
* commit '
1eca250b9dad45893fead128539f112cbc513496':
Fix disableForegroundNdefPush crash.
Martijn Coenen [Mon, 31 Oct 2011 22:53:08 +0000 (15:53 -0700)]
Merge "Fix disableForegroundNdefPush crash." into ics-mr0
Pannag Sanketi [Mon, 31 Oct 2011 22:05:19 +0000 (15:05 -0700)]
Merge "Expose video stabilization API" into ics-mr1
Svetoslav Ganov [Mon, 31 Oct 2011 20:30:30 +0000 (20:30 +0000)]
am
aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
* commit '
aeb11b598877523fd3c530c7a086c38b4a13c7a1':
Folding Accessibility Service sample into ApiDemos.
Svetoslav Ganov [Mon, 31 Oct 2011 20:28:57 +0000 (13:28 -0700)]
Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
The Android Open Source Project [Mon, 31 Oct 2011 20:06:22 +0000 (13:06 -0700)]
Reconcile with ics-mr0-release
Change-Id: Ice28e0b55ab17842c9bd01b519b7f4d562822445
Tom Taylor [Mon, 31 Oct 2011 19:51:19 +0000 (12:51 -0700)]
Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1
The Android Open Source Project [Mon, 31 Oct 2011 19:45:33 +0000 (19:45 +0000)]
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"
The Android Open Source Project [Mon, 31 Oct 2011 19:43:39 +0000 (12:43 -0700)]
Reconcile with ics-factoryrom-2-release
Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662
Adam Powell [Mon, 31 Oct 2011 19:37:58 +0000 (12:37 -0700)]
Merge "Bug
5535639 - Monkeys mad at FragmentManager" into ics-mr1
Winson Chung [Mon, 31 Oct 2011 17:54:12 +0000 (10:54 -0700)]
Merge "Using fast-invalidate pattern for screenshot animations." into ics-mr1
Marco Nelissen [Mon, 31 Oct 2011 17:46:33 +0000 (10:46 -0700)]
Merge "Make MediaController use low profile system UI" into ics-mr1
Alex Sakhartchouk [Mon, 31 Oct 2011 17:30:37 +0000 (10:30 -0700)]
Merge "Removing changes not meant for MR1" into ics-mr1
Michael Jurka [Mon, 31 Oct 2011 02:41:24 +0000 (19:41 -0700)]
Merge "HorizontalScrollView should delay child presses" into ics-mr1
Amith Yamasani [Sun, 30 Oct 2011 21:37:09 +0000 (21:37 +0000)]
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.
Jeff Brown [Sun, 30 Oct 2011 21:24:02 +0000 (14:24 -0700)]
resolved conflicts for merge of
2d280f75 to ics-mr1
Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
The Android Automerger [Sun, 30 Oct 2011 20:56:11 +0000 (13:56 -0700)]
Revert "Improve the slow query instrumentation."
This reverts commit
89101cd9d9b5c1a6ff1ed85eba0613ca4c4802e2.
The Android Automerger [Sun, 30 Oct 2011 19:35:09 +0000 (12:35 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Sun, 30 Oct 2011 13:29:10 +0000 (06:29 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 29 Oct 2011 03:40:07 +0000 (20:40 -0700)]
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit
2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to
2cc1c5d067736f221554be593c2ba2c96390f847.
Eric Fischer [Sat, 29 Oct 2011 03:15:36 +0000 (03:15 +0000)]
am
2cc1c5d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
2cc1c5d067736f221554be593c2ba2c96390f847':
Import revised translations. DO NOT MERGE
Scott Main [Sat, 29 Oct 2011 02:16:15 +0000 (02:16 +0000)]
am
8dbe177c: Merge "docs: fix spell checker client location" into ics-mr0
* commit '
8dbe177c5dda205086f7a353dd1fa09a0c7ab24c':
docs: fix spell checker client location
Joe Fernandez [Sat, 29 Oct 2011 02:16:10 +0000 (02:16 +0000)]
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
Justin Ho [Sat, 29 Oct 2011 02:16:08 +0000 (02:16 +0000)]
am
c1cf3b16: Merge "Vertically center the landscape navigation bar." into ics-mr0
* commit '
c1cf3b160b4852e021a45806d496a9f9a76d6683':
Vertically center the landscape navigation bar.
Amith Yamasani [Sat, 29 Oct 2011 01:59:11 +0000 (18:59 -0700)]
Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
satok [Sat, 29 Oct 2011 01:26:40 +0000 (18:26 -0700)]
Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1
satok [Sat, 29 Oct 2011 01:25:28 +0000 (18:25 -0700)]
Merge "Hide ime switcher when the screen is turned off." into ics-mr1
Jeff Brown [Sat, 29 Oct 2011 01:21:05 +0000 (18:21 -0700)]
Merge "Improve the slow query instrumentation." into ics-mr0
Dianne Hackborn [Sat, 29 Oct 2011 00:33:39 +0000 (17:33 -0700)]
Merge "Add some IO tests." into ics-mr1
OSDN Git Service
