138749 Commits

Author SHA1 Message Date
Selim Cinek
1352ef562f am 02f94e07: Merge "Fixed several bugs with redaction." into lmp-preview-dev
* commit '02f94e073838c4b58b01d4dbba7b8f60ce01b49c':
  Fixed several bugs with redaction.
2014-06-11 11:24:49 +00:00
Selim Cinek
9e5ed535a4 am 0f700f8c: Merge "Fixed an issue where holes in the notification shade could appear." into lmp-preview-dev
* commit '0f700f8c65979609242d3a18db412a0ce561eccb':
  Fixed an issue where holes in the notification shade could appear.
2014-06-11 11:24:44 +00:00
Nicolas Prevot
0cc9c1e9d3 Merge "Changing the value of the user consent extra in DevicePolicyManager." 2014-06-10 21:31:35 +00:00
Jessica Hummel
fe1de89fe9 am 3d5066de: Merge "Add different resolutions of afw icons" into lmp-preview-dev
* commit '3d5066de154193cc3a08a7be168aa5e31bfe0359':
  Add different resolutions of afw icons
2014-06-11 09:55:17 +00:00
Jessica Hummel
9c9fc7e536 am f65d5b41: Merge "Updating the pictures and labels for cross-profile intents." into lmp-preview-dev
* commit 'f65d5b41bb382a93be752076a2c0d8bd8a2cb012':
  Updating the pictures and labels for cross-profile intents.
2014-06-11 09:55:11 +00:00
Selim Cinek
45f904a529 resolved conflicts for merge of b38fd3d4 to master
Change-Id: Iaa87cdad76e1fa08d93185fd537f3d2783346c8e
2014-06-11 11:45:24 +02:00
Jinsuk Kim
7207b792d9 Merge "Define SendKeyAction for HdmiControlService" 2014-06-10 22:31:57 +00:00
Jinsuk Kim
cd97baf4d0 Define SendKeyAction for HdmiControlService
SendKeyAction is one of FeatureAction classes that handles HDMI-CEC UCP/UCP
(User Control Pressed/Release) command transmission flow mechanism.

Change-Id: Iede8479103330c1f9db516218c6a94d09ef6b7f4
2014-06-11 14:30:32 +09:00
Jungshik Jang
5945d484ca Merge "Use cached message in NewDeviceAction." 2014-06-10 22:31:57 +00:00
Jungshik Jang
a466929979 Use cached message in NewDeviceAction.
Vendor id and osd name can be cached in be reused
later.
Along with this, fix a bug on HotplugDetectionAction.

Change-Id: I0583a9c266eed4281a99a59b1301f41b3e155505
2014-06-11 13:59:59 +09:00
Jungshik Jang
65c64c31ab Implements Hdmi Cec keycode translater
In order to transfer some keyevent to other device
we need to have a logic to translate Android keycode
to Hdmi CEC keycode and vice versa.
HdmiCecKeyTranslater handles bidirectional keycode translation.
Basically it assumes bijection between android key code to
a pair of cec keycode and its optional param.
KeycodeEntry of HdmiCecKeycodeTranslate handles a mapping of it.

Note that all available mappings have no parameterized mapping.
If new Android keycode is defined for parameterized cec keycode,
entry should be added.

Change-Id: I287082a0a6ef5eb6f0916044b78179fe3fdfbece
2014-06-11 10:14:39 +09:00
Yohei Yukawa
04fcf1cabe Merge "Show IME-related system IME dialogs over windows owned by the IME" 2014-06-10 22:29:12 +00:00
Robert Greenwalt
f8333cc381 Merge "Minor changes to the LinkAddress API docs." 2014-06-10 21:59:55 +00:00
Robert Greenwalt
78802575ac Merge "Add a new IpPrefix class and use it in RouteInfo." 2014-06-10 22:12:51 +00:00
Selim Gurun
1ac3e017d4 Merge "Add WebChromeClient.showFileChooser" 2014-06-10 22:13:32 +00:00
Lorenzo Colitti
7dc78cf3af Minor changes to the LinkAddress API docs.
1. Rename getNetworkPrefixLength to getPrefixLength. Update all
   callers in frameworks/base and add a shim method and a TODO
   for the rest.
2. @hide isSameAddressAs. It doesn't add much, and it's just
   one-liner that callers can implement if they want.
3. Fix the alignment of the initial paragraph (<ul> should have
   been </ul>).
4. Remove the documentation that talks about creating
   LinkAddresses, since there's no public API for creating them.

With these changes I think LinkAddress is fine as a public API.

