Commit Graph

39125 Commits

Author SHA1 Message Date
The Android Open Source Project
1d4a293b9d Reconcile with ics-factoryrom-release
Change-Id: Iec5fbc58aa0d892e8fe3767aad9de7726ec0aa12
2011-09-29 14:24:50 -07:00
Roman Nurik
775bdf08ce Merge "Add 'updated' banner in guide TOC for media formats, rename Widgets design guide to App Widgets design guide" 2011-09-29 14:10:07 -07:00
Dima Zavin
b4a624bef7 am e8b7f4a2: eventhub: print debugginf info when removing device
* commit 'e8b7f4a20c43d8f55d0cf85a94363b764ba598b8':
  eventhub: print debugginf info when removing device
2011-09-29 14:06:38 -07:00
Marco Nelissen
2b2661c99c Merge "Use SoundPool instead of Ringtone." 2011-09-29 13:13:17 -07:00
Mike Cleron
c347a52cae Merge "Fix lockscreen Bug: 5391404" 2011-09-29 12:36:55 -07:00
Daniel Sandler
a4610444e0 Merge "Increase padding in notifications." 2011-09-29 11:57:23 -07:00
Dianne Hackborn
deed604ae6 am 9547d03e: Fix build.
* commit '9547d03ef1228406ad4eb6db31dbcf58be1e4655':
  Fix build.
2011-09-29 11:53:32 -07:00
Dianne Hackborn
cedbc8f852 am 1fd6c336: (-s ours) Fix issue #5312624: Lock screen very flickery
* commit '1fd6c33620171893b2e92c38b731fd89e5a8dd66':
  Fix issue #5312624: Lock screen very flickery
2011-09-29 11:53:31 -07:00
Lorenzo Colitti
48a953d977 Merge "Revert "Tell the resolver what protocols to use."" 2011-09-29 10:52:28 -07:00
Dianne Hackborn
824bbb8358 am 6ea4da95: (-s ours) Fix issue #5242779: Device not responding to touch on unlock screen
* commit '6ea4da95d9093dbfabe79321087b81cd7fbf5e84':
  Fix issue #5242779: Device not responding to touch on unlock screen
2011-09-29 10:21:27 -07:00
Gilles Debunne
1b172b75cb Merge "Bug 5278473 & 5278471: delete option in suggestion popup menu" 2011-09-29 10:21:18 -07:00
Gilles Debunne
680abc33b8 Merge "Too many SpellCheckSpans are created." 2011-09-29 10:20:46 -07:00
Guang Zhu
8ef5b1b677 Merge "Revert "log stack trace when finish() or onDestroy() is called"" 2011-09-29 10:14:27 -07:00
Marco Nelissen
43b714f502 Merge "Release MediaPlayer before letting it go out of scope." 2011-09-29 10:11:34 -07:00
Jean-Michel Trivi
67d68d0f4e Merge "Fix bug 5357295 NPE on display when remote control client dies" 2011-09-29 09:09:37 -07:00
Justin Ho
da8573aa25 Merge "Re-adding missing lockscreen drawable" 2011-09-29 08:58:50 -07:00
Chet Haase
8ae531991e Merge "Fixed ProgressBar logic for AnimationDrawables" 2011-09-29 07:47:16 -07:00
The Android Automerger
c4d102b1d6 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-29 06:29:20 -07:00
Steve Block
09bee306b3 Merge "Fix HTML5Audio to call WebView.isPrivateBrowsingEnabled() on the UI thread" 2011-09-29 04:09:45 -07:00
Luca Zanolin
1dfb77892d Merge "Change the width of the suggestion item to match the one of the suggestion pop-up" 2011-09-29 01:09:47 -07:00
Adam Powell
f4fac11e71 Merge "Fix bug 5385274 - tabs in browser can't be scrolled" 2011-09-28 23:51:50 -07:00
Adam Powell
645f19d4d2 Merge "Fix bug 5386915 - Action mode is intercepting touches it shouldn't be" 2011-09-28 22:47:08 -07:00
Chih-Chung Chang
de993f18c4 Merge "Fix 5389072: NPE in MediaController.updateFloatingWindowLayout()." 2011-09-28 22:14:06 -07:00
Scott Main
a3cd61574d Merge "docs: add some more info to Time javadocs" 2011-09-28 21:48:41 -07:00
Svetoslav Ganov
366e6906fd Merge "Revamping of the NumberPicker widget for improved usablility." 2011-09-28 19:43:55 -07:00
Adam Powell
e0e900ae74 Merge "Fully qualify javadoc links and make the tools happy" 2011-09-28 18:59:26 -07:00
Brian Colonna
6734e7fff9 Merge "Fix 5385186 - Face Unlock no longer shown when first booted" 2011-09-28 18:56:08 -07:00
Romain Guy
735fccf192 Merge "Don't build display lists for views with a layer." 2011-09-28 18:27:13 -07:00
Eric Fischer
4138dd712f am d908b40d: (-s ours) Merge "Import revised translations." into ics-factoryrom
* commit 'd908b40d0b0ed1e7e0b0f41e5060a26465b5cb99':
  Import revised translations.
