22284 Commits

Author SHA1 Message Date
Kristian Monsen
a014db7f0b Merge Chromium at 10.0.634.0: Add autofill fax string
Introduced here:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/fax_field.cc?view=diff&pathrev=70875&r1=70709&r2=70710

Change-Id: I20130029e26f2d9ef6ea4828921b070c887ccb69
2011-05-25 18:54:31 +01:00
Russell Brenner
70ecf97804 merge from honeycomb mr2
Refire the redraw event if webkit wasn't ready

If webkit wasn't in a drawing mood, post a WEBKIT_DRAW event to
assure that the update is not lost.

bug: 4474358
Change-Id: I70fcf652cc854f995885c58b55d58ecf75734ab8
2011-05-25 10:23:26 -07:00
Russell Brenner
dd36e1bde1 am 8b98284b: am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2
* commit '8b98284b97b81a4cc85d9fc26e79160e9c38ff1c':
  DO NOT MERGE-Refire the redraw event if webkit wasn't ready
2011-05-25 09:14:50 -07:00
Russell Brenner
8b98284b97 am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2
* commit '64796477f61f2fb5435e5043820c67dead4ec577':
  DO NOT MERGE-Refire the redraw event if webkit wasn't ready
2011-05-25 09:05:55 -07:00
Russell Brenner
64796477f6 Merge "DO NOT MERGE-Refire the redraw event if webkit wasn't ready" into honeycomb-mr2 2011-05-25 09:00:26 -07:00
Narayan Kamath
f509e72c71 Merge "Add a separate thread for writing to audiotracks." 2011-05-25 08:26:38 -07:00
Steve Block
ceb82f71dd Merge "Merge WebKit at r78450: Update useragent string" 2011-05-25 08:15:34 -07:00
Steve Block
ae8eb6beba Merge WebKit at r78450: Update useragent string
Change-Id: I4d597a8709e9188c083e73a133a12d3121204e6f
2011-05-25 16:10:29 +01:00
Narayan Kamath
c90f1c815d Add a separate thread for writing to audiotracks.
Now, SynthesisRequest.audioAvailable( ) will not block
until all data has been written to the audiotrack.

Change-Id: Ie24c0b6873ae44659e88646fb7ef821750dc314e
2011-05-25 15:31:06 +01:00
John Reck
2221e34ba5 am 00bcea1a: am dc8a53a7: am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2
* commit '00bcea1ac3be490e2730d15a6406541341dd3853':
  Update the Desktop UA to Chrome
2011-05-24 19:54:11 -07:00
Dianne Hackborn
77dd616e68 am 00b3a5c6: am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2
* commit '00b3a5c65e6ef26056178d1d7473b921671752e9':
  More compatibility mode improvements.
2011-05-24 19:13:45 -07:00
Dianne Hackborn
00b3a5c65e am c404e9b2: Merge "More compatibility mode improvements." into honeycomb-mr2
* commit 'c404e9b20165f634904d1489216d17d8e09fe696':
  More compatibility mode improvements.
2011-05-24 19:10:53 -07:00
Dianne Hackborn
c404e9b201 Merge "More compatibility mode improvements." into honeycomb-mr2 2011-05-24 19:07:55 -07:00
Dianne Hackborn
5be8de3420 More compatibility mode improvements.
We now correctly adjust display metrics, fixing for example issues
seen in Barcode Scanner.  In addition the decision about when to use
compatibility mode has a bug fixed where certain apps would not go
out of compatibility mode even though they should be able to.

Change-Id: I5971206323df0f11ce653d1c790c700f457f0582
2011-05-24 18:13:25 -07:00
Russell Brenner
1d87cbf602 DO NOT MERGE-Refire the redraw event if webkit wasn't ready
If webkit wasn't in a drawing mood, post a WEBKIT_DRAW event to
assure that the update is not lost.