Bug: 15142362
Change-Id: Iaf3b1db577745bb68a9e1dd7f96d666dd3f3ec7c
2014-06-10 14:46:39 -07:00
Selim Cinek
1c9c717f1b am f1187ac8: Merge "Added card elevation when card is clicked on the lockscreen" into lmp-preview-dev
* commit 'f1187ac8e8d2c8927caf322a12de8c32ee3f919f':
  Added card elevation when card is clicked on the lockscreen
2014-06-10 21:41:46 +00:00
Sreeram Ramachandran
cc91c7b804 Add a new IpPrefix class and use it in RouteInfo.
This change uses IpPrefix only in the public API and continues
to use LinkAddress for everything else. It does not change the
callers to use the new APIs, with the exception of changing
all current uses of getDestination to getDestinationLinkAddress
to make room for the new getDestination method that returns an
IpPrefix.

Based on Sreeram's earlier change:
https://googleplex-android-review.git.corp.google.com/#/c/477874/
but a bit simplified and with a bit more documentation.

Bug: 15142362
Bug: 13885501
Change-Id: Ib4cd96b22cbff4ea31bb26a7853989f50da8de4e
2014-06-10 14:30:15 -07:00
Jonathan Dixon
3a5cf3876c Add WebChromeClient.showFileChooser
Bug: 6930981

This replaces the never-published openFileChooser, and is more future
extensible.
Currently hidden; will unhide once working end to end and tested.

Change-Id: Ie66750be37e5b90e4a411cec76278369dc8dabe8
2014-06-10 13:58:07 -07:00
destradaa
54f6e80d32 Merge "IPv6 support for GPS HAL." 2014-06-10 19:42:04 +00:00
Raph Levien
cc8f7ae682 Merge "Support fake italics" 2014-06-10 19:05:29 +00:00
Raph Levien
a7be5dd006 Merge "Support for fake bold in Minikin builds" 2014-06-10 19:05:20 +00:00
Raph Levien
0627ec08dc Support fake italics
This patch adds fake italics, using essentially the same mechanism as
the fake bold implementation. Also combines fake bold/italic settings
with ones explicitly set in the paint.

Change-Id: Ia7eb3ddc8a6192d191711ba723ffd0d1d9d93f2e
2014-06-10 11:49:44 -07:00
Amit Mahajan
965bba3434 Merge "resolved conflicts for merge of 437a77d4 to master" 2014-06-10 18:38:26 +00:00
Raph Levien
1fc0fa87d4 Support for fake bold in Minikin builds
Part of the fix for bug 15436379 Fake bold doesn't fully work (Minikin)

This patch queries the Minikin layout for when fake bold is needed,
and applies that to both shaping and drawing paint.

Also simplifies refcounting (the lifetime of all MinikinFont objects
is subsumed by the enclosing FontCollection).

Note: the fake bold flag set by the user is ignored in this patch.

Fake italics would be possible using the same mechanism, but it's
slightly more complicated (fake and user-set textSkewX values would need
to be combined, and the latter restored after drawing).

Change-Id: Ica2c4604846cbb37e5a783778b18d8993c9d4563
2014-06-10 11:37:55 -07:00
destradaa
96a14701c0 IPv6 support for GPS HAL.
Change-Id: Iacaf3ab86009975ba07e1a13dbe539cf47c5a6f7
2014-06-10 11:14:31 -07:00
Leon Scroggins III
cdb4a446de Merge "Fix a memory leak with empty screenshot." 2014-06-10 18:08:45 +00:00
Matthew Williams
7b5c2340ad am e389d1ea: Merge "Remove SyncRequest.setPriority from public API" into lmp-preview-dev
* commit 'e389d1ea63b0a9caa6d069254ac661ca6420917f':
  Remove SyncRequest.setPriority from public API
2014-06-10 18:05:41 +00:00
Baligh Uddin
ad423df32e am fada3c25: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit 'fada3c25b3e9e7e58b14b42d676220a78264d1d9':
  Import translations. DO NOT MERGE
2014-06-10 18:05:36 +00:00
Santos Cordon
2489ac9d24 am 6538ac8c: (-s ours) Merge "Support conference calling. (1/4) [DO NOT MERGE]" into lmp-preview-dev
* commit '6538ac8c012a67215ee98208f5a668eeb5b7c483':
  Support conference calling. (1/4) [DO NOT MERGE]
2014-06-10 18:05:30 +00:00
Baligh Uddin
ecdb5b2bf8 am 66703cb3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit '66703cb306e154a68bd3ec6b7f15585e7db6b815':
  Import translations. DO NOT MERGE
2014-06-10 18:05:23 +00:00
Baligh Uddin
ab82c3b4a9 am eaeb602c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit 'eaeb602cc207b7d56c829d63cb0d951d28650cbd':
  Import translations. DO NOT MERGE
