Commit Graph

44260 Commits

Author SHA1 Message Date
Brian Carlstrom
13b99f3682 am 3b74850d: am 93468f7c: Merge "Add zygote preloading of shared libraries" into lmp-dev
* commit '3b74850dee7e41991794f778eb2f12b43e453a0d':
  Add zygote preloading of shared libraries
2014-09-12 05:46:04 +00:00
Yigit Boyar
f0e8dafdba am 590426f4: am 62bd62e4: Merge "Add support for default content description in DecorToolbar" into lmp-dev
* commit '590426f410c3da73926d4ff0a321febf37fbcc49':
  Add support for default content description in DecorToolbar
2014-09-12 05:45:58 +00:00
Alan Viverette
1c3d3e6a01 am bba2b9e8: am 8c7810a4: Merge "Vertically align toolbar child views with similar gravities" into lmp-dev
* commit 'bba2b9e8221a91dd03036b47e90f1ea364dc4fd2':
  Vertically align toolbar child views with similar gravities
2014-09-12 05:45:53 +00:00
Adam Powell
9c8cfa5a3b am e82480b3: am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev
* commit 'e82480b3a5ba0c342225035fac94020e41e5170a':
  Remove View methods that can't be used safely from the SDK
2014-09-12 05:45:37 +00:00
Craig Mautner
f20d09c17f am 2c85b1fc: am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev
* commit '2c85b1fcebdf08601124eada828da553a8d9f820':
  If activity is an alias get maxRecents from target
2014-09-12 05:45:32 +00:00
Jeff Davidson
85e36549ae am bf2ac88f: am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev
* commit 'bf2ac88fc4bceb56db27bfd3aa1483216648468f':
  Update VpnService Javadoc to reflect new UX.
2014-09-12 05:45:26 +00:00
Prerepa Viswanadham
7af08c0547 am 0d8efe53: am 041299e3: Remove onConnectionCongested callback
* commit '0d8efe53e1d3d5eefd48b608416b8ac2a02e7fba':
  Remove onConnectionCongested callback
2014-09-12 05:45:13 +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
Paul Lawrence
d0fa8ff165 am 1d255e2d: am 5f3e819f: Merge "Create correct files in dropbox on encrypted boot" into lmp-dev
* commit '1d255e2dee274917e16325901508f2ba79878624':
  Create correct files in dropbox on encrypted boot
2014-09-12 05:43:36 +00:00
Brian Carlstrom
38c29ca3c7 Merge "Add zygote preloading of shared libraries" into lmp-dev 2014-09-11 23:40:33 +00:00
Brian Carlstrom
6c9af96de5 Add zygote preloading of shared libraries
Bug: 17459019
Change-Id: I7cb4ecd0ec9542aa9079420fe158cedca7fca028
2014-09-11 16:36:45 -07:00
Yigit Boyar
dba92d416d Merge "Add support for default content description in DecorToolbar" into lmp-dev 2014-09-11 23:30:47 +00:00
Alan Viverette
34e53ab66e Merge "Vertically align toolbar child views with similar gravities" into lmp-dev 2014-09-11 23:24:48 +00:00
Alan Viverette
e3cb7baeb9 Vertically align toolbar child views with similar gravities
Also fixes Body1 text size, action bar title size on sw600dp-land.

BUG: 17266152
Change-Id: Ib686dd6e80dfcdad920c922a532f4f5d6252fa19
2014-09-11 16:23:29 -07:00
Adam Powell
fb008d6ac3 Merge "Remove View methods that can't be used safely from the SDK" into lmp-dev 2014-09-11 23:12:27 +00:00
Craig Mautner
3969cabf59 Merge "If activity is an alias get maxRecents from target" into lmp-dev 2014-09-11 23:02:27 +00:00
Craig Mautner
8307ea701c If activity is an alias get maxRecents from target
Activity aliases do not pick up values in the PackageParser. The
actual values should come from the target activity instead.

Also ActivityInfo now propagates maxRecents in copy constructor
and across Binder calls (via parcelling).

Fixes bug 17391328.

Change-Id: I35d248032eca7557528c9d499b3b38f27c713d09
2014-09-11 15:53:44 -07:00
Jeff Davidson
8afddbe7e9 Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev 2014-09-11 22:41:24 +00:00
Adam Powell
5eb3ffc24c Remove View methods that can't be used safely from the SDK
View methods that previously accepted a TypedArray to initialize
parameters parsed from xml cannot be used correctly by apps. The
TypedArray passed must always be obtained from a context using the
filter array com.android.internal.R.styleable.View, which is not
visible to the SDK.

A previous change already made this safe for existing apps already
using it so that they don't crash, this change removes these methods
from the SDK entirely.

Change-Id: I62099087ad6fd5bf8363e863b04fd0434b8cdfca
2014-09-11 15:38:55 -07:00
Prerepa Viswanadham
ba4f57a1c6 Remove onConnectionCongested callback
Bug:17289507

Change-Id: I49fd99d320084c618dcec756b832fb3b6a6aec51
2014-09-11 22:29:27 +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
Jeff Davidson
6d6ea3b6be Update VpnService Javadoc to reflect new UX.
The major change is that consent is now "sticky" and lasts until the
user explicitly disables the VPN connection.

Bug: 17474362
Change-Id: Id4e7807e635bbfc7645741135209d46763e280f9
2014-09-11 14:44:31 -07: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
Paul Lawrence
280813a6d9 Merge "Create correct files in dropbox on encrypted boot" into lmp-dev 2014-09-11 19:16:15 +00:00
Paul Lawrence
91317107a3 Create correct files in dropbox on encrypted boot
On the minimal framework start, don't mark ro.runtime.firstboot, allowing
the real framework to properly create the dropbox files in the real /data

Bug: 17450632
Change-Id: Ic53b3471b44e69f3eea7e3f3de18e789f51192bc
2014-09-11 12:09:56 -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
Matthew Williams
91911fd952 Merge "Add flag to JobParameters for job expired" into lmp-dev 2014-09-11 17:27:58 +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
Przemyslaw Szczepaniak
25183677ef am 817dbc8c: am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev
* commit '817dbc8c2aa437388617238e3fb6c4dc6ecf5849':
  Replace TreeSet with HashSet.
2014-09-11 16:16:24 +00:00
George Mount
6929f050ef am 6a6c4eed: am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev
* commit '6a6c4eed6b1bf7f3a00b28b41d984d0113377b76':
  Omit appearing views that have a parent that is also appearing.
2014-09-11 16:16:20 +00:00
Alexandra Gherghina
ffb6343938 Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 2014-09-11 16:12:59 +00:00
Julia Reynolds
3fb8348ecd am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev
* commit 'a098030f70a4861a4c0f7241d8a95f1d6441e5ed':
  Allow device owners to update LOCATION_MODE.
2014-09-11 16:04:20 +00:00
Przemyslaw Szczepaniak
6931cc9f41 Merge "Replace TreeSet with HashSet." into lmp-dev 2014-09-11 15:59:36 +00:00
Przemyslaw Szczepaniak
3786bc5498 Replace TreeSet with HashSet.
Both Locale and Voice do not implement Comparable.

Bug: 17467923
Change-Id: I683577e5b18ae1892e1ccea5ea241e1d016c9517
2014-09-11 16:56:46 +01:00
George Mount
27d83aa9a8 Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 2014-09-11 15:53:36 +00:00