bug: 4474358
Change-Id: Ib0c4cedb10f58821f95c439824c30043a906f8b8
2011-05-24 17:17:40 -07:00
Scott Main
ec6331b82a docs: add accepted values for setting status bar visibility
Change-Id: I67ef29f8ccc7b4a754ebb24efd96e9821e3d8662
2011-05-24 16:55:56 -07:00
Ying Wang
8f40e58712 Merge "Fix intermediate src dir for framework.jar" 2011-05-24 16:27:17 -07:00
Chet Haase
8d5f808f70 Add more functionality to ViewPropertyAnimator.
Allow ViewPropertyAnimator animations to be started immediately, canceled,
and to have an optional startDelay. This is functionality parallel to that
in the base Animator class.

Change-Id: I391f1810bf697656999bd6e3e63a59e46eb7eb8a
2011-05-24 15:56:41 -07:00
Chet Haase
7eaa5e57d8 Merge "Add ability to transition parent hierarchy in layout transitions" 2011-05-24 15:55:15 -07:00
Amith Yamasani
6ea08998ee More preference item visual adjustments for smaller tablets. DO NOT MERGE
Use medium text size for locale picker.
Hide icon region if there's no icon.

Bug: 4462313

Change-Id: I8062646f31bfec753bcd476f54c8ab5b66375b5e
2011-05-24 15:50:36 -07:00
Chet Haase
cca2c98072 Add ability to transition parent hierarchy in layout transitions
This change compensates for changes in the parent hierarchy of
transitioning views. It automatically animates parents with the same
animations as those used for the CHANGING animations run on the container
children.

Change-Id: I86471d16a9070b024cc09c8f6e0f504a881fa99f
2011-05-24 15:29:39 -07:00
Shimeng (Simon) Wang
8481646e57 Merge "Simplify viewport logic in webviewcore and zoom-manager." 2011-05-24 15:27:14 -07:00
Shimeng (Simon) Wang
24a252e634 Simplify viewport logic in webviewcore and zoom-manager.
As using wide viewport implies fixed viewport.

Also fixed an issue for mobile page viewport calculation.

issue: 4343683
Change-Id: I669618f8522377ff97317bb1b78700ad40e51bb3
2011-05-24 15:18:31 -07:00
Romain Guy
383715aafe Merge "Code cleanup." 2011-05-24 15:00:52 -07:00
Romain Guy
1c90f032fa Code cleanup.
Change-Id: I5469a2c826c054f20e045ea098bdbcad9e11b17b
2011-05-24 14:59:50 -07:00
Shimeng (Simon) Wang
e16cd5406c Merge "Use fixed viewport for all devices in wide viewport mode." 2011-05-24 14:42:44 -07:00
Jeff Brown
c1eb82373a Merge "Input device protocol enhancements." 2011-05-24 14:39:53 -07:00
Jeff Brown
80fd47ce75 Input device protocol enhancements.
Added support for Linux multitouch protocol B (slots).

Added support for using the device's input properties as a hint
to determine the intended usage of a touch device.

Added support for the ABS_MT_DISTANCE axis.

Fixed a bug reporting the presence of the orientation axis.

Change-Id: Icf7b5a5a0f1a9cdf6ad2b35be8ea0c1a35815d48
2011-05-24 14:39:19 -07:00
Jeff Brown
b5b1fb2585 Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 2011-05-24 14:26:18 -07:00
Jason parks
e372c17ba7 Merge "Add public API to do NDEF push." 2011-05-24 13:49:51 -07:00
Shimeng (Simon) Wang
994156053b Use fixed viewport for all devices in wide viewport mode.
This will simplify viewport logic; and currently Clank behaves
the same for phones.

issue: 4343683
Change-Id: Icddc23cd5b12f9820c611dbf66c9772f147baf4b
2011-05-24 13:40:08 -07:00
Jason parks
01425365a8 Add public API to do NDEF push.
Change-Id: I102da9bbc6d78577a26fa03ee363a60abc389d6c
2011-05-24 15:22:07 -05:00
Mike Lockwood
9fd4c6d3ae am 49b9449b: am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2
* commit '49b9449b6605c7b4f77f9a0635ba93f7dfa0ea47':
  MountService: Add StorageVolume as extra in storage related broadcasts.
