12192 Commits

Author SHA1 Message Date
The Android Open Source Project
1e90ab542d merge from open-source master 2010-02-11 10:03:02 -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
Dirk Dougherty
87bdfd6d22 am d74bf162: Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
Merge commit 'd74bf1623913bade8f58369f39ebc666d551bb57' into eclair-plus-aosp

* commit 'd74bf1623913bade8f58369f39ebc666d551bb57':
  Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
2010-02-10 09:41:15 -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
Dirk Dougherty
d74bf16239 Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair 2010-02-10 09:38:01 -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
Bart Sears
926780b023 Merge "DO NOT MERGE" into eclair 2010-02-10 09:13:48 -08:00
Chander S Pechetty
27f3de6bac Fixs the incorrect message for SecurityException
when injecting a Key, Pointer and Trackball events into the UI across
applications, the corresponding methods throw SecurityException with
incorrect permission message.
INJECT EVENT permission should be INJECT_EVENTS
2010-02-10 22:14:00 +05:30
Dirk Dougherty
9553703476 Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
Change-Id: I63f881739352d91d296c5c07432eeda74b22000a
2010-02-09 18:45:47 -08:00
Dirk Dougherty
e524ff534e am 859f4556: Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
Merge commit '859f455645bc49e32330108b1ea9f85ffb80a2cd' into eclair-plus-aosp

* commit '859f455645bc49e32330108b1ea9f85ffb80a2cd':
  Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
2010-02-09 18:44:18 -08:00
Dirk Dougherty
859f455645 Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair 2010-02-09 18:41:32 -08:00
Dirk Dougherty
d323b4c338 Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
Change-Id: Idbeda9a677c9772a8348146fe028083d9887a9d2
2010-02-09 18:38:30 -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
Suchi Amalapurapu
37a00a36fb am 08be55b8: Add null checks when scanning a package. Delete packages whose code and resource paths haven\'t been set correctly.
Merge commit '08be55b8ea917a5273c135a7bdc73e41c8524c05' into eclair-plus-aosp

* commit '08be55b8ea917a5273c135a7bdc73e41c8524c05':
  Add null checks when scanning a package.
2010-02-08 17:27:33 -08:00
Suchi Amalapurapu
08be55b8ea Add null checks when scanning a package.
Delete packages whose code and resource paths haven't been set
correctly.
2010-02-08 17:10:24 -08:00
Cyril Mottier
b81b1447d2 Default RotateDrawable's pivot set to (50%, 50%)
In order to define the pivot in an XML-instanciated RotateDrawable, android:pivotX
and android:pivotY had to be set in your XML. Forgetting to set those attributes
ended up in a NullPointerException (tv = null) that were caught by the Resources.getDrawable()
method (caught as an Exception). As a result a not-very-accurate message was logged:
"Resource not found ...". Defining a default pivot value seems like a great fix.
Some other fixes would be to modify the documentation or notify the user with a better
explanation than "Resource not found ...".
2010-02-06 00:36:40 +01: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
Romain Guy
7d039fbe07 Merge "Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method" 2010-02-05 10:33:44 -08:00
Marc Capdevielle
8621cfa43f Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method
The ACTION_UP event was fired at the "fromX" position instead of being
fired at the "toX" position which is the current value of local var "x".

This bug had no real impact as the VelocityTracker always ignores the last
MotionEvent when it received more than 3 events...
2010-02-05 19:28:23 +01:00
The Android Open Source Project
0af0449301 am 31bfdf69: reconcile main tree with open-source eclair
Merge commit '31bfdf695ef741f64066ef605bd6a7e23df88714' into eclair-plus-aosp

* commit '31bfdf695ef741f64066ef605bd6a7e23df88714':
  android-2.1_r1 snapshot
  Use 128p map tiles for high dpi devices.
  Throttle nitz updates as the are too numerous on cdma.
  don't request a sync when temp providers are created
  Increase light sensor delay from one to two seconds.
  Revert jparks code from IPCThreadState.
  Add a warning when we leave threads in the binder thread pool in the background scheduling group.
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
  Fix regression.
  Fix broken build.
  Bluetooth A2DP suspend/resume functionality
  EventLog when a database file is deleted due to corruption.
  Don't forget to clear "backup in progress" state when finishing a pass
  Fix issue #2148939: Sholes slow to wake up in landscape mode
  Fix Cdma re-start of default connection.
  Merge change 26821 into eclair
  Not all WebView's host have permission to read the history.
  Merge change 26908 into eclair
