drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,748 Commits 1 Branch 0 Tags
Commit Graph

1400 Commits

Author SHA1 Message Date
Brian Carlstrom
16376afb8d am 90b3135d: am 4d672988: Merge "Remove "StringTest.java"." into gingerbread 
Merge commit '90b3135d8b2471990412d79dce4ee6390118d8d3'

* commit '90b3135d8b2471990412d79dce4ee6390118d8d3':
  Remove "StringTest.java".
 2010-08-25 11:46:15 -07:00
Brian Carlstrom
90b3135d8b am 4d672988: Merge "Remove "StringTest.java"." into gingerbread 
Merge commit '4d672988fed7fbdd887fe78603fa2eaf713031ad' into gingerbread-plus-aosp

* commit '4d672988fed7fbdd887fe78603fa2eaf713031ad':
  Remove "StringTest.java".
 2010-08-25 11:04:26 -07:00
Brian Carlstrom
5c8e760bcb Remove "StringTest.java". 
This only tests stuff that's already better tested in dalvik/libcore, plus
private ICU API (RuleBasedNumberFormat) we'd like to remove, and that this
is the only caller of.

Conflicts:

	tests/CoreTests/android/core/StringTest.java

git cherry-pick -e 935022a99dac5454fc478e221b6392f3ba467009

Change-Id: I0bd172f2703bbcd6381920d40244165234fef4a1
 2010-08-24 21:04:25 -07:00
Romain Guy
a84e02ce3c Merge "Use only one GL context per process, share chaches." 2010-08-24 17:20:20 -07:00
Romain Guy
fb8b763f76 Use only one GL context per process, share chaches. 
Change-Id: Ieabaa25338d2f4b8d4fd90e7401ad6e7452eae11
 2010-08-24 17:18:14 -07:00
Guang Zhu
c4f44cb995 Merge "change the DRT to use Light theme" 2010-08-24 13:06:50 -07:00
Guang Zhu
ddf4f32b53 change the DRT to use Light theme 
works around the Holo theme crash.

Change-Id: I4e920629981bf3df0987bc4f65dc63644b3670b2
 2010-08-24 13:05:36 -07:00
Iain Merrick
558f7dcf05 Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html 
This patch modifies the old-style hard-coded ignore list. The new-style
text file (in external/webkit/LayoutTests/platform/android) has been
modified separately, as part of the normal WebKit merge process.

Test added in http://trac.webkit.org/changeset/64613
Needs clearAllApplicationCaches() callback. See http://b/issue?id=2944196

Change-Id: I31655c363c93eada40d01123e9c14c0d03bdba7b
 2010-08-24 12:15:54 +01:00
Romain Guy
a80d32f7b6 Add support for textScaleX. 
This will not look great because we render fonts using bitmaps, not
paths.

Change-Id: I01b87b81bfbdbfa28460a5d5309d38e2a65e77c4
 2010-08-20 18:42:37 -07:00
Romain Guy
29378192f7 Test setTextScaleX() 
Change-Id: Iafa421def64a8f9a83b320b6cf3cc5286515c355
 2010-08-20 15:49:27 -07:00
Daniel Sandler
6cf5eb0606 am 3f677b1b: Merge "Fix periodically disappearing status icons." into gingerbread 
Merge commit '3f677b1b3e45240728de39d60441d791c0e8d3f8' into gingerbread-plus-aosp

* commit '3f677b1b3e45240728de39d60441d791c0e8d3f8':
  Fix periodically disappearing status icons.
 2010-08-20 06:03:41 -07:00
Romain Guy
e9e7fd0813 Update OpenGLRenderer test to test opaque ARGB8888 bitmaps. 
Change-Id: I7159825f4b1d6f5a1cd09ec091994801b52b6bda
 2010-08-19 14:45:42 -07:00
Daniel Sandler
0398bf70e7 Fix periodically disappearing status icons. 
Occasionally the animation listener wasn't being told that
the ticker animation had completed; this callback was
essential to keeping the status bar's internal state correct
(namely, setting mTicking=false). The safest thing to do is
simply set mTicking to false immediately upon tickerDone()
or tickerHalting().

Bug: 2915280
Change-Id: I997911b12fa2985fa83b42154fb3485220886219
 2010-08-19 16:59:11 -04:00
Romain Guy
756879836b Merge "Layers were using an extra Snapshot causing extra clipping." 2010-08-18 11:51:25 -07:00
Romain Guy
2542d19974 Layers were using an extra Snapshot causing extra clipping. 
Bug #2919310

