9703 Commits

Author SHA1 Message Date
Romain Guy
bbb903280b am 7e31b282: am 0e122926: Merge "Rename private fields to break bad code examples" into froyo
Merge commit '7e31b282ddd1f4296ba702f7604044216a95f65e' into kraken

* commit '7e31b282ddd1f4296ba702f7604044216a95f65e':
  Rename private fields to break bad code examples
2010-03-29 12:37:48 -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
e5beca8e65 am 1889f40a: am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo
Merge commit '1889f40aa17bd658df1b7181d091a6dff631ec95' into kraken

* commit '1889f40aa17bd658df1b7181d091a6dff631ec95':
  Make EditTextPreference scrollable.
2010-03-29 11:32:53 -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
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
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
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
Mike Lockwood
a3ba63dc8a Add support for GPS privacy lock. DO NOT MERGE
Change-Id: Ieb55794453f86fb7100c9010a0729839990eb9f7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-03-28 09:34:41 -04: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
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
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
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
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
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
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