Commit Graph

29862 Commits

Author SHA1 Message Date
Justin Ho
98ba0ab94b am 0c3169cf: am 60a008ed: Updated volume dialog assets
* commit '0c3169cf208b253b1f3f41ca82796a464eeec464':
  Updated volume dialog assets
2011-02-07 10:57:19 -08:00
Jean-Baptiste Queru
e9491f7ec0 am b6bf10e4: Merge 917d9ea1
* commit 'b6bf10e4bd2c17838a00091c3b8efb2f91ce3457':
  Fix the Multi-page SMS sending error to several receipents
2011-02-07 10:48:25 -08:00
Justin Ho
d85314bf27 am fc05bc3b: am cc84ea17: Merge "Updated default wallpaper" into honeycomb
* commit 'fc05bc3b36c665a0da2661d57a2c5a68245e6a68':
  Updated default wallpaper
2011-02-07 10:48:07 -08:00
Justin Ho
e7a1d35500 am bf13e077: am e8d2b985: Merge "Scrubbing OGGs and updating all WAVs" into honeycomb
* commit 'bf13e0774e67f03433f5088a7d2c2fe6ee25e0c8':
  Scrubbing OGGs and updating all WAVs
2011-02-07 10:47:39 -08:00
Justin Ho
2040242b5b am efba660d: am 97e1dbab: Merge "Adding remaining volume dialog assets" into honeycomb
* commit 'efba660d8efb8ed2f8c31c4aeea81b32016ad601':
  Adding remaining volume dialog assets
2011-02-07 10:47:17 -08:00
Justin Ho
4399db14d5 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-02-07 10:47:01 -08:00
Justin Ho
7c192d5021 am 8bdfcaa0: am 9b95d352: Updated Talk notification icon Bug: 3362749
* commit '8bdfcaa0c452dba14b1dc03d9a78728bb39e72a0':
  Updated Talk notification icon Bug: 3362749
2011-02-07 10:46:47 -08:00
Andy Stadler
f6fe68fb15 Merge "Fix warnings" 2011-02-07 10:46:26 -08:00
David 'Digit' Turner
af916e1b14 Merge "WindowManagerService: Disable screen rotation animation under emulation." 2011-02-06 12:53:09 -08:00
Lorenzo Colitti
78b945f9bc Merge "Add a protocol property to the APNs and use it." 2011-02-04 17:41:11 -08:00
Wink Saville
76984f8dbf Merge "Fix SETUP_DATA_CALL handling." 2011-02-04 15:04:38 -08:00
Glenn Kasten
f07556fb02 Merge "Bug 3366668 Use BinderService template" 2011-02-04 14:00:17 -08:00
Andreas Huber
e4bc50507c Merge "Ignore format change message in sf2 instead of asserting" 2011-02-04 10:21:15 -08:00
Andreas Huber
7938367dd5 Merge "Improvements/fixes to ACodec." 2011-02-04 10:21:07 -08:00
Robert Greenwalt
29c9e9de0e Merge "Place the DHCP server address in the "next server IP address" field of the bootp header. A certain Apple client likes this, and it is more consistent with other DHCP servers." 2011-02-04 10:16:22 -08:00
Glenn Kasten
c8ae8f6142 Merge "Bug 3366885 Remove LVMX switch" 2011-02-03 18:44:32 -08:00
Jean-Baptiste Queru
57ea21df97 am 5c97e9d9: am 236afa68: am 375afcd5: am 4b8ad9ef: Merge from gingerbread
* commit '5c97e9d98566fcd4b6a702252223bb85d637259f':
2011-02-03 18:09:36 -08:00
Jean-Baptiste Queru
0f48ab8509 am 5086c457: am baaaca1c: Merge ee4c17ee from gingerbread
* commit '5086c45718a8344fb36adf5b15e98953612cac37':
  Fix delivery report error with PENDING status in SMS
