139565 Commits

Author SHA1 Message Date
Chris Craik
c4fc71dec8 Merge "Interrupt canvas before invoke" 2014-06-17 04:56:28 +00:00
Chris Craik
734df4b427 Interrupt canvas before invoke
Change-Id: I5b818958f6255c594339bd10d9efa99e9e2c00d4
2014-06-17 10:15:46 -07:00
John Reck
81efa15fad Merge "Make sure the root node has a type" 2014-06-17 04:56:28 +00:00
John Reck
2dc223d237 Make sure the root node has a type
Bug: 15686491

Change-Id: I4bd64a6470dd704740e99d21cfdbe84805961401
2014-06-17 10:47:11 -07:00
Richard Coles
2995606963 Merge "Connect WebView Async Cookie APIs" 2014-06-17 05:13:46 +00:00
Hector Dearman
24a11d311c Connect WebView Async Cookie APIs
Bug: 14379829
Change-Id: I6b0e0644153a805eccb48d30b0ad3e91babd8093
2014-06-17 15:32:07 +01:00
Baligh Uddin
0f8f45edad am 3358b9fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit '3358b9fe124a192a1775630d57485bcdec16069d':
  Import translations. DO NOT MERGE
2014-06-17 14:30:19 +00:00
Baligh Uddin
d99d5e098f am 1d96174c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit '1d96174cd57699272fb6dd9abf08599acc6ce8d0':
  Import translations. DO NOT MERGE
2014-06-17 14:30:14 +00:00
Baligh Uddin
22669d0024 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-17 05:00:50 +00:00
Baligh Uddin
281b14eea0 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-17 04:56:28 +00:00
Baligh Uddin
d31899bb76 Merge "Import translations. DO NOT MERGE" 2014-06-17 04:56:28 +00:00
Baligh Uddin
f67ce362cf Merge "Import translations. DO NOT MERGE" 2014-06-17 05:00:50 +00:00
Jungshik Jang
3ecdd832c7 Fix missing iteration policy on device discover action
Device polling requires both pick policy and pick iteration policy,
however, device discovery action has no iteration policy.
Along with fix, move send result and pick policy constants
to HdmiConstants package

Change-Id: Ibbcfdc482a189bbc3aa2c61143422541da78447d
2014-06-17 14:04:38 +09:00
John Reck
bf6899ed76 Merge "Handle Z in DA" 2014-06-17 04:50:03 +00:00
George Mount
13ccb79b34 Fix when allowExitOverlap is true to start entering as soon as possible
Bug 15474908

Change-Id: I6d2e8f940c9ed8427183b58a712c244c9940d535
2014-06-17 17:59:54 +00:00
John Reck
293e868bfc Handle Z in DA
Bug: 15671775

Change-Id: I33c7a70e78ef523ffd03165fb6c39d8e04d04f1f
2014-06-17 10:56:00 -07:00
George Mount
b963e13913 Merge "Better coordination of transition destination." 2014-06-17 04:50:03 +00:00
Jorim Jaggi
129e7ac809 Fix paddings for user switch and status bar icons.
Bug: 15540707
Change-Id: If7288d032b9625e0fbb5b657afcf680d178e63ee
(cherry picked from commit 5d545e7c89231ac80ab2b666bd83f63bcf54f78f)
2014-06-17 10:36:31 -07:00
George Mount
67d924341a Better coordination of transition destination.
Bug 15470128
Bug 15470558

Wait for shared element destinations to be complete
before sending it to the calling activity.

Don't allow layout between setting final destination
and the transition values capture.

Use snapshots to hold the final position while waiting
for the called Activity to take the shared element.

Fixed problem with exiting views sometimes disappearing
when exiting.

Change-Id: Ibc655f7bb9e8dd6e8a15778c96931e3d845cc15c
2014-06-17 10:26:50 -07:00
Griff Hazen
ea54579b54 am 6762a335: am 831ca9d3: Document best practices for display intent activities.
* commit '6762a3351ce84ec31ce7cd54c952ddb65a108958':
  Document best practices for display intent activities.
2014-06-17 16:25:10 +00:00
Griff Hazen
6762a3351c am 831ca9d3: Document best practices for display intent activities.
* commit '831ca9d3bc73e37f555f6c07babde270f83044fe':
  Document best practices for display intent activities.
