31483 Commits

Author SHA1 Message Date
Marco Nelissen
ca216a03f5 am 5c9f3579: am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Merge commit '5c9f35799422d818f34f814c76c2acd8c939a40c'

* commit '5c9f35799422d818f34f814c76c2acd8c939a40c':
  Add a check to track a problem the monkey script has been triggering.
2010-09-17 23:25:37 -07:00
Dianne Hackborn
03f3cb083d resolved conflicts for merge of 1f377298 to master
Change-Id: I0d92abae3a86792b47777f795143acc0489adfe4
2010-09-17 23:12:26 -07:00
John Wang
511f66d3b6 am afb777cb: am 0741a5ed: Merge "Add debug function." into gingerbread
Merge commit 'afb777cbd459f45eb833e12fbab03aed93f90409'

* commit 'afb777cbd459f45eb833e12fbab03aed93f90409':
  Add debug function.
2010-09-17 18:13:50 -07:00
Adam Powell
61241ad42a Merge "resolved conflicts for merge of b39470b5 to master" 2010-09-17 18:00:23 -07:00
Adam Powell
f37df070ea resolved conflicts for merge of b39470b5 to master
Change-Id: If441c8684c576b6cbc485a37088d6869ad3fb23f
2010-09-17 17:59:06 -07:00
Gil Dobjanschi
11dd325466 Merge "I splitted the start and end transtions into separate classes." 2010-09-17 16:43:25 -07:00
Gil Dobjanschi
7c1df82880 I splitted the start and end transtions into separate classes.
Change-Id: Ia8fbf5b34ee4b96fa4339d6dda78ec03c8a08615
2010-09-17 16:35:31 -07:00
Robert Greenwalt
1e58e4021c Merge "Enhance http proxy support" 2010-09-17 16:22:34 -07:00
Robert Greenwalt
d192dad69e Enhance http proxy support
Make it read proxys the correct way from CS so it works for all network types.
Add utility class for apache http client support.

bug:2700664
Change-Id: If81917b19b5f0636247a6519a1ec78bd8dbf3596
2010-09-17 16:14:10 -07:00
Jeff Brown
f1ec1ddd50 am bc9599d4: am 838e93ed: Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread
Merge commit 'bc9599d48c79c18d306a13f51af9ef2aac92cdca'

* commit 'bc9599d48c79c18d306a13f51af9ef2aac92cdca':
  Looper: Drop default parameters in favor of a safer overload.
2010-09-17 16:10:01 -07:00
Chet Haase
aca11c0cf4 am 6dcffb43: (-s ours) am 4a2b3ef1: Merge "new assets" into gingerbread
Merge commit '6dcffb434fff42b956b604e24a5b5728e721b686'

* commit '6dcffb434fff42b956b604e24a5b5728e721b686':
  new assets
2010-09-17 15:55:11 -07:00
Romain Guy
5e87e0d07d Merge "Fix positioning of 1 pixel wide lines (esp. non AA lines.)" 2010-09-17 15:49:56 -07:00
Romain Guy
be3512735c Merge changes Id5200e94,I08fcbfa7
* changes:
  Add support for non AA lines.
  Correctly free memory.
2010-09-17 15:49:30 -07:00
Andreas Huber
0a5dd105f7 am 7bc600cb: am f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.
Merge commit '7bc600cb08394e60eef984843976d4f79e5d94e8'

* commit '7bc600cb08394e60eef984843976d4f79e5d94e8':
  Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
2010-09-17 15:46:15 -07:00
Marco Nelissen
5c9f357994 am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Merge commit 'f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp

* commit 'f30fae63389a2216faf55636b95a08f35b5c3620':
  Add a check to track a problem the monkey script has been triggering.
