Commit Graph

4381 Commits

Author SHA1 Message Date
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
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
Evan Millar
a18c45b7ce am 6bcd99c2: Merge change I1b6d202b into eclair
Merge commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef' into eclair-plus-aosp

* commit '6bcd99c2a63338254c68e27e40e5395cbdd3e1ef':
  Move photo querying off main thread.
2009-11-17 14:45:00 -08:00
Evan Millar
1b6d202bd4 Move photo querying off main thread.
Fixes bug http://b/issue?id=2265642
2009-11-17 12:07:41 -08:00
Jim Miller
c586726dac am f0166e4d: Merge change I4f01d4a4 into eclair
Merge commit 'f0166e4dd0907e487531960e36f516406d265b73' into eclair-plus-aosp

* commit 'f0166e4dd0907e487531960e36f516406d265b73':
  Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
2009-11-16 23:52:25 -08:00
Jim Miller
4f01d4a4da Fix 2209086: Clean up visual glitches in SlidingTab for lock and incall screen.
This fixes the following glitches:
- flash at the end of animation as the widget resets. Fix: new "hold" animation holds the view for 1 second, allowing it to transition before we reset the view.
- target flashing. Fix: remove AlphaAnimation when we want to hide the target.
- bar appears to get stuck at edge. Fix: sliding bar now slides fully offscreen when hold == true.  Added setHoldAfterTrigger() method to allow InCallScreen and LockScreen to have different behaviors.
- view continues to animate when shown again. Fix: reset the animations and sliders when the view is hidden.

Tested:
	Answer/Decline call on CDMA and GSM device.
	Unlock phone and toggle sound on/off in LockScreen on both devices.
2009-11-16 23:08:35 -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
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
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
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
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
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
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
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
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
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