2014-06-17 16:20:30 +00:00
Griff Hazen
831ca9d3bc Document best practices for display intent activities.
Bug: 15412926

Change-Id: I1c3082dfde85cd03ffc97be6383a0608f925edcf
2014-06-17 00:38:38 -07:00
Alex Klyubin
fd445e0336 Merge "Add PSKKeyManager to enable the use of TLS-PSK." 2014-06-17 04:56:28 +00:00
Griff Hazen
f8f8bdaeba am e2f0160f: [Doc fix] Document best practices for display intent activities.
* commit 'e2f0160f776448d18411c25c4dccd888b0cefd92':
  [Doc fix] Document best practices for display intent activities.
2014-06-17 16:52:24 +00:00
Griff Hazen
0d0c177518 [Doc fix] Document best practices for display intent activities.
Bug: 15412926

Change-Id: I1c3082dfde85cd03ffc97be6383a0608f925edcf
(cherry picked from commit 831ca9d3bc73e37f555f6c07babde270f83044fe)
2014-06-17 16:26:28 +00:00
Robin Lee
b12f1778d6 Merge "Publish DevicePolicyManager CA certificate APIs" 2014-06-17 05:12:50 +00:00
John Reck
593007b804 Merge "Remove incorrect isEnabled() check" 2014-06-17 04:50:03 +00:00
John Reck
9d7ee60e5e Remove incorrect isEnabled() check
Bug: 15683945

 invokeFunctor() does not require isEnabled() to be true
 to execute. Specifically it does not care if HardwareRenderer
 has a Surface or not, as it will fall back to a pbuffer surface
 if available. If there is no context at all, it will invoke
 with kModeProcessNoContext.

Change-Id: Ie6abe566b92c8fa33bb7a673fc3b9fa9ce913446
2014-06-17 09:01:33 -07:00
Jungshik Jang
8db85ab744 Merge "Rename HdmiCecKeycodeTranslater to HdmiCecKeycode." 2014-06-17 04:00:08 +00:00
Jungshik Jang
cd3445cc8b Rename HdmiCecKeycodeTranslater to HdmiCecKeycode.
Since HdmiCecKeycode defines all keys used for Hdmi CEC,
simple HdmiCecKeycode sounds better than HdmiCecKeycodeTranslater.

Change-Id: I1a0ea9f128b19dd47bfda3bf2dd8794a9e42c6f8
2014-06-17 13:23:06 +09:00
Lorenzo Colitti
b86f752a24 Merge "Notify network observers of route changes." 2014-06-17 04:04:28 +00:00
Lorenzo Colitti
8c0d4594c3 Merge "Move netlink updates to a new NetlinkTracker class." 2014-06-17 04:04:28 +00:00
Jungshik Jang
3e1e33f13b Merge "Rearrange ownership between Hdmi control modules." 2014-06-17 04:00:08 +00:00
Jungshik Jang
79c58a4b97 Rearrange ownership between Hdmi control modules.
Here is a list of changes on this. (R: rationale)
1. HdmiCecLocalDeviceTv takes over responsibilty of device info
management.
 R: All devices infos are added or removed by only Tv's
device discovery and hot plug detection mecanism

2. Each HdmiCecLocalDevice manages FeatureAction and Cec
 message cache.
 R: There is no direct connection between actions that
 are created in different device action. If there is
 an same actions created from different local device,
 they should be managed independently.

3. Active path and logical address is managed by
   HdmiCecLocalDevice.
 R: All device should know active path of current source.

4. All system audio & ARC features are handled by
   HdmiCecLocalDeviceTv
 R: In terms of ARC, theoretically, any device can be transmiter of
   ARC but TV is the de facto device
   On other hands, for system audio Tv is the recipeint
    of request.

Change-Id: Iac9ff43fb41798ed4f94c61d23345fe5fe777fbb
2014-06-17 13:03:55 +09:00
Lorenzo Colitti
3ee63c25e4 Merge "Modify LinkProperties add/remove route functions." 2014-06-17 04:00:08 +00:00
Lorenzo Colitti
0f50bbfe45 Merge "IpPrefix improvements." 2014-06-17 04:11:04 +00:00
John Spurlock
64d1fbfa06 Merge "QS: Update embedded vol panel when re-attached to window." 2014-06-17 03:54:31 +00:00
John Spurlock
5de966790f QS: Update embedded vol panel when re-attached to window.
We intentionally drop interim updates when the panel is not
visible, but we should catch up when it becomes visible again.

