Commit Graph

7023 Commits

Author SHA1 Message Date
Dianne Hackborn
0425d3fab4 am ab5efde8: Merge change Iff5b8ce3 into eclair
Merge commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679' into eclair-plus-aosp

* commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679':
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 16:36:30 -08:00
Android (Google) Code Review
0cfbff7bda Merge change Iff5b8ce3 into eclair
* changes:
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 16:33:41 -08:00
Jack Palevich
be866756f3 am dc49acb0: Merge change Ica8c305a into eclair
Merge commit 'dc49acb0289cab2a6e0d73e66b69516605893e28' into eclair-plus-aosp

* commit 'dc49acb0289cab2a6e0d73e66b69516605893e28':
  More GLSurfaceView cleanup.
2009-11-16 15:52:59 -08:00
Android (Google) Code Review
52f7cae90c Merge change Ica8c305a into eclair
* changes:
  More GLSurfaceView cleanup.
2009-11-16 15:48:47 -08:00
Jack Wang
5bd60dda17 am e0cadd7c: Merge change Iffbb6e55 into eclair
Merge commit 'e0cadd7cd811a674df62279dec00d17678b2c501' into eclair-plus-aosp

* commit 'e0cadd7cd811a674df62279dec00d17678b2c501':
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:25:01 -08:00
Android (Google) Code Review
6e1fc55d1f Merge change Iffbb6e55 into eclair
* changes:
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:20:46 -08:00
Mathias Agopian
e34b756fca am f998c4a2: Merge change I1c0bebbc into eclair
Merge commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806' into eclair-plus-aosp

* commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806':
  fix [2262591] Junk on screen in ERD46
2009-11-16 15:08:12 -08:00
Android (Google) Code Review
1c84c754e3 Merge change I1c0bebbc into eclair
* changes:
  fix [2262591] Junk on screen in ERD46
2009-11-16 15:05:16 -08:00
Mathias Agopian
9e911efc10 fix [2262591] Junk on screen in ERD46
since we're using the GPU for composition, don't use a texture for dimming,
instead simply use an alpha-blended quad.

also workaround what looks like a GL driver bug by calling glFinish() before
glReadPixels().
2009-11-16 14:55:36 -08:00
Jeff Sharkey
5d15aff6b6 am 1162fd77: Let RemoteViews nest children, allow ViewFlipper.
Merge commit '1162fd77a8ff8467c96204c00bcaf941aef6aa85' into eclair-plus-aosp

* commit '1162fd77a8ff8467c96204c00bcaf941aef6aa85':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-16 14:38:29 -08:00
Jason Sams
ef72b642a4 am ec8178eb: Merge change I9c1bad53 into eclair
Merge commit 'ec8178eb0fb10e1ed753be4d065cf7f004355575' into eclair-plus-aosp

* commit 'ec8178eb0fb10e1ed753be4d065cf7f004355575':
  Add setPriority to allow wallpapers to run at lower cpu priority than default.
2009-11-16 14:04:54 -08:00
Android (Google) Code Review
f1ca2089d2 Merge change I9c1bad53 into eclair
* changes:
  Add setPriority to allow wallpapers to run at lower cpu priority than default.
2009-11-16 14:01:30 -08:00
Xavier Ducrohet
1e927916b4 am 19e420c5: Merge change Iae493184 into eclair
Merge commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d' into eclair-plus-aosp

* commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d':
  Minor fix for the parent style computation in the layoutlib.
2009-11-16 11:27:03 -08:00
Android (Google) Code Review
13f82e0909 Merge change Iae493184 into eclair
* changes:
  Minor fix for the parent style computation in the layoutlib.
2009-11-16 11:21:34 -08:00
Mike Lockwood
91caf3f6f3 am fa82d97d: Merge change Ib1fb3fcf into eclair
Merge commit 'fa82d97dc67b2c3047ad2abe7553d4a0f47b6e7f' into eclair-plus-aosp

* commit 'fa82d97dc67b2c3047ad2abe7553d4a0f47b6e7f':
  Keep screen bright until boot completed.
2009-11-16 03:24:25 -08:00
Android (Google) Code Review
13bac2b8b8 Merge change Ib1fb3fcf into eclair
* changes:
  Keep screen bright until boot completed.
2009-11-16 03:21:12 -08:00
Iliyan Malchev
2da9db0a82 am e2071c6b: Merge change I326e3e29 into eclair
Merge commit 'e2071c6b1d68220976d495d917566edf01303680' into eclair-plus-aosp

