15638 Commits

Author SHA1 Message Date
Gilles Debunne
9947b32185 Merge "Cherry-pick Ib76a95d9e7669016cf11b8b0add8843b438068ea from gingerbread" 2010-11-15 15:23:01 -08:00
Adam Powell
965b9699f1 Cherry-pick Ib76a95d9e7669016cf11b8b0add8843b438068ea from gingerbread
DO NOT MERGE Fix bug 3121030 - Text handles erroneously appear over
extract mode IME window

Make the SelectionModifierCursorController track its show/hide state
more accurately in the presence of an extract mode IME.

Lazily initialize CursorControllers so that we don't end up creating
them for various TextViews where they are not needed.

Change-Id: I3dce7535db3a1bd25ed9899406de47b00058e665
2010-11-15 15:21:15 -08:00
Wink Saville
47ea7c43da Merge "Move AsyncChannelTest and HierarchicalStateMachineTest to proper directory." 2010-11-15 13:24:37 -08:00
Vasu Nori
7f7b9fd000 Merge "map _data column to local_filename column. bug:3197501" 2010-11-15 13:24:23 -08:00
Derek Sollenberger
dd97f0cb41 Merge "Only show double-tap tip if the feature is enabled." 2010-11-15 13:19:37 -08:00
Vasu Nori
e69924f0d0 map _data column to local_filename column. bug:3197501
this bug is caused by Change-Id: Ief1693785f0484c1b434fb41a68693f9aff96492

Change-Id: Id654322d587968f50aecc7d965b8d7a8d78ce50d
2010-11-15 13:10:11 -08:00
Joe Onorato
64f1163084 Merge "The beginnings of the new status bar." 2010-11-15 12:23:51 -08:00
Wink Saville
6b888d98f7 Move AsyncChannelTest and HierarchicalStateMachineTest to proper directory.
Change-Id: Ifa0f14aad3fee7cad47cdf762c6cff457b56a473
2010-11-15 12:16:52 -08:00
Joe Onorato
fd52b18d9b The beginnings of the new status bar.
There is a lot of rough stuff still, but most of the functionality is here again.

Change-Id: I4b1241e61270f1434e798481afa83634233ee670
2010-11-15 11:52:33 -08:00
Kenny Root
b763fa1d7c Merge "Split UTF functions from String8/16" 2010-11-15 11:11:22 -08:00
Adam Cohen
ee4a7d8682 Merge "Fix for Issue: 3196583" 2010-11-15 11:09:59 -08:00
Adam Cohen
490127df19 Fix for Issue: 3196583
Change-Id: I7878cf41274d4f5885d6179f3072a3be05386075
2010-11-15 11:08:03 -08:00
Wink Saville
4543e0de20 Merge "Add html formatting to AsyncChannel & Hsm class comments." 2010-11-15 11:00:49 -08:00
Wink Saville
33c54e3365 Add html formatting to AsyncChannel & Hsm class comments.
Change-Id: Ic42fdb4e8970166a92f173317210353ab8a2fa6a
2010-11-15 10:50:34 -08:00
Brad Fitzpatrick
9f07da18e4 Merge "Disable CloseGuard early. (it defaults to spammy otherwise)" 2010-11-15 10:47:49 -08:00
Brad Fitzpatrick
e139bc944c Merge "Clean up, de-dup, and speed up ContextImpl getSystemService()" 2010-11-15 10:47:32 -08:00
Andreas Huber
81a602958f Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser." 2010-11-15 10:07:17 -08:00
Adam Cohen
c86b5a6af9 Merge "Adding click feedback to StackView" 2010-11-15 10:05:58 -08:00
Andreas Huber
5dffd0e3af Add http live mime types to MediaFile, add support for playlist mime types to browser.
Change-Id: I1f0b31dd2f4e6cfa33a61ff8505e8396aca3c20f
related-to-bug: 2368598
2010-11-15 08:54:40 -08:00
Brad Fitzpatrick
4d9e6d2bc2 Disable CloseGuard early. (it defaults to spammy otherwise)
We already selectively enable it later when desired.

