Commit Graph

12603 Commits

Author SHA1 Message Date
Dianne Hackborn
3a624abe27 am 92b18800: am ab5efde8: Merge change Iff5b8ce3 into eclair
Merge commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12' into eclair-mr2-plus-aosp

* commit '92b1880084ccfbe2ae03eec6a9656c5372c03f12':
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 20:04:09 -08:00
Dianne Hackborn
92b1880084 am ab5efde8: Merge change Iff5b8ce3 into eclair
Merge commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679' into eclair-mr2

* commit 'ab5efde8dcdfcafea7e9d95350e18022b1adc679':
  Work on issue 2259506: camera ANRed and then device runtime restarted
2009-11-16 19:53:15 -08:00
Jack Palevich
8d0e147233 am a822f02b: resolved conflicts for merge of dc49acb0 to eclair-mr2
Merge commit 'a822f02bb9c7f5bf2e3fa3cb63effc391be158c5' into eclair-mr2-plus-aosp

* commit 'a822f02bb9c7f5bf2e3fa3cb63effc391be158c5':
  More GLSurfaceView cleanup.
2009-11-16 19:52:12 -08:00
Jack Palevich
a822f02bb9 resolved conflicts for merge of dc49acb0 to eclair-mr2 2009-11-17 11:39:54 +08:00
Android (Google) Code Review
ab5efde8dc 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
Android (Google) Code Review
dc49acb028 Merge change Ica8c305a into eclair
* changes:
  More GLSurfaceView cleanup.
2009-11-16 15:48:47 -08:00
Jack Wang
e5fa335b0d am 6e045e0a: am e0cadd7c: Merge change Iffbb6e55 into eclair
Merge commit '6e045e0aa1b465e9e989d3058a5d2fa13dcf026b' into eclair-mr2-plus-aosp

* commit '6e045e0aa1b465e9e989d3058a5d2fa13dcf026b':
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:29:15 -08:00
Jack Wang
6e045e0aa1 am e0cadd7c: Merge change Iffbb6e55 into eclair
Merge commit 'e0cadd7cd811a674df62279dec00d17678b2c501' into eclair-mr2

* commit 'e0cadd7cd811a674df62279dec00d17678b2c501':
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:25:06 -08:00
Android (Google) Code Review
e0cadd7cd8 Merge change Iffbb6e55 into eclair
* changes:
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:20:46 -08:00
Mathias Agopian
af3e233fe3 am fc36afcb: am f998c4a2: Merge change I1c0bebbc into eclair
Merge commit 'fc36afcba6e65f2e0816b1af08255b9ccafb17a6' into eclair-mr2-plus-aosp

* commit 'fc36afcba6e65f2e0816b1af08255b9ccafb17a6':
  fix [2262591] Junk on screen in ERD46
2009-11-16 15:12:43 -08:00
Mathias Agopian
fc36afcba6 am f998c4a2: Merge change I1c0bebbc into eclair
Merge commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806' into eclair-mr2

* commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806':
  fix [2262591] Junk on screen in ERD46
2009-11-16 15:08:11 -08:00
Android (Google) Code Review
f998c4a289 Merge change I1c0bebbc into eclair
* changes:
  fix [2262591] Junk on screen in ERD46
2009-11-16 15:05:16 -08:00
Jeff Sharkey
35d857002d am 8059bcbf: resolved conflicts for merge of 1162fd77 to eclair-mr2
Merge commit '8059bcbfa71c8233e616304843d9280f5f1615bb' into eclair-mr2-plus-aosp

* commit '8059bcbfa71c8233e616304843d9280f5f1615bb':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-16 14:55:37 -08:00
Mathias Agopian
1c0bebbc95 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
8059bcbfa7 resolved conflicts for merge of 1162fd77 to eclair-mr2 2009-11-16 14:49:07 -08:00
Jason Sams
234e509a67 am 22186a2c: am ec8178eb: Merge change I9c1bad53 into eclair
Merge commit '22186a2c15cc752cfaaf8a12d415a3c097d338e0' into eclair-mr2-plus-aosp

