20431 Commits

Author SHA1 Message Date
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
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
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
Daniel Sandler
6d28ea87e6 am 4ea1eea5: (-s ours) Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo
Merge commit '4ea1eea55bedcf83e643f7847f5f0a3ccce35187' into kraken

* commit '4ea1eea55bedcf83e643f7847f5f0a3ccce35187':
  Redesigned keyguard layout in the no-SIM case. DO NOT MERGE
2010-03-26 14:31:17 -07:00
Christopher Tate
9c3cee9824 API CHANGE: Backup/restore API changes requested by the API Council
* @hide the android.app.backup.RestoreSession class and functionality

* Provide a public method on android.app.backup.BackupManager that apps
  can use to request a restore pass of their last-known-good dataset.
  The new method is called requestRestore().

* Provide the name of the package being restored, not just its ordinal,
  in the RestoreObserver's onUpdate() callback.

Part of bug #2545514

Change-Id: I9689bf8d6e2b808b4ee412424a36a835be0a5ca8
2010-03-26 14:26:44 -07:00
Brett Chabot
a3de745551 Move PackageManagerTests and AsecTests.
Remove PackageManagerTests test's from continuous due to flakiness.

merged from abandoned master.

Change-Id: I0a542df9df572c37bd1aa987cdc9fb2f95001a7c
2010-03-26 14:16:59 -07:00
Grace Kloba
092cfaaa22 Merge "cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo 2010-03-26 13:55:34 -07:00
Dianne Hackborn
d49258fed4 Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83
There was a really dumb bug that was causing us to not always apply
the new configuration.  As a result of fixing this, there were new
glithes in the transition between car and regular mode, so further
work here to fix that.  And since I was actually working during the
night and seeing night mode, I noticed how obnoxiously bright the
status bar is compared to the car home at night, so it now nicely
dims itself when we switch to the night config.  Oh and in doing
that I also found and fixed a bug in dispatching config changes to
a window (where they wouldn't get dispatched if the window didn't
resize).

FINALLY...  tweak the wallpaper enter/exit animations a bit to
make them a little smoother.

Change-Id: I4e062093cbcfbc919307799a794846db2920216f
2010-03-26 12:52:53 -07:00
Jean-Baptiste Queru
fc6d1ba930 Merge "Hide download manager." into froyo 2010-03-26 12:25:11 -07:00
Joe Onorato
89837b25c8 Merge "Fix StatusBarService deadlock for real this time." into froyo 2010-03-26 12:14:49 -07:00
Joe Onorato
1aedcce92f Fix StatusBarService deadlock for real this time.
The lock is now only held long enough to swap the queue with a new ArrayList.

Bug: 2542233
Change-Id: I8c1c3d4d0b5b53166cc239fc0069d69929b43f91
2010-03-26 12:13:29 -07:00
Grace Kloba
7e8bc24f62 cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo
According to GMail profile, almost half of WebView
init time is spent in creating the zoomControl which
is not used by them. So change to lazy initialize
the ZoomButtonControl which will be used by Browser.

Fix http://b/issue?id=2546481
2010-03-26 11:44:48 -07:00
Daniel Sandler
4ea1eea55b Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo 2010-03-26 11:41:34 -07:00
Jean-Baptiste Queru
cf7958f916 Hide download manager.
Not ready for public consumption yet.

Bug: 2544512
Change-Id: I4a5b3c5f6afbc911d31e24333c2898d0c36281a3
2010-03-26 10:29:28 -07:00
Andreas Huber
252573cb82 Finer-grained locking in AwesomePlayer, position and duration are now protected by a separate mutex that's only held for brief moments of time.
Change-Id: I989baf5a0ea8923985c560c2ec274abda0780242
related-to-bug: 2546577
2010-03-26 10:17:17 -07:00
Daniel Sandler
629520527e Redesigned keyguard layout in the no-SIM case. DO NOT MERGE
The emergency call button has been removed (since the user
can disable the keyguard, open the phone app, and enter the
emergency number there).

AM/PM have also been baseline-aligned with the clock.

Bug: 2421380
Change-Id: I3fb25a29e02f3e2ee2b1505a8765d53ccceb1372
2010-03-26 11:52:59 -04:00
Brad Fitzpatrick
2911e8eff7 Merge "Clarify some Binder docs regarding things that are thread-local." 2010-03-25 21:02:46 -07:00
Brad Fitzpatrick
a0527f207b Clarify some Binder docs regarding things that are thread-local.
Change-Id: I433c9c2f4593866b2e9846893676b93a670817d4
2010-03-25 20:40:34 -07:00
Mathias Agopian
d7c1c00663 Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" 2010-03-25 20:22:58 -07:00
Mathias Agopian
57e4865e52 fix [2236865] STOPSHIP: bump soft gl and egl minor version number
this is to allow developpers to deal with potiential differences
between the softgl versions.

Change-Id: I7ec2451d6af1be29818d66215b22977405d403e8
2010-03-25 20:21:12 -07:00