25908 Commits

Author SHA1 Message Date
Adam Powell
89e0645b41 Added context modes to ActionBar API.
Change-Id: I7c3e782cbf01be7bc671b377fb4d706040888833
2010-06-29 14:04:58 -07:00
Joe Onorato
6443de56f3 resolved conflicts for merge of 7f9ede96 to master
Change-Id: Iaa688e5f7adaa363c88e0824b44233c8906e9e26
2010-06-29 12:58:39 -04:00
Joe Onorato
7f9ede96f1 am b54ef614: Separate the status bar height from the icon size.
Merge commit 'b54ef61434eb82a53d8c840d86d1d656215604f9' into gingerbread-plus-aosp

* commit 'b54ef61434eb82a53d8c840d86d1d656215604f9':
  Separate the status bar height from the icon size.
2010-06-29 08:02:10 -07:00
Joe Onorato
b54ef61434 Separate the status bar height from the icon size.
Change-Id: I9cc8c5e8ed2c48d03b7c1c89f1bf7f94cc119171
2010-06-29 09:45:54 -04:00
Cary Clark
f0785a66f0 set maximum image size
Our use of web settings does not specify the maximum image size,
although we have some hard-coded values used when decoding the
image. For defective images, the hard-coded values are not enough,
since we may exceed memory in the decoder before the limit is
reached.

Pass along our limits to the decoder, and respect any limits
set by the caller.

companion change in external/webkit

Change-Id: Iabd78165390dddce917f637bd3263b83f9b4aa56
http://b/2689053
2010-06-29 09:06:33 -04:00
Mike Lockwood
144e5eaf97 am f045ddba: am de6bd120: Merge "Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Merge commit 'f045ddbad94028399ef1caee08347a264cb3729a'

* commit 'f045ddbad94028399ef1caee08347a264cb3729a':
  Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state
2010-06-29 05:32:44 -07:00
Mike Lockwood
1eb86d8b8d am 9be487ce: am 606d591a: Merge "Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state" into gingerbread
Merge commit '9be487ce6be705d210d42f8cbe6468226eeb544e'

* commit '9be487ce6be705d210d42f8cbe6468226eeb544e':
  Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
2010-06-29 05:32:37 -07:00
Mike Lockwood
f045ddbad9 am de6bd120: Merge "Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Merge commit 'de6bd120c97bb7986a6bac3889288f77bca63288' into gingerbread-plus-aosp

* commit 'de6bd120c97bb7986a6bac3889288f77bca63288':
  Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state
2010-06-29 05:27:11 -07:00
Mike Lockwood
9be487ce6b am 606d591a: Merge "Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state" into gingerbread
Merge commit '606d591afee24e31e3885a7330638893db1710f5' into gingerbread-plus-aosp

* commit '606d591afee24e31e3885a7330638893db1710f5':
  Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
2010-06-29 05:27:08 -07:00
Mike Lockwood
de6bd120c9 Merge "Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread 2010-06-29 05:24:45 -07:00
Mike Lockwood
606d591afe Merge "Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state" into gingerbread 2010-06-29 05:24:22 -07:00
Dianne Hackborn
9593b2ac9c Merge "Fix SDK build." 2010-06-28 21:49:41 -07:00
Dianne Hackborn
b0c56b24aa Fix SDK build.
Change-Id: Iec71b6cbaf262f143c65c4b7b98e165f285259ac
2010-06-28 21:46:32 -07:00
Mathias Agopian
b23ef2937d am 5d31a452: am f0562b4b: Merge changes I93dfc4c8,I781953d6 into gingerbread
Merge commit '5d31a4523bf5d1d3e3b5aa51043a1551d7aa56d7'

* commit '5d31a4523bf5d1d3e3b5aa51043a1551d7aa56d7':
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
2010-06-28 20:06:21 -07:00
Mathias Agopian
5d31a4523b am f0562b4b: Merge changes I93dfc4c8,I781953d6 into gingerbread
Merge commit 'f0562b4b071b74a760ad9c9caa0e41687ae6f407' into gingerbread-plus-aosp