* commit '22186a2c15cc752cfaaf8a12d415a3c097d338e0':
  Add setPriority to allow wallpapers to run at lower cpu priority than default.
2009-11-16 14:42:10 -08:00
Daisuke Miyakawa
d557614f3a am f016fa63: Merge change Ib1f7c3cb into eclair-mr2
Merge commit 'f016fa632b1d3c606934bc11a889af3921c6120e' into eclair-mr2-plus-aosp

* commit 'f016fa632b1d3c606934bc11a889af3921c6120e':
  Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
2009-11-16 14:41:28 -08:00
Xavier Ducrohet
1bd7261d2b am 1ddc0077: am 19e420c5: Merge change Iae493184 into eclair
Merge commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b' into eclair-mr2-plus-aosp

* commit '1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b':
  Minor fix for the parent style computation in the layoutlib.
2009-11-16 14:40:22 -08:00
Leon Scroggins
daf05d3e91 am a57632fe: Fix bugs around removing and attaching WebViews.
Merge commit 'a57632fee792d6078a7a61006f5a866c38addd33' into eclair-mr2-plus-aosp

* commit 'a57632fee792d6078a7a61006f5a866c38addd33':
  Fix bugs around removing and attaching WebViews.
2009-11-16 14:37:58 -08:00
Mike Lockwood
f6cee83f81 am 5fd01f7a: am fa82d97d: Merge change Ib1fb3fcf into eclair
Merge commit '5fd01f7aff5bf3e835ce233b68199db19ac93c1d' into eclair-mr2-plus-aosp

* commit '5fd01f7aff5bf3e835ce233b68199db19ac93c1d':
  Keep screen bright until boot completed.
2009-11-16 14:37:03 -08:00
Iliyan Malchev
7174fcf603 am f9bf75d5: am e2071c6b: Merge change I326e3e29 into eclair
Merge commit 'f9bf75d59acd8efb45d7137df507241483b1ad34' into eclair-mr2-plus-aosp

* commit 'f9bf75d59acd8efb45d7137df507241483b1ad34':
  dumpstate: include the contents of the last radio log
2009-11-16 14:36:37 -08:00
Daisuke Miyakawa
d5f787ab28 am 9e807d7c: Merge change Iecf85b40 into eclair-mr2
Merge commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b' into eclair-mr2-plus-aosp

* commit '9e807d7cc4e5deafc0744abd932e2b40e3f5e80b':
  Rename several files so that readers would not be confused.
2009-11-16 14:36:17 -08:00
Dan Egnor
8ad23618a2 am 92c12fae: Fix Zygote -- don\'t depend on these classes that are no longer in the bootclasspath. (This is a quick edit to the generated file; the next time the file is properly regenerated, it won\'t include these files.)
Merge commit '92c12fae9a977ea1dcb9f4de56257d4945101db7' into eclair-mr2-plus-aosp

* commit '92c12fae9a977ea1dcb9f4de56257d4945101db7':
  Fix Zygote -- don't depend on these classes that are no longer
2009-11-16 14:35:49 -08:00
Scott Main
63070f08a6 am 8faa61c3: am be9060b5: am 59450740: Merge change I0b0a4d6a into eclair-sdk
Merge commit '8faa61c3304392a9ab02387b1adad49dc8a5e488' into eclair-mr2-plus-aosp

* commit '8faa61c3304392a9ab02387b1adad49dc8a5e488':
  docs: update the publishing guide to revise the updating section
2009-11-16 14:35:10 -08:00
Jeff Sharkey
1162fd77a8 Let RemoteViews nest children, allow ViewFlipper.
This change allows applications to nest children RemoteViews
inside an existing set of RemoteViews.  These nested views
are inflated and treated as addView() calls.

