5431 Commits

Author SHA1 Message Date
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
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
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
Android (Google) Code Review
65f27f8721 Merge change I98f82b9a into eclair
* changes:
  Fix the full-weekday date format strings to actually use the full weekday.
2009-11-13 14:51:00 -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
Eric Fischer
66668524d4 Fix the full-weekday date format strings to actually use the full weekday.
Also fix the abbreviated weekday/month/day/year strings to use a 4-digit year.

Approver: jerryw
2009-11-13 14:04:03 -08:00
Jean-Baptiste Queru
9db3d07b96 eclair snapshot 2009-11-13 13:53:39 -08:00
Nicolas Catania
a128070a91 am 73f8aa67: Merge change I4898b145 into eclair
Merge commit '73f8aa678055598738dfba54c60a1674bcbf02b1' into eclair-plus-aosp

* commit '73f8aa678055598738dfba54c60a1674bcbf02b1':
  Removed the fixed height in the sim unlock screen's header.
2009-11-13 13:43:11 -08:00
Android (Google) Code Review
73f8aa6780 Merge change I4898b145 into eclair
* changes:
  Removed the fixed height in the sim unlock screen's header.
2009-11-13 13:39:01 -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
Mike Cleron
e351da6cde am 27d6e65b: Merge change I322b6ee7 into eclair
Merge commit '27d6e65b71f515deafbd93d5aa98732898c34ddf' into eclair-plus-aosp

* commit '27d6e65b71f515deafbd93d5aa98732898c34ddf':
  Add support for making a LiveWallpaper the default
2009-11-13 11:12: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
Android (Google) Code Review
27d6e65b71 Merge change I322b6ee7 into eclair
* changes:
  Add support for making a LiveWallpaper the default
2009-11-13 11:01:57 -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 Fischer
0a75f008c2 am b4c20fca: Merge change Ifb28d340 into eclair
Merge commit 'b4c20fca102a2ec6acf1648f2fd16d54fdc07f56' into eclair-plus-aosp

* commit 'b4c20fca102a2ec6acf1648f2fd16d54fdc07f56':
  Import revised translations.  DO NOT MERGE
2009-11-13 10:31:40 -08:00
Android (Google) Code Review
b4c20fca10 Merge change Ifb28d340 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-11-13 10:13:42 -08:00
Mike Cleron
322b6ee7e1 Add support for making a LiveWallpaper the default 2009-11-12 23:23:49 -08:00
Eric Laurent
e8302a64c7 am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-plus-aosp

* commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 22:49:51 -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
Eric Fischer
fb28d340bf Import revised translations. DO NOT MERGE
Approver: jerryw
2009-11-12 19:45:43 -08:00
Jim Miller
a488be82a1 am 11fea858: Merge change I8061e6ac into eclair
Merge commit '11fea858b2f2d3f9c40a4da848d7bcee47edde04' into eclair-plus-aosp

* commit '11fea858b2f2d3f9c40a4da848d7bcee47edde04':
  Fix 2209086: Updated assets and fixed widget dimension calculation.
2009-11-12 19:29:22 -08:00
Dianne Hackborn
1178644c3c am 1778776c: Fix issue #2258571: Fix build versions
Merge commit '1778776cf1349a5f275945c53edcd1454d58639c' into eclair-plus-aosp

* commit '1778776cf1349a5f275945c53edcd1454d58639c':
  Fix issue #2258571: Fix build versions
2009-11-12 19:08:54 -08:00
Wink Saville
1eee8ef30e am 2a1e9641: Merge change Ie122606f into eclair
Merge commit '2a1e96412c66f22939c010f10524122718c7bbeb' into eclair-plus-aosp

* commit '2a1e96412c66f22939c010f10524122718c7bbeb':
  Add code to use Gservices provided values for throtting NITZ updates.
2009-11-12 19:07:30 -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
Dianne Hackborn
1778776cf1 Fix issue #2258571: Fix build versions
Update the definition of SDK 6, remove all new APIs from it.

Change-Id: Id96827f630ab46279d9ad8d3f7498e5515e0a688
2009-11-12 17:02:03 -08:00
Nicolas Catania
4898b145bd Removed the fixed height in the sim unlock screen's header.
Use wrap content and set the textview for the explaination
to 2 lines.
Fixed the bug on passion.
G1 is too unstable to test.

