Commit Graph

16870 Commits

Author SHA1 Message Date
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
Jeff Sharkey
05e0ef9fa4 am 1162fd77: Let RemoteViews nest children, allow ViewFlipper.
Merge commit '1162fd77a8ff8467c96204c00bcaf941aef6aa85' into eclair-plus-aosp

* commit '1162fd77a8ff8467c96204c00bcaf941aef6aa85':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-16 14:38:29 -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
Kenny Root
6c2d4029f1 Time.parse3339 range checking and proper 'sec-frac' skip
The parse3339 JNI code doesn't properly do bounds checking on the input String.
These changes do some bounds checking to prevent a buffer underflow condition.

parse3339 should allow the fractional seconds to be optional and an arbitrary
length as specified in RFC 3339. This will scan through arbitrary precision
until it finds the timezone indicators.

Change-Id: Ie9d01d0b24163d893c58c747d37873c83b74e6c7
2009-11-16 14:30:24 -06: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
d96d08bf76 am 521d400b: Fix 2209086: Add animations and misc ui improvements to SlidingTab.
Merge commit '521d400b230bee5e7b9748f26832c0d0275b8253' into eclair-plus-aosp

* commit '521d400b230bee5e7b9748f26832c0d0275b8253':
  Fix 2209086: Add animations and misc ui improvements to SlidingTab.
2009-11-15 17:17:05 -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
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
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
Jean-Baptiste Queru
478de466ce merge from eclair 2009-11-15 12:06:23 -08:00
Jim Miller
9448e55044 am e5608f5e: Merge change Ied958262 into eclair
Merge commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b' into eclair-plus-aosp

* commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b':
  Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.
2009-11-15 11:43:44 -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
Fred Quintana
834b1e7016 am 383aa124: Merge change I60ff11dc into eclair
Merge commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae' into eclair-plus-aosp

* commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae':
  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:17:16 -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
Jim Miller
b201f72609 am 7c1c4600: Merge change I425ca595 into eclair
Merge commit '7c1c46000be136ffda36283fdc93bfe3cba72601' into eclair-plus-aosp

* commit '7c1c46000be136ffda36283fdc93bfe3cba72601':
  Fix 2261626: Don't show text on button if orientation is vertical.
2009-11-14 02:43:19 -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
Eric Fischer
b31e0c6b0f am d12ba5e0: Merge change Ibd5b099c into eclair
Merge commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9' into eclair-plus-aosp

* commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9':
  Import revised translations.  DO NOT MERGE
2009-11-13 17:45:46 -08:00
Android (Google) Code Review
d12ba5e04b Merge change Ibd5b099c into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-11-13 17:42:19 -08:00
Eric Fischer
bd5b099c25 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-11-13 17:13:39 -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
Trevor Johns
efdb6f978c Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Changed "thelayout" to "the layout".
2009-11-13 16:10:44 -08:00
Mike Lockwood
4c38ea650f am c104e1b3: am dc656339: am 991475a2: Merge change I0e419fcf into eclair
Merge commit 'c104e1b3912f1389848b0cc841866564d9314287'

* commit 'c104e1b3912f1389848b0cc841866564d9314287':
  Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
2009-11-13 15:28:40 -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
Mike Lockwood
017279288b am 991475a2: Merge change I0e419fcf into eclair
Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-plus-aosp

* commit '991475a2e5dcb344299387521b52fb637d6b1e4d':
  Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
2009-11-13 15:20:36 -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
Eric Fischer
6f711598d0 am 3eb76e16: am 7d7257dd: am 65f27f87: Merge change I98f82b9a into eclair
Merge commit '3eb76e1669807c737e883c5a5f094a170f55a3b9'

* commit '3eb76e1669807c737e883c5a5f094a170f55a3b9':
  Fix the full-weekday date format strings to actually use the full weekday.
2009-11-13 15:06:28 -08:00
Nicolas Catania
ceaf090ec7 am 702a8da8: am 235657db: am 73f8aa67: Merge change I4898b145 into eclair
Merge commit '702a8da8ae085328d8b99d14fa843b720f0878eb'

* commit '702a8da8ae085328d8b99d14fa843b720f0878eb':
  Removed the fixed height in the sim unlock screen's header.
2009-11-13 15:05:57 -08:00
Eric Fischer
3eb76e1669 am 7d7257dd: am 65f27f87: Merge change I98f82b9a into eclair
Merge commit '7d7257dd9cbe38453678f2803032e283a0344424' into eclair-mr2-plus-aosp

* commit '7d7257dd9cbe38453678f2803032e283a0344424':
  Fix the full-weekday date format strings to actually use the full weekday.
2009-11-13 15:01:28 -08:00
Eric Fischer
d35f0bc917 am 65f27f87: Merge change I98f82b9a into eclair
Merge commit '65f27f8721ae648ceffffb59a83e2af0d4641920' into eclair-plus-aosp

* commit '65f27f8721ae648ceffffb59a83e2af0d4641920':
  Fix the full-weekday date format strings to actually use the full weekday.
2009-11-13 14:58:41 -08:00