6708 Commits

Author SHA1 Message Date
Daisuke Miyakawa
675cab9240 am feef7de2: am ac3e2159: Merge change Icaf78440 into eclair-mr2
Merge commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c'

* commit 'feef7de25b3dc68f1d75c1c2171ddb5bd2169d8c':
  Split vCard composer into two parts: VCardComposer and VCardBuilder.
2009-11-17 15:06:00 -08:00
Adam Bliss
67ef546bb0 am 1ff57418: am 34073369: am 69e0b664: Merge change I000d3564 into eclair
Merge commit '1ff57418a7d58887301766031554a146c1ededd1'

* commit '1ff57418a7d58887301766031554a146c1ededd1':
  Move map tiles to no-dpi since they are dpi-independent.
2009-11-17 07:37:28 -08:00
Dianne Hackborn
87e5afb6e4 am 003ac2c8: am beaf87bf: am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore
Merge commit '003ac2c8e9a684a28180dac01340c759bf321cfd'

* commit '003ac2c8e9a684a28180dac01340c759bf321cfd':
  Fix #2262593: 42 ANR reports from android.process.acore
2009-11-17 07:37:08 -08:00
Jack Wang
90ea9af3e1 am e5fa335b: am 6e045e0a: am e0cadd7c: Merge change Iffbb6e55 into eclair
Merge commit 'e5fa335b0dffbd06385b6de05ae04b2bd2ea277e'

* commit 'e5fa335b0dffbd06385b6de05ae04b2bd2ea277e':
  Make perf metrics collection & output via instrumentation simpler
2009-11-17 07:33:59 -08:00
Jeff Sharkey
04b963ad7c am 35d85700: am 8059bcbf: resolved conflicts for merge of 1162fd77 to eclair-mr2
Merge commit '35d857002dcbc24d05a0f9d157ce8ee1927ae235'

* commit '35d857002dcbc24d05a0f9d157ce8ee1927ae235':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-17 07:32:55 -08:00
Daisuke Miyakawa
e4c4843c71 am d557614f: am f016fa63: Merge change Ib1f7c3cb into eclair-mr2
Merge commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2'

* commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2':
  Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.
2009-11-17 07:30:43 -08:00
Leon Scroggins
bb74b6f7d7 am daf05d3e: am a57632fe: Fix bugs around removing and attaching WebViews.
Merge commit 'daf05d3e91e817825562055cbf0b67e704defc7a'

* commit 'daf05d3e91e817825562055cbf0b67e704defc7a':
  Fix bugs around removing and attaching WebViews.
2009-11-17 07:29:50 -08:00
Daisuke Miyakawa
2227ecd1bf am d5f787ab: am 9e807d7c: Merge change Iecf85b40 into eclair-mr2
Merge commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509'

* commit 'd5f787ab28199d417f8a50ccd031e31f5c6db509':
  Rename several files so that readers would not be confused.
2009-11-17 07:28:35 -08:00
Daisuke Miyakawa
feef7de25b am ac3e2159: Merge change Icaf78440 into eclair-mr2
Merge commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb' into eclair-mr2-plus-aosp

* commit 'ac3e2159b41b825874cf574cf59225d4fbddfbcb':
  Split vCard composer into two parts: VCardComposer and VCardBuilder.
2009-11-16 21:35:19 -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
Adam Bliss
1ff57418a7 am 34073369: am 69e0b664: Merge change I000d3564 into eclair
Merge commit '340733697fcb0b73a707eb544b958af3121cdf60' into eclair-mr2-plus-aosp

* commit '340733697fcb0b73a707eb544b958af3121cdf60':
  Move map tiles to no-dpi since they are dpi-independent.
2009-11-16 20:04:44 -08:00
Dianne Hackborn
003ac2c8e9 am beaf87bf: am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore
Merge commit 'beaf87bfec29378b27bd28c1d1d2c4db1116d7ce' into eclair-mr2-plus-aosp

* commit 'beaf87bfec29378b27bd28c1d1d2c4db1116d7ce':
  Fix #2262593: 42 ANR reports from android.process.acore
2009-11-16 20:04:28 -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
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
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
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
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
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
Jim Miller
c82f4cc748 am 12814547: resolved conflicts for merge of 607b9c37 to eclair-mr2-plus-aosp
Merge commit '12814547b828bfd9d6a632bbc6c699afd5c4cbce'

* commit '12814547b828bfd9d6a632bbc6c699afd5c4cbce':
  Fix 2209086: Add animations and misc ui improvements to SlidingTab.
2009-11-16 14:40:16 -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
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
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
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
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
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
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
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
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
Android (Google) Code Review
e5608f5ea5 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
Jim Miller
ec05ece3ba Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier. 2009-11-15 11:12:39 -08:00
Dan Egnor
1d9a742cdf am c51e2793: am e3cfe2d9: Fix the SDK build.
Merge commit 'c51e279366ff7eed48d3256811381528692240d0'

* commit 'c51e279366ff7eed48d3256811381528692240d0':
  Fix the SDK build.
2009-11-15 10:51:17 -08:00
Dan Egnor
c51e279366 am e3cfe2d9: Fix the SDK build.
Merge commit 'e3cfe2d92868513c9524804a362c3c3c8b8cc4e5' into eclair-mr2-plus-aosp

* commit 'e3cfe2d92868513c9524804a362c3c3c8b8cc4e5':
  Fix the SDK build.
2009-11-15 10:46:51 -08:00
Android (Google) Code Review
383aa124de 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
Dan Egnor
e3cfe2d928 Fix the SDK build. 2009-11-14 16:32:13 -08:00
Jim Miller
151328767e am 17831dd4: am d1841144: am 7c1c4600: Merge change I425ca595 into eclair
Merge commit '17831dd428419686ec0e6da9b25fd593bdee7ac0'

* commit '17831dd428419686ec0e6da9b25fd593bdee7ac0':
  Fix 2261626: Don't show text on button if orientation is vertical.
2009-11-14 02:50:37 -08:00
Jim Miller
17831dd428 am d1841144: am 7c1c4600: Merge change I425ca595 into eclair
Merge commit 'd1841144e4d592724001018f427806edb9c72ae0' into eclair-mr2-plus-aosp

* commit 'd1841144e4d592724001018f427806edb9c72ae0':
  Fix 2261626: Don't show text on button if orientation is vertical.
2009-11-14 02:46:35 -08:00
Jim Miller
d1841144e4 am 7c1c4600: Merge change I425ca595 into eclair
Merge commit '7c1c46000be136ffda36283fdc93bfe3cba72601' into eclair-mr2

* commit '7c1c46000be136ffda36283fdc93bfe3cba72601':
  Fix 2261626: Don't show text on button if orientation is vertical.
2009-11-14 02:43:32 -08:00
Android (Google) Code Review
7c1c46000b 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
Jim Miller
425ca595dc Fix 2261626: Don't show text on button if orientation is vertical. 2009-11-13 19:20:28 -08:00