* commit 'e2071c6b1d68220976d495d917566edf01303680':
  dumpstate: include the contents of the last radio log
2009-11-16 00:34:38 -08:00
Android (Google) Code Review
25eb306500 Merge change I326e3e29 into eclair
* changes:
  dumpstate: include the contents of the last radio log
2009-11-16 00:30:10 -08:00
Scott Main
0a3e3db01d am be9060b5: am 59450740: Merge change I0b0a4d6a into eclair-sdk
Merge commit 'be9060b5d944a2b9ac5a0bdc018b4741dc2cd531' into eclair-plus-aosp

* commit 'be9060b5d944a2b9ac5a0bdc018b4741dc2cd531':
  docs: update the publishing guide to revise the updating section
2009-11-15 19:23:20 -08:00
Scott Main
71be81037a am 59450740: Merge change I0b0a4d6a into eclair-sdk
Merge commit '59450740c72c8642c25e2fa757754dc32252d1a2' into eclair

* commit '59450740c72c8642c25e2fa757754dc32252d1a2':
  docs: update the publishing guide to revise the updating section
2009-11-15 19:18:45 -08:00
Android (Google) Code Review
632159355d Merge change I0b0a4d6a into eclair-sdk
* changes:
  docs: update the publishing guide to revise the updating section bug 1755357
2009-11-15 19:12:13 -08:00
Jim Miller
be706018a8 am 521d400b: Fix 2209086: Add animations and misc ui improvements to SlidingTab.
Merge commit '521d400b230bee5e7b9748f26832c0d0275b8253' into eclair-plus-aosp

* commit '521d400b230bee5e7b9748f26832c0d0275b8253':
  Fix 2209086: Add animations and misc ui improvements to SlidingTab.
2009-11-15 17:17:05 -08:00
Jean-Baptiste Queru
6c42651591 merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15 14:03:15 -08:00
Jean-Baptiste Queru
cae00cb85c merge from open-source master
Merge commit 'goog/stage-korg-master^' into HEAD
2009-11-15 14:03:15 -08:00
Jim Miller
02b9abdbb4 am 16a9d9a7: Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
Merge commit '16a9d9a736a1bfdc12aa54c549508dd12596247f' into eclair-plus-aosp

* commit '16a9d9a736a1bfdc12aa54c549508dd12596247f':
  Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
2009-11-15 13:35:54 -08:00
Jean-Baptiste Queru
daeaa536fa merge from eclair 2009-11-15 12:06:23 -08:00
Jim Miller
df1881abb4 am e5608f5e: Merge change Ied958262 into eclair
Merge commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b' into eclair-plus-aosp

* commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b':
  Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.
2009-11-15 11:43:44 -08:00
Android (Google) Code Review
33efc13b02 Merge change Ied958262 into eclair
* changes:
  Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.
2009-11-15 11:41:43 -08:00
Mike Lockwood
0947498bbc am 04c585e3: Merge changes Ia4825f54,If6f80560 into eclair
Merge commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404' into eclair-plus-aosp

* commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404':
  Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
  PowerManagerService: Hold a wakelock while mProximityTask is queued
2009-11-15 05:35:35 -08:00
Android (Google) Code Review
f3b6793f8e Merge changes Ia4825f54,If6f80560 into eclair
* changes:
  Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
  PowerManagerService: Hold a wakelock while mProximityTask is queued
2009-11-15 05:32:03 -08:00
Fred Quintana
500c8cc3ed am 383aa124: Merge change I60ff11dc into eclair
Merge commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae' into eclair-plus-aosp

* commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae':
  fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
2009-11-14 22:17:16 -08:00
Android (Google) Code Review
7b563c23dc Merge change I60ff11dc into eclair
* changes:
  fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
2009-11-14 22:12:31 -08:00
Jim Miller
45a5150301 am 7c1c4600: Merge change I425ca595 into eclair
Merge commit '7c1c46000be136ffda36283fdc93bfe3cba72601' into eclair-plus-aosp

* commit '7c1c46000be136ffda36283fdc93bfe3cba72601':
  Fix 2261626: Don't show text on button if orientation is vertical.
2009-11-14 02:43:19 -08:00
Android (Google) Code Review
5a6ee8cba0 Merge change I425ca595 into eclair
* changes:
  Fix 2261626: Don't show text on button if orientation is vertical.
2009-11-14 02:39:51 -08:00
Mathias Agopian
6c3017b073 am 20aec2dd: Merge change I830df4b1 into eclair
Merge commit '20aec2ddee1b82fa59cc4537d6b42b6897bc30ca' into eclair-plus-aosp