Change-Id: Ic428f13a57a2b4340ce343e73c32413b64fcd1af
2010-11-15 08:49:51 -08:00
Patrick Scott
c12544a201 Offer a callback to intercept url requests.
The new callback allows applications to return a response for a particular url.
Deprecate onLoadResource in favor of the new api.  onLoadResource is not
currently being used by the new network stack and applications can post a
message from shouldInterceptRequest to handle onLoadResource.

Bug: 2905943
Change-Id: Icf48ab3110d85d76112b3c3b4a1a8c8a333b82f0
2010-11-15 09:19:38 -05:00
Iain Merrick
83d4a23c28 Provide default error strings in BrowserFrame.onReceivedError().
This method is called from both the Android and Chrome HTTP stacks.
We want the same user-facing behaviour in each case, but the Chrome
code does not have easy access to the same error message strings.

Therefore, I'll have the Chrome HTTP stack provide empty strings
for the descriptions. (See change I9042a2ee in external/webkit).

This CL makes BrowserFrame check for empty or null strings and use
the standard error messages instead.

The strings were package-private, so I did a little cleaning up
to make them public (but still hidden from the API). Using a switch
statement instead of an array because it's more robust and should
be comparably efficient.

Bug: 3172265
Test: Load http://google.com:81 to force a timeout error, check
that the correct message is displayed.

Change-Id: I7dec8dffe8ad9e513fdb90877e0b466e707174a8
2010-11-15 11:18:39 +00:00
Ben Murdoch
2f3496b424 Merge "Stop loading if the user cancels the SSL certificate warning dialog" 2010-11-15 02:33:50 -08:00
Dianne Hackborn
7eec10e6c9 Get rid of the extended themes.
We now decide whether to use a bitmap background based on whether the
window's drawing is hardware accelerated.  To do this, there is a new
"state_accelerated" that state list drawables can be parameterized on,
and the standard window background uses this to select a solid color
or bitmap drawable as appropriate.

Introduces a little hackery to have wm preview windows pretend like
they are hardware accelerated even if they aren't, so the preview looks
closer to the actual app.

Also Add a DialogWhenLarge variation for the light theme.

Change-Id: I215a79d5df65ba3eed52ab363cade9d8218a6588
2010-11-14 14:23:42 -08:00
Brad Fitzpatrick
7c2ae65703 Fix CloseGuard/StrictMode integration.
Change-Id: Ib89843c48b92138d3981f0f719eae28bf44e2ed4
2010-11-14 11:00:05 -08:00
Brad Fitzpatrick
224ba0cd06 Clean up, de-dup, and speed up ContextImpl getSystemService()
Bug: 3191436
Change-Id: I343adc016e02d0414b2d48a14e5e62a5cccb7899
2010-11-13 16:32:37 -08:00
Adam Powell
6af97e1c20 Revised assets for progress bars and indeterminate progress spinners.
Add support in ActionBar for activity-wide progress APIs.

Add ability for progress bars to set a target framerate rather than
the 5fps previously used.

Clean up some more dialog layouts using hardcoded styles rather than
theme attributes.

Change-Id: I8e88c7595e27c0b6f7829b598f2b084ac8501ae3
2010-11-12 19:06:40 -08:00
satok
b66d287e30 Add a setter of InputMethodSubtype to InputMethodManager
- Public API: void setCurrentInputMethodSubtype(int pos)

Change-Id: I55daa19ba924999def544bf841f00bf54852f3e1
2010-11-13 09:49:59 +09:00
Brian Muramatsu
5c5dfd0aa5 Merge "Fix NPE in SQLiteDatabase#updateWithOnConflict" 2010-11-12 15:55:14 -08:00
Kenny Root
300ba68469 Split UTF functions from String8/16
Split out all the UTF-8/16/32 handling code from String8/16 to its own
file to allow better reuse of code.

