52853 Commits

Author SHA1 Message Date
George Mount
4d994261e9 Fix NPE when shared elements are empty.
Bug 15608384

Change-Id: Id7ae383873d8d09b51d9c680942076a3a8ffea5b
2014-06-17 20:45:31 +00:00
George Mount
d4c3c91dd0 Allow antroid.transition Transitions in fragments.
Bug 15274281
Bug 15189829

Change-Id: I8e2974430b84a611866fe20afe1f5745e803683f
2014-06-17 20:24:16 +00:00
Anish Athalye
a4649d95fe Merge "Implement Paint.breakText() using Minikin" 2014-06-17 04:50:03 +00:00
Robert Ly
31f8d22ec5 am 1d3f9b72: am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-dev
* commit '1d3f9b72505cdf72889f9f1984005097ed35d314':
  fix javadocs b/14414251
2014-06-17 19:31:43 +00:00
Robert Ly
1d3f9b7250 am 0bfee5a4: Merge "fix javadocs b/14414251" into klp-modular-dev
* commit '0bfee5a4905a14a318731661214558792abc2f7d':
  fix javadocs b/14414251
2014-06-17 19:26:48 +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
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
George Mount
b963e13913 Merge "Better coordination of transition destination." 2014-06-17 04:50:03 +00: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
Alex Klyubin
fd445e0336 Merge "Add PSKKeyManager to enable the use of TLS-PSK." 2014-06-17 04:56:28 +00:00
Robin Lee
b12f1778d6 Merge "Publish DevicePolicyManager CA certificate APIs" 2014-06-17 05:12:50 +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
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
f67ce362cf Merge "Import translations. DO NOT MERGE" 2014-06-17 05:00:50 +00: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
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
Robert Ly
0bfee5a490 Merge "fix javadocs b/14414251" into klp-modular-dev 2014-06-17 03:35:51 +00: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
Anish Athalye
a7aa1b0aa5 Implement Paint.breakText() using Minikin
Change-Id: I36cee2d840ce1bd24a9a06f0c680880396b7398a
2014-06-17 00:31:19 +00:00
Adam Lesinski
2c749d2427 New command to get device config
Change-Id: I7172a3a150fd83e2382ca3e4e4a0188758189f14
2014-06-16 23:01:19 +00:00
John Reck
b69fc08303 Merge "Add atlas map pointer validation" 2014-06-16 22:12:26 +00:00
John Reck
b8802b1293 Add atlas map pointer validation
Bug: 15425820

 This just prevents the crash, it's still unclear how bad pointers
 are getting into the map in the first place

Change-Id: I3acffaae09548ec48973035b7fcf5f35606bad60
2014-06-16 15:28:50 -07:00
Raph Levien
466cd7a2a6 Merge "Clean up dirFlags / bidiFlags confusion" 2014-06-16 22:12:26 +00:00
Raph Levien
051910b9f9 Clean up dirFlags / bidiFlags confusion
The dirFlags and bidiFlags enums are distinct, and have different
meanings. The former is a determined direction for a run of text, while
the latter is a request for the bidi algorithm. They have been used
interchangeably, and this has caused some problems, notably running the
bidi algorithm needlessly when the direction for a run is already
determined.

This patch cleans up the confusion, by always naming each occurrence
explicitly "boolean isRtl" or "int bidiFlags" (the previous code often
just used "int flags", which added to the confusion), and converts
between the meanings when a function takes an isRtl argument but passes
it to another function expecting bidiFlags.

Fixes b/15089607 Clean up bidi flag mess

Change-Id: I410b6604376e853dd12c255e7f5a9d2b9a310dd9
2014-06-16 14:36:08 -07:00
Colin Cross
289476b65b am a803542a: am cb634bda: Merge "clean up native com.android.internal.os.Zygote"
* commit 'a803542aad4a58fe2446b8bf9cc4a4f59942d084':
  clean up native com.android.internal.os.Zygote
2014-06-16 20:19:05 +00:00
Baligh Uddin
1e40894890 Import translations. DO NOT MERGE
Change-Id: I0c9e89ee6bd378aae49c1406f0fe5322fbbe24d4
Auto-generated-cl: translation import
2014-06-16 10:02:13 -07:00
Adam Lesinski
e75b2c2677 Fix runtime overlay tests
The runtime overlay tests were crafting bad locales.

