44389 Commits

Author SHA1 Message Date
Adam Powell
e7175e848b am 86ce6866: am c1be7ac9: Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb
* commit '86ce68668c700bd4090d6ef74df3483ce9fea957':
  Asset updates for dialog frames and seek bar thumbs
2011-02-07 11:38:25 -08:00
Justin Ho
b843c687a7 am 6d1fbba6: am 40523b1b: Merge "Updating default wallpaper" into honeycomb
* commit '6d1fbba68608dfd8d91d14d67bc34255a14ee4ac':
  Updating default wallpaper
2011-02-07 11:38:04 -08:00
Justin Ho
6da8239f5e am a9b9f9c8: am b3e00457: Merge "Updated notification area layout Bumping clock up 1px Swapping in new Bluetooth icons" into honeycomb
* commit 'a9b9f9c816b2dac559cd06a756587f92e6f2215c':
  Updated notification area layout Bumping clock up 1px Swapping in new Bluetooth icons
2011-02-07 11:37:48 -08:00
Nick Pelly
996d493967 am 7c95a2c2: am 062443f2: am 40684946: Merge "Fix docs type that broke build." into gingerbread
* commit '7c95a2c2471e1ae2308f8a00927e08f321bf8059':
  Fix docs type that broke build.
2011-02-07 11:37:28 -08:00
Romain Guy
0e6fe4f31a am a9c369d0: am 87465f02: Merge "Fixes cache misses and extra allocations. Bug #3421454" into honeycomb
* commit 'a9c369d0fbe2b995f456877b2368aac95f810558':
  Fixes cache misses and extra allocations. Bug #3421454
2011-02-07 11:37:12 -08:00
Jean-Baptiste Queru
44053049e1 am c3a9bfde: am 501dbaea: am 6dbdcd55: am db71bda6: Merge from gingerbread
* commit 'c3a9bfde60dd4585358a1cf98d302b1a36f39281':
2011-02-07 11:36:55 -08:00
Amith Yamasani
9edc5c056f am 9589ac6c: am 823fbbba: Merge "Expanded volume panel with sliders and mute buttons." into honeycomb
* commit '9589ac6c3f63a632e078adcc8ef742412af2014c':
  Expanded volume panel with sliders and mute buttons.
2011-02-07 11:36:32 -08:00
Scott Main
8903f04708 am 6a7ca8f8: am 51768f4b: am 779f7410: Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread
* commit '6a7ca8f807c842fe5f4ed14df25f4f919b6ab116':
  cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
2011-02-07 11:36:04 -08:00
Nick Pelly
ca3a704acc am 3bb7b0c2: am 5394ef06: am 630ac8df: Merge "NFC documentation overhaul." into gingerbread
* commit '3bb7b0c2b3d448a60b64eba37c998d1f7c7424e2':
  NFC documentation overhaul.
2011-02-07 11:35:47 -08:00
Mathias Agopian
4462ae5220 am e5b6c284: am 33e9cb47: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into honeycomb
* commit 'e5b6c284b6070a3ca9ac1d33b56baba95775ced5':
  fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
2011-02-07 11:35:20 -08:00
Justin Ho
e44e28fa11 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
0d4c1fe368 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
f04b353573 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
1e29cc9676 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
6d9aa80ae9 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
073da9da1d Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-02-07 10:47:01 -08:00
Justin Ho
4a01756c99 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
9832945a99 Merge "Fix warnings" 2011-02-07 10:46:26 -08:00
David 'Digit' Turner
1ee31175ec Merge "WindowManagerService: Disable screen rotation animation under emulation." 2011-02-06 12:53:09 -08:00
Lorenzo Colitti
24401c7966 Merge "Add a protocol property to the APNs and use it." 2011-02-04 17:41:11 -08:00
David 'Digit' Turner
910a068122 WindowManagerService: Disable screen rotation animation under emulation.
Since there is no support for hardware GLES acceleration under
emulation, we disable the screen rotation animation when we detect
that we are in the emulator.

Note that ideally, we should only disable it when we detect that
GLES is implemented in software. However, I don't think there is
an easy way to test for this inside of the WindowManagerService.

