Sander Alewijnse
1b0dbd5c95
am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
...
* commit '8c1cd7e61f050afd450cb05add633e2fbe0b195a':
Added the restrictions pending application restrictions key.
2014-11-07 22:35:51 +00:00
Sander Alewijnse
3eed90f393
Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
2014-11-07 22:25:00 +00:00
Sander Alewijnse
53d63dcd04
Added the restrictions pending application restrictions key.
...
Bug:17632522
Change-Id: If5a0d0ea1f479b0584fc0b1cff2a179d296d2904
2014-11-07 22:19:48 +00:00
Winson Chung
675a0b6bc9
am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev
...
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
Adding bounce animation for affiliated tasks. (Bug 16656169)
2014-11-07 01:45:11 +00:00
Winson Chung
3ed9f2f903
Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev
2014-11-07 01:30:20 +00:00
Winson Chung
044d52934e
Adding bounce animation for affiliated tasks. (Bug 16656169)
...
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
2014-11-06 14:02:35 -08:00
Jim Miller
767ae175fa
am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev
...
* commit '6230cdf5721f11660e2c0fec1c5695346a9001d0':
Update TrustAgentService API after review
2014-11-06 03:07:09 +00:00
Jim Miller
262dc4dafe
Merge "Update TrustAgentService API after review" into lmp-mr1-dev
2014-11-06 02:52:20 +00:00
Jim Miller
e303bf4435
Update TrustAgentService API after review
...
This change incorporates API council feedback and enables the
TrustAgent whitelisting API.
It also contains a minor cleanup of DPM's use of UserHandle
to eliminate unnecessary object creation.
Fixes bug 17008504
Change-Id: I63cc50169fde54b34406845818bcaf6aadc1a3db
2014-11-05 18:17:56 -08:00
Wale Ogunwale
2749a5e6ce
am e54553c8: am d54b578e: Fix issue #17305377 : Don\'t kill process if it still has tasks.
...
* commit 'e54553c841f3ca1ebcb822e8b9ab6a412e7bd895':
Fix issue #17305377 : Don't kill process if it still has tasks.
2014-11-04 19:14:49 +00:00
Wale Ogunwale
d54b578e47
Fix issue #17305377 : Don't kill process if it still has tasks.
...
We previously killed a process when one of its task was
swiped away in the recents UI. This had negative performance
implications for apps with multiple tasks in recents. Now we
will only kill the process if there are no more tasks associated
with it.
Changed also removes the need for the
ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager
will now only kill a task process if it process has no out
standing tasks.
Bug: 17305377
Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4
2014-11-04 10:59:31 -08:00
Griff Hazen
472b990ae1
am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev
...
* commit '07e8b2fb7409f0893d13a6cfb4687ba70b220e91':
Improve support for the barcode-on-screen use case for wearables.
2014-11-04 15:33:17 +00:00
Griff Hazen
9c95015b0c
Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev
2014-11-04 15:23:21 +00:00
Griff Hazen
5f2edfc12c
Improve support for the barcode-on-screen use case for wearables.
...
Add two small developer apis to wearable extender to help developers
show barcodes on different shaped wearable screens.
Bug: 16299175
Bug: 17005635
Change-Id: I05088ffcc405c69f1e8df7bf967ea930548c7d51
2014-11-03 09:53:54 -08:00
Narayan Kamath
4a51d06402
am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev
...
automerge: 726e9ea
2014-11-03 12:52:14 +00:00
Narayan Kamath
9301eafbcc
Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev
2014-11-03 12:45:16 +00:00
George Mount
0d6624d35a
am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev
...
automerge: 7bce500
2014-10-31 21:38:13 +00:00
George Mount
fa21e75734
Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev
2014-10-31 21:30:20 +00:00
Sander Alewijnse
a1ceb92964
am 94efda63: am a0edff4e: Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev
...
* commit '94efda638e9789cacfbdffae6c6d6fae1dd41667':
Change javadoc of setAccountManagementDisabled.
2014-10-31 10:20:08 +00:00
Sander Alewijnse
a0edff4e94
Merge "Change javadoc of setAccountManagementDisabled." into lmp-mr1-dev
2014-10-31 10:05:36 +00:00
George Mount
104257bac6
am cfff5427: am 57928195: Merge "Fix NPE when snapshot ImageView uses ScaleType.MATRIX." into lmp-mr1-dev
...
* commit 'cfff54270b7b09e66eb618b51706c3f8779fb110':
Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
2014-10-31 00:38:48 +00:00
Jeff Hao
05ea3213fd
am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev
...
* commit '73577862ffe6332f326628febfa1fbb9e693bb40':
Change boot screen title to "Android is starting" when not upgrading.
2014-10-30 23:44:09 +00:00
George Mount
1fb941dd4f
Ensure views are attached prior to starting enter transition.
...
Bug 17964119
Change-Id: Ic4ecd5aa9a3bbe5565381b8d9b3c79dd47720e5d
2014-10-30 12:30:12 -07:00
George Mount
ca5094a05c
Fix NPE when snapshot ImageView uses ScaleType.MATRIX.
...
Bug 18170774
Change-Id: I28497f569f8a40242191196f059d8f40d17d52d6
2014-10-30 12:21:00 -07:00
Sander Alewijnse
112e053b9a
Change javadoc of setAccountManagementDisabled.
...
Method can also be called by device owner.
Bug:18166033
Change-Id: I38ab17bdfe9f0c4b33f5257d2f335afe16e84031
2014-10-30 14:54:28 +00:00
Jeff Hao
9f60c08a44
Change boot screen title to "Android is starting" when not upgrading.
...
Bug: 17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de
2014-10-29 14:42:39 -07:00
Narayan Kamath
cb383183d7
Fix getPackageInfo("android") in the system server.
...
The fix for bug 16555230 attempted to return the same LoadedApk
object between the system context object and the activity thread's
list of opened packaged. This ensured that we used the same classLoader
on both these objects (among other things).
However, the object the Context owns is actually incomplete (and
necessarily so) because it might be created before the package
manager is and we need the package manager to construct a complete
LoadedApk object.
Work around this by manually setting the classloader and aInfo for
"android" contexts created by the system server's activity thread.
bug: 18167468
Change-Id: I623634f912111f89eaf716b8258d1926d2513dcd
2014-10-29 18:02:29 +00:00
George Mount
aeb0a9dba2
am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
...
automerge: 8a536bb
2014-10-28 18:06:58 +00:00
George Mount
c142397272
am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
...
automerge: 69a3dd8
2014-10-28 18:06:04 +00:00
George Mount
95d520f160
Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
2014-10-28 17:01:25 +00:00
George Mount
45b701085b
Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
2014-10-28 17:00:43 +00:00
Dake Gu
54aad95336
am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
...
automerge: 63964d9
2014-10-27 21:34:58 +00:00
George Mount
eca1ae5e44
Fix NPE in moveSharedElementsToOverlay
...
Bug 18119532
Change-Id: I334bda2d63427032583a15a483e000412024c150
2014-10-27 14:25:12 -07:00
Dake Gu
4c2e3491ec
Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
2014-10-27 20:23:28 +00:00
George Mount
333b8093ea
Fixed: Nested shared elements now transition separately.
...
Bug 18073470
Shared element ordering was based on the key ordering in an
ArrayMap. This is normally fine, but when shared elements
are nested, the child's layout can be overwritten by the
parent's if it is laid out first. The only way to force the
ordering of shared element layout was the change the transition
name. To fix this, shared elements are now laid out parent
first, then child.
On return, nested shared elements were not transitioning to their
final destination properly because the matrix used to calculate
their position was not correct. This change recalculates the
parent matrices when appropriate.
Change-Id: I62333183cf03519e525587e4ea31fcf14bb83cdc
2014-10-24 16:19:19 -07:00
George Mount
a618afc0c7
am 511452cf: am b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev
...
* commit '511452cf4d3cd2669a89abd98658a844b852b5e3':
Fix NPE when rejected snapshots are null.
2014-10-24 23:13:38 +00:00
George Mount
b71580c34e
Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev
2014-10-24 22:43:45 +00:00
George Mount
83c692efd3
Fix NPE when rejected snapshots are null.
...
Bug 18055705
Change-Id: Id0b98e7da5510af438c5d66c0ddb00489d581864
2014-10-24 15:26:32 -07:00
Jeff Sharkey
b144b5f125
am e92bd4c0: am 2d87ba63: Merge "Allow I/O when installing providers." into lmp-mr1-dev
...
* commit 'e92bd4c04bcb0d18c0fdae9246f4af06a5aba345':
Allow I/O when installing providers.
2014-10-24 17:48:22 +00:00
Jeff Sharkey
2d87ba630c
Merge "Allow I/O when installing providers." into lmp-mr1-dev
2014-10-24 17:40:30 +00:00
Adrian Roos
621823e064
am 53f30ec2: am bcd07652: Add API for querying trusted state
...
* commit '53f30ec270db8c6b92ff06579cf4c591efe2544b':
Add API for querying trusted state
2014-10-24 13:27:39 +00:00
Adrian Roos
bcd076525c
Add API for querying trusted state
...
Bug: 18084166
Change-Id: Ic755461cc6978943aef4943def93a0e38a1c96c0
2014-10-24 13:59:45 +02:00
Svetoslav
eed63916a1
am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev
...
automerge: 89e7ffe
2014-10-24 02:04:11 +00:00
Jeff Sharkey
bb2e2cae58
Allow I/O when installing providers.
...
Bug: 17879170
Change-Id: I073d5b56bab6db01290aad5386c53c305669dc5b
2014-10-23 11:42:31 -07:00
Svetoslav
3a5c721072
APIs for an accessibility service to put interaction tracking overlays.
...
An accessibility service may register to observe the interactive windows
on the primary display. These windows are the one that has input focus and
ones a sighted user can touch. It is sometimes beneficial for an
accessibility service to overlay a window to intercept user interaction
and based on that introspect and perform an action on the windows that
are on the screen. This is problematic as overlaying a full screen window
that is touchable prevents the accessibility service to introspect the
content under this window.
This change adds a special type of window that only an accessibility service
can place which does not affect what an accessibility service can "see" on
the screen. Hence, even putting such a window full screen the service will
be able to interact with the other interactive windows it covers.
Change-Id: I053ccc3a5c6360a98dc40bdb172b54dab35d8b31
2014-10-21 14:45:53 -07:00
Brian Carlstrom
70111a429d
am fe6cde37: am 6580c273: am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
...
* commit 'fe6cde379a7b086032877917c0ee0e64bf7e9e57':
Set threads' contextClassLoader during LoadedApk.makeApplication.
2014-10-16 18:05:13 +00:00
Brian Carlstrom
6580c273a5
am d2b82488: am 20de619d: Merge "Set threads\' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
...
* commit 'd2b824887f9ec2e3448bd38aae58efbc4f178997':
Set threads' contextClassLoader during LoadedApk.makeApplication.
2014-10-16 17:45:54 +00:00
George Mount
56789daadf
am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
...
* commit '27a08f2ad547934280b626aee9c60dd3a597e6da':
Use empty snapshots list when there are no shared elements.
2014-10-16 14:29:51 +00:00
George Mount
ea6f0ae86d
Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
2014-10-16 14:21:43 +00:00
Brian Carlstrom
20de619d66
Merge "Set threads' contextClassLoader during LoadedApk.makeApplication." into lmp-dev
2014-10-16 01:01:26 +00:00