Change-Id: I72ccd44bba7a3f3db72f581aa96198b6226e4478
 2010-08-18 11:47:12 -07:00
Steve Block
487300abe1 Merge "Implement logic for new Geolocation delayed permission LayoutTests" 2010-08-18 09:59:33 -07:00
Steve Block
3374dce303 Merge "Fix naming and executable bits on DumpRenderTree2 scripts" 2010-08-18 09:52:35 -07:00
Steve Block
f0f30c677a Implement logic for new Geolocation delayed permission LayoutTests 
Bug: 2914450
Change-Id: Ic0be3120e88efe9199f7719b9ccb1090baaabed6
 2010-08-18 15:50:48 +01:00
Steve Block
0e4d86fddf Fix naming and executable bits on DumpRenderTree2 scripts 
Change-Id: Id1415e2a166289c8c585e132e842f5ca6ad35426
 2010-08-18 15:50:46 +01:00
Romain Guy
8fb954263d Fix save()/restore() issues in the OpenGL renderer. 
The save stack now behaves exactly like in Skia.

Change-Id: If7e642f41f2c8f693f6e8c26cba81507d466562e
 2010-08-17 18:40:21 -07:00
Romain Guy
89c7ec3453 Merge changes I16ce79ab,Ib86a7309 
* changes:
  Correctly set the viewport in layers.
  Cleanup, better code reuse.
 2010-08-17 12:36:03 -07:00
Romain Guy
1d83e1981c Correctly set the viewport in layers. 
Bug #2919295

Change-Id: I16ce79ab0d5747cb01c6c1abe531da3dfd93fb54
 2010-08-17 11:37:00 -07:00
Romain Guy
0a41749953 Cleanup, better code reuse. 
Change-Id: Ib86a7309ae579cce3b7cf464782c34e70a74c616
 2010-08-16 20:26:20 -07:00
Dianne Hackborn
a10382b67d am 2e47052f: am 567722ee: Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread 
Merge commit '2e47052fc4ad3439adc2322fd953fd58a85d457c'

* commit '2e47052fc4ad3439adc2322fd953fd58a85d457c':
  Fix problems with determining when to kill apps for wake usage.
 2010-08-16 15:18:27 -07:00
Dianne Hackborn
0a56fdc140 am 66b0343e: am a8d9291d: Merge "Various battery info things:" into gingerbread 
Merge commit '66b0343e9e32203cdd39b854852cf575ca2fcd6b'

* commit '66b0343e9e32203cdd39b854852cf575ca2fcd6b':
  Various battery info things:
 2010-08-16 15:17:46 -07:00
Dianne Hackborn
2e47052fc4 am 567722ee: Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread 
Merge commit '567722eee190f7cf88dc7ea95167db76d5514842' into gingerbread-plus-aosp

* commit '567722eee190f7cf88dc7ea95167db76d5514842':
  Fix problems with determining when to kill apps for wake usage.
 2010-08-15 17:34:49 -07:00
Dianne Hackborn
1ebccf531d Fix problems with determining when to kill apps for wake usage. 
Also improve debug printing of various times.

Change-Id: Ifcc288fd1bcbf44c069875ba97925b9e7ffe9a48
 2010-08-15 17:27:29 -07:00
Romain Guy
1e45aae5de Add drop shadows. 
Change-Id: Ic6a72409d4785968d1fbdff229f17ee5c00b240b
 2010-08-13 19:41:14 -07:00
Dianne Hackborn
66b0343e9e am a8d9291d: Merge "Various battery info things:" into gingerbread 
Merge commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177' into gingerbread-plus-aosp

* commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177':
  Various battery info things:
 2010-08-13 16:00:44 -07:00
Dianne Hackborn
9adb9c3b10 Various battery info things: 
- Now track wake locks in battery history.
- Now track sensors in battery history.
- Some filtering of sensory data.
- Fixes to some data that wasn't cleared when resetting battery stats.
- Print amount discharged since last charge.

And the big part -- keep track of wake locks held per process,
and kill processes that hold wake locks too much while they are in
the background.  This includes information in the battery stats
about the process being killed, which will be available to the
developer if the app is reported.

Change-Id: I97202e94d00aafe0526ba2db74a03212e7539c54
 2010-08-13 15:17:49 -07:00
