5635 Commits

Author SHA1 Message Date
Romain Guy
6c71d476f3 am 8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #2428005.
Merge commit '8368ef0b670f8193f3161671b119e78b1fb659a1' into eclair-plus-aosp

* commit '8368ef0b670f8193f3161671b119e78b1fb659a1':
  Manual merge of 40080 DO NOT MERGE
2010-02-17 21:10:34 -08:00
Romain Guy
8368ef0b67 Manual merge of 40080 DO NOT MERGE
Properly notifies listener when an animation is cancelled.
Bug: #2428005.
2010-02-17 20:49:10 -08:00
Eric Laurent
61bb25f2f9 am c1eba82b: Merge "Fix issue: 2413494: Add TTY support." into eclair
Merge commit 'c1eba82ba479006045c1d7a4c8ceba116a9602d1' into eclair-plus-aosp

* commit 'c1eba82ba479006045c1d7a4c8ceba116a9602d1':
  Fix issue: 2413494: Add TTY support.
2010-02-11 09:34:59 -08:00
Eric Laurent
c1eba82ba4 Merge "Fix issue: 2413494: Add TTY support." into eclair 2010-02-11 09:23:21 -08:00
Eric Laurent
7749adfd01 Fix issue: 2413494: Add TTY support.
This is a new implementation of TTY support.
Previous implementation in commit aead64def1fe58c95c086a0ca00cf0b13fa32ef1 is reverted.
The new method does not rely any more on the kernel headset driver to send a UEvent containing
current TTY mode.
2010-02-10 11:23:04 -08:00
Bart Sears
eb42a28837 am a1ab9766: Merge "DO NOT MERGE" into eclair
Merge commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db' into eclair-plus-aosp

* commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db':
  DO NOT MERGE
2010-02-10 09:41:06 -08:00
Bart Sears
a1ab976671 Merge "DO NOT MERGE" into eclair 2010-02-10 09:35:37 -08:00
Grace Kloba
b3316d35ff DO NOT MERGE
cherry-pick https://android-git.corp.google.com/g/#change,29843 from eclair-mr2
This will cherry-pick SHA1: 58def690a87b4aa2c01331c06b61e457198de0ea

This will workaround the following three bugs which are occuring because
the webview DB is getting corrupted:

http://b/issue?id=2338178
http://b/issue?id=2278210
http://b/issue?id=2405650

Here are the comments from the eclair-mr2 CL:

If openOrCreateDatabase() throws an exception, delete
the old db and re-do it. If it still fails, something
bad happens, like the directory may have the different
permission. Let it throw as WebView needs the db.

Fix http://b/issue?id=2179339
2010-02-10 09:24:31 -08:00
Bart Sears
789b11c715 am 926780b0: Merge "DO NOT MERGE" into eclair
Merge commit '926780b023a09d37e8dcf1fabf6fa990f042f06d' into eclair-plus-aosp

* commit '926780b023a09d37e8dcf1fabf6fa990f042f06d':
  DO NOT MERGE
2010-02-10 09:18:37 -08:00
Grace Kloba
614f8450a7 DO NOT MERGE
cherry-pick https://android-git.corp.google.com/g/#change,39258 from master

Now mSupportMultiTouch is depending on WebSettings,
it can't be static any more.

Fix http://b/issue?id=2413364
2010-02-09 18:20:28 -08:00
Adam Powell
87da860616 Manually merged VelocityTracker changes 2010-02-09 14:25:41 -08:00
Adam Powell
18f75bd45c am e88192b9: Cleanup fixes for ScaleGestureDetector
Merge commit 'e88192b9d2a8c364d8545471907c5baa275bb5f6' into eclair-plus-aosp

* commit 'e88192b9d2a8c364d8545471907c5baa275bb5f6':
  Cleanup fixes for ScaleGestureDetector
2010-02-09 10:55:57 -08:00
Adam Powell
e88192b9d2 Cleanup fixes for ScaleGestureDetector 2010-02-09 10:27:48 -08:00
The Android Open Source Project
ad9bcb22d0 merge from open-source master 2010-02-05 13:55:16 -08:00
Adam Powell
b09ef7b4fa Merge "Use a circular buffer in VelocityTracker" 2010-02-05 13:01:22 -08:00
Andreas Agvard
4766defdd0 Fixed Android animation framework, for using interpolators that do not start at 0.0f
There is a bug that affects interpolators that do not return 0.0f when given 0.0f as input. All default interpolators in Android do return 0.0f, which is why it hasn't been
noticed. Some custom interpolators can for example run backwards, returning 1.0f when given input 0.0f.
2010-02-05 08:16:01 +01:00
Eric Laurent
dd24f59906 am aead64de: Fix issue: 2413494: [Passion-c] Add TTY support.
Merge commit 'aead64def1fe58c95c086a0ca00cf0b13fa32ef1' into eclair-plus-aosp

