Commit Graph

7576 Commits

Author SHA1 Message Date
Romain Guy
2feec33de8 am 67e9e9df: Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
Merge commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e' into eclair-plus-aosp

* commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e':
  Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
2010-02-17 21:17:48 -08:00
Romain Guy
71f13a1cc8 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
android-build SharedAccount
2c6cb3db27 am 5d72a8dd: cherry pick d60e29009c1049a9776e6630e9489e1ef3f83491
Merge commit '5d72a8dda22cdb0c8e1ded1ca5e5122b0c25bcc7' into eclair-plus-aosp

* commit '5d72a8dda22cdb0c8e1ded1ca5e5122b0c25bcc7':
  cherry pick d60e29009c1049a9776e6630e9489e1ef3f83491
2010-02-16 12:53:04 -08:00
Wink Saville
4ab4ebc9ae am 6b178e47: Merge "Always assume evdoXxxx signal strength values are correct." into eclair
Merge commit '6b178e472266052b4a9b28b1e4a5cef07f1ebf8b' into eclair-plus-aosp

* commit '6b178e472266052b4a9b28b1e4a5cef07f1ebf8b':
  Always assume evdoXxxx signal strength values are correct.
2010-02-13 09:42:07 -08:00
Wink Saville
0814cdd0c7 Merge "Always assume evdoXxxx signal strength values are correct." into eclair 2010-02-13 09:36:17 -08:00
Xavier Ducrohet
0256b03e6e am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Merge commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp

* commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a':
  Add --auto-add-overlay option to aapt. DO NOT MERGE
2010-02-12 17:52:28 -08:00
Xavier Ducrohet
b22079f7f9 Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair 2010-02-12 17:48:36 -08:00
Scott Main
06286aac08 am 19bc31c3: Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Merge commit '19bc31c32d75ebebacd85cac2cf4c31108329613' into eclair-plus-aosp

* commit '19bc31c32d75ebebacd85cac2cf4c31108329613':
  docs: remove old tutorial and sample pages from the sitemap
2010-02-12 15:29:27 -08:00
Scott Main
4c4334d5c4 Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair 2010-02-12 15:25:44 -08:00
Jason Sams
6a3565b281 am 0b9bbb6d: DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
Merge commit '0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8' into eclair-plus-aosp

* commit '0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8':
  DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid.  This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
2010-02-12 11:27:01 -08:00
The Android Open Source Project
6e03ece9c9 merge from open-source master 2010-02-11 10:03:02 -08:00
Eric Laurent
8727c24cf2 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
fde9e349dd Merge "Fix issue: 2413494: Add TTY support." into eclair 2010-02-11 09:23:21 -08:00
Dirk Dougherty
3b3237bf4c 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
77eb6fb19b 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
a10ec4b8b1 Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair 2010-02-10 09:38:01 -08:00
Bart Sears
6e4c139af2 Merge "DO NOT MERGE" into eclair 2010-02-10 09:35:37 -08:00
Bart Sears
b913443da4 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
0985807e21 Merge "DO NOT MERGE" into eclair 2010-02-10 09:13:48 -08:00
Dirk Dougherty
b34f0a75a0 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
88d505a68e Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair 2010-02-09 18:41:32 -08:00
Adam Powell
3a6dc1ed75 Manually merged VelocityTracker changes 2010-02-09 14:25:41 -08:00
Adam Powell
459bd6bc23 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
Suchi Amalapurapu
ddd670c816 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
The Android Open Source Project
f8155987ae merge from open-source master 2010-02-05 13:55:16 -08:00
Adam Powell
54ab0ee5b3 Merge "Use a circular buffer in VelocityTracker" 2010-02-05 13:01:22 -08:00
Romain Guy
6ba1ed8f31 Merge "Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method" 2010-02-05 10:33:44 -08:00
The Android Open Source Project
9f4247668e 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
93fe6a1cee reconcile main tree with open-source eclair 2010-02-05 08:09:38 -08:00
Eric Laurent
df7b593133 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
Katie McCormick
4376a0cafc 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
6225fcd804 Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair 2010-02-03 16:52:18 -08:00
Scott Main
3ef51c88b6 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
957a1a2571 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
Megha Joshi
439270f03e 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
277345ae33 Merge "Screenshots for sample syncadapter." into eclair 2010-02-03 12:24:20 -08:00
Mike Lockwood
5378838b0b 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
a74f6908c6 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
97c0df6c31 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
2d15d737b7 Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair 2010-01-29 20:07:14 -08:00
Jim Miller
8fee03b1f0 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
The Android Open Source Project
9a2ed22a74 reconcile android-2.1_r1 snapshot 2010-01-29 14:09:16 -08:00
Scott Main
89f164ff7c am 9800adf2: Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair
Merge commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8' into eclair-plus-aosp

* commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8':
  docs: update web page debugging with info about page and line
2010-01-29 13:47:40 -08:00
Dirk Dougherty
329df1b5b0 am 196ec566: Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Merge commit '196ec566b39340942f146ce4a9af775f4c648d2d' into eclair-plus-aosp

* commit '196ec566b39340942f146ce4a9af775f4c648d2d':
  SDK doc change: Increment the platform version var used in doc footer and elsewhere.
2010-01-29 13:47:28 -08:00
Scott Main
f2d703adf0 Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair 2010-01-29 13:40:53 -08:00
Dirk Dougherty
aa51f1a242 Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair 2010-01-28 17:59:24 -08:00
Dirk Dougherty
f1e2b83c0a am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair
Merge commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp

* commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e':
  SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
2010-01-28 16:46:54 -08:00
Dirk Dougherty
d08c5fb5c8 Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 2010-01-28 16:40:56 -08:00
Grace Kloba
642a0cb054 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
Dirk Dougherty
a1cfe958c6 am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair
Merge commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef' into eclair-plus-aosp

* commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef':
  doc change only: Update announcement and mwc redirect to point to microsite.
2010-01-26 18:05:23 -08:00