1350 Commits

Author SHA1 Message Date
Jason Chen
39b4867d48 Revert "Merge "Allow notifications to not specify a contentIntent.""
This reverts commit 8885321046622d6a8c0a4214af98dc27eecd48a0, reversing
changes made to 61b8aaadd742f0be708cd37971d2c9e822bf778a.
2010-10-08 16:22:53 -07:00
Joe Onorato
80a752c537 Allow notifications to not specify a contentIntent.
If they don't, the click events will be passed through to the individual
views in the notification view, which may have their own PendingIntents
attached.

Previously, it was against the UX spec to allow this, but now we are
changing that and will have buttons in there.

Change-Id: Ie3b2e96c6a1c4449fa86ed571f3ad0f047320d31
2010-10-08 17:57:18 -04:00
Elliott Hughes
6190ba5a94 Merge "NIOTest fixes." 2010-10-08 12:59:43 -07:00
Elliott Hughes
ddd49c28b0 NIOTest fixes.
I've also broken the test up a bit, so it's easier to see what's failing.
(For the particular bug I'm investigating, only heap byte[]-backed Buffers
are broken.)

Bug: 3066167
Change-Id: I2f747414bd48eb8c666da5b31870bf39601911e2
2010-10-07 18:33:43 -07:00
Romain Guy
ecd31740a0 Merge "Add 3D transforms support to all gradients." 2010-10-07 16:20:20 -07:00
Romain Guy
14830948d0 Add 3D transforms support to all gradients.
Change-Id: I61409edd00dab3a11684a3f5e4f7df0afc734758
2010-10-07 15:07:45 -07:00
Joe Onorato
2cddeb4b82 am 2c164747: am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread
Merge commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba'

* commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba':
  PowerManagerService needs yet another flag...
2010-10-07 12:22:03 -07:00
Brett Chabot
c7912274b0 am 111a4135: am b9a40068: Merge "Failing test cleanup." into gingerbread
Merge commit '111a4135d84485eff85bbca6a96cd91886deb7ba'

* commit '111a4135d84485eff85bbca6a96cd91886deb7ba':
  Failing test cleanup.
2010-10-06 17:10:48 -07:00
Romain Guy
e3095e0c1e Apply 3D transformations to gradient shaders.
This fixes only linear gradients. Sweep and radial gradients, as well as
bitmap shaders, will be fixed in a future commit.

Change-Id: I4eee4ff62e9bbf3b9339fc111a780167449ecfef
2010-10-06 16:57:29 -07:00
Joe Onorato
2c164747d3 am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread
Merge commit 'f7872780ca3dae9584251b1e3495aed12110254c' into gingerbread-plus-aosp

* commit 'f7872780ca3dae9584251b1e3495aed12110254c':
  PowerManagerService needs yet another flag...
2010-10-05 14:45:28 -07:00
Joe Onorato
8274a0e536 PowerManagerService needs yet another flag...
... to make sure that if you press the power button to turn off the
screen, that the prox sensor won't turn it back on.

Bug: 3011618
Change-Id: Id16c1d65417539d4592f485b1c3efb737540c3cd
2010-10-05 17:39:01 -04:00
Romain Guy
469b1dbeaf Code cleanup and disable display lists for now.
Change-Id: I681213036b5279339cb96a016d1dfb15d74dafc8
2010-10-05 13:42:35 -07:00
Brett Chabot
111a4135d8 am b9a40068: Merge "Failing test cleanup." into gingerbread
Merge commit 'b9a40068b590b86904b40bf466571b140d0f94b4' into gingerbread-plus-aosp

* commit 'b9a40068b590b86904b40bf466571b140d0f94b4':
  Failing test cleanup.
2010-10-05 11:05:37 -07:00
Brett Chabot
b9a40068b5 Merge "Failing test cleanup." into gingerbread 2010-10-05 11:00:07 -07:00
Joe Onorato
066b5c5166 manual merge Merge commit '77e42376' into work
Conflicts:
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java

Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e
2010-10-05 12:37:03 -04:00
Brett Chabot
2ad24f944e Failing test cleanup.
Change-Id: I7cabc6ff2ec1fcb80dede5da03b03622a5bae021
2010-10-04 19:55:14 -07:00
Joe Onorato
77e4237682 am 87efbbb5: Merge "implement the number bubbles on the status bar" into gingerbread
Merge commit '87efbbb563ef96a74ffd2fbbe5c0865a450254df' into gingerbread-plus-aosp

* commit '87efbbb563ef96a74ffd2fbbe5c0865a450254df':
  implement the number bubbles on the status bar
2010-10-04 14:44:40 -07:00
Joe Onorato
6c01a11a20 implement the number bubbles on the status bar
Bug: 2993482
Change-Id: I73b1f8c39e995fd4f986c25ea04127eb23c3cd07
2010-10-04 17:40:24 -04:00
Romain Guy
7975fb6d12 Apply bilinear filtering to text.
Change-Id: I2c81ad657ee2a11a2139e0b11ae3749db54c0749
2010-10-01 16:36:14 -07:00
Romain Guy
0bb5667b4e Fix INVALID_OPERATION error with layers rendering.
This change is a workaround for a driver bug that causes an INVALID_OPERATION
to be thrown on every glCopyTexSubImage() call. This change also adds a new
test for gradients local matrices.