* commit 'f0562b4b071b74a760ad9c9caa0e41687ae6f407':
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
2010-06-28 20:04:23 -07:00
Mathias Agopian
f0562b4b07 Merge changes I93dfc4c8,I781953d6 into gingerbread
* changes:
  fix[2798925] Gingerbread TOT not booting
  Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
2010-06-28 20:01:58 -07:00
Mathias Agopian
8fa4c811e6 fix[2798925] Gingerbread TOT not booting
Fixed a typo where checking against the wrong constant caused GL_TEXTURE_EXTERNAL_OES
to be used with a regular texture, which some GL driver will choke on.

Change-Id: I93dfc4c8fa674433bbb678eee31954e9a8d0cb4b
2010-06-28 19:54:17 -07:00
Chris Tate
f40e4928b9 am 96725326: am 31e0ffe8: Merge "Native input event dispatching." into gingerbread
Merge commit '96725326149687168937cf62f75364cf9cc3e96b'

* commit '96725326149687168937cf62f75364cf9cc3e96b':
  Native input event dispatching.
2010-06-28 19:16:42 -07:00
Chris Tate
9672532614 am 31e0ffe8: Merge "Native input event dispatching." into gingerbread
Merge commit '31e0ffe8444b70500cac319da084c4c45e62aca2' into gingerbread-plus-aosp

* commit '31e0ffe8444b70500cac319da084c4c45e62aca2':
  Native input event dispatching.
2010-06-28 19:14:18 -07:00
Chris Tate
31e0ffe844 Merge "Native input event dispatching." into gingerbread 2010-06-28 19:12:55 -07:00
Jeff Brown
349703effc Native input event dispatching.
Target identification is now fully native.
Fixed a couple of minor issues related to input injection.
Native input enabled by default, can be disabled by setting
WindowManagerPolicy.ENABLE_NATIVE_INPUT_DISPATCH to false.

Change-Id: I7edf66ed3e987cc9306ad4743ac57a116af452ff
2010-06-28 19:10:54 -07:00
Romain Guy
66b1dbaa36 Merge "Add support for saveLayer()." 2010-06-28 18:54:09 -07:00
Romain Guy
d55a86120d Add support for saveLayer().
saveLayer() is affected by the paint's alpha and xfermode.

Change-Id: I28693a9337052643adccdb4889a8f228d4e17903
2010-06-28 18:52:24 -07:00
Patrick Dubroy
0cfd0f45d9 Fix build, update current.xml
Change-Id: Ice7322856dd6c7841e0dc4d509b9e87a2256728b
2010-06-28 18:23:45 -07:00
James Dong
8f704d89dc am b1e165eb: am d4760c24: Collect statistical data from authoring engine (second part)
Merge commit 'b1e165ebae798431e3569c28dc5d7c2e584834a6'

* commit 'b1e165ebae798431e3569c28dc5d7c2e584834a6':
  Collect statistical data from authoring engine (second part)
2010-06-28 17:30:54 -07:00
James Dong
b1e165ebae am d4760c24: Collect statistical data from authoring engine (second part)
Merge commit 'd4760c243fb129ebda43972c0fadf43a02c9849f' into gingerbread-plus-aosp

* commit 'd4760c243fb129ebda43972c0fadf43a02c9849f':
  Collect statistical data from authoring engine (second part)
2010-06-28 17:28:07 -07:00
Romain Guy
b4494b036f Merge "Implement support for PorterDuff's blending modes." 2010-06-28 17:15:24 -07:00
Romain Guy
026c5e1670 Implement support for PorterDuff's blending modes.
The blending modes are currently hooked up only when drawing filled rects but the
code is reusable for other primitives. This will allow implementation of saveLayer().
This method is required to support the fade effects used throughout the standard
Android UI.