2014-06-10 18:05:18 +00:00
Adam Connors
39f1311ce1 am 2e98c52d: (-s ours) DO NOT MERGE : Allow system process to call getApplicationBlockedAsUser
* commit '2e98c52d0b2f4722a237933c69f3ba38314479f4':
  DO NOT MERGE : Allow system process to call getApplicationBlockedAsUser
2014-06-10 18:05:07 +00:00
Adam Connors
9d4f771ac1 am c8d4c310: (-s ours) DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
* commit 'c8d4c3109a946fe3d4cf48ec7b14950b37abd669':
  DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
2014-06-10 18:05:01 +00:00
Amit Mahajan
0409e9f0af resolved conflicts for merge of 437a77d4 to master
Change-Id: I65585939a57c561064d370be131c0197de0f08c3
2014-06-10 10:47:26 -07:00
Selim Cinek
554f5406f3 Merge "Fixed several bugs with redaction." into lmp-preview-dev 2014-06-10 17:33:44 +00:00
Selim Cinek
429b1ab5cb Merge "Fixed an issue where holes in the notification shade could appear." into lmp-preview-dev 2014-06-10 17:33:21 +00:00
Chris Craik
1e5cf9aced am b1c76a1a: Merge "Tessellate on worker threads" into lmp-preview-dev
* commit 'b1c76a1abcfb2f33e12fef37ec71d20724863b5e':
  Tessellate on worker threads
2014-06-10 17:22:31 +00:00
Igor Murashkin
f1d758867a am 69729adf: Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev
* commit '69729adf04bddb2e5b67d625412151b4bcbc1ca4':
  camera2: Fix session-related CTS test failures
2014-06-10 17:22:22 +00:00
Adam Lesinski
859cd926fe am a277deb7: (-s ours) DO NOT MERGE - Creating an empty package should be succesfull
* commit 'a277deb755f95ca42e39f8910d958bfd1ceafa55':
  DO NOT MERGE - Creating an empty package should be succesfull
2014-06-10 17:22:12 +00:00
Jeff Brown
085a1e7933 am af0c2ebf: @hide ACCESS_INPUT_FLINGER permission.
* commit 'af0c2ebfc71f6106656eb17345e122ea7ac8cf2a':
  @hide ACCESS_INPUT_FLINGER permission.
2014-06-10 17:21:59 +00:00
Craig Mautner
7683baad6c am a7c5791a: Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev
* commit 'a7c5791a95bf732c2381f698d78930ee61efd36b':
  Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
2014-06-10 17:21:52 +00:00
Christopher Tate
4a1c0bd20b am 2099866f: Merge "Switch framework to using new scheduled-work API" into lmp-preview-dev
* commit '2099866f0d9ae5692e6edfc053aebe7f93a21618':
  Switch framework to using new scheduled-work API
2014-06-10 17:21:47 +00:00
Fabrice Di Meglio
5ef6f9078a am 821c8331: Merge "Fix bug #14258811 Permissions icons are not visible in App info" into lmp-preview-dev
* commit '821c833143d396cf64536eb4938c0d79d1adccc6':
  Fix bug #14258811 Permissions icons are not visible in App info
2014-06-10 17:21:42 +00:00
Leon Scroggins III
e3f9800f38 Fix a memory leak with empty screenshot.
Use an autodeleter to delete the ScreenshotClient when it's not
needed.

Discovered while investigating BUG:15454296, but it does not fix
the problem.

Change-Id: I00ea81de15ddc2507d904a6c20af3c410f573dce
2014-06-10 13:19:35 -04:00
Nicolas Prevot
fb8a98d3f3 Changing the value of the user consent extra in DevicePolicyManager.
Renaming android.app.action.USER_HAS_CONSENTED to
android.app.action.ACTION_PROVISIONING_USER_HAS_CONSENTED

Change-Id: I65a3b8f1ec29a0bed5b61ff9e7587195e1c96cec
2014-06-10 17:59:27 +01:00
Jessica Hummel
096fc544af Merge "Add different resolutions of afw icons" into lmp-preview-dev 2014-06-10 16:56:41 +00:00
Jessica Hummel
ae87d9eede Merge "Updating the pictures and labels for cross-profile intents." into lmp-preview-dev 2014-06-10 16:56:27 +00:00
Selim Cinek
295609a9a5 Merge "Delayed the highlighting of the statusbar header on drag down." into lmp-preview-dev 2014-06-10 16:44:39 +00:00
Selim Cinek
32b5f7a0e8 Merge "Added card elevation when card is clicked on the lockscreen" into lmp-preview-dev 2014-06-10 16:41:02 +00:00