Bug:2251298
2009-11-12 16:18:33 -08:00
Android (Google) Code Review
2a1e96412c Merge change Ie122606f into eclair
* changes:
  Add code to use Gservices provided values for throtting NITZ updates.
2009-11-12 15:12:08 -08:00
Jim Miller
ee6dea917b am 2477fd69: Merge change Ic31c11ad into eclair
Merge commit '2477fd69492055f3c6ee62ed9993e9fde8283144' into eclair-plus-aosp

* commit '2477fd69492055f3c6ee62ed9993e9fde8283144':
  Fix 2209086: restore drawable states when drawables change.
2009-11-12 13:18:13 -08:00
Dan Egnor
e76bca821c am 58c603ef: Merge change Id301a47f into eclair
Merge commit '58c603eff0d0b13fe581119e1d9c228da99d77e7' into eclair-plus-aosp

* commit '58c603eff0d0b13fe581119e1d9c228da99d77e7':
  Fix bug 2253204: MapView resources for hdpi devices.
2009-11-12 13:18:02 -08:00
Android (Google) Code Review
2477fd6949 Merge change Ic31c11ad into eclair
* changes:
  Fix 2209086: restore drawable states when drawables change.
2009-11-12 13:13:58 -08:00
Android (Google) Code Review
58c603eff0 Merge change Id301a47f into eclair
* changes:
  Fix bug 2253204: MapView resources for hdpi devices.
2009-11-12 12:54:43 -08:00
Dan Egnor
d301a47ff9 Fix bug 2253204: MapView resources for hdpi devices. 2009-11-12 12:24:33 -08:00
Eric Laurent
923d7d721d Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
The headset state indicated by HeadsetObserver in the broadcast intent ACTION_HEADSET_PLUG was not 0 or 1 as specified in the java doc but contained a bit field indicating the type of headset connected.

Modified HeadsetObserver to broacast a state conforming to java doc.
Added an extra to intent ACTION_HEADSET_PLUG to indicate if headset has a microphone or not.
Removed handling of non standard headset indications from HeadsetObserver.
Removed platform specific devices from output devices defined in AudioSystem.
Modified AudioService to use new ACTION_HEADSET_PLUG intent extra instead of bitfield in state.
2009-11-12 12:09:06 -08:00
Jim Miller
4df2c5433b Fix 2209086: restore drawable states when drawables change.
This fixes a bug where the right tab hightlight wasn't being seen.
The prooblem was that we weren't preserving the drawables' states when
the application requested a new drawable. We now track the drawable state
so we can updated it when the resources change.
2009-11-12 11:23:29 -08:00
Daniel Sandler
344329d7b1 am 609bbf18: Merge change I54089080 into eclair
Merge commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1' into eclair-plus-aosp

* commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1':
  Update keyguard and pattern-lock layouts for new UX designs.
2009-11-12 10:37:40 -08:00
Daniel Sandler
e3ea6e3d4c Update keyguard and pattern-lock layouts for new UX designs.
To do this, we bring DigitalClock over from Clock into the
internal widgets.  Its font, Clockopia, comes along for the
ride (find it in /system/fonts).

This change is required for relevant code changes in
frameworks/policy/phone.

Change-Id: I354534f1abd9cf9557c9d18566f1d55b6be5e8f1
2009-11-12 09:37:44 -08:00
Jaikumar Ganesh
a96e6f6b2d am 3c58d279: Merge change I738ed802 into eclair
Merge commit '3c58d279abed1da56b0ece74ded5854c509a42a4' into eclair-plus-aosp

* commit '3c58d279abed1da56b0ece74ded5854c509a42a4':
  Fix BMW and Audi auto pairing lists.
2009-11-11 23:31:14 -08:00
Android (Google) Code Review
3c58d279ab Merge change I738ed802 into eclair
* changes:
  Fix BMW and Audi auto pairing lists.
2009-11-11 23:27:03 -08:00
Dianne Hackborn
f91984a1e1 am 34d723d8: Merge change I32371166 into eclair
Merge commit '34d723d8fa75e8f97401311e03b3839246143018' into eclair-plus-aosp

* commit '34d723d8fa75e8f97401311e03b3839246143018':
  Fix issue #2239203: Setting large background causes OOME and soft-reboot spiral
2009-11-11 23:12:18 -08:00