Commit Graph

4751 Commits

Author SHA1 Message Date
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
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
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
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
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
Fred Quintana
60ff11dc39 fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange 2009-11-13 16:21:52 -08:00
Mike Lockwood
c104e1b391 am dc656339: am 991475a2: Merge change I0e419fcf into eclair
Merge commit 'dc6563393789e90d75b44b9ce97c167863bf0771' into eclair-mr2-plus-aosp

* commit 'dc6563393789e90d75b44b9ce97c167863bf0771':
  Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
2009-11-13 15:24:52 -08:00
Mike Lockwood
dc65633937 am 991475a2: Merge change I0e419fcf into eclair
Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-mr2

* commit '991475a2e5dcb344299387521b52fb637d6b1e4d':
  Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
2009-11-13 15:21:45 -08:00
Android (Google) Code Review
991475a2e5 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
Mike Lockwood
746b3184bf Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
Needed for the fix for b/2260437 (device wakes itself back up when camera is last application running)

Change-Id: I0e419fcf05542df203eb3f127dde7a888416e86d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-13 17:40:38 -05:00
Jaikumar Ganesh
66b6b90bbf am f05ec923: Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit 'f05ec9237ec907be3f2c581a950149435bd585fb' into eclair-mr2-plus-aosp

* commit 'f05ec9237ec907be3f2c581a950149435bd585fb':
  Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
2009-11-13 13:40:38 -08:00
Jaikumar Ganesh
f05ec9237e Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Add check in getOwnerPhoneNumberVcard(). If the incoming phonenumber is empty,
do not add "TEL" to vcard data.

Manual merge from eclair branch
2009-11-13 13:08:52 -08:00
Android (Google) Code Review
9284dec737 Merge change I4c05ba1f into eclair
* changes:
  Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
2009-11-13 12:06:29 -08:00
Scott Main
fd13fb7a9c am b0d2313e: am d05fd6c3: am dbc7e27e: docs: document the \'showSearchIconAsBadge" flag and "icon" attribute as deprecated. bug 2105329
Merge commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2' into eclair-mr2-plus-aosp

* commit 'b0d2313ea49194b8ab6caa987aaa680a45dd38b2':
  docs: document the 'showSearchIconAsBadge" flag and
2009-11-13 11:33:26 -08:00
Scott Main
b0d2313ea4 am d05fd6c3: am dbc7e27e: docs: document the \'showSearchIconAsBadge" flag and "icon" attribute as deprecated. bug 2105329
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-mr2

* commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f':
  docs: document the 'showSearchIconAsBadge" flag and
2009-11-13 11:11:06 -08:00
Jaikumar Ganesh
4c05ba1fcc Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Add check in getOwnerPhoneNumberVcard(). If the incoming phonenumber is empty,
do not add "TEL" to vcard data.

Original Change by: Yue Lixin
DrNo: Eastham
Bug: 2247067
2009-11-13 11:01:25 -08:00
Scott Main
d05fd6c335 am dbc7e27e: docs: document the \'showSearchIconAsBadge" flag and "icon" attribute as deprecated. bug 2105329
Merge commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51' into eclair

* commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51':
  docs: document the 'showSearchIconAsBadge" flag and
2009-11-13 10:45:32 -08:00
Eric Laurent
355743c70d am 609acfd2: am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '609acfd2a1067f49e51925776484b070a24d8301' into eclair-mr2-plus-aosp

* commit '609acfd2a1067f49e51925776484b070a24d8301':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-13 09:27:55 -08:00
Jim Miller
c41bc910bd am 5be290d6: am 11fea858: Merge change I8061e6ac into eclair
Merge commit '5be290d6296da34cdd2724ee94dfc3b61bc02785' into eclair-mr2-plus-aosp

* commit '5be290d6296da34cdd2724ee94dfc3b61bc02785':
  Fix 2209086: Updated assets and fixed widget dimension calculation.
2009-11-13 09:27:30 -08:00
Dianne Hackborn
255ba31a75 am 1ca191c2: am 1778776c: Fix issue #2258571: Fix build versions
Merge commit '1ca191c2f7eb2be53d0f96117784ecafd888da73' into eclair-mr2-plus-aosp

* commit '1ca191c2f7eb2be53d0f96117784ecafd888da73':
  Fix issue #2258571: Fix build versions
2009-11-13 09:27:04 -08:00
Eric Laurent
609acfd2a1 am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-mr2

* commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 23:10:18 -08:00
Jim Miller
5be290d629 am 11fea858: Merge change I8061e6ac into eclair
Merge commit '11fea858b2f2d3f9c40a4da848d7bcee47edde04' into eclair-mr2

* commit '11fea858b2f2d3f9c40a4da848d7bcee47edde04':
  Fix 2209086: Updated assets and fixed widget dimension calculation.
2009-11-12 23:09:15 -08:00
Wink Saville
126fee88d4 am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2
Merge commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef' into eclair-mr2-plus-aosp

* commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef':
  Add code to use Gservices provided values for throtting NITZ updates.
2009-11-12 23:08:56 -08:00
Dianne Hackborn
1ca191c2f7 am 1778776c: Fix issue #2258571: Fix build versions
Merge commit '1778776cf1349a5f275945c53edcd1454d58639c' into eclair-mr2

* commit '1778776cf1349a5f275945c53edcd1454d58639c':
  Fix issue #2258571: Fix build versions
2009-11-12 23:06:58 -08:00
Android (Google) Code Review
1aa9f3cac3 Merge change I923d7d72 into eclair
* changes:
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 22:45:50 -08:00
Wink Saville
db9f06d9c4 resolved conflicts for merge of 2a1e9641 to eclair-mr2
Change-Id: Ie1e1e686a7ef26a8a3f583c9660930eb16ca2659
2009-11-12 22:44:11 -08:00
Daisuke Miyakawa
2a77d4633a am 592988d3: Add unit tests for Japanization and fix several bugs.
Merge commit '592988d307e8d305ca163c4e58da0fb350054194' into eclair-mr2-plus-aosp

* commit '592988d307e8d305ca163c4e58da0fb350054194':
  Add unit tests for Japanization and fix several bugs.
2009-11-12 19:08:23 -08:00
Android (Google) Code Review
11fea858b2 Merge change I8061e6ac into eclair
* changes:
  Fix 2209086: Updated assets and fixed widget dimension calculation.
2009-11-12 18:51:35 -08:00
Jim Miller
4811d62d5f Fix 2209086: Updated assets and fixed widget dimension calculation.
Added hvga assets for new lock screen widget.

Tested:
	LockScreen on wvga and hvga devices.
	InCallScreen on wvga and hvga devices.
2009-11-12 18:15:00 -08:00