2011-02-03 18:09:26 -08:00
Justin Ho
b5a0a41b84 am b7fa0b65: am ef36255f: Merge "Revert "Sounds cleanup"" into honeycomb
* commit 'b7fa0b65d789464f67b00d5975a9bc26460ce63c':
  Revert "Sounds cleanup"
2011-02-03 18:09:00 -08:00
Vasu Nori
5005944bd6 am 9ec496b4: am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
* commit '9ec496b484305defa6cbb691b85836ace8b73a02':
  Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
2011-02-03 18:08:44 -08:00
Michael Jurka
3dfd70a008 am d51e0820: am 8275c608: Merge "adding fast setters for translationx/y" into honeycomb
* commit 'd51e0820b3b7a71f2b3e0447bdf05188588c6003':
  adding fast setters for translationx/y
2011-02-03 18:08:17 -08:00
Romain Guy
2f18508218 am cb2c84fd: am 3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb
* commit 'cb2c84fd81a0891071e8ed0237927ad785751850':
  Refresh display lists when turning off layers rendering. Bug #3420565
2011-02-03 18:08:03 -08:00
Xavier Ducrohet
217dc81b4d am 1ea9930e: am 5e76e0ae: Merge "LayoutLib: Fix some rendering issues" into honeycomb
* commit '1ea9930e74a3b10186b7691060b6e6cf09f73b07':
  LayoutLib: Fix some rendering issues
2011-02-03 18:07:36 -08:00
Evan Millar
7f0102d07f Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-02-03 18:07:29 -08:00
Justin Ho
47f7cd7bd6 am da75a283: am 205bdd4f: Merge "Sounds cleanup" into honeycomb
* commit 'da75a28304a026634e6583735e525c13a2040239':
  Sounds cleanup
2011-02-03 18:07:03 -08:00
satok
acdfacb7e9 Merge "Register ENABLED_INPUT_METHODS to SettingsObserver" 2011-02-03 18:07:03 -08:00
Jaikumar Ganesh
819e2c90f4 Merge "Wait till SDP records are registered before sending intent." 2011-02-03 17:27:10 -08:00
Daniel Sandler
199afb8e76 am 63944f6c: am 2243cca4: Merge "Time to take down the Christmas lights." into honeycomb
* commit '63944f6c38090e263d824d9c4a074d2baf13a21c':
  Time to take down the Christmas lights.
2011-02-03 17:19:16 -08:00
Joe Malin
b4ae187d0c am 64ee4ed4: am 70ff567a: Merge "DOC CHANGE: Fix bugs in Installing SDK topic" into honeycomb
* commit '64ee4ed48de701ffa0096e8fb715a604821d6b5e':
  DOC CHANGE: Fix bugs in Installing SDK topic
2011-02-03 17:19:05 -08:00
Eric Laurent
10b083c671 am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycomb
* commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836':
  Fix issue 3371080
2011-02-03 17:18:46 -08:00
Justin Ho
1d2bec7d13 am 7fbdc7f6: am 8138fc1f: Merge "Adding Iridium as a ringtone" into honeycomb
* commit '7fbdc7f6ecfff38693e4ca337984b591a8560574':
  Adding Iridium as a ringtone
2011-02-03 17:18:36 -08:00
Daniel Sandler
7f97addfe7 am 62362af8: am 81034187: Merge "Move the low battery sound to the notification stream." into honeycomb
* commit '62362af8f93a44147e27a43c56d3c8da22ae1864':
  Move the low battery sound to the notification stream.
2011-02-03 17:18:23 -08:00
Dheeraj Sharma
90091eaa49 am d13f987f: am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb
* commit 'd13f987f73df03b06c70c631452f6cafbdc254e1':
  Fix for issue :  3419353 Crash during transition generation
2011-02-03 17:18:13 -08:00
Cary Clark
3121fe6fbb am 859563eb: am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb
* commit '859563ebf7edbb6d556ef10bac7315fdc564e73a':
  stop GL drawing thread before killing WebCore
