OSDN Git Service
Amith Yamasani [Fri, 1 Jul 2011 17:30:00 +0000 (10:30 -0700)]
Merge "Reduce some padding in the search dialog to get more text space."
Alex Sakhartchouk [Fri, 1 Jul 2011 17:04:22 +0000 (10:04 -0700)]
Merge "Adding some debug modes to the rs benchmark app."
Teng-Hui Zhu [Fri, 1 Jul 2011 17:02:27 +0000 (10:02 -0700)]
Merge "Release the media player when exiting the full screen"
Andreas Huber [Fri, 1 Jul 2011 16:48:05 +0000 (09:48 -0700)]
Merge "Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec."
Kazuhiro Ondo [Fri, 1 Jul 2011 16:21:22 +0000 (09:21 -0700)]
am
c0c07d4f: am
012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting
* commit '
c0c07d4ff689a6050ef368933b9c53283a01520a':
DataConnection was cleaned up too early if it's already disconnecting
Edwin Wong [Fri, 1 Jul 2011 15:52:28 +0000 (08:52 -0700)]
Merge "Revert "Fix for b/
4165024: Serious Memory leak when playing a WV protected streaming video.""
James Dong [Fri, 1 Jul 2011 15:35:25 +0000 (08:35 -0700)]
Merge "Return ERROR_END_OF_STREAM when the input source reaches eos"
Kristian Monsen [Fri, 1 Jul 2011 15:04:11 +0000 (08:04 -0700)]
Merge changes I7e8401a4,I412ddf36
* changes:
Merge Chromium at r11.0.696.0: New autofill strings
Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
Robert Greenwalt [Fri, 1 Jul 2011 14:56:38 +0000 (07:56 -0700)]
am
672c468c: am
a2267451: Don\'t ever report a null ServiceState
* commit '
672c468c453ea0b5195f42150d6772ac33d1f7e3':
Don't ever report a null ServiceState
Conley Owens [Fri, 1 Jul 2011 14:56:15 +0000 (07:56 -0700)]
am
e0009bb0: am
98395483: am
9f2cbf14: am
e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
* commit '
e0009bb0b700dcfeba3ff77f8c33113499674432':
Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
Jeff Brown [Fri, 1 Jul 2011 10:11:20 +0000 (03:11 -0700)]
Merge "Query input device for initial slot index."
Chia-chi Yeh [Fri, 1 Jul 2011 06:27:53 +0000 (23:27 -0700)]
Merge "VPN: refactor a little bit for the upcoming integration of legacy VPN."
Jeff Sharkey [Fri, 1 Jul 2011 06:09:51 +0000 (23:09 -0700)]
Merge "Migrate bandwidth control to NMS, omit history."
Chia-chi Yeh [Fri, 1 Jul 2011 06:02:29 +0000 (23:02 -0700)]
Merge "VPN: correct the netmask for IPv4."
Dan Morrill [Fri, 1 Jul 2011 05:37:45 +0000 (22:37 -0700)]
Merge "Add a global-search column for last access."
Hung-ying Tyan [Fri, 1 Jul 2011 03:28:58 +0000 (20:28 -0700)]
Merge "Synchronize SipWakeupTimer.onReceive()"
Adam Powell [Fri, 1 Jul 2011 03:23:52 +0000 (20:23 -0700)]
Merge "Add API to report the presence of a permanent menu key on the device."
Jeff Hamilton [Fri, 1 Jul 2011 01:38:35 +0000 (18:38 -0700)]
Merge "Improve Tag.toString()."
Pannag Sanketi [Fri, 1 Jul 2011 01:38:18 +0000 (18:38 -0700)]
Merge "Minor fix in SurfaceTexture"
Kazuhiro Ondo [Fri, 1 Jul 2011 01:23:42 +0000 (18:23 -0700)]
am
0562efd1: am
f3f9967e: Make sure to update data availability in call setup capable triggers.
* commit '
0562efd1ea970ded01b1b47bbce790a269a60c45':
Make sure to update data availability in call setup capable triggers.
Robert Greenwalt [Fri, 1 Jul 2011 01:23:34 +0000 (18:23 -0700)]
am
8745caaf: am
dbcc57c6: Fix dependencyMet issues regarding hipri APN.
* commit '
8745caaf25e9f2d50125a793b7d02fc4522ba4ba':
Fix dependencyMet issues regarding hipri APN.
Svetoslav Ganov [Fri, 1 Jul 2011 01:07:11 +0000 (18:07 -0700)]
Merge "Crash observed when attempted to uncheck the Accessibility option."
Brian Carlstrom [Fri, 1 Jul 2011 01:06:12 +0000 (18:06 -0700)]
Merge "Add body id to ssl_certificate layout"
Kazuhiro Ondo [Fri, 1 Jul 2011 01:00:06 +0000 (18:00 -0700)]
am
012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting
* commit '
012b86d4294182497c4c72a318e0f4cbe5075a44':
DataConnection was cleaned up too early if it's already disconnecting
Svetoslav Ganov [Fri, 1 Jul 2011 00:18:47 +0000 (17:18 -0700)]
Merge "Fix crash at boot."
Andreas Huber [Thu, 30 Jun 2011 23:58:41 +0000 (16:58 -0700)]
Merge "Seeking/duration in HLS content is based on the individual segments' duration"
Mathias Agopian [Thu, 30 Jun 2011 23:25:25 +0000 (16:25 -0700)]
Merge "fix screen on/off animation, which was flipped"
Mathias Agopian [Thu, 30 Jun 2011 23:23:39 +0000 (16:23 -0700)]
fix screen on/off animation, which was flipped
Bug:
4673549
Change-Id: Ia9766754687b89c1ee24b2dbe918c11290ebe038
Jim Miller [Thu, 30 Jun 2011 22:56:47 +0000 (15:56 -0700)]
Merge "Fix
4691563: Polish MultiWaveView experience in LockScreen and InCall screen Better activation experience: - Hold off on switching out targets until current animation has finished. - Hide unselected targets when a target is selected. Code simplification: - Use explicit callback objects to handle animation updates instead of having MWV implement the interface. - More compact chevron-loading code. - Don't use animations for properties that need to change immediately."
Pannag Sanketi [Fri, 24 Jun 2011 16:56:27 +0000 (09:56 -0700)]
Minor fix in SurfaceTexture
Change-Id: Ic859715becf3e6d5107bd8beb8c577034d00ec52
Robert Greenwalt [Thu, 30 Jun 2011 21:50:32 +0000 (14:50 -0700)]
am
a2267451: Don\'t ever report a null ServiceState
* commit '
a2267451ddf91cc330f4c283e86811e38328915b':
Don't ever report a null ServiceState
Svetoslav Ganov [Thu, 30 Jun 2011 21:19:02 +0000 (14:19 -0700)]
Merge "Updating accessibility documentation."
Adam Powell [Thu, 30 Jun 2011 21:06:33 +0000 (14:06 -0700)]
Merge "Fix some issues with the action bar and action modes."
Dianne Hackborn [Thu, 30 Jun 2011 20:57:27 +0000 (13:57 -0700)]
Merge "Fix issue #
4902856: Don't let apps register non-explicit PendingIntents"
Shimeng (Simon) Wang [Thu, 30 Jun 2011 20:55:10 +0000 (13:55 -0700)]
Merge "Keep initial zoom overview for non-standard load."
RoboErik [Thu, 30 Jun 2011 20:30:15 +0000 (13:30 -0700)]
Merge "API updates to respond to comments"
Fabrice Di Meglio [Thu, 30 Jun 2011 20:11:50 +0000 (13:11 -0700)]
Merge "Support control of text alignment."
Jeff Hamilton [Thu, 30 Jun 2011 20:08:44 +0000 (13:08 -0700)]
Merge "Add a string based createUri()."
Jeff Brown [Thu, 30 Jun 2011 19:52:13 +0000 (12:52 -0700)]
Merge "Synthetic cancel event should have touchscreen source."
Chia-chi Yeh [Thu, 30 Jun 2011 19:43:14 +0000 (12:43 -0700)]
Merge "VPN: refactor few JNI methods for the usage of legacy VPN."
Shimeng (Simon) Wang [Thu, 30 Jun 2011 18:23:12 +0000 (11:23 -0700)]
Merge "Use default scale when restored scale is 0."
Andreas Huber [Thu, 30 Jun 2011 18:21:14 +0000 (11:21 -0700)]
Merge "Revert "Parse RTP-Info even for live streams.""
Irfan Sheriff [Thu, 30 Jun 2011 15:51:01 +0000 (08:51 -0700)]
Merge "DnsPinger changes incl. binding"
Conley Owens [Thu, 30 Jun 2011 15:25:13 +0000 (08:25 -0700)]
am
98395483: am
9f2cbf14: am
e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
* commit '
98395483e4309f7b92348136491575861008b3c0':
Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
Conley Owens [Thu, 30 Jun 2011 15:22:10 +0000 (08:22 -0700)]
am
9f2cbf14: am
e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
* commit '
9f2cbf14f8d79e6ed48ff9d76f6aaede45185418':
Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
Conley Owens [Thu, 30 Jun 2011 15:19:00 +0000 (08:19 -0700)]
am
e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
* commit '
e06749e14c1fb2d78540cba9548ee3b4b7b3b1d9':
Add FLAG_AUTO_CANCEL flag for multiple supl notifications.
Conley Owens [Thu, 30 Jun 2011 15:11:25 +0000 (08:11 -0700)]
Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications."
Justin Ho [Thu, 30 Jun 2011 14:56:53 +0000 (07:56 -0700)]
Merge "Textfield assets from Gingerbread for compatibility"
Justin Ho [Thu, 30 Jun 2011 14:56:43 +0000 (07:56 -0700)]
Merge "Initial upscaled progress spinners from Gingerbread in xhdpi"
Justin Ho [Thu, 30 Jun 2011 14:56:24 +0000 (07:56 -0700)]
Merge "Updated popup assets in xhdpi. Padding issues will be resolved in a separate CL."
Hung-ying Tyan [Thu, 30 Jun 2011 10:04:58 +0000 (03:04 -0700)]
Merge "Make NAT port timeout measurement more flexible."
Jeff Sharkey [Thu, 30 Jun 2011 07:49:12 +0000 (00:49 -0700)]
Merge "Permissions to protect bandwidth statistics."
Chih-Chung Chang [Thu, 30 Jun 2011 07:13:13 +0000 (00:13 -0700)]
Merge "Remove curtain effect (it's unused)."
Jeff Brown [Thu, 30 Jun 2011 04:20:36 +0000 (21:20 -0700)]
Merge "Fix joystick and trackpad regression."
Brian Carlstrom [Thu, 30 Jun 2011 01:49:39 +0000 (18:49 -0700)]
Merge "KeyChain API for credential installation"
Shimeng (Simon) Wang [Thu, 30 Jun 2011 01:04:56 +0000 (18:04 -0700)]
Merge "Initial zoom overview flag only meaningful in page overview mode."
Daniel Sandler [Thu, 30 Jun 2011 00:45:25 +0000 (17:45 -0700)]
Merge "Add 2mm dead zone (12dp) at the top of the navigation bar."
Kazuhiro Ondo [Thu, 30 Jun 2011 00:24:56 +0000 (17:24 -0700)]
am
f3f9967e: Make sure to update data availability in call setup capable triggers.
* commit '
f3f9967e22201276d65f4be6006aca1cecc2a604':
Make sure to update data availability in call setup capable triggers.
Romain Guy [Thu, 30 Jun 2011 00:22:18 +0000 (17:22 -0700)]
Merge "Add test case for driver issue"
Russell Brenner [Wed, 29 Jun 2011 23:16:42 +0000 (16:16 -0700)]
Merge "Add Hebrew bold and regular font files"
Mathias Agopian [Wed, 29 Jun 2011 23:15:56 +0000 (16:15 -0700)]
Merge "SF transactions are now O(1) wrt IPC instead of O(N)."
Chia-chi Yeh [Wed, 29 Jun 2011 23:08:26 +0000 (16:08 -0700)]
Merge "VPN: add a method to handle requests of legacy VPNs."
Teng-Hui Zhu [Wed, 29 Jun 2011 22:58:38 +0000 (15:58 -0700)]
Merge "Media player should be paused while the surface is still alive"
Robert Greenwalt [Wed, 29 Jun 2011 22:22:50 +0000 (15:22 -0700)]
am
dbcc57c6: Fix dependencyMet issues regarding hipri APN.
* commit '
dbcc57c6f1602da324609ddbaf76f836504733ae':
Fix dependencyMet issues regarding hipri APN.
Mathias Agopian [Wed, 29 Jun 2011 02:09:31 +0000 (19:09 -0700)]
SF transactions are now O(1) wrt IPC instead of O(N).
Change-Id: I57669852cbf6aabae244ea86940a08a5a27ffc43
Svetoslav Ganov [Wed, 29 Jun 2011 21:25:44 +0000 (14:25 -0700)]
Merge "Adding right margin in the DatePicker"
Dianne Hackborn [Wed, 29 Jun 2011 21:05:01 +0000 (14:05 -0700)]
Merge "Plumb information from the framework about asec container size."
Jason Simmons [Wed, 29 Jun 2011 20:48:39 +0000 (13:48 -0700)]
Merge "Add a linear transform library to libutils"
Justin Ho [Wed, 29 Jun 2011 19:56:48 +0000 (12:56 -0700)]
Merge "Merging spinners from Gingerbread"
Mike Lockwood [Wed, 29 Jun 2011 19:47:05 +0000 (12:47 -0700)]
Merge "GPS: Support for on-demand NTP time injection"
Svetoslav Ganov [Wed, 29 Jun 2011 19:26:43 +0000 (12:26 -0700)]
Merge "Minor tweak of NumberPicker to draw the scroll wheel at the right locaion"
Matthew Xie [Wed, 29 Jun 2011 18:33:58 +0000 (11:33 -0700)]
Merge "Method setBondState passes its parameter reason to mBondState.setBondState."
Svetoslav Ganov [Wed, 29 Jun 2011 18:31:41 +0000 (11:31 -0700)]
Merge "Minot twaek of the NumberPicker"
Fabrice Di Meglio [Wed, 29 Jun 2011 18:02:23 +0000 (11:02 -0700)]
Merge "Add textDirection support for TextView and ViewGroup"
Jeff Sharkey [Wed, 29 Jun 2011 17:53:06 +0000 (10:53 -0700)]
Merge "Push interface quota rules from NetworkPolicyManager to kernel."
Andreas Huber [Wed, 29 Jun 2011 17:23:14 +0000 (10:23 -0700)]
Merge "Fix a format string that triggered a compile-time warning in OMXCodec.cpp"
Andreas Huber [Wed, 29 Jun 2011 16:51:50 +0000 (09:51 -0700)]
Merge "Instantiate a NetworkChangeNotifier to have chromium transparently handle interface"
Andreas Huber [Wed, 29 Jun 2011 16:11:21 +0000 (09:11 -0700)]
Merge "Support for "streaming" non-transport streams by first converting them to ts packets."
Daisuke Miyakawa [Wed, 29 Jun 2011 15:23:06 +0000 (08:23 -0700)]
Merge "Use upper case country codes in Country.java"
satok [Wed, 29 Jun 2011 15:14:54 +0000 (08:14 -0700)]
Merge "Add onClickView to InputMethodService"
satok [Wed, 29 Jun 2011 14:22:31 +0000 (07:22 -0700)]
Merge "Fix setAdditionalSubtypes"
satok [Wed, 29 Jun 2011 12:03:34 +0000 (05:03 -0700)]
Merge "Show aux ime in the selection dialog if a keyboard is shown."
Flavio Lerda [Wed, 29 Jun 2011 11:50:52 +0000 (04:50 -0700)]
Merge "Constants for accessing call log with voicemails."
Jesse Wilson [Wed, 29 Jun 2011 06:47:02 +0000 (23:47 -0700)]
Merge "Move socket tagging from libcore."
Irfan Sheriff [Wed, 29 Jun 2011 04:44:45 +0000 (21:44 -0700)]
Merge "Ping through default dns & ping settings changes"
Scott Main [Wed, 29 Jun 2011 04:02:05 +0000 (21:02 -0700)]
am
846764e5: am
d3cc051d: am
a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
* commit '
846764e5aafc21d2bed9c7fde0b43e9548f96617':
cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
Scott Main [Wed, 29 Jun 2011 03:57:40 +0000 (20:57 -0700)]
am
d3cc051d: am
a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
* commit '
d3cc051dcb05a32eba1c208792e1bde4654a6db3':
cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
Scott Main [Wed, 29 Jun 2011 03:50:12 +0000 (20:50 -0700)]
am
a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
* commit '
a687045045157eab2dbf657bb085cb0af68d72f2':
cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
Jeff Brown [Wed, 29 Jun 2011 03:38:32 +0000 (20:38 -0700)]
Merge "Add some logging code to track down touch issues."
Jeff Brown [Wed, 29 Jun 2011 03:17:59 +0000 (20:17 -0700)]
Merge "Improve input event consistency invariants."
Jeff Brown [Wed, 29 Jun 2011 03:08:48 +0000 (20:08 -0700)]
Improve input event consistency invariants.
Fixed some issues where inconsistent streams of events could
be generated by the dispatcher, particularly when switching from
hovering with one device to hovering with another.
Fixed a bug where the touch pad would fail to generate a new
HOVER_MOVE following a tap event. As a result, the hover event
stream would not resume until the user touched the touch pad
again.
Change-Id: I444dce84641fb12e56a0af84c931520771d6c493
Xavier Ducrohet [Wed, 29 Jun 2011 02:15:32 +0000 (19:15 -0700)]
am
e1918353: am
842725fc: (-s ours) am
4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread
* commit '
e1918353e795d4f4fb67760ad593458517976072':
Bring in more layout lib changes from hc-mr1.
Xavier Ducrohet [Wed, 29 Jun 2011 02:14:05 +0000 (19:14 -0700)]
am
842725fc: (-s ours) am
4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread
* commit '
842725fc642b7ba2c087cc81796973b838c23c76':
Bring in more layout lib changes from hc-mr1.
Hung-ying Tyan [Wed, 29 Jun 2011 02:04:30 +0000 (19:04 -0700)]
Merge "Record external IP and port from SIP responses"
Xavier Ducrohet [Wed, 29 Jun 2011 02:00:25 +0000 (19:00 -0700)]
am
66044737: (-s ours) am
9bce27a9: (-s ours) am
4753498d: Merge "CherryPick
06942bc4 from hc-mr1. do not merge." into gingerbread
* commit '
660447379d07f2e7480a30784f04cdd476877d73':
CherryPick
06942bc4 from hc-mr1. do not merge.
Xavier Ducrohet [Wed, 29 Jun 2011 01:58:23 +0000 (18:58 -0700)]
am
d7542263: (-s ours) am
155cf6c1: (-s ours) am
9918ffb0: Merge "CherryPick
988eeeb5 from hc-mr1. do not merge." into gingerbread
* commit '
d7542263c6dfa2522e8844c7c714fbf2ad112385':
CherryPick
988eeeb5 from hc-mr1. do not merge.
Xavier Ducrohet [Wed, 29 Jun 2011 01:58:20 +0000 (18:58 -0700)]
am
adf5914b: (-s ours) am
e0947693: (-s ours) am
54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
* commit '
adf5914b390061e48a86c9f55e68899cfa526841':
DO NOT MERGE. may fix build on some version of gcc
Xavier Ducrohet [Wed, 29 Jun 2011 01:58:09 +0000 (18:58 -0700)]
am
9bce27a9: (-s ours) am
4753498d: Merge "CherryPick
06942bc4 from hc-mr1. do not merge." into gingerbread
* commit '
9bce27a9ce916bdf363667ee67fc0ce50c533aa3':
CherryPick
06942bc4 from hc-mr1. do not merge.
Xavier Ducrohet [Wed, 29 Jun 2011 01:56:17 +0000 (18:56 -0700)]
am
155cf6c1: (-s ours) am
9918ffb0: Merge "CherryPick
988eeeb5 from hc-mr1. do not merge." into gingerbread
* commit '
155cf6c1e191bb03fe24db8663715862d8e6a43d':
CherryPick
988eeeb5 from hc-mr1. do not merge.
Xavier Ducrohet [Wed, 29 Jun 2011 01:56:14 +0000 (18:56 -0700)]
am
e0947693: (-s ours) am
54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
* commit '
e0947693c9984727dfa775a747dd32aaaeb90284':
DO NOT MERGE. may fix build on some version of gcc