2011-09-28 17:39:35 -07:00
Eric Fischer
f23300b042 Merge "Import revised translations." into ics-factoryrom 2011-09-28 17:35:18 -07:00
The Android Automerger
750fd30919 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-28 17:34:28 -07:00
Mathias Agopian
1c1804afab Merge "may fix the build" 2011-09-28 17:34:12 -07:00
Mathias Agopian
55b81b10aa may fix the build
Change-Id: I065b1e6652f0e800ba5674a6d9aa954c3ac6c790
2011-09-28 17:33:11 -07:00
Eric Fischer
5bff6321db am a94489b4: Merge "Don\'t lose product variant strings that also vary between locales." into ics-factoryrom
* commit 'a94489b4394350b1727437818cd4f6d845e97dc0':
  Don't lose product variant strings that also vary between locales.
2011-09-28 17:03:07 -07:00
Eric Fischer
89f653b9ca Merge "Don't lose product variant strings that also vary between locales." into ics-factoryrom 2011-09-28 17:01:39 -07:00
Eric Fischer
bf33c35c3d am 5c12c039: (-s ours) Merge "Import revised translations. DO NOT MERGE." into ics-factoryrom
* commit '5c12c039310ddde6dcea6694a9d3d8c5904aadc2':
  Import revised translations.  DO NOT MERGE.
2011-09-28 16:59:02 -07:00
Eric Fischer
1e4c600e6d Merge "Import revised translations. DO NOT MERGE." into ics-factoryrom 2011-09-28 16:55:33 -07:00
Justin Ho
a69e7d4b77 Merge "Updated lockscreen assets Bug: 5380966" 2011-09-28 16:33:20 -07:00
Brian Colonna
768778657f Merge "Pulled out part of onScreenTurnedOn() into show() function" 2011-09-28 16:29:48 -07:00
Andreas Huber
3dbb680035 Merge "Support multiple NAL fragments per .mkv payload" 2011-09-28 16:08:59 -07:00
Roman Nurik
829b5865e2 Merge "Update Widget Design guidelines for ICS" 2011-09-28 16:04:30 -07:00
Adam Powell
73fbc6320f Merge "Fix bug 5386180 - Wire up action bar home/up for dialogs" 2011-09-28 16:02:13 -07:00
Justin Ho
510703270f am 24664c00: Merge "Updated menu icon Bug: 5388009" into ics-factoryrom
* commit '24664c0003f964ffe9f4fc98d69c802cddd0d7b0':
  Updated menu icon Bug: 5388009
2011-09-28 15:25:49 -07:00
Justin Ho
49941d56a8 am 3b5a379d: Merge "Updated overflow menu icon Bug: 5388009" into ics-factoryrom
* commit '3b5a379dda952faa6266c8fa794c6f0d3a192c13':
  Updated overflow menu icon Bug: 5388009
2011-09-28 15:25:48 -07:00
Justin Ho
58bd71095f Merge "Updated menu icon Bug: 5388009" into ics-factoryrom 2011-09-28 15:24:09 -07:00
Justin Ho
b917577a94 Merge "Updated overflow menu icon Bug: 5388009" into ics-factoryrom 2011-09-28 15:23:57 -07:00
Justin Ho
e4cdd0b642 Merge "Downscaling circular assets with bilinear to fix jagged edges" 2011-09-28 15:08:24 -07:00
Michael Chan
a05091c7e2 Merge "Changed translation for the day of the week zh-rTW" 2011-09-28 14:44:39 -07:00
Jesse Wilson
8fbb9d8972 Merge "Format NaN and Infinity as Doclava expects." 2011-09-28 14:19:02 -07:00
James Dong
2b410fff34 Merge "Flush resets the count of played audio frames" 2011-09-28 13:46:49 -07:00