17675 Commits

Author SHA1 Message Date
Kristian Monsen
1fae3cf246 Merge "Merge Chromium at 10.0.634.0: Add autofill fax string" 2011-05-25 12:09:46 -07:00
Adam Powell
50f7fb9ca1 Merge "Action bar tab layout" 2011-05-25 12:01:00 -07:00
Adam Powell
f8ac6b7394 Action bar tab layout
Sync with UX on action bar tab layout behavior.

Make action bar tabs behave better with configuration changes.

LinearLayout now supports largest child measurement in unspecified
mode.

Change-Id: Id520641715a61c07e64124a0c5a70912996c98a0
2011-05-25 11:55:56 -07:00
Romain Guy
4725a90e8e Code cleanup.
Change-Id: Ie7685b14e3eb81a2e1034004c3ba04b523e9dd13
2011-05-25 11:13:20 -07:00
Romain Guy
7d70fbf0b5 Use OpenGL to render transition bitmaps.
When the IME is opened/dismissed, ViewAncestor would draw the
view hierarchy into a Bitmap, using the software rendering
pipeline. With this change, ViewAncestor will now use OpenGL.

Change-Id: I69e24570e12ff55f6f3cec18a664b33410a0eaf4
2011-05-25 11:13:19 -07:00
Russell Brenner
0d74112eed Merge "merge from honeycomb mr2" 2011-05-25 11:04:28 -07:00
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
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
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
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
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
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
Gilles Debunne
9511b41e05 Made getOffsetForPosition public in TextView.
Bug 4443839

Change-Id: I3e5d6f0fe3a45b068166f682daf3c4163903306e
2011-05-23 18:48:26 -07:00
Jeff Sharkey
a462079303 Observe screen on/off events in NetworkPolicy.
The POLICY_REJECT_BACKGROUND policy requires that network traffic be
blocked when a UID goes into the background.  Even if the UID has an
activity in the foreground, it's considered "background" if the screen
is turned off.

This changes watches for SCREEN_ON/OFF broadcasts, and rule generation
now observes screen state.  It also introduces an observer pattern so
that ActivityManager doesn't directly know about NetworkPolicy, and
moves the service management into SystemServer.

Change-Id: Ie7a84929d3ca60ae4578d47e19d5a8da10fd8d58
2011-05-23 18:39:56 -07:00
Jeff Sharkey
442fa21e98 Merge "APIs to profile network usage for current UID." 2011-05-23 18:38:04 -07:00
Gilles Debunne
3bca69b09f TextView uses floats for touch event positions.
This is the type returned by event.getX/Y methods. Conversion
to ints is only performed when needed. Low performance impact
since there is only a minimal amount of computations on these
values.

Change-Id: I53a56efe5e3a1a96911adc25fedaab7f40f1ba8e
2011-05-23 18:20:26 -07:00
Adam Powell
7d372b49e2 am 7dfdb914: am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
* commit '7dfdb914206eafbf2aa4533e9b6a50428a5d0d3d':
  Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
2011-05-23 17:18:54 -07:00
Gilles Debunne
f3a135bfba Added a new flag in TextView to disable Suggestions.
This is needed for specific TextEdit (such as AutoCompleteTextField)
which do not want to display the "No suggestions available" message.

Bug 4443830

Change-Id: Ic228b56bacfdf2765e70eb24952ab087556c1f93
2011-05-23 17:15:20 -07:00
Amith Yamasani
fcdbcf9174 am 5b00912e: am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2
* commit '5b00912e5844591a846e8ba3c4710d2daaa8069a':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
2011-05-23 17:12:00 -07:00
Mike Lockwood
49b9449b66 am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2
* commit 'd8d8470825a637843d45a3b436e80a3b85f1dd11':
  MountService: Add StorageVolume as extra in storage related broadcasts.
2011-05-23 17:09:30 -07:00
Amith Yamasani
5b00912e58 am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2
* commit '51652f5674e266d62607324255517d41d225d9be':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
2011-05-23 17:08:48 -07:00
Mike Lockwood
d8d8470825 am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2
* commit '988b6648b0138fe1294228e17164b2f1d6a4042d':
  MountService: Add StorageVolume as extra in storage related broadcasts.
2011-05-23 17:06:47 -07:00
Amith Yamasani
51652f5674 Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 2011-05-23 17:05:47 -07:00
Mike Lockwood
988b6648b0 Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2 2011-05-23 17:04:01 -07:00
Mike Lockwood
a5250c9392 MountService: Add StorageVolume as extra in storage related broadcasts.
Change-Id: I8e1a21ae233ba9812e58b363b59a66b260a01cbf
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-23 20:01:55 -04:00