drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,316 Commits 1 Branch 0 Tags
Commit Graph

51316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wink Saville
c9e3608fa6 am 5faaaa5f: am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE 
* commit '5faaaa5f5af3ef1b82178bc36933bede5ad0c5d7':
  Handle ProvideLocalInfo stk command.
 2011-05-24 19:53:59 -07:00
Irfan Sheriff
d57f5067e6 am c2ff0e70: am 9a737639: Merge "Clear network id when invalid" into honeycomb-LTE 
* commit 'c2ff0e7031b54810d26e1d2a1ba9cdb529f25306':
  Clear network id when invalid
 2011-05-24 19:53:04 -07:00
Ying Wang
8f40e58712 Merge "Fix intermediate src dir for framework.jar" 2011-05-24 16:27:17 -07:00
Chet Haase
dfe1645c22 Merge "Add more functionality to ViewPropertyAnimator." 2011-05-24 16:07:02 -07:00
Andreas Huber
70fbd15af9 Merge "Make sure all references to the decoder plugin are accounted for" 2011-05-24 15:58:09 -07:00
Andreas Huber
1b50fe2952 Merge "Make sure the software mpeg4 decoder supports multiple input frames per input buffer" 2011-05-24 15:56:42 -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
Andreas Huber
54802de06c Make sure all references to the decoder plugin are accounted for 
before calling dlunload().

Change-Id: I59aa1d19edf566b8a86a6f73b1c2eeb47c96b0de
related-to-bug: 4466387
 2011-05-24 15:15:42 -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
Andreas Huber
60a3cb81c0 Make sure the software mpeg4 decoder supports multiple input frames per input buffer 
to enable faster throughput in ACodec.

Change-Id: I6f6a1c70d9446f9d52c3df257b2d22358b0e71f4
 2011-05-24 14:53:30 -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
395d6a291d Merge "Disable pointer debug logging." 2011-05-24 14:42:18 -07:00
Jeff Brown
9f2106f2bc Disable pointer debug logging. 
Change-Id: I00628fa369cb1b179a1907f9cb19de8ca4c755ab
 2011-05-24 14:40:35 -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
Jeffrey Tinker
4b4e3a0b21 am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 
* commit 'c41a17de2b2e80f246adeef4962073916dcfff0b':
  Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
 2011-05-24 12:57:22 -07:00
Mike Lockwood
7cc9ee2676 am 859443f2: am c0d9834a: am 5d78e0b8: Merge "GPS: Change NTP polling interval from 4 to 24 hours" into honeycomb-mr2 
* commit '859443f2a4d6a2b72c3e9c75720d32d4e4c09489':
  GPS: Change NTP polling interval from 4 to 24 hours
 2011-05-24 12:57:17 -07:00
Amith Yamasani
942bc252ce am fcdbcf91: (-s ours) am 5b00912e: am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2 
* commit 'fcdbcf9174f7a5404da4514b71041c3d37692d15':
  DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
 2011-05-24 12:57:08 -07: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
John Reck
aa9fff8cb4 am f656d950: (-s ours) am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 
* commit 'f656d95078fbcb65df7753ba8c04679c5389e15c':
  DO NOT MERGE Use previous version if version is a codename
 2011-05-24 12:56:32 -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
Steve Block
20ce4a49af Merge "In DRT2, correctly handle the case of zero tests" 2011-05-24 10:55:17 -07:00
Steve Block
9eed25e257 In DRT2, correctly handle the case of zero tests 
Bug: 3291382
Change-Id: I8cde1d8d78a57407c585b02ca8ba3f3f893a609b
 2011-05-24 18:54:14 +01:00
Steve Block
ee864481e9 Merge changes Ibe495cdc,I6f8e5745 
* changes:
  Update DRT2 to reflect WebKit code movement
  Add extra error handling to DRT2 launcher script
 2011-05-24 10:48:21 -07:00
Steve Block
183c3c9ca2 Update DRT2 to reflect WebKit code movement 
See http://trac.webkit.org/changeset/74301

Change-Id: Ibe495cdc1f50f65db5663dbb63af9b9c2db050d0
 2011-05-24 18:46:35 +01:00
Steve Block
31e446c3db Add extra error handling to DRT2 launcher script 
Bug: 3291220
Change-Id: I6f8e57458cd4334a998eb256af303ffcd9c50d64
 2011-05-24 18:46:34 +01:00
Wink Saville
5faaaa5f5a am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE 
* commit '543c3146cb011380e4328e049abf97bc797db95a':
  Handle ProvideLocalInfo stk command.
 2011-05-24 10:10:13 -07:00
Wink Saville
543c3146cb Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE 2011-05-24 10:06:58 -07:00
Kazuhiro Ondo
38b6999d9e Handle ProvideLocalInfo stk command. 
Change-Id: I4cb685f7d8e7442185e927fa0d49531b96eeab08
 2011-05-24 10:04:09 -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
TK MUN
6895c49943 am 98a8231e: (-s ours) am 59c87cb6: (-s ours) am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received 
* commit '98a8231e838d7d624c5862d81d1975ef4f8d0d57':
  DO NOT MERGE SystemUI: update signal level when broadcast is received
 2011-05-24 08:44:12 -07:00
Wink Saville
fb9eebc427 am 9a8ea20d: am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE 
* commit '9a8ea20d4b3975d3f771364fb9f2272c32f8cad1':
  Map multiple apnType to one DataConnection fixes.
 2011-05-24 08:42:10 -07:00