20550 Commits

Author SHA1 Message Date
The Android Open Source Project
f29c7d4d27 am c89704a7: merge from open-source master
Merge commit 'c89704a77f9c51ebd8c1cc6863e15ff402a56c86' into kraken

* commit 'c89704a77f9c51ebd8c1cc6863e15ff402a56c86':
  Fix Memory Leak When Switching Input Methods
2010-03-29 11:03:33 -07:00
The Android Open Source Project
c89704a77f merge from open-source master
Change-Id: I6a8109d11dabc579501c598ab2927cf802797130
2010-03-29 10:57:04 -07:00
Daniel Lehmann
7eeb9c2382 am 3e9032e6: Merge "Increase name-label height so that "g" isn\'t cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo
Merge commit '3e9032e646c898a725c256c90031494cc349eea0' into kraken

* commit '3e9032e646c898a725c256c90031494cc349eea0':
  Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts
2010-03-29 10:37:41 -07:00
Daniel Lehmann
3e9032e646 Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo 2010-03-29 10:30:54 -07:00
Jean-Michel Trivi
462e4a900a am 0737d77a: Merge "Implement audio focus support in the notification manager." into froyo
Merge commit '0737d77ac3964e4db8218ca61a1eaaae31a74f1c' into kraken

* commit '0737d77ac3964e4db8218ca61a1eaaae31a74f1c':
  Implement audio focus support in the notification manager.
2010-03-29 10:14:28 -07:00
Jean-Michel Trivi
0737d77ac3 Merge "Implement audio focus support in the notification manager." into froyo 2010-03-29 10:05:28 -07:00
Grace Kloba
0092c80ee6 am 51b97011: cherry-pick 4a4f9886a789ece80f127397c1c7ad7f543b78fa into froyo
Merge commit '51b97011b73c10b832ea4ad10637f761802e125d' into kraken

* commit '51b97011b73c10b832ea4ad10637f761802e125d':
  cherry-pick 4a4f9886a789ece80f127397c1c7ad7f543b78fa into froyo
2010-03-29 09:44:05 -07:00
Jean-Michel Trivi
211957f639 Implement audio focus support in the notification manager.
This change introduces the NotificationPlayer class which was
created from the code of android.media.AsyncPlayer. The only modification
was to modify the construction of the MediaPlayer so it properly issues
onCompletion notifications (which are used to abandon audio focus).

Unless the sound to be played is looped, the notification is transient
and other apps may duck (uses AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK in
audio focus request).
Change-Id: I69cbb71d0892447b934351384e4e24a2e239295b
2010-03-29 09:37:02 -07:00
Grace Kloba
51b97011b7 cherry-pick 4a4f9886a789ece80f127397c1c7ad7f543b78fa into froyo
Use the content width to calculate the zoom overview
width. We used to use the minimum preferred width
to calculate the overview width as it is what we
use to define the viewport width. But some sites,
like cbsnews, engadget, the content width will be
slightly wider than the viewport width decided by
the min preferred width. The result is we can still
scroll a little bit in the overview mode. This issue
is magnified when we introduce the overscroll feature.

By using content width as zoom overview width, we
will have content fit in the overview mode. But
some sites, like
"http://www.sfjazz.org/concerts/2010/spring/artists/towner.php"
will be layout wider in the overview mode than it
is in the zoom in state. This is a tradeoff.

Fix http://b/issue?id=2551119
2010-03-29 09:32:36 -07:00
Leon Clarke
8812fdcf1a am 7c3006f5: http://b/issue?id=2496591 When receiving a message to delete the root layer, delay it until the next new picture message, so that the layers only disappear when we start displaying the new page, and not the moment the DOM on the old page is destroyed.
Merge commit '7c3006f53ac02adeac7396726cdc0bf5d6d01926' into kraken

* commit '7c3006f53ac02adeac7396726cdc0bf5d6d01926':
  http://b/issue?id=2496591
2010-03-29 09:10:58 -07:00
Leon Clarke
7c3006f53a http://b/issue?id=2496591
When receiving a message to delete the root layer, delay it until the next
new picture message, so that the layers only disappear when we start displaying
the new page, and not the moment the DOM on the old page is destroyed.
2010-03-29 16:49:16 +01:00
Wu-cheng Li
4d47e1b16b am 0ca25191: Add some comments for zoom methods.
Merge commit '0ca25191c663ef229f1f475b17899f2017ed6980' into kraken

* commit '0ca25191c663ef229f1f475b17899f2017ed6980':
  Add some comments for zoom methods.
2010-03-29 02:08:09 -07:00
Wu-cheng Li
0ca25191c6 Add some comments for zoom methods.
Also change RuntimeException to IllegalArgumentException.
bug:2458926