This change also allows ViewFlipper through RemoteViews, and
adds logic surpress flipping when the parent window is
detached or behind the lockscreen.  Also fixes ViewAnimator
to observe the measureAllChildren flag when set.

Fixes http://b/2239905
2009-11-16 14:27:19 -08:00
Jim Miller
12814547b8 resolved conflicts for merge of 607b9c37 to eclair-mr2-plus-aosp 2009-11-16 14:08:24 -08:00
Jason Sams
22186a2c15 am ec8178eb: Merge change I9c1bad53 into eclair
Merge commit 'ec8178eb0fb10e1ed753be4d065cf7f004355575' into eclair-mr2

* commit 'ec8178eb0fb10e1ed753be4d065cf7f004355575':
  Add setPriority to allow wallpapers to run at lower cpu priority than default.
2009-11-16 14:04:15 -08:00
Android (Google) Code Review
ec8178eb0f 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
Dianne Hackborn
f670ef7235 Work on issue 2259506: camera ANRed and then device runtime restarted
If a process fails to come up, we could leave content providers and
services hanging around.

Change-Id: Iff5b8ce3b933580954724338a89e110e45f1b00c
2009-11-16 13:59:16 -08:00
Android (Google) Code Review
f016fa632b Merge change Ib1f7c3cb into eclair-mr2
* changes:
  Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
2009-11-16 13:19:08 -08:00
Daisuke Miyakawa
3d745c2b92 Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
Internal issue number: 2195990
2009-11-17 06:16:22 +09:00
Xavier Ducrohet
1ddc0077ac am 19e420c5: Merge change Iae493184 into eclair
Merge commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d' into eclair-mr2

* commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d':
  Minor fix for the parent style computation in the layoutlib.
2009-11-16 11:32:53 -08:00
Android (Google) Code Review
19e420c52d Merge change Iae493184 into eclair
* changes:
  Minor fix for the parent style computation in the layoutlib.
2009-11-16 11:21:34 -08:00
Leon Scroggins
a57632fee7 Fix bugs around removing and attaching WebViews.
When removing a WebView from its Window, remove the WebTextView.
Remove the old attempt to do the same, which was not being called.

When attaching a WebView to a Window, call onWindowFocusChanged so
its state of drawing the selection ring returns.

Fixes http://b/issue?id=2257787 and http://b/issue?id=2260867
2009-11-16 11:47:12 -05:00
Mike Lockwood
5fd01f7aff am fa82d97d: Merge change Ib1fb3fcf into eclair
Merge commit 'fa82d97dc67b2c3047ad2abe7553d4a0f47b6e7f' into eclair-mr2

* commit 'fa82d97dc67b2c3047ad2abe7553d4a0f47b6e7f':
  Keep screen bright until boot completed.
2009-11-16 03:24:35 -08:00
Android (Google) Code Review
fa82d97dc6 Merge change Ib1fb3fcf into eclair
* changes:
  Keep screen bright until boot completed.
2009-11-16 03:21:12 -08:00
Jack Palevich
a08d46d8aa More GLSurfaceView cleanup.
+ The mDone flag is now a pair of flags: mShouldExit and mExited. The
problem with mDone was that it meant "had been asked to exit", but was
being used by some observers as "had exited". Using two variables means
that observers can observe either "had been asked to exit" or "had exited",
as they prefer.

+ Simplyify where we check for mShouldExit. We now check for it at the
  top of our innermost guardedRun while loop.

+ requestExitAndWait now waits for mExited to be set to true to know
that a thread has exited, rather than using join(). This means we can use
wait() for the check, which releases the sGLThreadManager
monitor, avoiding a potential deadlock.

+ move the event queue into the sGLThreadManager monitor. This avoids
having to acquire two locks in order to enque/deque events, which also
avoids the potential for lock ordering deadlocks.