Change-Id: If9ce63920edc75472c38da4adce0d13cda9ad2f7
2010-11-12 15:53:40 -08:00
Vasu Nori
54511bb6e4 Merge "remove unnecessary code from DownloadManager" 2010-11-12 15:46:25 -08:00
Adam Cohen
8baf5df0fa Adding click feedback to StackView
Change-Id: If163d144c96607c53299877e5d99747530c281fe
2010-11-12 15:12:56 -08:00
Vasu Nori
e16c43bc59 remove unnecessary code from DownloadManager
Change-Id: Ief1693785f0484c1b434fb41a68693f9aff96492
2010-11-12 15:05:15 -08:00
satok
735cf38b8c Add a function to switch back to the last used IME
Change-Id: Iac7bcc2ee16dd04d91a3e75b160622d246788c9a
2010-11-13 08:00:25 +09:00
Jeff Brown
46e75294d5 Enable touch splitting for all windows by default.
New default only applies to applications with targetSdkVersion >=
HONEYCOMB.  Old applications default to no touch splitting for
their windows.

In addition, enabled split touch for various system windows.

Bug: 3049580
Change-Id: Idc8da9baa2cd8e1e4e76af8967d7b6a5ccb94427
2010-11-12 14:53:43 -08:00
Brian Muramatsu
46a8851360 Fix NPE in SQLiteDatabase#updateWithOnConflict
Bug 3188586

...to restore old behavior of throwing IllegalArgumentException
when values is null.

Change-Id: Ic2df542b2cdbdb7571080eb7f0fc6a4fe1678446
2010-11-12 14:00:36 -08:00
Alon Albert
6e079a32bc Reset backoff on successful sync
Change-Id: I5661485e580dae127c756cd13e814987242e26dd
2010-11-12 13:42:56 -08:00
Brad Fitzpatrick
9feaa0fb44 Merge "Disable SamplingProfilerIntegration until it's fixed." 2010-11-12 13:24:09 -08:00
Brad Fitzpatrick
0b91729b8d Disable SamplingProfilerIntegration until it's fixed.
Change-Id: I685e0600414836d0caae8e37ee7e97cabeb555ce
2010-11-12 13:22:24 -08:00
Shimeng (Simon) Wang
ce1d004ca1 Merge "Fix mobile sites' viewport in fixed viewport mode." 2010-11-12 13:16:24 -08:00
Gilles Debunne
c7e7287aec Fix in public.xml for broken build
Change-Id: I17fdd8a01eb06b4e63ea020bbdfe5dd281743a19
2010-11-12 13:01:18 -08:00
Gilles Debunne
e7b73d2974 Merge "Added a flag for TextView that allows for text selection in read-only TextViews." 2010-11-12 12:23:00 -08:00
Derek Sollenberger
515f6d8db3 Only show double-tap tip if the feature is enabled.
bug: 3170472
Change-Id: I41a278ff44a7fba807c3a4a22f0e0ea20d137d0a
2010-11-12 15:12:58 -05:00
Leon Scroggins
56a102c02e nativeFocusCandidateTextSize now returns a float.
Bug:3085564

Requires a change in external/webkit.

Change-Id: Id2960226766e87b4d0ff364c2e5b3bee6b6757ad
2010-11-12 15:03:30 -05:00
Shimeng (Simon) Wang
f902e4b2b5 Fix mobile sites' viewport in fixed viewport mode.
issue:3003933
Change-Id: I4d9665c578443fcc12bab2f929ffa8b5995c28f7
2010-11-12 11:58:46 -08:00
Adam Cohen
176116aa60 Merge "-Prevent StackView from advancing while interacting with it -Fixed null pointer exception Change-Id: I294a0d055de51573d79219ef469c8df6ab04a297" 2010-11-12 11:38:35 -08:00
Gilles Debunne
86b9c78e3e Added a flag for TextView that allows for text selection in read-only TextViews.
Bug 3101642

Change-Id: I5538e507043c89b02c07f3e1c1abc74a93467427
2010-11-12 11:33:01 -08:00
Leon Scroggins
393352608e Merge "Provide variable for debugging the text in WebTextView." 2010-11-12 11:20:13 -08:00
Adam Cohen
0ac116b688 -Prevent StackView from advancing while interacting with it
-Fixed null pointer exception
Change-Id: I294a0d055de51573d79219ef469c8df6ab04a297
2010-11-12 11:04:32 -08:00
Adam Powell
9a0d1d2a25 Merge "Fix bug 3146938 - Menus spawned by ActionBar should hide when action bar is hidden" 2010-11-12 10:37:50 -08:00