2011-05-24 12:56:56 -07:00
Dianne Hackborn
c42b791b74 Merge "resolved conflicts for merge of bbca8133 to master" 2011-05-24 12:44:07 -07:00
Jeff Brown
ebed7d6e35 Support wrapping app processes to inject debug instrumentation.
Bug: 4437846

Change-Id: I4552501c693716b14714afb5c5248edaca9547ab
2011-05-24 12:01:25 -07:00
RoboErik
43175dde74 Merge "Add original_id definition for cal db v301" 2011-05-24 11:34:45 -07:00
Dianne Hackborn
e2c7715c77 resolved conflicts for merge of bbca8133 to master
Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
2011-05-24 11:27:11 -07:00
Kristian Monsen
bc533dd320 am 18a259fe: am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit '18a259fe37861a78632a0667d746ea7d06356ced':
  Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
2011-05-24 11:22:39 -07:00
Kristian Monsen
18a259fe37 am 36ac304c: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit '36ac304c6e62dbb1caaf729c70d7aa956aff63be':
  Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
2011-05-24 11:19:00 -07:00
Kristian Monsen
36ac304c6e Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE" into honeycomb-mr2 2011-05-24 11:16:39 -07:00
John Reck
00bcea1ac3 am dc8a53a7: am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2
* commit 'dc8a53a7db91ac23d2b213dc5cf758d64bd880be':
  Update the Desktop UA to Chrome
2011-05-24 11:10:00 -07:00
John Reck
dc8a53a7db am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2
* commit '2959916b13165f56431f3993bd6b16364032af14':
  Update the Desktop UA to Chrome
2011-05-24 11:06:38 -07:00
John Reck
2959916b13 Merge "Update the Desktop UA to Chrome" into honeycomb-mr2 2011-05-24 11:03:11 -07:00
Kristian Monsen
f147b5f2a6 Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
This is the WebView part, passing the bypass list to
the native side.

Moved some code to JWebCoreJavaBridge.java because
because sendStaticMessage only takes one argument.

Needs CL in external/webkit:
https://android-git.corp.google.com/g/#change,111108

Needs following CL in external/chromium:
https://android-git.corp.google.com/g/#change,111107

Change-Id: Ib548bdcbc9eb22bbb8f2754808840052bd3ec80e
2011-05-24 18:58:51 +01:00
Gilles Debunne
970ce73017 Merge "Made getOffsetForPosition public in TextView." 2011-05-24 09:26:44 -07:00
Gilles Debunne
bd4d582622 Merge "TextView uses floats for touch event positions." 2011-05-24 09:26:14 -07:00
Gilles Debunne
7a4adca1cb Merge "Added a new flag in TextView to disable Suggestions." 2011-05-24 09:25:52 -07:00
Shimeng (Simon) Wang
5b0724d6cf am f55a00b1: am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.
* commit 'f55a00b1b86c58d78a4c2812d00e1b61d03f520a':
  Simplify browser pause/resume logic to avoid stuck timer.
2011-05-24 08:41:37 -07:00
Daniel Sandler
0601eb7953 Framework support for Android Dreams.
A Dream is an activity that is launched by the window
manager after a specified idle time. You might think of this
as a "screen saver", but with the same capacity for
interactivity as any other application.

The window manager maintains a timer (like the screen lock
timer) that is reset on userActivity; the timer is suspended
during wakelocks and when the screen is off.

When the timer elapses, the user's preferred dream module is
launched (by reading Settings.Secure.DREAM_COMPONENT, which
is configured through the Settings app UI).

Like a dock app, the user can install new dreams and a
single application package may contain multiple dream
activities. Unlike the dock mode, however, there is no
"screensaver mode" for the system to manage. This allows us
to offer the user the ability to run a dream at any time, in
addition to making the overall mechanism quite simple.

There is no public API for this facility.

There is, however, a useful/recommended base class for dream
activities in the support library (change I4559a958).

Change-Id: Ied691856f88cfa38a7aca496d015f9a595da72f2
2011-05-24 10:28:52 -04:00
John Wang
5ea7a29387 am b7a13791: am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE
* commit 'b7a13791a12eef57434b84a97609d98e03e17009':
  Add UI to handle SIM swap.
2011-05-23 20:48:57 -07:00