Change-Id: I41b7437481026702d0a3a9677f099b4557c0a84e
2010-10-01 00:25:02 -07:00
Steve Block
856f2859e8 Fix some bugs in DumpRenderTree2 when forming HTML diffs
Change-Id: Id98c1b7dde1961c2dab4214a36ad43916baf8011
2010-09-29 18:51:42 +01:00
Steve Block
fd487ad1b8 Use the empty string when expected text results are missing in DumpRenderTree2
Change-Id: I204583ecc9c6a8017349124d5813c693c7f00dc9
2010-09-29 18:51:42 +01:00
Steve Block
f460dd4219 Fix a bug with the expected result path in DumpRenderTree2
If we fail to read from any of the possible expected result paths, we should
not record an expected result path.

Change-Id: Ica96b791c14a7755154be4ec9480be4d13f47a19
2010-09-29 18:51:42 +01:00
Steve Block
fdffee828c Correctly implement EventSender mouse methods in DumpRenderTree2
This is taken from a similar change to DumpRenderTree in
https://android-git.corp.google.com/g/62449

Change-Id: I01418100ace1cf1ccfbb4fd28d72b99b54e0c140
2010-09-29 18:51:41 +01:00
Steve Block
c0f90a8f93 Trim empty lines when comparing text results in DumpRenderTree2
Change-Id: I94c9de8e6131f6b60456700e9d5a3b27c8c9d1c3
2010-09-29 18:51:41 +01:00
Steve Block
49aa65aa46 Reclassify failing multi-touch tests in DumpRenderTree ignore list
Change-Id: I95c94354a4d4f38583251a2d5d1a7ab4cb554e00
2010-09-29 18:51:41 +01:00
Iain Merrick
5f421a5678 Update DumpRenderTree test expectations for fast/encoding
New layout tests added in https://android-git.corp.google.com/g/70926

Change-Id: I3c12f44d2c283e8b1da1c10975d6e4dd567889f8
2010-09-29 16:30:10 +01:00
Guang Zhu
82c11b42f1 add multiple device support to layout test driver script
pass on the serial number onto adb command so that it don't get
confused when multiple devices are connected

Change-Id: I0b16f9da941d77425bcc5f782393f8800e035871
2010-09-28 12:54:02 -07:00
Steve Block
27c5fab571 Reduce the AppCache maximum size to a more reasonable value in DumpRenderTree2
Without this change, any use of AppCache fails after the test
http/tests/appcache/max-size.html has been run. The test in question
passes, but seems to leave the database in a corrupted state, causing
all future database transactions to fail. The only fix is to remove
the database file.

This behaviour is only observed with DumpRenderTree2, not
DumpRenderTree, so I don't think this is a WebView problem. I'm not
sure what the root cause is, but I think it make sense to submit this
fix now in order to get the LayoutTests stable with DumpRenderTree2.

Change-Id: I763c09406e66839676b839e3cdeba3b9427c1cb9
2010-09-28 19:01:12 +01:00
Steve Block
31fb8b60fb Merge changes Ic62f60d9,I04a01634
* changes:
  Provide a useful message in DumpRenderTree2 GUI when the host server is not running
  Prevent DumpRenderTree2 from crashing when the host server is not running
2010-09-28 07:09:45 -07:00
Steve Block
cb98a3e621 Provide a useful message in DumpRenderTree2 GUI when the host server is not running
Bug: 3010758
Change-Id: Ic62f60d96055e7ad1e475215ca384306cdfa859c
2010-09-28 14:34:01 +01:00
Steve Block
898bfbd865 Prevent DumpRenderTree2 from crashing when the host server is not running
Bug: 3010758
Change-Id: I04a01634544d223d225b264827d3cf18be74e1e0
2010-09-28 14:21:03 +01:00
Steve Block
42bf092c47 Update run_layout_tests.py to give a useful error if DumpRenderTree2 is not found on the device
Bug: 3006981
Change-Id: Ie789eb726bc051305371d4958c16ceca980ea1d1
2010-09-28 13:12:36 +01:00
Joe Onorato
7ebd659dbf Merge commit 'f9f9e248' into manualmerge
Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
	tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java

Change-Id: Ibbb2fec2d8c6f5d41398272753d271dfae698100
2010-09-27 14:13:46 -07:00
Guang Zhu
c18ac6ef84 Merge "skip 2d.drawImage.broken.html layout test" 2010-09-27 12:22:17 -07:00
Guang Zhu
4022d94658 skip 2d.drawImage.broken.html layout test
this test currently blocks on some type of test devices

Change-Id: Ifacc520c441cf4142b5e6d28bde2b86728b5fc35
2010-09-27 12:20:25 -07:00
Joe Onorato
f9f9e248a0 am 6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some other icon." into gingerbread
Merge commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp

* commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd':
  If an icon add remove get coalesced, don't remove some other icon.
2010-09-27 11:56:24 -07:00
Joe Onorato
795f2840b4 If an icon add remove get coalesced, don't remove some other icon.
Also adds a test case and turns off the extra logging we added to debug this.

Change-Id: I8640938ae4d1e75c88213177888f363e05ce0fa0
2010-09-27 11:34:46 -07:00
Huahui Wu
a6c2ddbf2a Merge "Bug 2372180: pass multi-touch events from browser to webkit. Since the UI uses multi-touch for zooming, the event is passed to webkit only when the webpage doesn't allow zooming. 1. Updated the data structure TouchEventData in WebViewCore.java to take multiple points and used it everywhere. 2. Added a passMultiTouchToWebkit() function to do what its name means. 3. Added the multi-point touch support to dumprendertree." 2010-09-27 10:22:41 -07:00
Joe Onorato
091e1b8a86 Implement disable() on the status bar.
This includes adding the new DISABLE_NAVIGATION flag.

Bug: 3000770
Change-Id: I6d1c3586198e13e06b5d26e8b23a9495dc4ba02e
2010-09-26 19:07:51 -07:00
Huahui Wu
41865f4b0c Bug 2372180: pass multi-touch events from browser to webkit.
Since the UI uses multi-touch for zooming, the event is passed to webkit
only when the webpage doesn't allow zooming.
1. Updated the data structure TouchEventData in WebViewCore.java
   to take multiple points and used it everywhere.
2. Added a passMultiTouchToWebkit() function to do what its name means.
3. Added the multi-point touch support to dumprendertree.

Change-Id: Iafc1aa7b21a587ad26efd2f124b9a66316297ab8
2010-09-26 16:26:38 -07:00
Joe Onorato
ddf680bff5 Touching the blue glow should close the system and notification panels.
Bug: 3029373
Change-Id: I96760656dcda20ab238305900f9964083a8e5273
2010-09-26 13:59:40 -07:00
Dianne Hackborn
846df9f517 resolved conflicts for merge of 8952a448 to master
Change-Id: I9c752a5d10ae8d8e5ead1243b6abd4795204fc0b
2010-09-23 20:33:19 -07:00
Dianne Hackborn
8952a4488e am 287952c3: Fix issue #3022508: Crash during media scan
Merge commit '287952c35e148811c106bc0f5036eabf20f71562' into gingerbread-plus-aosp

* commit '287952c35e148811c106bc0f5036eabf20f71562':
  Fix issue #3022508: Crash during media scan
2010-09-23 16:04:23 -07:00
Dianne Hackborn
287952c35e Fix issue #3022508: Crash during media scan
Don't kill processes for excessive wake lock use, even if they
are in the background, as long as they have running services.

Also fix some problems with this, such as not noting the kill
in battery stats.

And add killing of processes for cpu usage as well, along with
some optimizations to computing CPU usage.

And fix BatteryWaster to be better behaving for testing these
cases.

Add new "monitor" command to am to watch as the activity manager
does stuff (so we can catch things at the point of ANR).

Finally some miscellaneous debug output for the stuff here, as
well as in progress debugging of an ANR.

Change-Id: Ib32f55ca50fb7486b4be4eb5e695f8f60c882cd1
2010-09-23 15:59:28 -07:00
Steve Block
1358a1c806 Fix DumpRenderTree2 to clear AppCache between tests
Change-Id: I1bafc79bbdbec0df7e4c8039488478a3bfcb3bd4
2010-09-22 15:43:34 +01:00
Steve Block
3cf18f5c96 Fix DumpRenderTree2 to wait for the WebCore thread to become ready
This is required to make sure that the WebCore thread's message
handlers are ready to receive settings.

Change-Id: I2c4df95e3b7409535b739ada957d93a7e6cd78d6
2010-09-22 15:43:34 +01:00
Steve Block
0e1d6876f9 Fix a bug in DumpRenderTree2's run_apache2.py script
We use a printf style approach when setting the run command in the
command string to be executed. When doing so, the printf must be
applied to only the relevant part of the string. This avoids problems
in the case that other parts of the string contain special character
sequences, such as '%s' in a custom log directive.

Change-Id: I87df773a2872320386a34cb6a5041a9e0ba6f31e
2010-09-22 15:33:05 +01:00
Steve Block
34f3851e95 Fix DumpRenderTree2 to make AbstractResult serializable
This should have been doen as part of
https://android-git.corp.google.com/g/#change,65283

Change-Id: I7a4681f98014ff5a7546a7346fc5523e01f62e19
2010-09-22 15:33:05 +01:00
Steve Block
f09aafa275 Fix DumpRenderTree2 to handle SSL errors
This fixes http/tests/appcache/different-https-origin-resource-main.html

Change-Id: I90e151c027b2d8c55ea82104c02e4a641b933024
2010-09-22 15:33:05 +01:00