OSDN Git Service
Dirk Dougherty [Wed, 14 Dec 2011 02:33:04 +0000 (18:33 -0800)]
Merge "Doc change: API diff report for 15." into ics-mr1
Dianne Hackborn [Tue, 13 Dec 2011 23:40:18 +0000 (15:40 -0800)]
Merge "Fix issue #
5756204: Crespo IME briefly appears shortened when..." into ics-mr1
Gilles Debunne [Tue, 13 Dec 2011 23:36:48 +0000 (15:36 -0800)]
Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
Dianne Hackborn [Tue, 13 Dec 2011 21:38:56 +0000 (13:38 -0800)]
Merge "Fix issue #
5755172: Soft menu key disappears when menu is open" into ics-mr1
Gilles Debunne [Tue, 13 Dec 2011 21:37:29 +0000 (13:37 -0800)]
Merge "NPE in GMail / TextLine" into ics-mr1
Scott Main [Tue, 13 Dec 2011 21:10:45 +0000 (13:10 -0800)]
am
fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
* commit '
fc279e51c0bca8086b87bd49e95367c400cb61b4':
Created Android University lesson for Multiple APKs.
Scott Main [Tue, 13 Dec 2011 21:10:42 +0000 (13:10 -0800)]
am
801fda54: AndroidU lesson on designing for multiple screens.
* commit '
801fda548c719a8618e7f4cd64cad8404b0970b9':
AndroidU lesson on designing for multiple screens.
Scott Main [Tue, 13 Dec 2011 20:25:38 +0000 (12:25 -0800)]
Merge "Created Android University lesson for Multiple APKs." into ics-mr0
Andreas Huber [Tue, 13 Dec 2011 19:59:50 +0000 (11:59 -0800)]
Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
Jeff Sharkey [Tue, 13 Dec 2011 04:19:27 +0000 (20:19 -0800)]
Merge "Avoid NPE when missing network stats." into ics-mr1
Mike Cleron [Tue, 13 Dec 2011 02:15:59 +0000 (18:15 -0800)]
Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1
Dianne Hackborn [Tue, 13 Dec 2011 00:09:54 +0000 (16:09 -0800)]
Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1
Gilles Debunne [Mon, 12 Dec 2011 23:53:25 +0000 (15:53 -0800)]
Merge "Prevent a memory leak in TextLine." into ics-mr1
Gilles Debunne [Mon, 12 Dec 2011 23:52:39 +0000 (15:52 -0800)]
Merge "Text blinking cursor hard to see." into ics-mr1
Adam Powell [Mon, 12 Dec 2011 23:40:00 +0000 (15:40 -0800)]
Merge "Bug
5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1
Jamie Gennis [Mon, 12 Dec 2011 22:10:04 +0000 (14:10 -0800)]
Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1
Raphael [Mon, 12 Dec 2011 21:14:12 +0000 (13:14 -0800)]
Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
Matthew Xie [Mon, 12 Dec 2011 20:07:39 +0000 (12:07 -0800)]
Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
Eric Fischer [Mon, 12 Dec 2011 19:04:39 +0000 (11:04 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Justin Ho [Fri, 9 Dec 2011 23:42:10 +0000 (15:42 -0800)]
Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1
Jamie Gennis [Fri, 9 Dec 2011 23:07:44 +0000 (15:07 -0800)]
SurfaceTexture: fix a verbose-log compile error
Change-Id: I045231207e068d950bb0cb5085717af5d9454ed1
Jeff Tinker [Fri, 9 Dec 2011 19:11:56 +0000 (11:11 -0800)]
Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
Joe Fernandez [Fri, 9 Dec 2011 18:45:44 +0000 (10:45 -0800)]
am
89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
* commit '
89c3bc38421a3f01b39f0246e53884bdf8b14415':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
Joe Fernandez [Fri, 9 Dec 2011 18:43:32 +0000 (10:43 -0800)]
Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
Gilles Debunne [Fri, 9 Dec 2011 17:34:04 +0000 (09:34 -0800)]
Merge "Blinking cursor in Talk" into ics-mr1
Gilles Debunne [Fri, 9 Dec 2011 02:18:25 +0000 (18:18 -0800)]
Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
Gilles Debunne [Fri, 9 Dec 2011 01:58:24 +0000 (17:58 -0800)]
Merge "Re-use SpanSets in TextLine" into ics-mr1
Joe Malin [Fri, 9 Dec 2011 01:44:34 +0000 (17:44 -0800)]
am
0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
* commit '
0a9005ed58d3a6173e8fffbd72933f7646c6fdba':
DOC CHANGE: Package text and Formatter javadoc
Joe Malin [Fri, 9 Dec 2011 01:42:36 +0000 (17:42 -0800)]
Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
Chia-chi Yeh [Fri, 9 Dec 2011 01:22:16 +0000 (17:22 -0800)]
Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
Irfan Sheriff [Thu, 8 Dec 2011 23:59:26 +0000 (15:59 -0800)]
Merge "Fix wifi bring up at boot up" into ics-mr1
Jake Hamby [Thu, 8 Dec 2011 23:51:33 +0000 (15:51 -0800)]
Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:33:16 +0000 (13:33 -0800)]
Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:33:06 +0000 (13:33 -0800)]
Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
Svetoslav Ganov [Thu, 8 Dec 2011 20:28:11 +0000 (12:28 -0800)]
Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
Irfan Sheriff [Thu, 8 Dec 2011 20:21:20 +0000 (12:21 -0800)]
Merge "Handle emergency call back mode correctly" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 19:57:06 +0000 (11:57 -0800)]
Merge "Make the Next key navigate between TextViews" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 19:56:28 +0000 (11:56 -0800)]
Merge "Limit created string size in Spell Checker" into ics-mr1
Eric Fischer [Thu, 8 Dec 2011 19:09:11 +0000 (11:09 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
The Android Open Source Project [Thu, 8 Dec 2011 18:26:33 +0000 (10:26 -0800)]
Reconcile with ics-mr0-release
Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079
Gilles Debunne [Thu, 8 Dec 2011 17:59:44 +0000 (09:59 -0800)]
Merge "IOOB is Suggestions" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 17:59:29 +0000 (09:59 -0800)]
Merge "Prevent NPE in SuggestionSpan" into ics-mr1
Jeff Tinker [Thu, 8 Dec 2011 08:13:43 +0000 (00:13 -0800)]
Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
Jeff Brown [Thu, 8 Dec 2011 07:29:52 +0000 (23:29 -0800)]
Merge "Shortcut keys should be handled on down, not up." into ics-mr1
Jeff Brown [Thu, 8 Dec 2011 07:29:45 +0000 (23:29 -0800)]
Merge "Fix system hotkey handling." into ics-mr1
Dave Burke [Thu, 8 Dec 2011 04:40:10 +0000 (20:40 -0800)]
Merge "Remove dangerous and useless optimization Bug #
5525888" into ics-mr1
Wink Saville [Thu, 8 Dec 2011 04:15:45 +0000 (20:15 -0800)]
Merge "When the SIM_READY set current preferred network type." into ics-mr1
Jaikumar Ganesh [Thu, 8 Dec 2011 03:50:03 +0000 (19:50 -0800)]
Merge "Reduce likelihood of crash in state machine." into ics-mr1
John Wang [Thu, 8 Dec 2011 02:49:28 +0000 (18:49 -0800)]
Merge "Correct the dialing number of structured MMI." into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 02:41:04 +0000 (18:41 -0800)]
Merge "Insert into user dict with the correct locale" into ics-mr1
Adam Powell [Thu, 8 Dec 2011 01:55:35 +0000 (17:55 -0800)]
Merge "Raise touch slop value from previous experiment" into ics-mr1
Daniel Sandler [Thu, 8 Dec 2011 01:40:07 +0000 (17:40 -0800)]
Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
Joe Malin [Thu, 8 Dec 2011 01:11:59 +0000 (17:11 -0800)]
am
3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '
3937e055708a8618f184feab204fed4bb41f3f6e':
DOC CHANGE: Add text for android.os.storage
Dianne Hackborn [Thu, 8 Dec 2011 01:11:57 +0000 (17:11 -0800)]
am
b32785c6: Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '
b32785c6e893743956e28b285b8e6f6fc7aa8edb':
More fixing for issue #
5366535: Lockscreen has wrong layout...
Dianne Hackborn [Thu, 8 Dec 2011 01:10:34 +0000 (17:10 -0800)]
Merge "Merge commit '
eee12419' into manualmerge" into ics-mr1
Robert Greenwalt [Thu, 8 Dec 2011 01:09:05 +0000 (17:09 -0800)]
Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
Amith Yamasani [Thu, 8 Dec 2011 00:54:31 +0000 (16:54 -0800)]
Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1
Daniel Sandler [Thu, 8 Dec 2011 00:33:31 +0000 (16:33 -0800)]
Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
Dianne Hackborn [Thu, 8 Dec 2011 00:33:15 +0000 (16:33 -0800)]
Merge commit '
eee12419' into manualmerge
Russell Brenner [Thu, 8 Dec 2011 00:20:15 +0000 (16:20 -0800)]
Merge "Update Armenian and Georgian fonts" into ics-mr1
Joe Malin [Thu, 8 Dec 2011 00:07:49 +0000 (16:07 -0800)]
Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
Dianne Hackborn [Wed, 7 Dec 2011 23:22:21 +0000 (15:22 -0800)]
Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
Jeff Brown [Wed, 7 Dec 2011 23:04:39 +0000 (15:04 -0800)]
Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 23:01:55 +0000 (15:01 -0800)]
Merge "Fix issue #
5144065: Tap on Music icon from Home screen..." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 23:00:05 +0000 (15:00 -0800)]
Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen..." into ics-mr0
Winson Chung [Wed, 7 Dec 2011 22:33:31 +0000 (14:33 -0800)]
Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)" into ics-mr1
Dave Burke [Wed, 7 Dec 2011 22:05:41 +0000 (14:05 -0800)]
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
Robert Greenwalt [Wed, 7 Dec 2011 20:29:14 +0000 (12:29 -0800)]
Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
Irfan Sheriff [Wed, 7 Dec 2011 20:06:31 +0000 (12:06 -0800)]
Merge "Fix CS wakelock handling" into ics-mr1
Bart Sears [Wed, 7 Dec 2011 19:41:57 +0000 (11:41 -0800)]
Merge "Fix WebTextView rings" into ics-mr1
Joe Malin [Wed, 7 Dec 2011 19:28:25 +0000 (11:28 -0800)]
am
9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
* commit '
9e2cf49fa360e70b33a870e9ae0b3eec11752972':
DOC CHANGE: Add Content URI ref doc
Joe Malin [Wed, 7 Dec 2011 19:26:20 +0000 (11:26 -0800)]
Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
Dianne Hackborn [Wed, 7 Dec 2011 18:33:19 +0000 (10:33 -0800)]
Merge "Truthiness is good." into ics-mr1
The Android Open Source Project [Wed, 7 Dec 2011 15:24:54 +0000 (07:24 -0800)]
Reconcile with ics-mr0-release
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
Irfan Sheriff [Wed, 7 Dec 2011 05:06:03 +0000 (21:06 -0800)]
Merge "Disable poor network connection alone" into ics-mr1
Scott Main [Wed, 7 Dec 2011 01:12:53 +0000 (17:12 -0800)]
am
b6322a5b: docs: fix broken links bug:
5542371
* commit '
b6322a5bb9fda370cccf89434b939370dfa36b02':
docs: fix broken links bug:
5542371
Andreas Huber [Wed, 7 Dec 2011 00:20:01 +0000 (16:20 -0800)]
Merge "Merge commit '
babb7200' into manualmerge" into ics-mr1
Fabrice Di Meglio [Tue, 6 Dec 2011 23:47:27 +0000 (15:47 -0800)]
Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
Hong Teng [Tue, 6 Dec 2011 23:37:25 +0000 (15:37 -0800)]
Merge "Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1
Amith Yamasani [Tue, 6 Dec 2011 23:36:10 +0000 (15:36 -0800)]
Merge "New and improved silent mode on lockscreen." into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 23:03:10 +0000 (15:03 -0800)]
Merge commit '
babb7200' into manualmerge
Adam Powell [Tue, 6 Dec 2011 21:58:20 +0000 (13:58 -0800)]
Merge "Lower touch slop in ViewConfiguration." into ics-mr1
James Dong [Tue, 6 Dec 2011 20:52:52 +0000 (12:52 -0800)]
Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 20:44:53 +0000 (12:44 -0800)]
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 20:11:38 +0000 (12:11 -0800)]
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr0
Irfan Sheriff [Tue, 6 Dec 2011 19:34:58 +0000 (11:34 -0800)]
am
7b62313e: Disable wifiwatchdog for now
* commit '
7b62313eab4af8835a64fb3fe1e15e5e534a9479':
Disable wifiwatchdog for now
Gilles Debunne [Tue, 6 Dec 2011 19:20:18 +0000 (11:20 -0800)]
Merge "Invalidated bounds tightened in TextView" into ics-mr1
Eric Fischer [Tue, 6 Dec 2011 18:34:41 +0000 (10:34 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Svetoslav Ganov [Tue, 6 Dec 2011 18:27:04 +0000 (10:27 -0800)]
Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1
Jeff Brown [Tue, 6 Dec 2011 06:50:49 +0000 (22:50 -0800)]
Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
Jim Miller [Tue, 6 Dec 2011 06:12:54 +0000 (22:12 -0800)]
Merge "Fix
5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
Jesse Hall [Tue, 6 Dec 2011 05:23:29 +0000 (21:23 -0800)]
Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
Matthew Xie [Tue, 6 Dec 2011 03:56:54 +0000 (19:56 -0800)]
Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
Dianne Hackborn [Tue, 6 Dec 2011 03:16:54 +0000 (19:16 -0800)]
Merge "Fix issue #
5714517: App shortcuts can result in bad task intents" into ics-mr1
Dianne Hackborn [Tue, 6 Dec 2011 03:07:52 +0000 (19:07 -0800)]
Merge "Fix issue #
5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1
Daniel Sandler [Tue, 6 Dec 2011 03:02:28 +0000 (19:02 -0800)]
Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
Adam Powell [Tue, 6 Dec 2011 01:38:23 +0000 (17:38 -0800)]
Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
Eric Laurent [Tue, 6 Dec 2011 01:20:53 +0000 (17:20 -0800)]
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
Fred Quintana [Tue, 6 Dec 2011 00:45:29 +0000 (16:45 -0800)]
Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1
Michael Kolb [Tue, 6 Dec 2011 00:12:35 +0000 (16:12 -0800)]
Merge "Remove debug log messages" into ics-mr1
OSDN Git Service
