Dianne Hackborn
35d64df51b
Merge "New animations from lbk."
2010-11-22 21:05:39 -08:00
satok
9250194b2e
Merge "Add an API to get shortcut IMEs"
2010-11-22 17:27:43 -08:00
Jean-Baptiste Queru
f2854d02e3
Merge "resolved conflicts for merge of 8484e57f to master"
2010-11-22 16:46:18 -08:00
Jean-Baptiste Queru
dec491cf02
resolved conflicts for merge of 8484e57f to master
...
Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653
2010-11-22 16:43:59 -08:00
Gil Dobjanschi
bfba13c13b
Merge "Begin transition was invalidated when the image duration was changed."
2010-11-22 16:38:38 -08:00
Jean-Baptiste Queru
37e7e9e052
resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp
...
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
2010-11-22 16:32:34 -08:00
Joe Onorato
c8f77827db
Merge "Add a better notification test and clean up the flag handling in the notification builder."
2010-11-22 16:28:32 -08:00
Jason Sams
bc07b41d83
Merge "More error checks"
2010-11-22 16:27:59 -08:00
Justin Ho
bfda58f54e
Merge "Merging some Gingerbread status bar icons to master"
2010-11-22 16:24:48 -08:00
Jean-Baptiste Queru
dba567c4ae
Merge "Enabling cell broadcast (SMS-CB) support in the platform."
2010-11-22 15:59:04 -08:00
Andreas Huber
c80d23edfe
Merge "Squashed commit of the following:"
2010-11-22 15:40:29 -08:00
Justin Ho
0d4d153220
Merge "Adding new gingerbread notifications and ringtones to master"
2010-11-22 15:38:37 -08:00
satok
16412037b0
Merge "Synchronize getCurrentInputMethodSubtype"
2010-11-22 15:17:37 -08:00
Xia Wang
fd9edda6ce
am 6bdd6937: am 5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread
...
* commit '6bdd69370fe2bda7adc7055f62165fccd944b192':
Add Wifi Tethering stress test
2010-11-22 14:50:28 -08:00
Adam Powell
51fc568b17
Merge "Fix bug 3208546 - use the right sized progress spinner for holo.light"
2010-11-22 14:49:20 -08:00
Xia Wang
07db9276c0
am 5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread
...
* commit '5df8c155872833647ac56951ab90bd26a9af9480':
Add Wifi Tethering stress test
2010-11-22 14:46:33 -08:00
Xia Wang
14073fb621
Merge "Add Wifi Tethering stress test" into gingerbread
2010-11-22 14:44:49 -08:00
Jean-Michel Trivi
e8240ed015
Merge "Unhide android.media.AudioManager.MODE_IN_COMMUNICATION"
2010-11-22 14:08:18 -08:00
Naomi Luis
29a73ba845
frameworks/base: Destroy the overlay even if there is an error
...
Allow the overlay object to be destroyed whenever the destroy is
invoked. Currently the destroy call returns if there is an error
encountered, which results in open data and control channels.
Change-Id: I1f2ef4ebb5fb1dcabf05ab50b5bbf6e5e240a63a
2010-11-22 14:03:18 -08:00
Scott Main
5061e76071
am 4f3c40cc: am 8fac7c2e: change sdk version variable to 2.3 (for docs)
...
* commit '4f3c40cc4d24ba1404b1332dbf1bfcddede8bf99':
change sdk version variable to 2.3 (for docs)
2010-11-22 13:58:05 -08:00
Scott Main
30a731e6c5
am 8fac7c2e: change sdk version variable to 2.3 (for docs)
...
* commit '8fac7c2edc433b6c7d153caac238fef595133663':
change sdk version variable to 2.3 (for docs)
2010-11-22 13:55:55 -08:00
Jean-Baptiste Queru
badd6db1e9
am c8454a85: am b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
...
* commit 'c8454a851f26b78de77c0f6b1aa746ce3e2517f1':
SearchDialog: Fix for NullpointerException while using Suggestions in Browser
2010-11-22 13:48:06 -08:00
Jean-Baptiste Queru
a96d0edeef
am b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
...
* commit 'b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4':
SearchDialog: Fix for NullpointerException while using Suggestions in Browser
2010-11-22 13:44:56 -08:00
Jean-Baptiste Queru
0fd91dffef
Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
2010-11-22 13:40:29 -08:00
Gloria Wang
29ac797707
Merge "64-bit file size/offset support for DRM framework"
2010-11-22 10:48:30 -08:00
James Dong
4a2dee85be
Merge "Fixed an issue in SampleTable where the table index was incorrectly wrapped around to -1"
2010-11-22 09:54:21 -08:00
Dmitri Plotnikov
e99743fc59
Merge "Adding IS_READ_ONLY flag to groups"
2010-11-22 09:48:17 -08:00
Iain Merrick
702228b304
Merge "Make maybeSavePassword() a top-level method in BrowserFrame."
2010-11-22 09:34:31 -08:00
Erik
456cf7d222
Merge "b/3215774 Fix scrollMode notifications"
2010-11-21 20:08:06 -08:00
Joe Onorato
d5a7fe9fbc
Merge changes I61331a6e,I5728222b
...
* changes:
new battery assets
Use new nav button assets.
2010-11-21 19:23:36 -08:00
Dirk Dougherty
3b400b5deb
am e489d48f: am 805bddc1: Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
...
* commit 'e489d48f7c95b874ee7820d1052d862109244437':
doc change: Docs for SDK Tools r8, ADT 8
2010-11-19 19:21:04 -08:00
Wu-cheng Li
a84b8e4bc1
am fb6f4505: am 589e8381: Merge "Improve camera documentation." into gingerbread
...
* commit 'fb6f4505ba5c227cebb73f1269b0af5d92e6e5e6':
Improve camera documentation.
2010-11-19 19:20:59 -08:00
Dirk Dougherty
fa2ef12b08
am 805bddc1: Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
...
* commit '805bddc123c1fc56be333d6ff365f168d4bc2b08':
doc change: Docs for SDK Tools r8, ADT 8
2010-11-19 19:04:56 -08:00
Dirk Dougherty
6063a4c77a
Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
2010-11-19 19:03:03 -08:00
Wu-cheng Li
3dc42067f9
am 589e8381: Merge "Improve camera documentation." into gingerbread
...
* commit '589e838116b0dffa696fa39336d0588124877f98':
Improve camera documentation.
2010-11-19 18:17:24 -08:00
Wu-cheng Li
ced9b3525a
Merge "Improve camera documentation." into gingerbread
2010-11-19 18:14:43 -08:00
James Dong
aa171003b3
Merge "Fixed MediaPlayer unit test issues"
2010-11-19 17:35:26 -08:00
Mathias Agopian
a340dadd63
am d3b5510b: am 927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
...
* commit 'd3b5510b8505c6c653469193a40f6431272085f3':
Fix SensorManager.getOrientation() documentation.
2010-11-19 17:23:13 -08:00
Mathias Agopian
7d27daed05
am 927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
...
* commit '927e7410000dd1917387c01fc4229836ddd5eb97':
Fix SensorManager.getOrientation() documentation.
2010-11-19 17:20:14 -08:00
Mathias Agopian
2a4743599b
Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
2010-11-19 17:18:21 -08:00
Shimeng (Simon) Wang
badc41e772
Merge "Make sure we have a ";" after locale in User Agent"
2010-11-19 17:13:07 -08:00
Brad Fitzpatrick
3a2e2e044d
Merge "Don't re-read SharedPreferences unnecessarily."
2010-11-19 17:08:44 -08:00
Daniel Shiplacoff
92a6519b39
Merge "Updates assets for edge glow and line."
2010-11-19 17:00:25 -08:00
Scott Main
72ffb6c5cb
am 55ff5708: am 828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread
...
* commit '55ff5708bb166ab985ffd89e62ddcb13927d6403':
docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462
2010-11-19 16:56:53 -08:00
Jean-Baptiste Queru
9b99eb350e
am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp
...
* commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2':
StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
2010-11-19 16:56:49 -08:00
Jean-Baptiste Queru
6bca1b0809
am 7b76ed69: am e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
...
* commit '7b76ed693e42caea0c5f1bcbe7059c580e9cb314':
Added noop unregisterReceiver to complement existing noop registerReceiver.
2010-11-19 16:56:42 -08:00
Jake Hamby
e27be5d088
Merge "Revert "Don't call cancel discovery when its already canceelled.""
2010-11-19 16:53:26 -08:00
Brian Muramatsu
7240174e54
Merge "Fix ClipboardManager#hasText"
2010-11-19 16:52:11 -08:00
Scott Main
08f93179ec
am 828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread
...
* commit '828b68166679ebfc0002e2ea516ca91e6fb13597':
docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462
2010-11-19 16:51:57 -08:00
James Dong
342f7fab44
Merge "Removed uncessary FILE structure pointer for I/O"
2010-11-19 16:49:10 -08:00