+ Simplify the event dequeueing code. We now deque one event each time
through the main GLSurfaceView loop. Events still have priority over
rendering, so there isn't any semantic change, it just cleans up the code.

+ Avoid trying to acquire an egl Surface if we're paused.

+ To simplify reasoning about the code, call sGLThreadManager.notifyAll()
in every case where we modify one of the variables that's protected by
the sGLThreadManager monitor. It would be slightly more efficient to only
notify when we change variables that could cause a thread to wait(), but
then we would have to redo our analysis every time we change any code.

+ Clean up the logic for creating the EGL surface and then calling the
renderer's onSurfaceCreated / onSurfaceChanged methods.

+ Implement work-around for bug 2263168	"Need to draw twice after
  screen rotation..."
2009-11-16 18:48:26 +08:00
Iliyan Malchev
f9bf75d59a am e2071c6b: Merge change I326e3e29 into eclair
Merge commit 'e2071c6b1d68220976d495d917566edf01303680' into eclair-mr2

* commit 'e2071c6b1d68220976d495d917566edf01303680':
  dumpstate: include the contents of the last radio log
2009-11-16 00:34:38 -08:00
Android (Google) Code Review
e2071c6b1d Merge change I326e3e29 into eclair
* changes:
  dumpstate: include the contents of the last radio log
2009-11-16 00:30:10 -08:00
Android (Google) Code Review
9e807d7cc4 Merge change Iecf85b40 into eclair-mr2
* changes:
  Rename several files so that readers would not be confused.
2009-11-15 23:51:34 -08:00
Daisuke Miyakawa
5a1f2d2de0 Rename several files so that readers would not be confused.
Add unit tests around Phone-number handling and fix some bugs.

Internal issue number: 2195990
2009-11-16 16:31:32 +09:00
Dan Egnor
92c12fae9a Fix Zygote -- don't depend on these classes that are no longer
in the bootclasspath.  (This is a quick edit to the generated
file; the next time the file is properly regenerated, it won't
include these files.)
2009-11-15 20:53:01 -08:00
Scott Main
8faa61c330 am be9060b5: am 59450740: Merge change I0b0a4d6a into eclair-sdk
Merge commit 'be9060b5d944a2b9ac5a0bdc018b4741dc2cd531' into eclair-mr2

* commit 'be9060b5d944a2b9ac5a0bdc018b4741dc2cd531':
  docs: update the publishing guide to revise the updating section
2009-11-15 19:22:01 -08:00
Scott Main
be9060b5d9 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
59450740c7 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
Iliyan Malchev
326e3e291a dumpstate: include the contents of the last radio log
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-11-15 18:28:41 -08:00
Jim Miller
607b9c37de am 521d400b: Fix 2209086: Add animations and misc ui improvements to SlidingTab.
Merge commit '521d400b230bee5e7b9748f26832c0d0275b8253' into eclair-mr2

* commit '521d400b230bee5e7b9748f26832c0d0275b8253':
  Fix 2209086: Add animations and misc ui improvements to SlidingTab.
2009-11-15 17:17:13 -08:00
Jim Miller
521d400b23 Fix 2209086: Add animations and misc ui improvements to SlidingTab.
Added translation animation where tab "flies" when you release.
Added translation animation where pressing and releasing one tab will hide/show the other
Added alpha animation to make target appear gradually
Added margin around swipe area to allow easier unlocking.
Removed unused handler.
2009-11-15 17:06:49 -08:00
Xavier Ducrohet
0da2676ea8 Minor fix for the parent style computation in the layoutlib.
This is an SDK change only.

Change-Id: Iae493184ae76b2e21200dd6bb48795ff74f79ab3
2009-11-15 16:15:33 -08:00
Mike Lockwood
2d7bb81ac4 Keep screen bright until boot completed.
Fixes b/2262575 (device boots into darkness)

Change-Id: Ib1fb3fcfd4a389d8aa5803a60e07660cfbe4fe47
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-15 18:12:22 -05:00