Vasu Nori
34878787f0
Merge "print certain rows from downloads.db when bugreports are taken"
2010-11-23 10:05:06 -08:00
Adam Powell
637d337b58
Merge overscrolling from gingerbread.
...
Change-Id: I3eb4413261b38ddd8c609d6153bdfd4ae46c6a0f
2010-11-23 09:30:10 -08:00
Mike Lockwood
5a2755d0c9
Rename MtpCursor to PtpCursor
...
Change-Id: I8ce257641388b195f3e17995d323355b19355dc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-23 12:25:49 -05:00
Mike Lockwood
aef9c05d3f
Merge "MTP: Remove static library build for linux host."
2010-11-23 09:22:37 -08:00
Kenny Root
e56764a8fd
Merge "Add knowledge of mipmap to aapt"
2010-11-23 09:20:33 -08:00
Brad Fitzpatrick
0c8224000d
CloseGuard cleanups.
...
Change-Id: I8ece2cb7f2c7ca2c1ac72ca3080c436e50aa6c80
2010-11-23 09:17:56 -08:00
Mike Lockwood
d46c683f0e
MTP: Remove static library build for linux host.
...
Change-Id: Iefdd386b91dba0579ca952aca40b7114535e1d4e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-23 10:30:31 -05:00
Mike Lockwood
c0b8b321d5
Rename MtpClient and MtpCursor to PtpClient and PtpCursor
...
Change-Id: I26fce3bf32c8e9c8d592106af7ab4c35b19e0996
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-23 10:30:31 -05:00
Mike Lockwood
a31560598a
Rename android.provider.Mtp to android.provider.Ptp
...
We are only supporting the PTP subset of MTP in host mode and have
no plans for full MTP, so calling it Mtp was misleading.
Also moved ACTION_MTP_SESSION_END Intent name to android.provider.MediaStore
and added it to the public API.
Change-Id: Ie35d15864d5972e65a39b982aa51316ecca3725a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-23 10:30:31 -05:00
Bjorn Bringert
901b3796fd
Don't drop zeros in the second position in formatDuration()
...
Bug: 3223250
Change-Id: I462c96af51cc052f9df1dc3d2c668551b10155ea
2010-11-23 14:43:12 +00:00
Irfan Sheriff
b8297cfc76
Stop listening to supplicant state change events
...
wifi connected status should be based only on
network state change events or it can lead to a
race condition.
Change-Id: Ib2343f0d192ef99959f908a370d55aae7ba86a5a
2010-11-23 04:34:35 -08:00
Ben Murdoch
57914381a8
Offer the user the option to configure an AutoFill profile.
...
When the user selects a form field that is part of a form that can
be autofilled, inform the embedder that this is the case to give
them the opportunity to configure a profile if they the user has
not done so already. A Message is also provided
to the embedder that when sent will trigger the form to be filled
with the profile that the embedder set up.
Change-Id: Ica995e5b1ed92a3ec3e356401b261740d9f90e57
2010-11-23 12:18:02 +00:00
Dianne Hackborn
1c24e957ad
Fix issue #3222014 : Dragging items around home screen is unresponsive
...
Also make the dim fade duration configurable, with a configured value
that more closely matches what UX wants.
Change-Id: Id32e2de14a2a2003d8fade6331377d8d723ac397
2010-11-23 00:40:52 -08:00
Brad Fitzpatrick
cdcb73ef78
Cache WindowManager in StrictMode; add android.util.Singleton
...
Change-Id: I15a85461424de930710d4901658440b5d305cabb
2010-11-22 23:00:23 -08:00
Kenny Root
7c71023b7f
Add knowledge of mipmap to aapt
...
New mipmap drawable type that does not get filtered according to
configuration. Useful for things that get built as part of the system.
Change-Id: I556033d065e504079271dce79c23c90d3c387ce4
2010-11-22 22:28:44 -08:00
Gloria Wang
c60df506c1
am 3e18dfab: am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
...
* commit '3e18dfab3417e139c7ec3896cea9e303fdc8fa63':
Notify the playback status to DRM agents before the playback starts
2010-11-22 21:29:22 -08:00
Gloria Wang
35f2d3997e
am 24a90c26: am d9334934: Merge "Update of DRM Framework."
...
* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18':
Update of DRM Framework.
2010-11-22 21:29:08 -08:00
Gloria Wang
3e18dfab34
am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
...
* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
Notify the playback status to DRM agents before the playback starts
2010-11-22 21:26:13 -08:00
Gloria Wang
24a90c2674
am d9334934: Merge "Update of DRM Framework."
...
* commit 'd93349342a89a25c7a884e8543c6adc048c5f86d':
Update of DRM Framework.
2010-11-22 21:25:56 -08:00
Gloria Wang
4da48ec883
Merge "Notify the playback status to DRM agents before the playback starts"
2010-11-22 21:15:07 -08:00
Gloria Wang
d93349342a
Merge "Update of DRM Framework."
2010-11-22 21:14:09 -08:00
Dianne Hackborn
c0ec802e96
Merge "New animations from lbk."
2010-11-22 21:05:39 -08:00
Dianne Hackborn
9a372f53fd
New animations from lbk.
...
Change-Id: Ia9f88fa080c30c51db848c01587f06bcfce57ed1
2010-11-22 21:04:01 -08:00
Brad Fitzpatrick
6804433b0a
StrictMode visual notification support.
...
Change-Id: I64a5adb683060d9649f1132414547bb3c346a2a8
2010-11-22 19:39:52 -08:00
Xia Wang
739d0aed02
Add Wi-Fi tests for static IP. DO NOT MERGE
...
- Add support in parser to parse static IP settings
- Add test for static IP configuration
Change-Id: I37e11ceb0f34c87113d8281b4de09893506c29e7
2010-11-22 19:10:01 -08:00
Dianne Hackborn
621e17de87
Implement issue #3221502 : New APIs to support new back stack / task navigation
...
What this adds:
- A new Intent activity flag to completely replace an existing task.
- A new Intent activity flag to bring the current home task up behind
a new task being started/brought to the foreground.
- New versions of startActivity() that take an array of Intents to be
started, allowing applications to start a task in a specific state.
- A public moveTaskToFront() method on ActivityManager, with a new flag
that allows the caller to have the task moved to the front with the
current home task immediately behind it.
Change-Id: Ie8028d09acffb5349d98043c67676daba09f75c8
2010-11-22 18:35:55 -08:00
satok
703c5f39c5
Merge "Add an API to get shortcut IMEs"
2010-11-22 17:27:43 -08:00
satok
4e4569dab5
Add an API to get shortcut IMEs
...
- If there are no selected shortcut IMEs, the most applicable voice input will be selected as a shortcut IME
Change-Id: Ibd0f7ef5101013569c303820a3adc9038a97356d
2010-11-23 10:26:11 +09:00
Vasu Nori
8da7a4e345
changes to support Change-Id: I572fdfd6d34dbb5a0577c6cf14664b6f2d5700b4
...
1. add new column constants for : COLUMN_last_updatesrc
2. send downloadid in the uri wherever possible.
Change-Id: I49a18506060bf292a0750790042e94b0a35ea9bf
2010-11-22 17:07:22 -08:00
Jean-Baptiste Queru
656a23ba2b
Merge "resolved conflicts for merge of 8484e57f to master"
2010-11-22 16:46:18 -08:00
Jean-Baptiste Queru
8503144665
resolved conflicts for merge of 8484e57f to master
...
Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653
2010-11-22 16:43:59 -08:00
Gil Dobjanschi
e45674e284
Merge "Begin transition was invalidated when the image duration was changed."
2010-11-22 16:38:38 -08:00
Jean-Baptiste Queru
8484e57f30
resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp
...
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
2010-11-22 16:32:34 -08:00
Joe Onorato
eca0f6877d
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
d2a5a0b584
Merge "More error checks"
2010-11-22 16:27:59 -08:00
Justin Ho
077b6ed354
Merge "Merging some Gingerbread status bar icons to master"
2010-11-22 16:24:48 -08:00
Jason Sams
add9d96332
More error checks
...
Change-Id: Id2b9ab7a76bbdf2ed745f5e36e552dc9b101982f
2010-11-22 16:20:16 -08:00
Joe Onorato
8d0b655c49
Add a better notification test and clean up the flag handling in the notification builder.
...
Change-Id: I9354ed2c2cda690f53e5f43ad60943b63b02e7d4
2010-11-22 16:19:40 -08:00
Jean-Baptiste Queru
e4ae7fc3eb
Merge "Enabling cell broadcast (SMS-CB) support in the platform."
2010-11-22 15:59:04 -08:00
Andreas Huber
4a0ff4de79
Merge "Squashed commit of the following:"
2010-11-22 15:40:29 -08:00
Justin Ho
747698664d
Merge "Adding new gingerbread notifications and ringtones to master"
2010-11-22 15:38:37 -08:00
Gil Dobjanschi
37f7e0c7bf
Begin transition was invalidated when the image duration was changed.
...
Change-Id: I0118813a66c65d8b3746fc2c689cf9d8da651aa3
2010-11-22 15:33:10 -08:00
Justin Ho
60b440ac38
Merging some Gingerbread status bar icons to master
...
Change-Id: I18c18b0ce2b1883998d40119a101e7598bcdfba6
2010-11-22 15:25:30 -08:00
satok
e9811d7dd4
Merge "Synchronize getCurrentInputMethodSubtype"
2010-11-22 15:17:37 -08:00
Xia Wang
ef11d3289e
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
7ac91a7ddb
Merge "Fix bug 3208546 - use the right sized progress spinner for holo.light"
2010-11-22 14:49:20 -08:00
Adam Powell
7f1c57d11e
Fix bug 3208546 - use the right sized progress spinner for holo.light
...
Change-Id: I7c9d3607368a72c0b06012be0995d23591a68b78
2010-11-22 14:46:34 -08:00
Xia Wang
6bdd69370f
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
5df8c15587
Merge "Add Wifi Tethering stress test" into gingerbread
2010-11-22 14:44:49 -08:00
Jean-Michel Trivi
dd688b600c
Merge "Unhide android.media.AudioManager.MODE_IN_COMMUNICATION"
2010-11-22 14:08:18 -08:00