2010-09-17 15:42:21 -07:00
Marco Nelissen
f30fae6338 Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread 2010-09-17 15:39:00 -07:00
Romain Guy
b5ab4173e0 Fix positioning of 1 pixel wide lines (esp. non AA lines.)
Change-Id: Ic155cac72f351edae35dffdfbb236954f57ba7de
2010-09-17 15:36:56 -07:00
Andreas Huber
f6bd4369fd resolved conflicts for merge of 1fc97385 to master
Change-Id: I9b1fb673844eb822313067d3be16b6c1ce1f2ccb
2010-09-17 15:35:59 -07:00
Romain Guy
c95c8d6bf8 Add support for non AA lines.
Change-Id: Id5200e94815404d62760437d0d2dbb0a9276c700
2010-09-17 15:31:32 -07:00
Dianne Hackborn
1f377298e2 am 58e0eefe: Improve power tracking of WIFI use.
Merge commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5' into gingerbread-plus-aosp

* commit '58e0eefeb5e2e270e2b04369bbf29fc22abda8d5':
  Improve power tracking of WIFI use.
2010-09-17 15:20:10 -07:00
Dianne Hackborn
58e0eefeb5 Improve power tracking of WIFI use.
We now distribute "wifi started" time across all apps that are
holding WIFI locks that cause it to be started.  But only when
WIFI would not normally be running.  Also have a mechanism to
distribute other WIFI work that has happened across those processes
based on their use.

Also fixed a bug where we were not retaining the CPU speed step
stats across boots...!

Change-Id: I00e3153b98429166273750512cc37e7975211ab9
2010-09-17 15:14:57 -07:00
John Wang
afb777cbd4 am 0741a5ed: Merge "Add debug function." into gingerbread
Merge commit '0741a5ed38757ef2f6b52945ad494d965b3b83de' into gingerbread-plus-aosp

* commit '0741a5ed38757ef2f6b52945ad494d965b3b83de':
  Add debug function.
2010-09-17 15:06:44 -07:00
Marco Nelissen
3c473ea7f9 Add a check to track a problem the monkey script has been triggering.
Change-Id: If3896946d993cbab2442e17740f18efd7e753a3b
2010-09-17 15:04:01 -07:00
John Wang
0741a5ed38 Merge "Add debug function." into gingerbread 2010-09-17 15:03:01 -07:00
Adam Powell
b39470b57d am b08013c3: Added overlay support for drawing/responding to text anchors.
Merge commit 'b08013c312e3d849029a2f4c11889274c00f438d' into gingerbread-plus-aosp

* commit 'b08013c312e3d849029a2f4c11889274c00f438d':
  Added overlay support for drawing/responding to text anchors.
2010-09-17 14:53:43 -07:00
Jamie Gennis
9db8abcd1e Merge "Fix a SurfaceFlinger bug." 2010-09-17 14:07:13 -07:00
Stephen Hines
580807a20a Merge "Handle RS reflection name changes." 2010-09-17 13:55:39 -07:00
Nipun Kwatra
8726305905 Merge "Adding default profiles for specific levels." 2010-09-17 13:54:55 -07:00
John Wang
bd53554f8a Add debug function.
Change-Id: If2381b04b08876f78ac93833f848f099de5c6104
2010-09-17 13:53:45 -07:00
Stephen Hines
2c6f34480c Merge "Minor app updates for RS. force RSTest to portrait." 2010-09-17 13:50:21 -07:00
Jason Sams
d74a72fd0a Merge "Fix function name match for refcounting funcs." 2010-09-17 13:42:27 -07:00
Adam Powell
b08013c312 Added overlay support for drawing/responding to text anchors.
Overlays let views draw and respond to touch events outside of their
bounds. This allows selection anchors to be friendlier and easier to
grab. This is currently private API, pending further evaluation.

Added themes/styles for text selection anchors.

Added assets for text selection anchors as provided by UX. The
left/right anchors are currently not suitable for use. They are here
for bookkeeping and replacement later. The theme currently uses the
'middle' anchor asset for all three. This will be changed once assets
are ready.

Change-Id: I01b21e5ae90cab201f86f38f2f5eeaf2bd7f6bcd
2010-09-17 13:31:33 -07:00
Jeff Brown
bc9599d48c am 838e93ed: Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread
Merge commit '838e93ed19879ce3d88b5be51630137d6a6999c6' into gingerbread-plus-aosp

* commit '838e93ed19879ce3d88b5be51630137d6a6999c6':
  Looper: Drop default parameters in favor of a safer overload.