2010-02-05 08:48:38 -08:00
The Android Open Source Project
31bfdf695e reconcile main tree with open-source eclair 2010-02-05 08:09:38 -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
Katie McCormick
b5c01b96a8 am 8a6c0607: Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair
Merge commit '8a6c060719c8870f370b82faa48ae2f437915214' into eclair-plus-aosp

* commit '8a6c060719c8870f370b82faa48ae2f437915214':
  SDK doc change: Fixed typo--fingure->finger
2010-02-03 20:21:26 -08:00
Katie McCormick
8a6c060719 Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair 2010-02-03 16:52:18 -08:00
Katie McCormick
db72f1ba85 SDK doc change: Fixed typo--fingure->finger
Bug: 1993220
2010-02-03 16:37:15 -08:00
Scott Main
2f7b69aab9 am 98a9fc0a: Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair
Merge commit '98a9fc0a0025a3df7b36f7752fc330eba8810603' into eclair-plus-aosp

* commit '98a9fc0a0025a3df7b36f7752fc330eba8810603':
  docs: revise the Style and Themes document to improve the
2010-02-03 16:18:17 -08:00
Scott Main
98a9fc0a00 Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair 2010-02-03 16:11:41 -08:00
Scott Main
4d5770904c docs: revise the Style and Themes document to improve the
clarity of the concepts and expand the available information
2010-02-03 14:50:15 -08:00
Megha Joshi
b299f802b2 am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair
Merge commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434' into eclair-plus-aosp

* commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434':
  Screenshots for sample syncadapter.
2010-02-03 12:29:19 -08:00
Megha Joshi
9f4cfc3afc Merge "Screenshots for sample syncadapter." into eclair 2010-02-03 12:24:20 -08:00
Megha Joshi
021a90dbaa Screenshots for sample syncadapter. 2010-02-03 11:21:45 -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
Mike Lockwood
8ab11f87ac Fix for GPS engines without separate session and engine status events.
GPS_STATUS_SESSION_BEGIN now implies GPS_STATUS_ENGINE_ON
and GPS_STATUS_ENGINE_OFF now implies GPS_STATUS_SESSION_END.

Change-Id: Ifeeb1d5094d1e7304974b7c3ac27dd83b1e65bca
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-02-02 13:26:52 -05:00
Mike Lockwood
c2a6738215 Be tolerant of GPS session and engine on status messages arriving out of order.
BUG: 2366194

Change-Id: Iac152cc46f3647e12c9077f1bfa4183f19ac94b6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-02-02 13:26:33 -05:00
Mike Lockwood
2f3a615fea GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Change-Id: I705b1d33af2d70aa1084cca8f6280fade9461d2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-02-02 13:21:21 -05:00
Mike Lockwood
21875ab332 am a0460004: Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair
Merge commit 'a0460004aae7576114639393a230f18608d213e6' into eclair-plus-aosp

* commit 'a0460004aae7576114639393a230f18608d213e6':
  Ignore NTP time fixes that differ from system time by more than 5 minutes.
2010-01-29 20:12:21 -08:00
John Wang
1ef6fb3bbe am 8deed914: Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
Merge commit '8deed914c2df15d71674deae591bcd3313093931' into eclair-plus-aosp

* commit '8deed914c2df15d71674deae591bcd3313093931':
  Handle RIL_UNSOL_RESEND_INCALL_MUTE.
2010-01-29 20:12:15 -08:00
Mike Lockwood
a0460004aa Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair 2010-01-29 20:09:16 -08:00
John Wang
8deed914c2 Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair 2010-01-29 20:07:14 -08:00
John Wang
1ccc41ed93 Handle RIL_UNSOL_RESEND_INCALL_MUTE.
For bug 2400052.

Notify registered handler whenever receiving RIL_UNSOL_RESEND_INCALL_MUTE.
2010-01-29 20:04:39 -08:00