Joe Onorato
f2057d907b
Merge changes I09e8c4eb,I91a0e05f into honeycomb
...
* changes:
Use a DateFormat that fits.
Update the network info when the configuration changes.
2011-01-30 13:18:16 -08:00
Joe Onorato
0c953f68f5
Use a DateFormat that fits.
...
Bug: 3405724
Change-Id: I09e8c4ebf1d0142b8737fc1bf9500dee320332b7
2011-01-30 13:07:53 -08:00
Daniel Sandler
2ed08d2e70
Dismiss the ticker early if the status bar is tapped.
...
Tapping the ticker will still launch the notification's
contentIntent, but tapping anywhere else in the bar will
immediately hide the ticker.
Bug: 3365129
Change-Id: Ic1abd38fd4c5bdf32f3586b4e4aa5b833b11a9bd
2011-01-30 16:07:28 -05:00
Dheeraj Sharma
9803b8435e
Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
...
Change-Id: I6216e7e66be4bf0d7cfc74ee3bda7e22969a229a
2011-01-30 12:50:23 -08:00
The Android Open Source Project
b2abd8c424
Mass merge from gingerbread - do not merge
...
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
2011-01-30 12:40:38 -08:00
Joe Onorato
99641836d8
Update the network info when the configuration changes.
...
Bug: 3405559
Change-Id: I91a0e05f2e6d1c7766b89ba4f96d87ce07783318
2011-01-30 12:17:27 -08:00
Gilles Debunne
12ab64593f
Auto-clearing setError popup
...
Bug 3403325
Error popup has to be dismissed whether or not the key was handled.
Change-Id: Ib6326b27fc521398f3cb0c546d29a7de9df18375
2011-01-30 12:11:24 -08:00
Jeff Brown
3c89f6d1bd
Merge "Add "Use physical keyboard" option to system bar IME button." into honeycomb
2011-01-30 12:07:49 -08:00
Dianne Hackborn
e97a12e340
Fix screen size compatibility mode.
...
Change-Id: I2c06bbb586b4e54fc7ec52ec914cf95a18006217
2011-01-30 10:31:30 -08:00
Joe Malin
51990f9b0c
Merge "sdk doc change: Copy/Paste/Drag/Drop" into honeycomb
2011-01-30 09:45:59 -08:00
Daniel Sandler
eec2028698
Merge "Fix broken intitial notification panel animation." into honeycomb
2011-01-29 22:37:13 -08:00
Dianne Hackborn
43abedde5f
am c12cdda9: (-s ours) Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
...
* commit 'c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
DO NOT MERGE: Fix screen size compatibility mode.
2011-01-29 22:27:16 -08:00
Daniel Sandler
8c9891840a
Fix broken intitial notification panel animation.
...
I also tuned the animation parameters a bit to get things to
look just a tiny bit smoother. The first run is still jerky
but it's not jumping all over the place in the wrong
direction.
Bug: 3404950
Change-Id: Id10c52f227e6d2db428dc860097023560d154356
2011-01-30 01:24:09 -05:00
Dianne Hackborn
c12cdda949
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
2011-01-29 22:20:05 -08:00
Dheeraj Sharma
5618e037af
Fix for issue 3404671 Crash when exporting movie in JNI
...
Change-Id: Id2883d7be314ebd2138297b936bcbe6b55361ac5
2011-01-29 21:29:49 -08:00
Dianne Hackborn
726318b56a
DO NOT MERGE: Fix screen size compatibility mode.
...
Cherry-picked from HC.
Change-Id: Icce2a64f187a56deefcddc3d9b22fa94effce431
2011-01-29 18:02:18 -08:00
Ken Wakasa
8710e76a89
Follow up change to I741642ac
...
Fix wrong constant.
bug: 3404788
Change-Id: Ic5f849e6640a78a70951cf819d7e8ce53a9c2585
2011-01-30 11:02:09 +09:00
Jean-Baptiste Queru
8f4a04f04c
am 1358b6a4: Tweak to make merges easier
...
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
2011-01-29 14:32:04 -08:00
Jean-Baptiste Queru
7ea919c44b
Merge 6b739dc7 from gingerbread
...
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
2011-01-29 12:59:20 -08:00
Jean-Baptiste Queru
1358b6a4fb
Tweak to make merges easier
...
Bug: 3364311
Change-Id: Idec05206615de524a3b61d8579d9f2b462b541cd
2011-01-29 12:54:09 -08:00
Jason parks
a2e765ef1a
Merge "Update the encryption password when the device password is changed." into honeycomb
2011-01-29 12:02:19 -08:00
Eric Fischer
5f3ba16de0
am 5f2def8c: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
2011-01-29 11:25:30 -08:00
Dirk Dougherty
51a6df010d
am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
...
* commit 'fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
Doc change: Add time-lapse video to 3.0 highlights.
2011-01-29 11:16:13 -08:00
Andreas Huber
317e8c89f5
am b6c2e2b4: (-s ours) DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
...
* commit 'b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
2011-01-29 11:16:07 -08:00
Jean-Baptiste Queru
80838d256d
Merge 0ef57993 from gingerbread
...
Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
2011-01-29 11:04:41 -08:00
Jim Miller
a8d5dbbccd
am 226e5756: (-s ours) Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
...
* commit '226e57563c3110aa688fc41f10b7a96cd21b6231':
Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
2011-01-29 11:00:28 -08:00
Jean-Baptiste Queru
0044b4ad6a
Merge d350dc04 from gingerbread
...
Change-Id: Ieb76b9724a3e253f9614d02cc06d3348b8e2c929
2011-01-29 10:57:48 -08:00
Eric Fischer
355f66917d
am 3d73c4d3: (-s ours) Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
Import revised translations. DO NOT MERGE
2011-01-29 10:40:17 -08:00
Nick Pelly
4226be3f04
am 21d0a173: Fix build - javadoc.
...
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
Fix build - javadoc.
2011-01-29 10:40:07 -08:00
Scott Main
f067fbfe0c
am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
...
* commit '7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
2011-01-29 10:40:01 -08:00
Jean-Baptiste Queru
0440cc1fb7
Merge eab0e97b from gingerbread
...
Change-Id: Ibbe49137775b58ba0961fadd945c05acfcd1ce61
2011-01-29 10:38:09 -08:00
Robert Greenwalt
df346d8a78
am 89a54408: (-s ours) Merge "Update networktype before sending state change." into gingerbread
...
* commit '89a544088fcfa849be0d8824a2ac0a545950847b':
Update networktype before sending state change.
2011-01-29 10:26:33 -08:00
Dirk Dougherty
50d7d52810
am 591a5f86: Doc change: fix adt archive filename.
...
* commit '591a5f86bd4b3f1732b935daad909e4e63149f01':
Doc change: fix adt archive filename.
2011-01-29 10:16:14 -08:00
Jean-Baptiste Queru
ef1cf4b416
Merge ba3dd323 from gingerbread
...
Change-Id: I615bf5177abbc680292e0116491da58835c7396f
2011-01-29 10:11:06 -08:00
Scott Main
4feebc2c7d
am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
...
* commit 'a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
2011-01-29 09:59:33 -08:00
Andreas Huber
9df3861ccb
am 2dce338e: (-s ours) DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
...
* commit '2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
2011-01-29 09:55:13 -08:00
Dianne Hackborn
1ac4f38dfa
am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
...
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
2011-01-29 09:54:53 -08:00
Jean-Michel Trivi
aaa814c4a8
am 2ba92c71: (-s ours) do not merge bug 3370834 Cherrypick from master
...
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug 3370834 Cherrypick from master
2011-01-29 09:54:41 -08:00
Kenny Root
c68a657f12
am 138757db: Merge "Make OBB results a one-way call" into gingerbread
...
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
2011-01-29 09:48:07 -08:00
Jean-Baptiste Queru
593dadd683
Merge c33acae9 from gingerbread
...
Change-Id: I52b5045cbef6e4927f86830498050977b2829859
2011-01-29 09:45:41 -08:00
Mathias Agopian
5af18cbf57
am 239fd805: (-s ours) Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
...
* commit '239fd805ef7c0e4116b0a89e20caaf287e91f017':
fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
2011-01-29 09:40:51 -08:00
Mathias Agopian
27667d808e
am 1955a5c9: (-s ours) Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
...
* commit '1955a5c9da421dc89bb1a1dd3d3193159192cde9':
partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
2011-01-29 09:40:34 -08:00
Mathias Agopian
58da4d30a3
am d0441f92: (-s ours) Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
...
* commit 'd0441f921b2b1879fb44041f521d9bfaa5a547d0':
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
2011-01-29 09:40:25 -08:00
Mathias Agopian
87c9dee034
am 043a3cdd: (-s ours) Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
...
* commit '043a3cddf67e2baf38711bcb125084599f8f9802':
workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
2011-01-29 09:40:14 -08:00
Mathias Agopian
8dc246ece5
am d3fcd0a1: (-s ours) Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
...
* commit 'd3fcd0a1c923498921107bb44fbc8b24582a170a':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
2011-01-29 09:40:06 -08:00
Jean-Baptiste Queru
962d556a12
Merge f126ad3b from gingerbread
...
Change-Id: I13a79033239d306fcf9291ca7fad7445f2cd1f47
2011-01-29 09:37:44 -08:00
Marco Nelissen
cc2915c0b1
am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
...
* commit 'c929677e017759047d94599faa1b80ebe278fefb':
Increase the number of useful bits in the spectrum.
2011-01-29 09:32:05 -08:00
Nick Pelly
1ac6d08a05
am b134223f: Make Mifare Classic increment/decrement operands little endian
...
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
Make Mifare Classic increment/decrement operands little endian
2011-01-29 09:31:56 -08:00
Hung-ying Tyan
dd75788eda
am cc019c0c: Merge "Get mute state from active call." into gingerbread
...
* commit 'cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
Get mute state from active call.
2011-01-29 09:31:40 -08:00
Hung-ying Tyan
7b2ca23262
am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
...
* commit '14b6d0620b42d1bb3a55778ba452d838a0d89223':
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
2011-01-29 09:31:19 -08:00