2010-09-17 13:30:20 -07:00
Jeff Brown
838e93ed19 Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread 2010-09-17 13:25:55 -07:00
Nipun Kwatra
d48a15c3fe Adding default profiles for specific levels.
The low and high profiles should each match one of the
specific profiles. So we need to add the specific profiles
corresponding to the low/high profiles. This makes the
default profile compliant to documentation + cts.

Also fixed javadoc to account time lapse profiles.

Change-Id: I34e7307d00ce261c69dc10ead2900025c7f6d428
2010-09-17 13:19:13 -07:00
Jason Sams
4fd8bb4b56 Fix function name match for refcounting funcs.
Change-Id: I3fa8211200023e0df494cd9aab698e215b3c2164
2010-09-17 13:17:17 -07:00
Chet Haase
6dcffb434f am 4a2b3ef1: Merge "new assets" into gingerbread
Merge commit '4a2b3ef1810135bea25a827d7c52767f50c528b6' into gingerbread-plus-aosp

* commit '4a2b3ef1810135bea25a827d7c52767f50c528b6':
  new assets
2010-09-17 13:14:58 -07:00
Chet Haase
4a2b3ef181 Merge "new assets" into gingerbread 2010-09-17 13:10:54 -07:00
Chet Haase
657028c293 new assets
Change-Id: I077fd2162e0901b6f31b815459873586f813a753
2010-09-17 12:55:03 -07:00
Andreas Huber
7bc600cb08 am f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.
Merge commit 'f98197a7274c2d7da647f52b3d8b0c74492139af' into gingerbread-plus-aosp

* commit 'f98197a7274c2d7da647f52b3d8b0c74492139af':
  Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
2010-09-17 12:50:45 -07:00
Andreas Huber
1fc97385d8 am 524e6f62: Register the new OMX components.
Merge commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c' into gingerbread-plus-aosp

* commit '524e6f62c93e9947f3f9de386c6f6be7a3085d3c':
  Register the new OMX components.
2010-09-17 12:50:35 -07:00
Joe Malin
0b7a3bc3de Merge "Doc Change: add screenshots to Testing in Eclipse topic" 2010-09-17 12:43:06 -07:00
Jamie Gennis
40d272c132 Fix a SurfaceFlinger bug.
The bug caused SurfaceFlinger to constantly trigger reallocation of buffers
that requested a fixed size.

Change-Id: Ic993a60e6474e36a344c8b48d541a0d08b8c4faf
2010-09-17 12:19:07 -07:00
Andreas Huber
f98197a727 Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
Change-Id: I9c896cf07dea0c3201b6f074dbaf27e6d85cd784
2010-09-17 11:49:39 -07:00
Shimeng (Simon) Wang
3fed1bd49a Merge "Use website preferred width as the fixed viewport." 2010-09-17 11:31:45 -07:00
Shimeng (Simon) Wang
14bcc0e7fe Use website preferred width as the fixed viewport.
This preferred width will be set between the default viewport width and
the max fixed viewport width.  The default viewport width serves as the
minimum fixed viewport width, so it's lowered to 980.

This change will make the shirt.woot.com/blog site works better, since it's using
1080 as the preferred width, so user needs not to scroll in overview mode.

issue: 3003933
Change-Id: Ie3eed44a54d277f5bc5f63cd394d463012a80d80
2010-09-17 10:54:48 -07:00
Romain Guy
31529ff791 Correctly free memory.
Change-Id: I08fcbfa7d27ae413e0a8e8ca6ea305c8530a72c1
2010-09-17 10:26:31 -07:00
Jeff Hamilton
bfb619a12a Merge "Convert Numbers to Booleans when calling getAsBoolean()." 2010-09-17 10:21:55 -07:00
Vasu Nori
4e874edf69 don't compile statement for certain SQL statements
SQL statements such as Create table, Pragma, Begin, Commit, Rollback
etc don't need a compiled statement.

Change-Id: I55f5e4e6cbb41cbe83e592e25ba852fe23e2b39f
2010-09-17 10:15:40 -07:00
Stephen Hines
93a958f095 Handle RS reflection name changes.
Change-Id: I0f3f9805a0f0bf44ce9e9944a3eaa5a80dd0cdde
2010-09-17 10:03:00 -07:00