* commit 'aead64def1fe58c95c086a0ca00cf0b13fa32ef1':
  Fix issue: 2413494: [Passion-c] Add TTY support.
2010-02-04 09:34:34 -08:00
Eric Laurent
aead64def1 Fix issue: 2413494: [Passion-c] Add TTY support.
Handle TTY mode change events received by HeadsetObserver and send information down to AudioHardware with AudioManager.setParameters()

Use setting "tty_mode_uses_heaset_events" in core config.xml to indicate if the product uses this particular
method of indicating the TTY mode change.
2010-02-03 23:35:34 -08:00
Marc Capdevielle
ce760cd6df Use a circular buffer in VelocityTracker
Optimizes the frequently called addPoint() method while keeping the
same velocity computation.

Thx Cyril Mottier for help and tests.
2010-02-03 11:15:38 +01:00
Jim Miller
3a8a28185b am d8a3a895: Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Merge commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c' into eclair-plus-aosp

* commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c':
  Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
2010-01-29 18:06:48 -08:00
Jim Miller
d8a3a8957b Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Updated javadoc.
2010-01-29 17:59:33 -08:00
Grace Kloba
bb074ef9c2 am 769ed21c: Fix http://b/issue?id=2400423.
Merge commit '769ed21c33c3629411eb3bbf924de45737a18067' into eclair-plus-aosp

* commit '769ed21c33c3629411eb3bbf924de45737a18067':
  Fix http://b/issue?id=2400423.
2010-01-27 12:30:19 -08:00
Grace Kloba
769ed21c33 Fix http://b/issue?id=2400423.
When the same page is loaded, updateRestoreState
will be false when we finish the first layout. As
we are still in the same page, we don't want to
update the current zoom/scroll. But in some cases,
like a site switch from mobile to full site and
keeps the same url, we do want to update the zoom
range as the viewport spec changed. Otherwise, user
can't zoom in the full site as the WebView thought
it is still a mobile non-scalable page.
2010-01-27 12:24:38 -08:00
Jim Miller
fbf977be54 am 9985867a: Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
Merge commit '9985867a8eb80c6db84c80a9b5e96bd68e2d14d7' into eclair-plus-aosp

* commit '9985867a8eb80c6db84c80a9b5e96bd68e2d14d7':
  Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode.
2010-01-26 13:55:16 -08:00
Jim Miller
9985867a8e Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode. 2010-01-26 12:34:25 -08:00
Mike Reed
b22446901c am f904be16: Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair
Merge commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737' into eclair-plus-aosp

* commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737':
  disable high-quality filtering during scrolling, until I can cached the scaled images.
2010-01-25 06:24:35 -08:00
Mike Reed
f904be1659 Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair 2010-01-25 06:19:17 -08:00
Mike Reed
729d8369b5 disable high-quality filtering during scrolling, until I can cached the scaled images. 2010-01-25 08:30:35 -05:00
Jim Miller
33ca1f3218 am 2e4e25f3: Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair
Merge commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc' into eclair-plus-aosp

* commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc':
  Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
2010-01-22 20:23:37 -08:00
Jim Miller
af1b980ef1 Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
This is intended as a workaround for the long text lines introduced in https://android-git.corp.google.com/g/#change,38100.
2010-01-22 19:09:50 -08:00
Grace Kloba
4f01c92750 am 5ff24d5d: DO NOT MERGE
Merge commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d' into eclair-plus-aosp

* commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d':
  DO NOT MERGE
2010-01-22 13:17:52 -08:00
Grace Kloba
5ff24d5da4 DO NOT MERGE
This reverts commit 52cb3cbd6fe06e3706be1a7c2939f027106aaaf7.
2010-01-22 12:45:54 -08:00
Fred Quintana
6f3e1e27a6 am 9a400fa4: Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair
Merge commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1' into eclair-plus-aosp

* commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1':
  initialize sync adapters that get installed while the system is running
2010-01-21 17:35:28 -08:00
Fred Quintana
9a400fa4d3 Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair 2010-01-21 17:30:07 -08:00
Eric Fischer
ad0e536355 am 50adb167: Pull in "emergency calls only" translations.
Merge commit '50adb167534889421dc0d7cfc7d3bf663c03f01c' into eclair-plus-aosp

