Commit Graph

4081 Commits

Author SHA1 Message Date
Dianne Hackborn
da511167ca am 23ef7b48: Fix most of issue #2271640: Fix wallpaper etc docs
Merge commit '23ef7b4836d66d31430fedee2aac36275bb30d4b' into eclair-plus-aosp

* commit '23ef7b4836d66d31430fedee2aac36275bb30d4b':
  Fix most of issue #2271640: Fix wallpaper etc docs
2009-11-18 19:07:46 -08:00
Dianne Hackborn
23ef7b4836 Fix most of issue #2271640: Fix wallpaper etc docs
Only thing remaining is the live wallpaper feature.

Change-Id: I8854c7978999d759bf618307f4f984c9c89d3fc8
2009-11-18 18:34:19 -08:00
Mike Lockwood
8cfccb1514 am 03786b83: Merge change I813fdb7a into eclair
Merge commit '03786b83bd02f8dd8e1049d333fbfdee395ac965' into eclair-plus-aosp

* commit '03786b83bd02f8dd8e1049d333fbfdee395ac965':
  Fixes for proximity sensor behavior:
2009-11-18 16:24:59 -08:00
Android (Google) Code Review
03786b83bd Merge change I813fdb7a into eclair
* changes:
  Fixes for proximity sensor behavior:
2009-11-18 16:20:32 -08:00
Mike Lockwood
0e39ea83c5 Fixes for proximity sensor behavior:
Add optional flag to Wakelock.release() to specify whether we should wait for proximity sensor to go negative before turning on the screen.
Clear the "waiting for proximity sensor to go negative" state when the power key is pressed.

Part of the fix for b/2243198 (Black screen lockup after ending call)

Change-Id: I813fdb7aa4192cd3384a25be9e59d7d4b90da53a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-18 18:45:59 -05:00
Dianne Hackborn
4393822e60 am dfc066e7: Merge change I5ad37324 into eclair
Merge commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f' into eclair-plus-aosp

* commit 'dfc066e769ec227b4dbf0e2e5097973c20c2b34f':
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
2009-11-18 15:13:12 -08:00
Dianne Hackborn
abcb849d09 am 1d62ea9d: Fix issue #2249821: Unable to start passion in safe mode
Merge commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e' into eclair-plus-aosp

* commit '1d62ea9d8c2646d198b6967e2c6ae3dad5c18f9e':
  Fix issue #2249821: Unable to start passion in safe mode
2009-11-18 11:49:59 -08:00
Dianne Hackborn
f931520287 Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
Don't hold the global package log while instantiated an AssetManager+Resources, since
this is a fairly heavy-weight operation, and if done in the background can starve the
foreground.

Change-Id: I5ad37324fb7c27ffdbf28e1498ca0ad667479580
2009-11-18 11:47:15 -08:00
Dianne Hackborn
1d62ea9d8c Fix issue #2249821: Unable to start passion in safe mode
Holding down the trackball now works.

Also fix a little API check warning from Intent.

Change-Id: Icb1f901535cb521917bf7f847a93c4ff7861d20e
2009-11-18 11:42:32 -08:00
Eric Fischer
419094223a am 04a0e969: Merge change Id7c432bf into eclair
Merge commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec' into eclair-plus-aosp

* commit '04a0e969c6ae4c81a187ce70fdcee3f026eee7ec':
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 17:54:23 -08:00
Android (Google) Code Review
04a0e969c6 Merge change Id7c432bf into eclair
* changes:
  Add vertical bar to the alt-space character picker for the hardware keyboard.
2009-11-17 17:51:37 -08:00
Jaikumar Ganesh
d2709747b6 am 660282dc: Merge change I706fe6b0 into eclair
Merge commit '660282dc3e81784224945be0787a9e2d4276de8c' into eclair-plus-aosp

* commit '660282dc3e81784224945be0787a9e2d4276de8c':
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 17:36:06 -08:00
Eric Fischer
d7c432bf7f Add vertical bar to the alt-space character picker for the hardware keyboard.
Bug 2242177

Approver: jerryw
2009-11-17 16:28:30 -08:00
Android (Google) Code Review
660282dc3e Merge change I706fe6b0 into eclair
* changes:
  Check if Bluetooth is enabled before making any calls down.
2009-11-17 16:07:58 -08:00
Dianne Hackborn
0929928212 am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore
Merge commit '60d7db4c3e3d60060e7ac021445ea1f510b7a1fb' into eclair-plus-aosp

* commit '60d7db4c3e3d60060e7ac021445ea1f510b7a1fb':
  Fix #2262593: 42 ANR reports from android.process.acore
2009-11-16 17:36:32 -08:00
Jaikumar Ganesh
8c9dd7d8b9 Check if Bluetooth is enabled before making any calls down.
This was causing problems when apps were making calls, without
turning on BT first.

Bug: 2234918
Dr No: Eastham
2009-11-16 17:29:27 -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
2c13b9d155 am e0cadd7c: Merge change Iffbb6e55 into eclair
Merge commit 'e0cadd7cd811a674df62279dec00d17678b2c501' into eclair-plus-aosp

* commit 'e0cadd7cd811a674df62279dec00d17678b2c501':
  Make perf metrics collection & output via instrumentation simpler
2009-11-16 15:25:01 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jaikumar Ganesh
738ed80262 Fix BMW and Audi auto pairing lists.
Bug no:2256558
Dr No:Eastham
2009-11-11 23:12:04 -08:00
Android (Google) Code Review
34d723d8fa Merge change I32371166 into eclair
* changes:
  Fix issue #2239203: Setting large background causes OOME and soft-reboot spiral
2009-11-11 23:10:06 -08:00
Dianne Hackborn
c9dbbe28f7 Fix issue #2239203: Setting large background causes OOME and soft-reboot spiral
Try really really hard not to crash, for any reason.

Change-Id: I32371166229825f13fc8d12d5cf3a6531cdb345e
2009-11-11 22:50:37 -08:00
Jaikumar Ganesh
ebafd95f34 am 013b0e53: Merge change I143ea844 into eclair
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-plus-aosp

* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
  Add BMW and Audi to Auto Pairing black list.
2009-11-11 22:49:48 -08:00