2011-02-03 17:17:45 -08:00
Justin Ho
7908ec1e52 am 7d75cd65: am b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb
* commit '7d75cd65fa08e9457f6dacb5eb89664a09789dd9':
  Changing Honeycomb default wallpaper
2011-02-03 17:17:35 -08:00
Romain Guy
f926cc173f am 20bf23e5: am ac14db72: Merge "Fast transform properties setters. Bug #3413510" into honeycomb
* commit '20bf23e5e4172f5f80ce6c4cc16168355b107f0d':
  Fast transform properties setters. Bug #3413510
2011-02-03 17:17:21 -08:00
Daniel Sandler
73fb742f9b am a2e82d4c: am 6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb
* commit 'a2e82d4c69bc25eb9f262be0efb4bd38695c4f86':
  Implement priority ordering in notifications.
2011-02-03 17:16:54 -08:00
Gil Dobjanschi
b23831cc42 am 3f9a851e: am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb
* commit '3f9a851e07f0fbe0f5440afd82f26b52ca79428e':
  Bug fix: 3419287 Deleted images and video clips invalidate the entire project
2011-02-03 17:16:43 -08:00
Joe Onorato
e91eaf8fba am 020c021c: am e9dea7b7: Merge "Add a bluetooth icon and data direction to the status bar." into honeycomb
* commit '020c021c62f804ed08d89a3a38457a002184158e':
  Add a bluetooth icon and data direction to the status bar.
2011-02-03 17:16:31 -08:00
Romain Guy
198ec912cf am 109da7df: am 5bfd1aff: Merge "Allocate layers from the layers pool. Bug #3413433" into honeycomb
* commit '109da7dfd4c0766274b17467880ee673c731735c':
  Allocate layers from the layers pool. Bug #3413433
2011-02-03 17:16:19 -08:00
Justin Ho
f941e4882f am a29acdfb: am 1cee14f1: Merge "System bar tweaks" into honeycomb
* commit 'a29acdfb8a3c9812718ead057f77ef5dbd508682':
  System bar tweaks
2011-02-03 17:15:33 -08:00
Justin Ho
80f8df9daf am 8e2c67ea: am be36f9a3: Merge "Adding new volume control dialog icons" into honeycomb
* commit '8e2c67ea26d38677802f3029472aa2393f47173d':
  Adding new volume control dialog icons
2011-02-03 17:15:21 -08:00
Dianne Hackborn
433959418f am dd954212: am a5861743: Merge "Fix issue #3418265: Rotation animation on wallpaper is broken" into honeycomb
* commit 'dd95421291f590ec0b1d8e79b73264516e1da027':
  Fix issue #3418265: Rotation animation on wallpaper is broken
2011-02-03 17:15:04 -08:00
Jean-Michel Trivi
780ff37263 am d1488c58: am 17f88656: Fix audible selection sound is not played
* commit 'd1488c588d796ee0d44235b11510327144be977a':
  Fix audible selection sound is not played
2011-02-03 17:14:44 -08:00
Scott Main
ddd551c08d Merge "docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:" 2011-02-03 16:57:36 -08:00
Andreas Huber
0d2e1fc44e Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)" 2011-02-03 16:19:59 -08:00
Andreas Huber
8c36b4e01b Merge "Make sure timestamps attached to encoded media are composition timestamps." 2011-02-03 16:19:30 -08:00
Justin Ho
9db2a1f15c am 60a008ed: Updated volume dialog assets
* commit '60a008ed834da2b9eb6968cfb05733860aaa51b5':
  Updated volume dialog assets
2011-02-03 15:34:04 -08:00
Jack Palevich
5d9ed5a8b9 Merge "Throw an exception when trying to upload a recycled bitmap." 2011-02-03 15:25:52 -08:00
Jean-Baptiste Queru
4e251c8741 Merge 917d9ea1
Change-Id: I7c92b0dbff44375b714e99b9cdc7052628db8ecb
2011-02-03 14:22:52 -08:00