Maksymilian Osowski
073d2c9aa9 Added copyright information to the files that were missing it. 
Change-Id: I3b814f2fbd96384189e702e723764d17cbbde5fe
 2010-08-13 17:12:51 +01:00
Ben Murdoch
3778a632a0 Merge "Merge WebKit at r65072 : Update DRT ignore list." 2010-08-13 05:20:08 -07:00
Ben Murdoch
e7611352ae Merge WebKit at r65072 : Update DRT ignore list. 
This merge introduces two new Geolocation tests that to pass we need
a new LayoutTestController function. We ignore those tests until this
function is added - see b/2914450

Change-Id: If13dda2caa467b771d4a21d60463319019cc7679
 2010-08-13 13:18:41 +01:00
Maksymilian Osowski
74b13aecbe Added python script that starts/stops apache2 server on host machine configured to handle http layout tests. 
Change-Id: I7bf4390dfb4f9a580e6e4ca0eb25c85655df723c
 2010-08-13 12:07:17 +01:00
Maksymilian Osowski
2e64bb7afd Added more info to the Summarizer. 
Bug: 2889572
Change-Id: If02dbdf90e8b8717370b5586cc72be235c93db79
 2010-08-12 14:32:30 +01:00
Maksymilian Osowski
0186c93a6e Merge "Added a basic version of python script and supporting code in DumpRenderTree." 2010-08-11 05:26:38 -07:00
Maksymilian Osowski
a0a586cd2f Fixes crash when root dir does not exist. 
Bug: 2904439
Change-Id: I629f88626e165348dd414f3ad49d9b415ab336cf
 2010-08-11 12:55:01 +01:00
Maksymilian Osowski
5fb9ff420d Added a basic version of python script and supporting code in DumpRenderTree. 
Change-Id: Ic60ef9b89f74a3a36a4c31765f99c8de08dce911
 2010-08-11 12:20:30 +01:00
Maksymilian Osowski
cbfe6ec1b4 Merge "Resets Summarizer after everything's finished." 2010-08-11 04:02:21 -07:00
Romain Guy
48daa54d31 Add extra blending modes. 
This change adds the following blending modes for shaders and color filters:
Add
Multiply
Screen
Overlay
Darken
Lighten

Change-Id: Iff22f5ce6041b43c71b1857d73013f5010ab3413
 2010-08-10 21:42:40 -07:00
Romain Guy
a674ab74e3 Add support for text underline and strikethru. 
Change-Id: I3a0e6643d7cafbdd06d9a908c8cf9347dcaba146
 2010-08-10 17:26:42 -07:00
Romain Guy
61c8c9c5b2 Fix tons of bugs and add new text rendering support. 
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
 2010-08-10 12:22:01 -07:00
Maksymilian Osowski
ea46f2595a Resets Summarizer after everything's finished. 
Bug: 2903641
Change-Id: I7cecd454fe726a1527999259d37bd51ea2785116
 2010-08-10 18:28:52 +01:00
Maksymilian Osowski
77bdba839b Merge "Changed some parts of the code to prepare it for script support that will come in later commit." 2010-08-10 07:42:47 -07:00
Maksymilian Osowski
c8fb818b94 Changed some parts of the code to prepare it for script support that will come in later commit. 
Bug: 2903591

Change-Id: If8fcfad1557c8140c476212d8be9f99987cdaa18
 2010-08-10 14:47:53 +01:00
Maksymilian Osowski
38b7eb96fd Merge "Added generating text summary to Summarizer." 2010-08-10 05:41:40 -07:00
Steve Block
68dede3d66 Hook up mock for testing DeviceOrientation in DRT 
Change-Id: I99fbe328807428aa0d94893545bad0697ccb71d7
 2010-08-10 12:00:35 +01:00
Maksymilian Osowski
8aff3c0571 Added eventSender. 
Change-Id: Iae31dc11ddd7b4b1b9c2e1c39fb61cc7b9832721
 2010-08-10 11:41:47 +01:00
Maksymilian Osowski
3df4eab3de Added generating text summary to Summarizer. 
Change-Id: I8768403b0e4edd46132018c9da6de54b218fb594
 2010-08-09 18:15:33 +01:00
Steve Block
6618e69857 Merge WebKit at r64523 : Add new LayoutTest fast/dom/DeviceOrientation/basic-operation.html to skipped list 
Change-Id: I42afa8d430349a0d8aa7349563c90043d08452e1
 2010-08-09 15:39:50 +01:00