* commit '20aec2ddee1b82fa59cc4537d6b42b6897bc30ca':
  addresses several bugs: 2206097, 2166583, 2261119, 2216759
2009-11-14 01:06:05 -08:00
Android (Google) Code Review
bee20a282f Merge change I830df4b1 into eclair
* changes:
  addresses several bugs: 2206097, 2166583, 2261119, 2216759
2009-11-14 01:01:26 -08:00
Mathias Agopian
dcaf29af10 addresses several bugs: 2206097, 2166583, 2261119, 2216759
2206097: Broken suggestions while composing message
2166583: Color artifacts with MDP dithering
2261119: Passion transition animations are rough
2216759: Screen flicker when dropdown list in background window shows or hides

This is part of enabling GPU composition instead of using the MDP. This change
is dependent on another change in the vendor project.

Specifically this change disables the use of EGLImageKHR for s/w buffers
for cache coherency reasons. memcpy is used instead.
2009-11-13 18:54:14 -08:00
Eric Fischer
28b58e74f1 am d12ba5e0: Merge change Ibd5b099c into eclair
Merge commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9' into eclair-plus-aosp

* commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9':
  Import revised translations.  DO NOT MERGE
2009-11-13 17:45:46 -08:00
Android (Google) Code Review
ed83aa2fc7 Merge change Ibd5b099c into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-11-13 17:42:19 -08:00
Mathias Agopian
0c7b4e27d6 am 91e40e78: Merge change I18e02606 into eclair
Merge commit '91e40e7838d183cb2a9e750edf0a6572f21da21d' into eclair-plus-aosp

* commit '91e40e7838d183cb2a9e750edf0a6572f21da21d':
  fix some aspects of [2258746] native crash in launcher2
2009-11-13 17:33:35 -08:00
Android (Google) Code Review
9875c79ba9 Merge change I18e02606 into eclair
* changes:
  fix some aspects of [2258746] native crash in launcher2
2009-11-13 17:31:21 -08:00
Mike Cleron
d36a9fe905 am d54261aa: Merge change Id6c0b844 into eclair
Merge commit 'd54261aab0a96defc9584c4c59a3218015cdb1f7' into eclair-plus-aosp

* commit 'd54261aab0a96defc9584c4c59a3218015cdb1f7':
  Unbreak setting photos as wallpaper
2009-11-13 17:04:11 -08:00
Android (Google) Code Review
7a0892c6e0 Merge change Id6c0b844 into eclair
* changes:
  Unbreak setting photos as wallpaper
2009-11-13 17:00:44 -08:00
Xavier Ducrohet
df03d377df am ae210437: Merge change I7082e366 into eclair
Merge commit 'ae2104371d84570011dbb8c1621832a132ed4584' into eclair-plus-aosp

* commit 'ae2104371d84570011dbb8c1621832a132ed4584':
  Properly implement Paint.breakText for layoutlib.
2009-11-13 15:46:46 -08:00
Android (Google) Code Review
753e37d9b3 Merge change I7082e366 into eclair
* changes:
  Properly implement Paint.breakText for layoutlib.
2009-11-13 15:42:31 -08:00
Mathias Agopian
963abad79a fix some aspects of [2258746] native crash in launcher2
Surface::validate() could sometimes dereference a null pointer before checking it wasn't null.
This will prevent the application to crash when given bad parameters or used incorrectly.
However, the bug above probably has another cause.
2009-11-13 15:26:29 -08:00
Mike Lockwood
5109a21819 am 991475a2: Merge change I0e419fcf into eclair
Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-plus-aosp

* commit '991475a2e5dcb344299387521b52fb637d6b1e4d':
  Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
2009-11-13 15:20:36 -08:00
Android (Google) Code Review
6e0560c7be Merge change I0e419fcf into eclair
* changes:
  Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
2009-11-13 15:17:59 -08:00
Eric Fischer
f7df871493 am 65f27f87: Merge change I98f82b9a into eclair
Merge commit '65f27f8721ae648ceffffb59a83e2af0d4641920' into eclair-plus-aosp

* commit '65f27f8721ae648ceffffb59a83e2af0d4641920':
  Fix the full-weekday date format strings to actually use the full weekday.
2009-11-13 14:58:41 -08:00
Android (Google) Code Review
bf33571f03 Merge change I98f82b9a into eclair
* changes:
  Fix the full-weekday date format strings to actually use the full weekday.
2009-11-13 14:51:00 -08:00