Change-Id: I33c87e71752756f40a954db9f01ea3cdde488a42
2014-06-17 01:22:57 +00:00
Fabrice Di Meglio
6b2df21eca Merge "Fix SeekBarPreference Theming" 2014-06-16 15:46:16 +00:00
Fabrice Di Meglio
19ae4ca5a7 Fix SeekBarPreference Theming
- make the layout a Theme attribute and use it
- make a specific Material version of the layout for matching
what we have in the Settings App

See bug: #15414236 Define a framework theme for system settings

and #15384992 Setting Dashboard - padding updates

Change-Id: I69c90523fab112fecf26d89de8fc35dd62430c06
2014-06-16 15:58:25 -07:00
Colin Cross
cb634bda7b Merge "clean up native com.android.internal.os.Zygote" 2014-06-16 15:34:52 +00:00
Colin Cross
18cd9f5762 clean up native com.android.internal.os.Zygote
This is never compiled for the host any more, so remove all the
unnecesarry ifdefs.

Change-Id: I757e6d604b7f41476ac1021f5bdbc777eac6f99e
2014-06-16 12:22:56 -07:00
Narayan Kamath
97df96d8eb am 2ecc4dc8: am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU apis."
* commit '2ecc4dc88fc209f75f5dfe815d6a1fbb5fd49ef2':
  Track changes to libcore ICU apis.
2014-06-16 11:10:00 +00:00
Narayan Kamath
2ecc4dc88f am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU apis."
* commit 'f36fe3f85daaf9e3b3270143d6648394768bb324':
  Track changes to libcore ICU apis.
2014-06-16 11:01:29 +00:00
Narayan Kamath
5af1edc4bb am 5a44bdc8: am 8382b0d3: am ab9a19e3: Merge "Remove some pointless code."
* commit '5a44bdc828cba61aa055e2d71b3af62f39100179':
  Remove some pointless code.
2014-06-16 10:03:19 +00:00
Narayan Kamath
5a44bdc828 am 8382b0d3: am ab9a19e3: Merge "Remove some pointless code."
* commit '8382b0d3c6639ee0eeadec02983bfceaf5ba0a32':
  Remove some pointless code.
2014-06-16 09:54:49 +00:00
Narayan Kamath
8966fd383b am 031dec4a: am bfa6ddd0: Merge "Support deprecated language codes."
* commit '031dec4acd384ae6c5ab183139c7f91289a05f62':
  Support deprecated language codes.
2014-06-16 09:44:03 +00:00
Jessica Hummel
d7ccad9935 Remove unused icon.
The icon was left there during a rename to allow easier merging between android branches.

Change-Id: Ia605e228be1eaebd235bd92100a14b8f5f46f1f8
2014-06-16 09:55:41 +01:00
Jinsuk Kim
6d97f5b91c A few more APIs for HdmiControlService
Added following APIs in HdmiControlService:

- portSelect
- sendKeyEvent
- getPortInfo
- addDeviceEventListener

Some are not fleshed out yet. Will work on it in a follow up CL.

Change-Id: Ia8c635176c0378f6e8db589bf714d82bf21ce85d
2014-06-16 14:01:45 +09:00
Nick Kralevich
5f20e1ae8d am 23315095: am 748f4b8d: Merge "update mLastSlash for gdbserver"
* commit '23315095f1d1f647311ad0fcf05ddb152ad9452d':
  update mLastSlash for gdbserver
2014-06-14 09:05:57 +00:00
Vinod Krishnan
61eb51b8f5 am 1e6048e0: Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev
* commit '1e6048e0158310ee31e0310661bed06a41ac7dd7':
  DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows
2014-06-14 01:06:50 +00:00
Craig Mautner
916cd9770c am 6335fbcb: Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
* commit '6335fbcba106147d914acae0a9d8f4fcd53af768':
  Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
2014-06-14 00:30:47 +00:00
Craig Mautner
6335fbcba1 Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
This reverts commit dd5c94717077c9366dee364c88a86a78e5ee2688.
2014-06-13 17:18:47 -07:00