Change-Id: I87af31f5f3f10244131a1117bd1725c2d292b587
2010-03-29 16:21:12 +08:00
David Hoover
5f3445dc60 Fix typos in comment.
Change-Id: Ia2a9ea0802bcc5773bb4fd52d7e07f9492242bfd
2010-03-28 08:49:49 -07:00
Tatsuo Nagamatsu
69f789a128 CursorToBulkCursorAdapter.close must call mCursor.close instead of mCursor.deactivate. This prevent us to call Cursor.close on cross process ContentProvider and may cause a database leak problem.
Change-Id: I126457c1b709e853727f460095b518b0420aa34f
2010-03-28 14:23:51 +09:00
Jack Palevich
8cab04f010 am 4a65900c: Turn off logging.
Merge commit '4a65900cd69b79e6e47d275575eaeb5bb2487f9f' into kraken

* commit '4a65900cd69b79e6e47d275575eaeb5bb2487f9f':
  Turn off logging.
2010-03-27 15:12:31 -07:00
Jack Palevich
4a65900cd6 Turn off logging. 2010-03-27 15:02:59 -07:00
Dirk Dougherty
f459bde976 am 7205b0fc: Merge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo
Merge commit '7205b0fcb43e9309e2516420d235a1df0b3cd04a' into kraken

* commit '7205b0fcb43e9309e2516420d235a1df0b3cd04a':
  cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo.
2010-03-27 13:08:53 -07:00
Dianne Hackborn
54ca402c25 am 4c8a63ca: Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo
Merge commit '4c8a63ca4d4ac18f593fd9c235f18ba1f691eef7' into kraken

* commit '4c8a63ca4d4ac18f593fd9c235f18ba1f691eef7':
  Fix issue #2538228: Intents targeting browsers constantly nagging
2010-03-27 13:08:50 -07:00
Dirk Dougherty
ee419b40eb am 5c2a502b: cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo.
Merge commit '5c2a502bffc05d54c8de3456fee5aec5b99ff3e9' into kraken

* commit '5c2a502bffc05d54c8de3456fee5aec5b99ff3e9':
  cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo.
2010-03-27 13:08:48 -07:00
Dirk Dougherty
f9b2ad0ab0 am 1f196f29: Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo
Merge commit '1f196f29127f9a05d0bd0553d2f3db2ad983df14' into kraken

* commit '1f196f29127f9a05d0bd0553d2f3db2ad983df14':
  cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo
2010-03-27 13:08:44 -07:00
Daniel Lehmann
d07950f0a1 Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts
Bug:2542703
Bug:2549485

Change-Id: Ic2b88fd405043c2869610c9495bd4aa860b5c025
2010-03-26 19:34:13 -07:00
Dirk Dougherty
7205b0fcb4 Merge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo 2010-03-26 18:25:05 -07:00
Katie McCormick
913cbccb66 cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo.
Change-Id: I670cd996a54602b70469b3b6883cce5a2c6d113f
2010-03-26 18:13:29 -07:00
Dianne Hackborn
4c8a63ca4d Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo 2010-03-26 18:06:52 -07:00
Dirk Dougherty
5c2a502bff cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo.
Change-Id: Ic205588bb0ecd5660b8c8949da88fbae6981f416
2010-03-26 17:53:41 -07:00
Dirk Dougherty
1f196f2912 Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo 2010-03-26 17:50:26 -07:00
Romain Guy
dcb116690c am 213b9805: Merge "Don\'t assume there\'s a selected position in touch mode. Bug #2520743" into froyo
Merge commit '213b9805e31ae9de26c740c04e04af2090759e52' into kraken

* commit '213b9805e31ae9de26c740c04e04af2090759e52':
  Don't assume there's a selected position in touch mode.
2010-03-26 17:37:08 -07:00
Dirk Dougherty
7b229effcc cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo
Conflicts:

	docs/html/sdk/installing.jd

Change-Id: Id43ad8c62039099bb518722bb8694dcf8ba6dfa6
2010-03-26 17:32:26 -07:00
Romain Guy
213b9805e3 Merge "Don't assume there's a selected position in touch mode. Bug #2520743" into froyo 2010-03-26 17:30:40 -07:00
Romain Guy
91c8613679 Don't assume there's a selected position in touch mode.
Bug #2520743

Bad GridView, bad!

Change-Id: Ideed32dc70a69c85df5afbf949e78b481e147b7f
2010-03-26 17:29:45 -07:00
Dianne Hackborn
5ef402baaf Fix issue #2538228: Intents targeting browsers constantly nagging
Some applications are setting the MIME type field for an http:
intent, which is technically wrong because the recipient opening
the URI will get the MIME type from the header.  This was hitting
a bug when we compute the intent filter when setting the
preferred activity, where we have to set both the MIME type and
data URI for the intent filter.  (For file: and content: URIs
only the MIME type is needed, since these can be opened directly
through ContentResolver so everyone is presumed to be able to
handle them.)

Change-Id: Ia7025e6859e9c90997bf56c2c80f225fca7a2007
2010-03-26 17:17:25 -07:00
Dirk Dougherty
0f3d0d6350 am a947fce3: cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo
Merge commit 'a947fce312fb0670ed4e5a486cf9dbd226baa948' into kraken

* commit 'a947fce312fb0670ed4e5a486cf9dbd226baa948':
  cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo
2010-03-26 17:02:28 -07:00
Dirk Dougherty
c008c03b7d am 7986a167: Merge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo
Merge commit '7986a167d0d8078f33d3ab580252e2f0849e1fad' into kraken

* commit '7986a167d0d8078f33d3ab580252e2f0849e1fad':
  Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo.
2010-03-26 17:02:25 -07:00
Dirk Dougherty
a947fce312 cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo
Conflicts:

	docs/html/sdk/ndk/1.5_r1/index.jd

Change-Id: I19f6e97bd019ac347a34db0aea157a33d0217189
2010-03-26 16:32:02 -07:00
Jean-Michel Trivi
fbcd5ed1e1 am c7d2e169: Merge "Cherry-picking this fix into Froyo." into froyo
Merge commit 'c7d2e169c04de37717c2320184f87caed6be7769' into kraken

* commit 'c7d2e169c04de37717c2320184f87caed6be7769':
  Cherry-picking this fix into Froyo.
2010-03-26 16:27:47 -07:00
Dirk Dougherty
7986a167d0 Merge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo 2010-03-26 16:27:07 -07:00
Katie McCormick
4658b4dccf Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo.
Change-Id: Iaad92f99883c868d71d0cb17c115811e017994e4
2010-03-26 16:20:32 -07:00
Jean-Michel Trivi
c7d2e169c0 Merge "Cherry-picking this fix into Froyo." into froyo 2010-03-26 16:17:38 -07:00
Charles Chen
def7185cf1 Cherry-picking this fix into Froyo.
This fix is part of addressing bug #2548048

Making it possible to determine which TTS engine is currently set
as the default by the user.

Change-Id: Ifa422f43a33498b94d96811078c0794d64668357
2010-03-26 16:14:10 -07:00
Jim Miller
966a8c7859 Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
This is try to capture the case where we sometimes see UNSPECIFIED
MeasureSpec in SlidingTab. It should be OK as long as one of the dimensions
is constrained. The log event will give some indication of what's
going on when this happens.

This also fixes a bug where it was possible to not reset the mAnimating flag
in the Phone app.

Change-Id: Ibab1c944ec895a7c19d5a18cc67f6e4db716f685
2010-03-26 15:54:09 -07:00
Grace Kloba
04f2f31a5f am 307a2b59: Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo
Merge commit '307a2b59ba9666c071f5c5b03f58700e7c28ea35' into kraken

* commit '307a2b59ba9666c071f5c5b03f58700e7c28ea35':
  Remove long_press when WebView lost window focus.
2010-03-26 15:40:18 -07:00
Grace Kloba
307a2b59ba Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo 2010-03-26 15:30:26 -07:00
Grace Kloba
378f028000 Remove long_press when WebView lost window focus.
Reset touch mode too.

Fix http://b/issue?id=2542711.

Also move dismissZoomControl() before calling
super.onDetachedFromWindow(). This is a guess to
fix http://b/issue?id=2547574
2010-03-26 15:01:30 -07:00
Christopher Tate
3cc042cb3e am 9c3cee98: API CHANGE: Backup/restore API changes requested by the API Council
Merge commit '9c3cee9824026764275e4d84ba9b5d9fdc5da690' into kraken

* commit '9c3cee9824026764275e4d84ba9b5d9fdc5da690':
  API CHANGE: Backup/restore API changes requested by the API Council
2010-03-26 14:48:09 -07:00
Brett Chabot
9c14c7c5db am a3de7455: Move PackageManagerTests and AsecTests.
Merge commit 'a3de74555120cc4dc205a3f93ef44c843b8d64a8' into kraken

* commit 'a3de74555120cc4dc205a3f93ef44c843b8d64a8':
  Move PackageManagerTests and AsecTests.
2010-03-26 14:31:39 -07:00
Grace Kloba
02b45ce764 am 092cfaaa: Merge "cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo
Merge commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe' into kraken

* commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe':
  cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo
2010-03-26 14:31:35 -07:00
Dianne Hackborn
16f1c78739 am d49258fe: Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83
Merge commit 'd49258fed489bcd72a2b2a6ce3a3c38d4b2531e6' into kraken

* commit 'd49258fed489bcd72a2b2a6ce3a3c38d4b2531e6':
  Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83
2010-03-26 14:31:32 -07:00
Jean-Baptiste Queru
f6700c5031 am fc6d1ba9: Merge "Hide download manager." into froyo
Merge commit 'fc6d1ba930111ef7a51d91908f489ca9469fc572' into kraken

* commit 'fc6d1ba930111ef7a51d91908f489ca9469fc572':
  Hide download manager.
2010-03-26 14:31:28 -07:00
Joe Onorato
a3636bb980 am 89837b25: Merge "Fix StatusBarService deadlock for real this time." into froyo
Merge commit '89837b25c85929b29288fd42727c44093548fced' into kraken

* commit '89837b25c85929b29288fd42727c44093548fced':
  Fix StatusBarService deadlock for real this time.
2010-03-26 14:31:23 -07:00