Commit Graph

38903 Commits

Author SHA1 Message Date
Wei Huang
623e78b792 am 5b422186: am 9c4c98b1: Merge "new presence icons for video/audio chats." into gingerbread
Merge commit '5b422186f3740a228620210db6d0be0a9838be51'

* commit '5b422186f3740a228620210db6d0be0a9838be51':
  new presence icons for video/audio chats.
2010-06-28 15:11:05 -07:00
Wei Huang
5b422186f3 am 9c4c98b1: Merge "new presence icons for video/audio chats." into gingerbread
Merge commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33' into gingerbread-plus-aosp

* commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33':
  new presence icons for video/audio chats.
2010-06-28 15:08:37 -07:00
Wei Huang
9c4c98b102 Merge "new presence icons for video/audio chats." into gingerbread 2010-06-28 15:05:56 -07:00
Wei Huang
0b0997cc99 new presence icons for video/audio chats.
Change-Id: I1d011060dc6cb5e04d3a86def03ca55cd318e721
2010-06-28 14:38:25 -07:00
Daniel Sandler
e94364c749 am be5f3121: am 5dbd05ed: Intruder alert! (First try at the immersive-mode alert bar.)
Merge commit 'be5f31212064b78735cd6f643015f244ad81ce78'

* commit 'be5f31212064b78735cd6f643015f244ad81ce78':
  Intruder alert! (First try at the immersive-mode alert bar.)
2010-06-28 14:24:33 -07:00
Daniel Sandler
be5f312120 am 5dbd05ed: Intruder alert! (First try at the immersive-mode alert bar.)
Merge commit '5dbd05ed18906be3499978303f2fca4f86211567' into gingerbread-plus-aosp

* commit '5dbd05ed18906be3499978303f2fca4f86211567':
  Intruder alert! (First try at the immersive-mode alert bar.)
2010-06-28 14:22:17 -07:00
Mike Lockwood
ac051ae7ac Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state
Replaces use of battery status, which will not work on devices that do not
charge over USB.

Change-Id: I1e123bb534d46b890461ddfdee24f81da5798756
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-28 16:38:33 -04:00
Daniel Sandler
5dbd05ed18 Intruder alert! (First try at the immersive-mode alert bar.)
When a FLAG_HIGH_PRIORITY notification is posted and the
foreground activity is immersive, this window will be shown
to the user. It disappears after a while (currently 10s,
which is far too long to be usable but is very handy for
testing) and can be dismissed by a tap.

Artwork is extremely rough; please ignore the aesthetics.

Still TODO:
  - sticky alerts for ongoing priority notifications
  - tap to launch PendingIntent associated with the
    notification

Change-Id: Ief4a98b84cc836d33359bd7d65de9909f5186317
2010-06-28 16:33:27 -04:00
Scott Main
337b0873f4 docs: update backup guide and bmgr tool
elaborate the guide to testing a backup agent and add links between the docs

Change-Id: I35f815d1848c6bd7c6bfaee214f333e35a6cb23c
2010-06-28 12:28:31 -07:00
Robert Greenwalt
924cc94caa Reduce Tethering Logging.
bug:2581886
Change-Id: Ib6243a413c22d80216d83c02dbc9ff4e3bb38db9
2010-06-28 10:27:12 -07:00
Derek Sollenberger
59ec92c4e3 Merge "Rename a data storage object to better reflect its intended usage." 2010-06-28 10:23:07 -07:00
Gilles Debunne
d64dd2ef1c Merge "New XmlAdapters sample code." 2010-06-28 10:21:37 -07:00
Derek Sollenberger
b983c893d4 Rename a data storage object to better reflect its intended usage.
Change-Id: I18eae0665b59e7fee389a0e09955c5860a7e65f2
2010-06-28 12:59:48 -04:00
Mike Lockwood
ff2544c6cb Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state
Replaces use of UMS notifications, which will not work on devices without
USB mass storage support.

Change-Id: I2ea7f4d2dead91418935e97e2f442f5e3fc5e6dc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-28 10:03:17 -04:00
Mike Lockwood
709981eeed Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
This can be used instead of ACTION_USB_CONNECTED and ACTION_USB_DISCONNECTED
by clients that need to be informed of both USB connect and disconnect events

Change-Id: Ic26927af2e775c2694d18775f9d574c97b095dfd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-28 10:02:05 -04:00
Derek Sollenberger
4aef697d58 Initial pass at unit tests for ZoomManager.
This CL also includes some minor changes to the ZoomManager that
make the manager easier to test as well as fix some uncovered issues.

Change-Id: I66a84d70ee75e765ccf9cccb2d123757a9470f93
2010-06-28 08:53:20 -04:00
Jens Gulin
6d85ea9c55 Keep track of remaining fd when devices are removed
Sometimes the wrong fd was accessed when the device was addressed
by device id.

The earlier implementation assumed that two arrays were in sync
but one of them was compacted when devices were removed. Instead
of that dependency the device now keeps track of it's file descriptor.

