10354 Commits

Author SHA1 Message Date
Andreas Huber
9c54010f76 Improvements to TimedEventQueue.
Events are now cancelled given their "unique" event_id instead of the event pointer
itself (which may be reallocated in place if we're unlucky). Also the ability to
cancel multiple events matching a predicate has been added.
2009-11-17 10:29:32 -08:00
Daisuke Miyakawa
8c80818724 Modify test code a little.
Internal issue number: 2195990
2009-11-17 18:53:19 +09:00
Android (Google) Code Review
a184d4b95d Merge change I11526e6c into eclair-mr2
* changes:
  Clean up codes and remove/modify stale codes/comments.
2009-11-17 01:02:46 -08:00
Daisuke Miyakawa
d2145b97fb Clean up codes and remove/modify stale codes/comments.
Internal issue number: 2195990
2009-11-17 17:12:54 +09:00
Jim Miller
c0b0ad212a am f0166e4d: Merge change I4f01d4a4 into eclair
Merge commit 'f0166e4dd0907e487531960e36f516406d265b73' into eclair-mr2

* commit 'f0166e4dd0907e487531960e36f516406d265b73':
  Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
2009-11-16 23:51:24 -08:00
Android (Google) Code Review
f0166e4dd0 Merge change I4f01d4a4 into eclair
* changes:
  Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
2009-11-16 23:48:28 -08:00
Jim Miller
4f01d4a4da Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
This fixes the following glitches:
- flash at the end of animation as the widget resets. Fix: new "hold" animation holds the view for 1 second, allowing it to transition before we reset the view.
- target flashing. Fix: remove AlphaAnimation when we want to hide the target.
- bar appears to get stuck at edge. Fix: sliding bar now slides fully offscreen when hold == true.  Added setHoldAfterTrigger() method to allow InCallScreen and LockScreen to have different behaviors.
- view continues to animate when shown again. Fix: reset the animations and sliders when the view is hidden.

Tested:
	Answer/Decline call on CDMA and GSM device.
	Unlock phone and toggle sound on/off in LockScreen on both devices.
2009-11-16 23:08:35 -08:00
Android (Google) Code Review
ac3e2159b4 Merge change Icaf78440 into eclair-mr2
* changes:
  Split vCard composer into two parts: VCardComposer and VCardBuilder.
2009-11-16 21:31:49 -08:00
Daisuke Miyakawa
1b9e2bec63 Split vCard composer into two parts: VCardComposer and VCardBuilder.
As for VCardBuilder, there was a class with the same name, but this implementation is fundamentally different.
This time, VCardBuilder is like StringBuilder. It enables developers to create their own vCard by themselves.

Make Constants public and rename it to VCardConstants.

Internal issue number: 2242528, 2195990
2009-11-17 14:30:17 +09:00
Mike Lockwood
0d82914929 am f8c4af65: Merge change I51b84496 into eclair
Merge commit 'f8c4af65e8f9c7f395ac8eb52fe741242f6747b6' into eclair-mr2

* commit 'f8c4af65e8f9c7f395ac8eb52fe741242f6747b6':
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-16 19:56:49 -08:00
Scott Main
4b26bab8a4 am 06ddc677: am 00ecac95: Merge change If556e259 into eclair-sdk
Merge commit '06ddc67797388da6260e43579c7ebd506b5b376c' into eclair-mr2

* commit '06ddc67797388da6260e43579c7ebd506b5b376c':
  docs: remove all content from the older sdk download,
2009-11-16 19:56:30 -08:00
Mike Cleron
fd5cfd885d am f36b8f43: Merge change Ia428b2c2 into eclair
Merge commit 'f36b8f439babc141970b1207d1d9c12b7a14c468' into eclair-mr2

* commit 'f36b8f439babc141970b1207d1d9c12b7a14c468':
  This time for sure: make wallpapers work
2009-11-16 19:56:09 -08:00
Dianne Hackborn
43e9eb28ab am 9ddb7df8: Fix build.
Merge commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6' into eclair-mr2

* commit '9ddb7df88a62a131519264f75f5d6616ee11b6e6':
  Fix build.
2009-11-16 19:55:53 -08:00
Adam Bliss
340733697f am 69e0b664: Merge change I000d3564 into eclair
Merge commit '69e0b6646f109d17a5cff4b8c32582e3d3a3f544' into eclair-mr2

* commit '69e0b6646f109d17a5cff4b8c32582e3d3a3f544':
  Move map tiles to no-dpi since they are dpi-independent.
2009-11-16 19:55:31 -08:00
Dianne Hackborn
beaf87bfec am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore
Merge commit '60d7db4c3e3d60060e7ac021445ea1f510b7a1fb' into eclair-mr2

* commit '60d7db4c3e3d60060e7ac021445ea1f510b7a1fb':
  Fix #2262593: 42 ANR reports from android.process.acore
2009-11-16 19:55:13 -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
a822f02bb9 resolved conflicts for merge of dc49acb0 to eclair-mr2 2009-11-17 11:39:54 +08:00
Android (Google) Code Review
f8c4af65e8 Merge change I51b84496 into eclair
* changes:
  Revert "PowerManagerService: enable logging for when mPowerState changes."
2009-11-16 19:04:06 -08:00
Mike Lockwood
51b844965b Revert "PowerManagerService: enable logging for when mPowerState changes."
This reverts commit 24ace3395b532e3cbb63d2a6197a91dd9242bb36.

Bug b/2265538 (verbose logging from power manager)
2009-11-16 21:51:18 -05:00
Scott Main
06ddc67797 am 00ecac95: Merge change If556e259 into eclair-sdk
Merge commit '00ecac957c4a5d2df132640ff418280d969e7d83' into eclair

* commit '00ecac957c4a5d2df132640ff418280d969e7d83':
  docs: remove all content from the older sdk download,
2009-11-16 18:25:56 -08:00
Android (Google) Code Review
00ecac957c Merge change If556e259 into eclair-sdk
* changes:
  docs: remove all content from the older sdk download, install, and requirements pages and redirect to the new sdk pages. Also update the "older sdks" doc to include all version-specific sdks. also update the robots file to disallow indexing of the old sdk docs.
2009-11-16 18:19:10 -08:00
Android (Google) Code Review
f36b8f439b Merge change Ia428b2c2 into eclair
* changes:
  This time for sure: make wallpapers work
2009-11-16 18:02:20 -08:00
Dianne Hackborn
9ddb7df88a Fix build.
Change-Id: I70c86738e2894d7f8c51034aea8fda1585a6fcb3
2009-11-16 17:59:32 -08:00
Android (Google) Code Review
69e0b6646f Merge change I000d3564 into eclair
* changes:
  Move map tiles to no-dpi since they are dpi-independent.
2009-11-16 17:53:20 -08:00
Adam Bliss
000d356458 Move map tiles to no-dpi since they are dpi-independent. 2009-11-16 17:47:41 -08:00
Scott Main
8ef5a6b6ae docs: remove all content from the older sdk download,
install, and requirements pages and redirect to the new sdk
pages. Also update the "older sdks"
doc to include all version-specific sdks.
also update the robots file to disallow indexing
of the old sdk docs.
2009-11-16 17:39:52 -08:00
Dianne Hackborn
60d7db4c3e Fix #2262593: 42 ANR reports from android.process.acore
There was a lock in AssetManager that purported to be per-instance (mSync)
but was actually static.  A lot of code used it like it was per-instance,
but this would actually block all instances.  This is now changed to fix
the name and make everything except the actual static data lock on the
specific AssetManager instance.

Change-Id: Ie8e9ad60f962184e76b2301f7a2790d0c2487063
2009-11-16 17:16:26 -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
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
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
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
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
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