Commit Graph

41505 Commits

Author SHA1 Message Date
George Mount
e799cd44e0 am d28671db: am b9a2399e: am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev
* commit 'd28671db218886b24ca3fe38ad8446fdef04b5dc':
  Fixed: TransitionSet setStartDelay did nothing.
2014-09-12 19:23:31 +00:00
George Mount
bc12aa06e0 am 9c663fcf: am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev
* commit '9c663fcfb9efc4313bcaf57ee52d207bd2c4ea35':
  Have Activity Transitions activited by a new window attribute.
2014-09-12 19:23:26 +00:00
Igor Murashkin
67335343f4 am 0682190b: am 5d2587c3: am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev
* commit '0682190b025b5039567532de2a752a00e7c20977':
  camera2.legacy: Add aberration, noisereduction, timestamp source keys
2014-09-12 19:23:15 +00:00
Sreeram Ramachandran
dd6ecbaaee am 2b3b6875: am 6e06689c: am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev
* commit '2b3b68753f4bb2231d9a17393fdfeac93a1b24c0':
  Hide mutable VpnService APIs to add/remove IP addresses dynamically.
2014-09-12 19:23:08 +00:00
Chet Haase
3e2ff75f7b am 4280132f: am e58831a6: am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev
* commit '4280132f44a20d42cffd436d8eab7653c82b3249':
  Make starting window hw-accelerated
2014-09-12 19:22:14 +00:00
Robin Lee
e5c0bc9530 am 7ee71d8a: am ac988bd9: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev
* commit '7ee71d8a7be25bea6b66b26898945b27dffb3af6':
  Add DevicePolicyManager PrivateKey mgmt
2014-09-12 19:19:24 +00:00
Matthew Williams
b0b0b7fd30 am f94a6a7c: am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev
* commit 'f94a6a7c55682d634b4d0f9a1184afe57d18f3c4':
  Add flag to JobParameters for job expired
2014-09-12 19:18:50 +00:00
Amith Yamasani
3b4bc41239 am 411eda84: am 3b18a0c5: am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev
* commit '411eda84661bb1ddde095e51c00bc05a71d86451':
  Apply cross-user restrictions to Shell
2014-09-12 19:18:30 +00:00
Alexandra Gherghina
c323e1cbca am 23e809a3: am 3507cc0f: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev
* commit '23e809a396c44ab7c2b8a103b621ee49a9947640':
  Bugfix: use the correct user for ContentResolver calls
2014-09-12 19:17:37 +00:00
Przemyslaw Szczepaniak
990d99290d am c67fbc95: am 817dbc8c: am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev
* commit 'c67fbc959991bb9c49ffcd4f0f238d74541a18d2':
  Replace TreeSet with HashSet.
2014-09-12 19:17:26 +00:00
George Mount
79055af7e4 am ad2317c7: am 6a6c4eed: am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev
* commit 'ad2317c7dd51b1c0bbac223ef467d7a5b9ee613e':
  Omit appearing views that have a parent that is also appearing.
2014-09-12 19:17:21 +00:00
Julia Reynolds
056c6d0e95 am b5f388f8: am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev
* commit 'b5f388f8f6b94dae5b8a4d4eb68316d52df4cdcd':
  Allow device owners to update LOCATION_MODE.
2014-09-12 19:17:02 +00:00
Alexandra Gherghina
d681c23cd6 am dda4634d: am 04d1560c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev
* commit 'dda4634da53dd9732969ebf0871c9f4f3760c600':
  Remove package level intent forwarding.
2014-09-12 19:15:56 +00:00
Paul Jensen
f0a0068496 am 14add2d2: am 576fc3ca: am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev
* commit '14add2d2140a85394024d67bb8d7fd156920721a':
  Flush HTTP socket pools and DNS cache when binding process to a Network.
2014-09-12 18:04:11 +00:00
Paul Jensen
cb2403d453 am d0295aac: am 09ff9d7e: am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev
* commit 'd0295aac9c30e820424678fca3c0c7eaa8bdba65':
  Make Network.openConnection() share HttpHandlers not OkHttpClients.
2014-09-12 18:04:06 +00:00
George Mount
189a460a34 am b9a2399e: am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev
* commit 'b9a2399e205f231f07176063854a8410a7fec1c1':
  Fixed: TransitionSet setStartDelay did nothing.
2014-09-12 05:44:57 +00:00
George Mount
b6d4a7f141 am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev
* commit '9ace814b28d582e9cd08f13919ba5b672e2b72ef':
  Have Activity Transitions activited by a new window attribute.