Change-Id: Ic17719f7d0b14640bacb3b33b7b1a196006982ee
2011-02-05 00:34:46 +01:00
Wink Saville
d4a3d032b1 Merge "Fix SETUP_DATA_CALL handling." 2011-02-04 15:04:38 -08:00
Wink Saville
70181e2a9f Fix SETUP_DATA_CALL handling.
Handle version 4 returning more than 3 strings and
handle addresses and dnses which are possibly zero length.

Change-Id: Ic58231aa53ccb1fa2b2aaa19580f83f71db1cca3
2011-02-04 14:55:15 -08:00
Glenn Kasten
7e54397b8f Merge "Bug 3366668 Use BinderService template" 2011-02-04 14:00:17 -08:00
Andy Stadler
76324fcabe Fix warnings
* wrong package vs. file path (this was an error in eclipse)
* unused imports
* unused variables (at least for now)

Change-Id: Ic316e7e8586f75df5a048e98a21a65abf777deda
2011-02-04 12:50:09 -08:00
Andreas Huber
0a0930f2fc Merge "Ignore format change message in sf2 instead of asserting" 2011-02-04 10:21:15 -08:00
Andreas Huber
669520b258 Merge "Improvements/fixes to ACodec." 2011-02-04 10:21:07 -08:00
Robert Greenwalt
6d1f9d031d 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
Andreas Huber
5ea137203b Ignore format change message in sf2 instead of asserting
Change-Id: I2d7cdf371c07109398c53c7ffc37d7b10b6b6312
2011-02-04 10:14:08 -08:00
Andreas Huber
6760f9832d Improvements/fixes to ACodec.
- Make sure ACodec reverts its state when it's shutdown
- Defer "resume" to after handling the OutputPortSettingsChange

- If the OMX_EventPortSettingsChanged event comes in while we're flushing, defer it
  and make sure the output port can be disabled by deleting all buffers not already
  owned by the component.

Change-Id: I1f8cdffa71237b57d4275a48b834647a7b263e8b
2011-02-04 10:12:26 -08:00
Leon Scroggins
2f7fa83507 Save form data when submitted.
Bug:3280725

Save form data when submitted, rather than when a page
loads.

Requires a change in external/webkit.

Change-Id: I3ff9515ef9e9ab28992cdc8a7beb537752ed1e8c
2011-02-04 11:43:19 -05:00
Glenn Kasten
8adacd8e22 Merge "Bug 3366885 Remove LVMX switch" 2011-02-03 18:44:32 -08:00
Jean-Baptiste Queru
c8af866f73 am 5c97e9d9: am 236afa68: am 375afcd5: am 4b8ad9ef: Merge from gingerbread
* commit '5c97e9d98566fcd4b6a702252223bb85d637259f':
2011-02-03 18:09:36 -08:00
Jean-Baptiste Queru
1372f0449b 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
7e0f69db6c 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
1b67231483 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
bb01f8a2d0 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
8b113cf6d7 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
795ff6999a 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
16289de340 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-02-03 18:07:29 -08:00
Justin Ho
2b413b1d2e am da75a283: am 205bdd4f: Merge "Sounds cleanup" into honeycomb
* commit 'da75a28304a026634e6583735e525c13a2040239':
  Sounds cleanup
2011-02-03 18:07:03 -08:00
satok
43c3200280 Merge "Register ENABLED_INPUT_METHODS to SettingsObserver" 2011-02-03 18:07:03 -08:00
Stan Chesnutt
eafccc0859 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.

Change-Id: I59e73fbf3dccfbadd1325d3ad5e2997952a28fde
2011-02-03 17:32:39 -08:00
Jaikumar Ganesh
b3c4efc22d Merge "Wait till SDP records are registered before sending intent." 2011-02-03 17:27:10 -08:00
Daniel Sandler
8cd46b577b 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
f368c03039 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
2e8fbebff4 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
79cce9f445 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
589a6a3355 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
Glenn Kasten
1570aff60f Bug 3366885 Remove LVMX switch
Change-Id: I0bf98c6f85f00b3296874571e1c049dcc4e2fcca
2011-02-03 17:18:19 -08:00