Change-Id: I2b8a793d76b89ab464ae830482b309fe86031671
2010-06-28 11:36:14 +02:00
Stefan Larsson
38a1054c1c Fix hang when error in SIM card communication
When there is a problem communicating with the RIL (e g when the SIM
card is not connected) the IccPhoneBookManager hangs. This is corrected.

Change-Id: I28cf6cd3b79a29f4784fdef2b5072af5533e53da
2010-06-28 08:45:40 +02:00
Romain Guy
26ae3b66e5 Merge "Reduced the complexity of layers composition." 2010-06-27 23:01:58 -07:00
Romain Guy
5cbbce5357 Reduced the complexity of layers composition.
This change also refactors the code base a bit by moving classes out of
OpenGLRenderer into separate headers/implementations. This makes the code
more manageable.

This change also adds documentation for implementation methods. The
undocumented methods are simply Skia's Canvas methods.

Change-Id: I54c68b443580a0129251dddc1a7ac95813d5289e
2010-06-27 22:59:20 -07:00
Chih-Chung Chang
1df11fc8f1 am cbbc035b: am de1057c4: Unhide new API for supporting multiple cameras.
Merge commit 'cbbc035b640790650d0e377a2d6291cc523a2a35'

* commit 'cbbc035b640790650d0e377a2d6291cc523a2a35':
  Unhide new API for supporting multiple cameras.
2010-06-27 20:54:36 -07:00
Chih-Chung Chang
cbbc035b64 am de1057c4: Unhide new API for supporting multiple cameras.
Merge commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb' into gingerbread-plus-aosp

* commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb':
  Unhide new API for supporting multiple cameras.
2010-06-27 20:49:42 -07:00
Chih-Chung Chang
de1057c4a6 Unhide new API for supporting multiple cameras.
Change-Id: I916a536c80330444a15986ba380205a6deed2390
2010-06-28 11:12:45 +08:00
Naveen Kalla
2e896830f8 Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
Change-Id: Ic794ef8258138b903f83c5ed77a0ee09e75ca094
2010-06-26 23:18:03 -07:00
Naveen Kalla
213c853f40 Make hasIccCard return true if RUIM card is present.
Currently hasIccCard method works only for GSM phones with SIM/USIM
cards. Extend that to RUIM as well.

Change-Id: Iefbfc35025074e7414f4abdffea844e9e0325053
2010-06-26 22:52:39 -07:00
Romain Guy
1d58b498de Merge "Add implementations for saveLayerAlpha() and textured rects." 2010-06-26 00:16:20 -07:00
Romain Guy
bd6b79b402 Add implementations for saveLayerAlpha() and textured rects.
Even though there's an implementation for textured rects, drawBitmap() is not
hooked up yet as it will require a good texture cache.

This method is implemented using FBOs. There's currently an issue either in the
driver or in the Canvas renderer that forces the FBO to be fullscreen, which is
extremely expensive and yields terrible performance.

Change-Id: I148419195e12d45653c60186938aa78c23a68e2c
2010-06-26 00:13:53 -07:00
Irfan Sheriff
30683b2ad0 am 53dca61f: am 9005e7f4: Merge "Add setWifiApConfiguration interface" into gingerbread
Merge commit '53dca61f26f4ff348418add60599213297acc899'

* commit '53dca61f26f4ff348418add60599213297acc899':
  Add setWifiApConfiguration interface
2010-06-25 19:53:34 -07:00
Irfan Sheriff
53dca61f26 am 9005e7f4: Merge "Add setWifiApConfiguration interface" into gingerbread
Merge commit '9005e7f4297a3f04263e81cb61ba2703d5667b0a' into gingerbread-plus-aosp

* commit '9005e7f4297a3f04263e81cb61ba2703d5667b0a':
  Add setWifiApConfiguration interface
2010-06-25 19:51:50 -07:00
Irfan Sheriff
9005e7f429 Merge "Add setWifiApConfiguration interface" into gingerbread 2010-06-25 19:49:58 -07:00
Mathias Agopian
781953d62d Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
This reverts commit 330dd304a4.
2010-06-25 18:02:21 -07:00
Chris Peterson
c05df82b36 update 404'd source.android.com URLs
Change-Id: I4d3d2ae267c9f6da9f4969b3970cfb923ce8ef2f
2010-06-25 17:32:20 -07:00
James Dong
a2312efff1 am fd45c1e6: am 41debbc6: Merge "Provide progress status report during authoring" into gingerbread
Merge commit 'fd45c1e68dbc0c821c2b6d7e0b7e2a3493400798'

* commit 'fd45c1e68dbc0c821c2b6d7e0b7e2a3493400798':
  Provide progress status report during authoring
2010-06-25 16:46:07 -07:00
James Dong
fd45c1e68d am 41debbc6: Merge "Provide progress status report during authoring" into gingerbread
Merge commit '41debbc613ec57aa892f604229df376402942687' into gingerbread-plus-aosp

* commit '41debbc613ec57aa892f604229df376402942687':
  Provide progress status report during authoring
