12587 Commits

Author SHA1 Message Date
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
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
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
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
Jim Miller
2c1b37555e am ac4bacd9: am 16a9d9a7: Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
Merge commit 'ac4bacd9777c12e4cd6ddc335518a61a3f18f47f' into eclair-mr2-plus-aosp

* commit 'ac4bacd9777c12e4cd6ddc335518a61a3f18f47f':
2009-11-15 14:59:08 -08:00
Jim Miller
381f3fbca8 am 197ef85e: am e5608f5e: Merge change Ied958262 into eclair
Merge commit '197ef85ef5c8563270a38808d2716a29e12e00e9' into eclair-mr2-plus-aosp

* commit '197ef85ef5c8563270a38808d2716a29e12e00e9':
2009-11-15 14:58:54 -08:00
Mike Lockwood
cd3667010a am 7f9fb0c4: am 04c585e3: Merge changes Ia4825f54,If6f80560 into eclair
Merge commit '7f9fb0c4de7b9c8e9e33260d64844aad8a075609' into eclair-mr2-plus-aosp

* commit '7f9fb0c4de7b9c8e9e33260d64844aad8a075609':
2009-11-15 14:58:38 -08:00
Jean-Baptiste Queru
ce757d693e merge from open-source master 2009-11-15 14:55:20 -08:00
Jim Miller
ac4bacd977 am 16a9d9a7: Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
Merge commit '16a9d9a736a1bfdc12aa54c549508dd12596247f' into eclair-mr2

* commit '16a9d9a736a1bfdc12aa54c549508dd12596247f':
  Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
2009-11-15 14:51:12 -08:00
Jim Miller
197ef85ef5 am e5608f5e: Merge change Ied958262 into eclair
Merge commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b' into eclair-mr2

* commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b':
  Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.
2009-11-15 14:50:19 -08:00
Mike Lockwood
7f9fb0c4de am 04c585e3: Merge changes Ia4825f54,If6f80560 into eclair
Merge commit '04c585e3bcb75c85ceeacf2fd94ea4194f332404' into eclair-mr2

* 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 14:49:40 -08:00
Jean-Baptiste Queru
f9b97e6941 am fef18bfc: resolved conflicts for merge of 383aa124 to eclair-mr2
Merge commit 'fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2' into eclair-mr2-plus-aosp

* commit 'fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2':
  fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
2009-11-15 14:46:03 -08:00
Jean-Baptiste Queru
fef18bfcb0 resolved conflicts for merge of 383aa124 to eclair-mr2 2009-11-15 14:39:53 -08:00
Jean-Baptiste Queru
abc5772504 merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15 14:03:15 -08:00
Jean-Baptiste Queru
89282e98fe merge from open-source master
Merge commit 'goog/stage-korg-master^' into HEAD
2009-11-15 14:03:15 -08:00
Jim Miller
e5ff77c8bf 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
Jim Miller
16a9d9a736 Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
Also includes a cosmetic fix to move the Digital clock down a bit.
2009-11-15 13:26:37 -08:00
Fred Quintana
05ffc255c0 always preserve rows for accounts with type of localhost even if the account manager doesn't know about them 2009-11-15 12:53:42 -08:00
Jason Sams
7d787b4722 Add setPriority to allow wallpapers to run at lower cpu priority than default. 2009-11-15 12:14:26 -08:00