23208 Commits

Author SHA1 Message Date
Teng-Hui Zhu
f17bd97103 Merge "Release the media player when exiting the full screen" 2011-07-01 10:02:27 -07:00
Kristian Monsen
5faaadffbf 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
2011-07-01 08:04:11 -07:00
Debashish Chatterjee
73f0a3a6bd VoicemailContract API change to add voicemail status table fields.
See design doc:
https://docs.google.com/a/google.com/document/pub?id=1FM2cl7Qqt002m9PahbpxUAJNM8rdH1b08IHePi-qaDA

Change-Id: Ib471f50d32ed77eed45a4e0857e3053be8a6582d
2011-07-01 14:08:06 +01:00
Chia-chi Yeh
41d1685a22 VPN: integrate legacy VPN.
Change-Id: I00e77664354c05e0edfcd5fb2e3da2ca434ed521
2011-07-01 02:12:06 -07:00
Chia-chi Yeh
8909b10175 VPN: Use List<String> instead for dnsServers and searchDomains.
Change-Id: I5d72c182ad47f59121a04b68ec6c2d164e2d00a8
2011-07-01 01:14:19 -07:00
Chia-chi Yeh
5db03df1ff VpnDialogs: prepare for the usages of legacy VPN.
- Use PendingIntent to start activities.
- Handle configs without package names.
- Switch to system UID.

Change-Id: Ia78112a97e3628b603d9e059705e32694ebe142b
2011-07-01 00:10:32 -07:00
Chia-chi Yeh
2e46061cd2 Merge "VPN: refactor a little bit for the upcoming integration of legacy VPN." 2011-06-30 23:27:53 -07:00
Chia-chi Yeh
a4b87b5e98 VPN: refactor a little bit for the upcoming integration of legacy VPN.
Change-Id: I0fe0dffe59d8d9c9a0fdd05e07b07aa6c8da0a80
2011-06-30 23:21:55 -07:00
Jeff Sharkey
072d39e079 Merge "Migrate bandwidth control to NMS, omit history." 2011-06-30 23:09:51 -07:00
Dan Morrill
5093d3ee99 Merge "Add a global-search column for last access." 2011-06-30 22:37:45 -07:00
Adam Powell
eefc908921 Merge "Add API to report the presence of a permanent menu key on the device." 2011-06-30 20:23:52 -07:00
Adam Powell
8c47062522 Add API to report the presence of a permanent menu key on the device.
Action bar now uses this to determine whether to show an overflow menu.

Change-Id: Ife4f724d02bbc0d9d86d94740c85299f6dacae91
2011-06-30 19:40:54 -07:00
Jeff Hamilton
748d9f2fe4 Merge "Improve Tag.toString()." 2011-06-30 18:38:35 -07:00
Svetoslav Ganov
0e0c204391 Merge "Crash observed when attempted to uncheck the Accessibility option." 2011-06-30 18:07:11 -07:00
Brian Carlstrom
77dd02df71 Merge "Add body id to ssl_certificate layout" 2011-06-30 18:06:12 -07:00
Brian Carlstrom
2ddef21f6e Add body id to ssl_certificate layout
Change-Id: I81d6d0a9fb8fd8a97db1c667e2dc245fba584d15
2011-06-30 18:04:26 -07:00
Svetoslav Ganov
ce5ee2dc8d Crash observed when attempted to uncheck the Accessibility option.
1. Accessibility events for change in the window content are sent
   with a delay and code performing the send does not check the
   accessibilitys state before sending the event.

bug:4980754

Change-Id: Ice68037ebab9c5dcd0dece927765585e13959c0c
2011-06-30 18:04:01 -07:00
Teng-Hui Zhu
b1c2c1e3c7 Release the media player when exiting the full screen
Once we switch out from full screen mode, the player will be re-created for the
next video, we should release the sources as early as possible.

bug:4332676
Change-Id: I4c26523b3600d3100f81e422979236fca57beb7c
2011-06-30 16:44:47 -07:00
Jim Miller
d0c18aabac 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." 2011-06-30 15:56:47 -07:00
Jeff Sharkey
350083e36b Migrate bandwidth control to NMS, omit history.
Both stats and policy make NMS calls that depend on bandwidth control
being enabled, so move enable/disable into NMS and drop calls when
disabled.  This avoids throwing heavy ISE exceptions when disabled.

Only include recent data when writing NetworkStatsHistory as part of
dumpsys call.  Introduce manual poll event for Settings UI.

Bug: 4982115, 4770435, 4515856
Change-Id: I257820b057af2f0f99c736fb4f61e55b9fdc3e66
2011-06-30 15:47:51 -07:00
Jim Miller
4dfecf55c1 Fix runtime reboot loop.
Change-Id: Ib0614e64e81e376fdbbe7c42a5e4aa8fb9c88ce9
2011-06-30 15:45:35 -07:00
Jeff Hamilton
8856c4278d Improve Tag.toString().
Change-Id: Iea254201d04dc45bc94c237aa4a57da096c5f134
2011-06-30 17:35:05 -05:00
Jim Miller
1c8d207201 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.

Other minor timing tweaks.

Change-Id: I328533e8ab7b4c69c7ba51c8c55002765dcbbd46
2011-06-30 14:30:37 -07:00
Svetoslav Ganov
1e75fbd8fe Merge "Updating accessibility documentation." 2011-06-30 14:19:02 -07:00
Svetoslav Ganov
38e8b4e5bc Updating accessibility documentation.
Change-Id: Ice8cf9ac6918b3bfa553776c68d4619fa6559cf8
2011-06-30 14:18:34 -07:00
Adam Powell
43b944f19d Merge "Fix some issues with the action bar and action modes." 2011-06-30 14:06:33 -07:00
Dianne Hackborn
e6b3af24c4 Merge "Fix issue #4902856: Don't let apps register non-explicit PendingIntents" 2011-06-30 13:57:27 -07:00
Adam Powell
f6ce6a9bac Fix some issues with the action bar and action modes.
Fix bug 4976004 - bad title measurement for split action modes