* commit '50adb167534889421dc0d7cfc7d3bf663c03f01c':
  Pull in "emergency calls only" translations.
2010-01-21 15:14:30 -08:00
John Wang
97fdd0aba9 am 7f70998d: Merge "Add Emergency Calls Only String." into eclair
Merge commit '7f70998dec6d7db850373b7e75677ecf72904878' into eclair-plus-aosp

* commit '7f70998dec6d7db850373b7e75677ecf72904878':
  Add Emergency Calls Only String.
2010-01-21 14:06:35 -08:00
Eric Fischer
50adb16753 Pull in "emergency calls only" translations. 2010-01-21 13:52:09 -08:00
John Wang
7f70998dec Merge "Add Emergency Calls Only String." into eclair 2010-01-21 13:38:32 -08:00
Fred Quintana
44037e6c41 initialize sync adapters that get installed while the system is running
bug http://b/issue?id=2360782
2010-01-21 13:14:49 -08:00
John Wang
f936745f5a Add Emergency Calls Only String.
Prepare strings for bug 2352094.

The string is the same as the settings.R.string.radioInfo_service_emergency,
so use the same msgid and translations.
2010-01-21 12:46:01 -08:00
Wei Huang
29bc7270ec am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair
Merge commit '495bae67ff7df4a11325a4cc1d8af288f82128fe' into eclair-plus-aosp

* commit '495bae67ff7df4a11325a4cc1d8af288f82128fe':
  fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
2010-01-21 12:28:08 -08:00
Wei Huang
22149f3d4e fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
- ContactHeaderWidget has cascading async queries, which weren't cancelled if a new query for a different phone number is started.
If the new query fails to find a corresponding contact, the old async queries from the previous number could end up setting the
contact name and photo to the wrong contact.

I tested this by calling

  ContactHeaderWidget.bindFromPhoneNumber(number1);
  ContactHeaderWidget.bindFromPhoneNumber(number2);

where number1 has a corresponding contact in the databse, and number2 doesn't. At the end of these 2 calls, the ContactHeaderWidget
would display the contact info for number1.

- also found a bug in AsyncQueryHandler.cancelOperation(), which doesn't reliably cancel the previous query. In ContactHeaderWidget's
case, we really depend on the cancelling to work. So work around this bug by resetting mAsyncQueryHandler when we need to do a
new lookup/query. When the old query result is passed back in the callback, discard the result if the QueryHandler is not the same
as mAsyncQueryHandler.

Change-Id: Ice79e77f787af03400e080cbd58162a91838181f
2010-01-21 12:06:43 -08:00
The Android Open Source Project
176a88ff14 merge from open-source master 2010-01-21 11:21:25 -08:00
Grace Kloba
e5b9beae26 am f6aed0e0: Merge "DO NOT MERGE" into eclair
Merge commit 'f6aed0e0a7c96094b66f5426baad78032b794497' into eclair-plus-aosp

* commit 'f6aed0e0a7c96094b66f5426baad78032b794497':
  DO NOT MERGE
2010-01-20 23:34:42 -08:00
Grace Kloba
f6aed0e0a7 Merge "DO NOT MERGE" into eclair 2010-01-20 23:30:05 -08:00
Grace Kloba
5b74576218 am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change.
Merge commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp

* commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b':
  ScaleGestureDetector needs to query the displaymetrics
2010-01-20 23:26:03 -08:00
Grace Kloba
d5ada83c71 ScaleGestureDetector needs to query the displaymetrics
for the width/height on each touch down as orientation
can change.

This should fix the problem where we can't pinch on the
top right corner when device is in landscape mode.
2010-01-20 23:06:43 -08:00
Grace Kloba
52cb3cbd6f DO NOT MERGE
Just scale the canvas instead of changing the real
scale factor during pinch.

Added over limit zoom feedback for pinch in the WebView.

Fix http://b/issue?id=2383539
2010-01-20 21:58:27 -08:00
Grace Kloba
aeeb1a84aa am 8681df90: DO NOT MERGE
Merge commit '8681df902e8cc61d290808c5d78ea48920d30f3b' into eclair-plus-aosp

* commit '8681df902e8cc61d290808c5d78ea48920d30f3b':
  DO NOT MERGE
2010-01-20 19:20:57 -08:00
Grace Kloba
8681df902e DO NOT MERGE
Adopt the sloppy detection in the ScaleGestureDetector.
Try to fix the fat thumb problem.

Fix http://b/issue?id=2385061
2010-01-20 19:15:44 -08:00