9587 Commits

Author SHA1 Message Date
Romain Guy
e16741b22a am 272b504e: Merge "Tame the monkey. Bug #2547546" into froyo
Merge commit '272b504ee6aaf2515572520cd642f9a4fbf81a44' into froyo-plus-aosp

* commit '272b504ee6aaf2515572520cd642f9a4fbf81a44':
  Tame the monkey.
2010-03-29 13:06:20 -07:00
Romain Guy
7eec2bcf6f Tame the monkey.
Bug #2547546

Change-Id: I2a41f53dbd71a166ddce70f3fbec24cfedaa514a
2010-03-29 13:00:07 -07:00
Romain Guy
7e31b282dd am 0e122926: Merge "Rename private fields to break bad code examples" into froyo
Merge commit '0e1229260d66b308a0ad271c20970e3decd6f55c' into froyo-plus-aosp

* commit '0e1229260d66b308a0ad271c20970e3decd6f55c':
  Rename private fields to break bad code examples
2010-03-29 12:34:23 -07:00
Romain Guy
0e1229260d Merge "Rename private fields to break bad code examples" into froyo 2010-03-29 12:28:20 -07:00
Romain Guy
65fe2c08fa Rename private fields to break bad code examples
Change-Id: I4a3e8df5de159c703db244212f78824e4105ba90
2010-03-29 12:27:30 -07:00
Romain Guy
1889f40aa1 am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo
Merge commit 'ab924c909a516eb71fef7c238a20c7755f8170ed' into froyo-plus-aosp

* commit 'ab924c909a516eb71fef7c238a20c7755f8170ed':
  Make EditTextPreference scrollable.
2010-03-29 11:28:07 -07:00
Romain Guy
ab924c909a Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo 2010-03-29 11:24:31 -07:00
Romain Guy
b5d73d0fb0 Make EditTextPreference scrollable.
Bug #2549257

Change-Id: If2f69f957681e15977a7603a1f6533e9d1fea9f7
2010-03-29 11:23:18 -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
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
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
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
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
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
Dianne Hackborn
4c8a63ca4d Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo 2010-03-26 18:06:52 -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
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
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
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
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
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
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
Jim Miller
1d1fe98755 Merge "Fix 2535700: Add support for enforcing password quality" 2010-03-25 19:54:15 -07:00
Dianne Hackborn
0d3b202bde Merge "Fix Memory Leak When Switching Input Methods" 2010-03-25 19:23:09 -07:00
Marco Nelissen
386d7ae7ab Merge "Remove spurious byte order marks from xml files." 2010-03-25 19:06:23 -07:00
Jim Miller
cd70988401 Fix 2535700: Add support for enforcing password quality
In addition, this change removes old lockpattern constants which were set
to DevicePolicyManager constants anyway.

Change-Id: I05f7f50ca099f4bd87a2d8e1d6dd2bc6f3a2b139
2010-03-25 18:24:02 -07:00
Marco Nelissen
35a2a90fd6 Remove spurious byte order marks from xml files.
Change-Id: I864078ad1a1621609a8a33412327844499712324
2010-03-25 18:15:14 -07:00
Adam Powell
aeb30e6d22 Fix bug 2544916 - Fun with AbsListView touch mode
Change-Id: I79de051891d535f44c0910295976d1f3634aca4c
2010-03-25 18:09:09 -07:00
Adam Powell
7b8970b4ef Merge "API refactoring for OverScroller." 2010-03-25 17:03:58 -07:00
Adam Powell
6579b0b4ac API refactoring for OverScroller.
OverScroller is no longer a child class of Scroller and several
Scroller methods that do not make sense for OverScroller and could
cause misbehaving edge cases have been removed or hidden and
deprecated.

Change-Id: Ie055b607bd3b36c47ab9798d5c9518aef686b474
2010-03-25 16:02:27 -07:00
Irfan Sheriff
a3bd409a0a settings variable for wifi saved state
We add a variable for saving wifi state
to restore after tethering.

Bring up wifi on boot up if the state indicates so.

Bug: 2537983
Change-Id: I9c6548b93df6fcbc0cec1e6b857f7224dc6d1b2c
2010-03-25 15:10:34 -07:00
Robert Greenwalt
bfb7bfa538 Update Framework to support multiple dhpc ranges
Previously we only supported a single range - this was inadequate for
multiple interfaces.  Adding a second range so we can support
both usb and wifi tethering.

Also moving out of the zero-conf range as our dhcp client won't
accept ip addrs in that range (no nexus to nexus wifi action).

bug: 2537963
bug: 2533491
bug: 2538303
Change-Id: I600b421343c28c2f9839ed2076122ae3d0ff5d3d
2010-03-25 14:46:13 -07:00
Fred Quintana
838bfef915 Merge "check for nulls" 2010-03-25 14:39:15 -07:00
Fred Quintana
382601fc8b check for nulls
Change-Id: Ie02749db1dceb4288a70e5b28040459d669904c1
http://b/issue?id=2527346
2010-03-25 13:55:02 -07:00
Patrick Scott
661a19765b Merge "Add .3gpp as the preferred extension for video/3gpp." 2010-03-25 13:27:57 -07:00
Daniel Sandler
c68b5b7e5b Merge "Use a more benign icon for ADB notifications." 2010-03-25 13:26:36 -07:00
Daniel Sandler
39576c8df3 Use a more benign icon for ADB notifications.
Also suppress vibe & noise for ADB notifications.

Bug: 2544480
Bug: 2545486

Change-Id: I955a7271f47601f9b35f0d3fcd48363370ebd252
2010-03-25 16:19:53 -04:00
Patrick Scott
c9048a683d Add .3gpp as the preferred extension for video/3gpp.
As it appears earlier in the list, .3gpp will be used as the extension for
video/3gpp mime types.

Bug: 2542939
Change-Id: I7d9188b460774af7bc29f4e8f1ebada43bf2ed10
2010-03-25 16:18:05 -04:00
Brad Fitzpatrick
5348c01412 Better fix for gettid() sim-eng breakage from last night.
Change-Id: I2e8762d43b3c224a2e102ff82fc79072a85bb4c6
2010-03-25 12:43:56 -07:00
Joe Onorato
8f2bd4328a Add window flags and window types to hierarchyviewer.
For debugging http://b/issue?id=2544870

Change-Id: I4b7775e6fd275bb7a9041bf5736e076122bfb5f1
2010-03-25 11:52:06 -07:00