Fix bug 4902960 - action modes leaving a hidden action bar in a bad state

Sync with design for the behavior of various permutations of action
bar configuration + modes.

Change-Id: Id75f6b5911b761fabc5fef2cc2600ce197cf9a92
2011-06-30 13:55:19 -07:00
Shimeng (Simon) Wang
56528a3546 Merge "Keep initial zoom overview for non-standard load." 2011-06-30 13:55:10 -07:00
Shimeng (Simon) Wang
72a1d2e138 Keep initial zoom overview for non-standard load.
In case of non-standard load such as reload, currently the ZoomManager's
onFirstLayout will not be triggered, hence initial zoom overview will not
be set.

This change provides a fix to set initial zoom overview in case of
non-standard load for the new picture after first layout.

issue: 4975315
Change-Id: If2ba3e472f2bb7b6fc4c52024d18a66dc1e41a23
2011-06-30 13:36:53 -07:00
RoboErik
5612b3d125 Merge "API updates to respond to comments" 2011-06-30 13:30:15 -07:00
Fabrice Di Meglio
fe8b06cfb4 Merge "Support control of text alignment." 2011-06-30 13:11:50 -07:00
RoboErik
083cd2dfeb API updates to respond to comments
Change-Id: I58597b722fc0c39da53570a45c859372bf4c3782
2011-06-30 13:09:33 -07:00
Jeff Hamilton
169abcf63f Merge "Add a string based createUri()." 2011-06-30 13:08:44 -07:00
Jeff Brown
8ef7358fb3 Merge "Synthetic cancel event should have touchscreen source." 2011-06-30 12:52:13 -07:00
Jeff Hamilton
1584af9d4e Add a string based createUri().
Change-Id: Ie26977684d0f48201daa605b8b6057ab9afb370e
2011-06-30 14:51:07 -05:00
Jeff Brown
2fdbc5a0c4 Synthetic cancel event should have touchscreen source.
Fixed a warning identified by the InputEventConsistencyVerifier
due to some code that synthesizes a touch event which it sends
to onTouchEvent with no input device source specified.
This is generally harmless but a fake source is better than
none in this case.

Change-Id: I44cfa36a4746f598f8fde3086084af3896e2ba2a
2011-06-30 12:25:54 -07:00
Dianne Hackborn
6c418d585e Fix issue #4902856: Don't let apps register non-explicit PendingIntents
Location manager now checks for such intents, and logs a warning when
they are given to it.  Nothing thrown yet, it needs to check the
targetSdkVersion of the caller somehow.

When sending the pending intent, we require that the recipient hold the
appropriate permission.  This should pretty much close the security hole.

Includes a bunch of infrastructure in the activity manager needed to
support all this.

Change-Id: I4dba7a98a7b8bbb9e347666451aa9cb1efad1848
2011-06-30 11:23:54 -07:00
Shimeng (Simon) Wang
e58e9b8c82 Merge "Use default scale when restored scale is 0." 2011-06-30 11:23:12 -07:00
Shimeng (Simon) Wang
be768ee508 Use default scale when restored scale is 0.
issue: 4975315
Change-Id: I47aa09605bb245cd271932d59d4d334f1e1b732f
2011-06-30 10:27:30 -07:00
Justin Ho
ab337a01ce Merge "Textfield assets from Gingerbread for compatibility" 2011-06-30 07:56:53 -07:00
Justin Ho
be9fbbc9e8 Merge "Initial upscaled progress spinners from Gingerbread in xhdpi" 2011-06-30 07:56:43 -07:00
Justin Ho
65b1847722 Merge "Updated popup assets in xhdpi. Padding issues will be resolved in a separate CL." 2011-06-30 07:56:24 -07:00
Kristian Monsen
6f38f0f68e Merge Chromium at r11.0.696.0: New autofill strings
Corresponding native change:
https://android-git.corp.google.com/g/#change,118079

Change-Id: I7e8401a4909c903ee4806825ff82a49e3cf6dacb
2011-06-30 13:48:14 +01:00
Jeff Sharkey
428e84388a Extend network stats to signatureOrSystem.
Change-Id: I82cc99797b5d5bc3bb9a876b67f311643174da33
2011-06-30 00:50:52 -07:00
Jeff Sharkey
845678fcbf Merge "Permissions to protect bandwidth statistics." 2011-06-30 00:49:12 -07:00
Jeff Sharkey
b3f19ca36c Enforce background data flag, rules through netd.
Connect up netd penalty box through NMS, and enforce the existing
background data flag by putting all UIDs in penalty box.  Allow
platform applications to have policy applied.  Only dispatch unique
rules to netd, avoiding any repeats.

Bug: 4598463, 4965677
Change-Id: Ibf9beff998ba7a1ea92f5e2f7eeba7b483d4b918
2011-06-30 00:17:46 -07:00
Brian Carlstrom
6e24576b6b Merge "KeyChain API for credential installation" 2011-06-29 18:49:39 -07:00
Brian Carlstrom
a00a2b33cc KeyChain API for credential installation
Bug: 3497064
Change-Id: I4ac4d8b5559496b1632d63c2129e2bafd240893f
2011-06-29 18:46:56 -07:00
Shimeng (Simon) Wang
3e622f5c3c Merge "Initial zoom overview flag only meaningful in page overview mode." 2011-06-29 18:04:56 -07:00