Not a problem for the dialog panel, since it is torn down / recreated
each time.

Bug:15573750
Change-Id: I717b5d459acb25f9610222e9913d7b8eb71cdd00
2014-06-17 11:25:21 -04:00
smain@google.com
28b244ef02 am 755c930a: am b17420b8: Merge "add toggle for IDE instructions, revise some titles and other cleanup to Google API setup" into klp-modular-dev
* commit '755c930a5139987d865facdc9ed2e8c033136dfd':
  add toggle for IDE instructions, revise some titles and other cleanup to Google API setup
2014-06-17 03:33:25 +00:00
smain@google.com
755c930a51 am b17420b8: Merge "add toggle for IDE instructions, revise some titles and other cleanup to Google API setup" into klp-modular-dev
* commit 'b17420b81ebe7e1235a45ad3e7ce8c1850c129f2':
  add toggle for IDE instructions, revise some titles and other cleanup to Google API setup
2014-06-17 03:24:16 +00:00
Robert Ly
792346e494 am 48e337ae: am 696b3cd9: docs: fix links
* commit '48e337ae333d0b960fa4d4abcd3c1a68a4c5bfc1':
  docs: fix links
2014-06-17 03:23:48 +00:00
Robert Ly
48e337ae33 am 696b3cd9: docs: fix links
* commit '696b3cd96f0c0d061b3f860412ad1e6cf34b64c9':
  docs: fix links
2014-06-17 03:19:13 +00:00
Robert Ly
696b3cd96f docs: fix links
Change-Id: Ibbf3e24893d953a65cb1ef2dd31cf1174a40ebf6
2014-06-16 20:10:49 -07:00
Lorenzo Colitti
c18cbfdf8d Notify network observers of route changes.
Bug: 9180552
Change-Id: If8432bc74335676320b815784b21f404d3479c35
2014-06-17 11:18:54 +09:00
Lorenzo Colitti
10accbb46e Move netlink updates to a new NetlinkTracker class.
This will allow us to use this logic on other link types such as
Ethernet, and will also avoid increasing the complexity of
WifiStateMachine as we get more information such as routes and
DNS servers from netlink.

Bug: 9180552
Change-Id: I79034827cb0c5f24d783d7243e04b69e12aa3cc6
2014-06-17 11:18:53 +09:00
Lorenzo Colitti
c17a1b9ee4 Modify LinkProperties add/remove route functions.
This will allow us to dynamically track routes being added and
removed, similar to what we do for IP addresses.

1. Support removing routes. Since this is a new function, we
   don't need to jump through hoops to support callers passing
   in routes that have no interface, we just fail to match them.
2. Make the addRoute method return a boolean value indicating
   whether anything changed. This is consistent with what we do
   for addresses and is used to decide whether to update the
   rest of the system when an update comes in.

Bug: 9180552
Change-Id: I50648b5f81ec55c88501a7640e119cda2bb540f2
2014-06-17 11:18:53 +09:00
Lorenzo Colitti
8c6c2c3c92 IpPrefix improvements.
1. Allow IpPrefixes to be created from strings. In order to do
   this, factor out the code from LinkAddress which already does
   this to a small utility class in NetworkUtils.
2. Truncate prefixes on creation, fixing a TODO.
3. Add a toString method.
4. Write a unit test.

While I'm at it, make RouteInfoTest pass again, and convert it
to use IpPrefix instead of LinkAddress.

Change-Id: I5f68f8af8f4aedb25afaee00e05369f01e82a70b
2014-06-17 11:18:53 +09:00
Robert Ly
f141f48fb4 am 483af3bf: docs: fix lmp index
* commit '483af3bf9e0de4d84b6b36fddf458d35ba5728d6':
  docs: fix lmp index
2014-06-17 00:05:15 +00:00
RoboErik
6b1bea0903 b/15676582 Fix ordering of sessions returned by MediaSessionManager
This was causing the wrong rcc to be shown. Simple fix
just fixes the ordering so it's not reversed.

Change-Id: I56f2d9d6895d6ba3b0eca8f77a3b0b63e0193ad1
2014-06-16 16:59:37 -07:00
Robert Ly
483af3bf9e docs: fix lmp index
Change-Id: If3f696cba65bcd9a126a1abde6d4b2a0bda84767
2014-06-16 16:56:09 -07:00