2014-09-12 05:44:51 +00:00
Igor Murashkin
5e03d27960 am 5d2587c3: am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev
* commit '5d2587c3ff59ac30b411f5b0d593707289ffc0aa':
  camera2.legacy: Add aberration, noisereduction, timestamp source keys
2014-09-12 05:44:41 +00:00
Sreeram Ramachandran
ea949c3002 am 6e06689c: am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev
* commit '6e06689c6dc38e57b83d73d22245fffe1b5065c4':
  Hide mutable VpnService APIs to add/remove IP addresses dynamically.
2014-09-12 05:44:36 +00:00
Chet Haase
dcce4a5119 am e58831a6: am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev
* commit 'e58831a6a0edce3114686cb8168652a50e956031':
  Make starting window hw-accelerated
2014-09-12 05:43:45 +00:00
George Mount
e6f66e78a5 Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev 2014-09-11 22:08:36 +00:00
George Mount
04600023d0 Fixed: TransitionSet setStartDelay did nothing.
Bug 17452965

Change-Id: Id2fd6ed3bd8e7156dd3d22dcd83117cec12e3528
2014-09-11 14:59:58 -07:00
George Mount
db352c7835 Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 2014-09-11 21:54:13 +00:00
Igor Murashkin
6894f60c9c Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev 2014-09-11 21:50:34 +00:00
Sreeram Ramachandran
a1e06807ee Hide mutable VpnService APIs to add/remove IP addresses dynamically.
These APIs were added because we thought we needed them to provide
seamless transition from one server backend to another using local IP
addresses to distinguish between the backends. I.e., connections whose
local IP address was old would be routed to the old backend; connections
whose local IP address was new would be routed to the new backend.

It turns out that's not needed. VpnService already supports seamless
re-establishment, so VPNs just need to call establish() again with a
different IP address. I've verified with a custom VPN app that this
works, and can distinguish traffic based on the old and new addresses.

Nobody is using these APIs at the moment, so we could even consider
removing them altogether, but I prefer just hiding them, just in case.

Bug: 15409819
Change-Id: I30949926a0f859c9d839981ccbc5d8e1e535a3a5
2014-09-11 14:17:10 -07:00
Igor Murashkin
442395751d camera2.legacy: Add aberration, noisereduction, timestamp source keys
Bug: 17328591
Change-Id: I037908e0db505ace1ef62d5aa0622596d8fa2713
2014-09-11 13:21:37 -07:00
Chet Haase
969e543b32 Merge "Make starting window hw-accelerated" into lmp-dev 2014-09-11 19:32:00 +00:00
Chet Haase
4f52b34206 Make starting window hw-accelerated
An earlier fix in L disabled hw acceleration for the starting window
after the system process became hw accelerated. This was done to preserve
the old behavior of the starting window having some default behavior
(in particular, being filled with a default color). However, this ends up
being a memory and performance problem on some platforms (memory because
some platforms have backing store for software surfaces, performance
because it takes far longer to create a screen-size software surface than
a hardware surface).

The fix is to allow the starting window to inherit the hw acceleration
behavior of its process, and to detect when we are drawing the contents
of that starting window and to fill it with a default color (black).

Issue #17443449 use hardware rendering for app preview window

Change-Id: I8be8111d9e38c51fbbc07185acca065815ce26dc
2014-09-11 12:28:29 -07:00
George Mount
9826f636ad Have Activity Transitions activited by a new window attribute.
Bug 17006497

Window content transitions were being enabled by default in
the Material Theme so that Activity Transitions could be
enabled by default. Unfortunately, this gave the effect that
many applications did not want -- the default transition between
window content is a fade out/in. Here, a new attribute is
added: windowActivityTransitions that is enabled by default
in the Material theme and windowContentTransitions is disabled
by default in all themes.

Change-Id: Iab453d608f00a48ff7ab7f09ce84b52cf5f20294
2014-09-11 12:23:17 -07:00
Robin Lee
ebf185a591 am ac988bd9: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev
* commit 'ac988bd9e45c5588cfffc6e67d04e54b86ecd519':
  Add DevicePolicyManager PrivateKey mgmt
2014-09-11 18:39:54 +00:00
Matthew Williams
146eccccbd am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev
* commit '04f538e80614567cb175e2021265d2b6cd727a99':
  Add flag to JobParameters for job expired
2014-09-11 18:32:08 +00:00
Amith Yamasani
5f0439d729 am 3b18a0c5: am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev
* commit '3b18a0c5f8efdb915fb1304c959236d608eb8b79':
  Apply cross-user restrictions to Shell