2010-06-25 16:44:09 -07:00
James Dong
41debbc613 Merge "Provide progress status report during authoring" into gingerbread 2010-06-25 16:40:47 -07:00
James Dong
09936ed192 Provide progress status report during authoring
- Track either the number of A/V frames authored, or the time elapsed
- Track the completion of the authoring
- Add multiple camera support for authoring by accepting a camera id parameter
- Set file type based on the OUTPUT_FORMAT requested

Change-Id: I0f9d31b3b7a8fa43eb53f572410fb0ebd4fa0bb7
2010-06-25 16:20:42 -07:00
David Brown
e3df791ff2 am a0a58235: am 01719a22: Merge "Placeholder icons for the "ringing" variant of stat_sys_phone_call." into gingerbread
Merge commit 'a0a582355ba10454d2625ce2968015e50a12a3e3'

* commit 'a0a582355ba10454d2625ce2968015e50a12a3e3':
  Placeholder icons for the "ringing" variant of stat_sys_phone_call.
2010-06-25 16:07:05 -07:00
David Brown
a0a582355b am 01719a22: Merge "Placeholder icons for the "ringing" variant of stat_sys_phone_call." into gingerbread
Merge commit '01719a22f9e0e0eadfedcfc17b2deb73c5fb3d6b' into gingerbread-plus-aosp

* commit '01719a22f9e0e0eadfedcfc17b2deb73c5fb3d6b':
  Placeholder icons for the "ringing" variant of stat_sys_phone_call.
2010-06-25 15:59:33 -07:00
David Brown
01719a22f9 Merge "Placeholder icons for the "ringing" variant of stat_sys_phone_call." into gingerbread 2010-06-25 15:54:55 -07:00
Jason Sams
2afa22003d Merge "Update fountain to use boolean rather than ints for true/false." 2010-06-25 15:12:29 -07:00
Jason Sams
61d10a4e43 Update fountain to use boolean rather than ints for true/false.
Change-Id: I5e8334f53239c869caeaff45e611309cea5ba284
2010-06-25 15:09:45 -07:00
Mathias Agopian
391a3e0237 am 687f8a2e: am 1cb3fdc9: Merge "Fix a bug in sp<> and wp<> which could cause memory corruptions" into gingerbread
Merge commit '687f8a2eb78c95bb9974951dbe38124f8543bacb'

* commit '687f8a2eb78c95bb9974951dbe38124f8543bacb':
  Fix a bug in sp<> and wp<> which could cause memory corruptions
2010-06-25 14:22:51 -07:00
Dianne Hackborn
1c686489b8 am 20b8dd3a: am 50dc3bca: Refactor ActivityManagerService activity stack.
Merge commit '20b8dd3a05ab9f7701631ebc9f81038f31949a9f'

* commit '20b8dd3a05ab9f7701631ebc9f81038f31949a9f':
  Refactor ActivityManagerService activity stack.
2010-06-25 14:22:47 -07:00
Eric Laurent
cf3a2b79f3 am cdf1357b: am 8e103da1: Merge "Various fixes and improvements in audio effects implementation" into gingerbread
Merge commit 'cdf1357b6e0152280dcd611b5f096db4887d8126'

* commit 'cdf1357b6e0152280dcd611b5f096db4887d8126':
  Various fixes and improvements in audio effects implementation
2010-06-25 14:22:39 -07:00
Andreas Huber
b8d97c456a am 2f8f81f5: am 330dd304: Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
Merge commit '2f8f81f5c2e42f52b1a7796ef23b83172c6bc4d9'

* commit '2f8f81f5c2e42f52b1a7796ef23b83172c6bc4d9':
  Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger"
2010-06-25 14:22:35 -07:00
The Android Open Source Project
d4ca6cf2c1 am 102d0ab0: merge from froyo-plus-aosp
Merge commit '102d0ab071af04c81ede8155205a6231b99b140c'

* commit '102d0ab071af04c81ede8155205a6231b99b140c':
2010-06-25 14:22:31 -07:00
The Android Open Source Project
74c95d4d41 am 8b0d5bc3: merge from froyo-plus-aosp
Merge commit '8b0d5bc3f858ae2b737ac654fa05c439344ad631'

* commit '8b0d5bc3f858ae2b737ac654fa05c439344ad631':
  Fixing counting the number of days in call log screen.
2010-06-25 14:22:25 -07:00
The Android Open Source Project
d0e73fb629 am d3844bcf: merge from froyo-plus-aosp
Merge commit 'd3844bcfb05719ab69d4aae6f4767ad3ef6d23fc'

* commit 'd3844bcfb05719ab69d4aae6f4767ad3ef6d23fc':
  Support custom themes with AlertDialog.Builder
2010-06-25 14:22:11 -07:00
The Android Open Source Project
7701041955 am 7e343b8d: merge from froyo-plus-aosp
Merge commit '7e343b8d39309d2c9d73cc5d1ec2434e666ae48b'

* commit '7e343b8d39309d2c9d73cc5d1ec2434e666ae48b':
  fillWindow's start position must be smaller than getCount value
2010-06-25 14:22:06 -07:00
The Android Open Source Project
be4f149ff1 am f29fbc58: merge from froyo-plus-aosp
Merge commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c'

* commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c':
  Change in media scanner to set correct date
2010-06-25 14:22:01 -07:00