Change-Id: I396023d123436f16cdafc606e358e4eb80c9df2c
2010-06-28 17:12:22 -07:00
James Dong
d4760c243f Collect statistical data from authoring engine (second part)
- added sample duration to the statistcal log messages.
- fixed the bug on miscalcuting the average frame rate.

- also fixed an issue where both frame and time progress status notifications
  are sent out even though only one of them is explicitly requsted.

Change-Id: Ib86f15a85fad3dbeabde120c3c782b79c16da46c
2010-06-28 17:09:51 -07:00
Patrick Dubroy
b151fe3b8e Merge "Add a new attribute to allow widgets to specify a preview image." 2010-06-28 17:00:54 -07:00
Patrick Dubroy
d2db2a5794 Add a new attribute to allow widgets to specify a preview image.
Change-Id: I0d79c85c6a2fc477af17eda05eabaa3151b0bef5
2010-06-28 16:39:19 -07:00
James Dong
68d42e3887 am c2c59f69: am 2a76b316: Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread
Merge commit 'c2c59f690deafe34c7701b01b612fd777cee8d4b'

* commit 'c2c59f690deafe34c7701b01b612fd777cee8d4b':
  Separate MediaRecorderClient with MediaPlayerClient
2010-06-28 16:28:11 -07:00
James Dong
c2c59f690d am 2a76b316: Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread
Merge commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587' into gingerbread-plus-aosp

* commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587':
  Separate MediaRecorderClient with MediaPlayerClient
2010-06-28 16:25:39 -07:00
James Dong
2a76b3163b Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread 2010-06-28 16:19:40 -07:00
Scott Main
ab3593956c am 0884cb5e: am f2b544f5: am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs
Merge commit '0884cb5ec6dc425bb3848e682000c1c4b70bc4df'

* commit '0884cb5ec6dc425bb3848e682000c1c4b70bc4df':
  docs: update backup guide and bmgr tool
2010-06-28 15:36:56 -07:00
Scott Main
0884cb5ec6 am f2b544f5: am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs
Merge commit 'f2b544f5ae7676f7ab4cdf3379b2ed3c60a65def' into gingerbread-plus-aosp

* commit 'f2b544f5ae7676f7ab4cdf3379b2ed3c60a65def':
  docs: update backup guide and bmgr tool
2010-06-28 15:34:37 -07:00
James Dong
fe1bafecde Separate MediaRecorderClient with MediaPlayerClient
- An alternative would be to define a common base class that
  both MediaRecorderClient and MediaPlayerClient can derive.
  But since the common code, onTransact() and notify() uses
  some Binder code, having a common base class may not gain
  us too much in terms of code reuse.

Change-Id: Ibc06720278ad173fceacff3d267b7060856c6316
2010-06-28 15:32:26 -07:00
Scott Main
f2b544f5ae am 337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs
Merge commit '337b0873f43eac5f23483bec94bd8729f79d47ec' into gingerbread

* commit '337b0873f43eac5f23483bec94bd8729f79d47ec':
  docs: update backup guide and bmgr tool
2010-06-28 15:31:35 -07:00
Dianne Hackborn
f1b0eff0da Merge "Improvements to ListFragment." 2010-06-28 15:26:00 -07:00
Robert Greenwalt
016a646c1b Merge "Reduce Tethering Logging." 2010-06-28 15:19:48 -07:00
Dianne Hackborn
445646c521 Improvements to ListFragment.
Now deals correctly with a content view containing just a list,
and adds a lot more built-in functionality: ability to show
custom text for an empty list, and indeterminant progress while
populating the list.

In addition, reworks transaction committing to be more aggressive
about committing the transactions as the containing activity
moves between its states (rather than waiting for the activity's
handler to process the transaction message whenever that may
finally happen).  And fixed a bug with saving/restoring state of
transaction replace operations.

Change-Id: I9617a0c4f248b50a61b319910323639b6de24f73
2010-06-28 15:17:44 -07:00
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
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