Commit Graph

6299 Commits

Author SHA1 Message Date
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
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
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
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
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
Jean-Baptiste Queru
9db3d07b96 eclair snapshot 2009-11-13 13:53:39 -08:00
Jaikumar Ganesh
92a110023c am 66b6b90b: am f05ec923: Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit '66b6b90bbf2d3f71574472bdabe87f2b4b4d10d0'

* commit '66b6b90bbf2d3f71574472bdabe87f2b4b4d10d0':
  Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
2009-11-13 13:45:05 -08: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
Jaikumar Ganesh
d7fdda2f06 am 9284dec7: Merge change I4c05ba1f into eclair
Merge commit '9284dec737da58a92b3aa916a357e700d291a68a' into eclair-plus-aosp

* commit '9284dec737da58a92b3aa916a357e700d291a68a':
  Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
2009-11-13 12:10:19 -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
35b921669d am fd13fb7a: am b0d2313e: am d05fd6c3: am dbc7e27e: docs: document the \'showSearchIconAsBadge" flag and "icon" attribute as deprecated. bug 2105329
Merge commit 'fd13fb7a9cbda152c25f28989cb3ce2e316406d3'

* commit 'fd13fb7a9cbda152c25f28989cb3ce2e316406d3':
  docs: document the 'showSearchIconAsBadge" flag and
2009-11-13 11:37:52 -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
7c8fcc19db am d05fd6c3: am dbc7e27e: docs: document the \'showSearchIconAsBadge" flag and "icon" attribute as deprecated. bug 2105329
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-plus-aosp

* commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f':
  docs: document the 'showSearchIconAsBadge" flag and
2009-11-13 11:11:57 -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
Eric Laurent
bfdece49cf am 355743c7: am 609acfd2: am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '355743c70d9810fda3e59d718d055f9513fb05b7'

* commit '355743c70d9810fda3e59d718d055f9513fb05b7':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-13 10:53:01 -08:00
Jim Miller
52349182e1 am c41bc910: am 5be290d6: am 11fea858: Merge change I8061e6ac into eclair
Merge commit 'c41bc910bd6fe3daf56c32a5be858b71872093d3'

* commit 'c41bc910bd6fe3daf56c32a5be858b71872093d3':
  Fix 2209086: Updated assets and fixed widget dimension calculation.
2009-11-13 10:52:32 -08:00
Dianne Hackborn
ddbc0107b7 am 255ba31a: am 1ca191c2: am 1778776c: Fix issue #2258571: Fix build versions
Merge commit '255ba31a75d864d9c7278c9aceb542652b80d586'

* commit '255ba31a75d864d9c7278c9aceb542652b80d586':
  Fix issue #2258571: Fix build versions
2009-11-13 10:51:54 -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
Wink Saville
b74ebcabe0 am 126fee88: am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2
Merge commit '126fee88d480939d46b8ddd1e3a03cdd193fa040'

* commit '126fee88d480939d46b8ddd1e3a03cdd193fa040':
  Add code to use Gservices provided values for throtting NITZ updates.
2009-11-12 23:13:17 -08:00
Daisuke Miyakawa
5b65ef4c95 am 2a77d463: am 592988d3: Add unit tests for Japanization and fix several bugs.
Merge commit '2a77d4633aae1d04054fb09850d7939aa386b0a0'

* commit '2a77d4633aae1d04054fb09850d7939aa386b0a0':
  Add unit tests for Japanization and fix several bugs.
2009-11-12 23:13:03 -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