2014-09-11 18:31:06 +00:00
Bernhard Bauer
26408ccd8e Add DevicePolicyManager PrivateKey mgmt
Additional device policy API to install keypairs to the keychain
silently.

Bug: 15065444
Change-Id: Idc25774c9ab1a61080290bebd6f5c4f24e6ee2e0
2014-09-11 19:17:00 +01:00
Alan Viverette
a2d2aaabb2 am 4a8d9449: am 5f9ce5e9: am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev
* commit '4a8d944934b47cd3a0e9a52b5b133c550fe9c836':
  Use Calendar day of week rather than Time in SimpleMonthView
2014-09-11 17:28:17 +00:00
Svetoslav Ganov
24b4c4e82c am 983a6f93: am b6e7e347: am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev
* commit '983a6f9385389e7d82ee4ea1d4343b949a67849d':
  Using the correct package name for ContentResolver
2014-09-11 17:28:05 +00:00
Matthew Williams
91911fd952 Merge "Add flag to JobParameters for job expired" into lmp-dev 2014-09-11 17:27:58 +00:00
Dianne Hackborn
3cec76c455 am 1fa1dd50: am f6f453d1: am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev
* commit '1fa1dd50bad987722c8907b1b305597884b7cc65':
  Fix issue #17428001: Fix revokeUriPermissions
2014-09-11 17:27:48 +00:00
Lajos Molnar
5a52457fab am 7fca7f55: am b9414beb: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev
* commit '7fca7f55f21cd34b94ace89167f6516228520bff':
  add android.util.SizeF.parseSizeF()
2014-09-11 17:27:43 +00:00
Alan Viverette
a75f6b3159 am b2f46415: am ba870607: am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev
* commit 'b2f46415d2a05e25a9eca912060958ac0d827c59':
  Fix docs and nulling behavior for TextView.setCompoundDrawables
2014-09-11 17:26:57 +00:00
Alan Viverette
cfd3deef7d am 28d22bd2: am 1c19026d: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev
* commit '28d22bd23b219fc65eb80da04945fc0b72100040':
  Make SearchView styles public, remove public Holo styles added in L
2014-09-11 17:26:40 +00:00
George Mount
10dcaa134f am b13022fd: am 86d1c5d3: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev
* commit 'b13022fd5fc168a70cd833dc355ee7ae05938891':
  Fix ArrayIndexOutOfBoundsException.
2014-09-11 17:25:07 +00:00
Tao Bai
b1664bd741 am 42a3b372: am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev
* commit '42a3b372b5c41f5fe9b3c4e8645a924e32dd0443':
  Revise createIntent and parseResult API.
2014-09-11 17:24:48 +00:00
Craig Mautner
de1c660b36 am 242c891a: am 99a902ed: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev
* commit '242c891a8896977c90254a838b8f36fa165fdb6f':
  Wait for animation complete before completing boot
2014-09-11 17:24:32 +00:00
George Mount
6381c728ae am 92eba9f0: am 7726c740: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev
* commit '92eba9f08abd508a849209c09328a3b1b3eb5c33':
  Move capturing entering views until just before transition.
2014-09-11 17:24:04 +00:00
Chet Haase
1368cbb2e9 am 35dc5ec9: am 969628cd: am 804df9eb: Use constant state in AnimatedVectorDrawable
* commit '35dc5ec9877b468cba32c60b729bfded559a5c5a':
  Use constant state in AnimatedVectorDrawable
2014-09-11 17:24:00 +00:00
Raph Levien
cfbcca8992 am 75e39a46: am fff6aab7: am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev
* commit '75e39a46e1df35bfd3f77b4583b31ca24888651e':
  Remove auto spaceifying behavior on paste
2014-09-11 17:23:07 +00:00
Jon Miranda
0b50acd03f am ea01c7d4: am a8ced922: am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev
* commit 'ea01c7d4ff251d6702ca687b5bf83f7928a30aaa':
  Tries to resolve reference resource names instead of its data.
2014-09-11 17:22:44 +00:00
Eino-Ville Talvala
c060183610 am 88720d12: am 6b63cd11: am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev
* commit '88720d12694af351811572c3de80e9a1eae7c637':
  Camera2: Allow captures right after abort
2014-09-11 17:22:02 +00:00
Amith Yamasani
f58e532e01 Merge "Apply cross-user restrictions to Shell" into lmp-dev 2014-09-11 16:46:34 +00:00
Alexandra Gherghina
802669e7f8 am 3507cc0f: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev
* commit '3507cc0f8474d28b834fd4382397975478c63725':
  Bugfix: use the correct user for ContentResolver calls
2014-09-11 16:31:57 +00:00