Selim Cinek
2f0df8ae03
Fixed several bugs with redaction.
...
The Notification row was in most cases directly referring to
the private layout which lead to numerous bugs.
Bug: 15107339
Bug: 15536865
Bug: 15181880
Change-Id: Id1021eb853d67db168c9471d7dacbe5265c4ba2f
2014-06-10 17:40:42 +02:00
Baligh Uddin
6af88cc76f
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-10 15:37:56 +00:00
Baligh Uddin
2ad173d891
Merge "Import translations. DO NOT MERGE"
2014-06-10 15:37:54 +00:00
Santos Cordon
ece0270d99
Merge "Support conference calling. (1/4) [DO NOT MERGE]" into lmp-preview-dev
2014-06-10 15:34:30 +00:00
Baligh Uddin
342c0d0a94
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-10 15:29:10 +00:00
Baligh Uddin
c60aa41104
Merge "Import translations. DO NOT MERGE"
2014-06-10 15:28:30 +00:00
Baligh Uddin
6584375afd
Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
2014-06-10 15:28:25 +00:00
Baligh Uddin
5f4291c1a5
Merge "Import translations. DO NOT MERGE"
2014-06-10 15:28:25 +00:00
Baligh Uddin
56f7c59168
Merge "Import translations. DO NOT MERGE"
2014-06-10 15:28:25 +00:00
Baligh Uddin
291258c880
Merge "Import translations. DO NOT MERGE"
2014-06-10 15:28:19 +00:00
Matthew Williams
f53c295ae3
am 3b471117: Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev
...
* commit '3b4711176e77640d697e94137e65fa93c8363f5c':
Add OnNetworkActive to TaskManager and simplify locking.
2014-06-10 14:55:46 +00:00
John Reck
1a2f7a1e29
resolved conflicts for merge of 2d2aa0cc to master
...
Change-Id: Ib7bb0e40569a8f6a7f856eef54980d70d9769cdc
2014-06-10 07:53:03 -07:00
Selim Cinek
7d447726e2
Fixed an issue where holes in the notification shade could appear.
...
When redaction was turned on, holes could appear.
Bug: 15107339
Change-Id: I8c2830caaa78f03c8ccada1a7160f73c906365d7
2014-06-10 16:03:46 +02:00
Calin Juravle
3f967910d9
Improved profile.start-immediately comment
...
Change-Id: I41bda6a1cd99cb0a8230961e0462a41cb552887e
2014-06-10 14:52:24 +01:00
Adrian Roos
59a6127551
Add Emergency Calls Only and Charging State to Status Bar Header
...
Bug: 15393101
Change-Id: If1dc300d843fb5f694ef57714225f43924dbb2b8
2014-06-10 14:49:10 +02:00
Selim Cinek
c0ce82daa4
Delayed the highlighting of the statusbar header on drag down.
...
Also delayed the highlighing of buttons inside notifications.
Bug: 15184882
Change-Id: Ic3af7ec7c41232ac7f8ecfa4700659b1ca293894
2014-06-10 14:00:42 +02:00
Adam Connors
8f70744221
DO NOT MERGE : Allow system process to call getApplicationBlockedAsUser
...
MDMs in the managed profile needs to be able to call
DPM.isApplicationBlocked without the INTERACT_ACROSS_USERS
permission. DevicePolicyManager checks for appropriate
PROFILE_OWNER permission and then removes callerId, so this
change is needed to prevent a spurious security exception.
Bug: 14400206
Change-Id: Idd1bda6bb234f6cb7cb78a885ae2d7cc5cca4890
(cherry picked from commit c11c67b3e117b4fec3245f87b6d510461c1f8323)
2014-06-10 11:39:31 +00:00
Jeff Sharkey
d734c698e3
am 99f4fe07: Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev
...
* commit '99f4fe0797adb8350f92c7d1ba11776d1947e768':
Refactor directory API to "opening document tree."
2014-06-10 11:18:54 +00:00
Xiaolei Wang
b71f764c28
am c686a0d4: Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev
...
* commit 'c686a0d4b116654d6bec3ff7d5443f8da3ffb20a':
Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
2014-06-10 11:18:48 +00:00
Alan Viverette
3b77eb33a5
am 28104981: Merge "Optimize use of layers in ripple, update dialog styling" into lmp-preview-dev
...
* commit '28104981ea36e96e0c85b735b91583fb344b85c5':
Optimize use of layers in ripple, update dialog styling
2014-06-10 11:18:38 +00:00
Alan Viverette
4a00c53800
am 5d5de3ee: Merge "Use a weak reference to the ObjectAnimator target" into lmp-preview-dev
...
* commit '5d5de3ee32302ae45f3a01933997a2b838bf6291':
Use a weak reference to the ObjectAnimator target
2014-06-10 11:18:30 +00:00
Jeff Brown
11ef6a3b11
am 16eb7133: (-s ours) Add @SystemApi annotation to internal permissions. (DO NOT MERGE)
...
* commit '16eb71335edcbe2978e2b2a9e5a69d1458ab03bd':
Add @SystemApi annotation to internal permissions. (DO NOT MERGE)
2014-06-10 11:18:19 +00:00
Jeff Brown
260fd18d4d
am 1337bac1: (-s ours) Add support for @SystemApi annotation to aapt. (DO NOT MERGE)
...
* commit '1337bac111c70ba4ccce21b2c75491ee690954a8':
Add support for @SystemApi annotation to aapt. (DO NOT MERGE)
2014-06-10 11:18:14 +00:00
Jeff Brown
1ffcc58c68
am 7296e808: (-s ours) Rename PrivateApi annotation to SystemApi. (DO NOT MERGE)
...
* commit '7296e80837cd8e406e04193c239a1441c9f147b0':
Rename PrivateApi annotation to SystemApi. (DO NOT MERGE)
2014-06-10 11:18:09 +00:00
Michael Wright
66a862c38e
am b225171e: (-s ours) Merge "Pack PointerCoords with BitSet. DO NOT MERGE" into lmp-preview-dev
...
* commit 'b225171eb981dbd062c6c6b42a963930a31a2a51':
Pack PointerCoords with BitSet. DO NOT MERGE
2014-06-10 11:18:02 +00:00
Matthew Williams
3f51a909f0
am a06fce7d: Merge "Add test app for JobScheduler" into lmp-preview-dev
...
* commit 'a06fce7dea359571877ae8d9cd9cf720934083f5':
Add test app for JobScheduler
2014-06-10 11:17:55 +00:00
Adam Connors
ac383e52a9
DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
...
And update the javadoc to explain use-case.
Bug: 15025562
Change-Id: I8eb2666c8480f873e042687223b1a1f82e7919c9
2014-06-10 10:24:14 +00:00
Yohei Yukawa
2f4bd692d3
Merge "Use more user actions to update the IME rotation order"
2014-06-10 09:33:13 +00:00
Kenny Guy
ef2b37ea87
Merge "Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only."
2014-06-10 08:55:47 +00:00
Selim Cinek
b89de4ec49
Added card elevation when card is clicked on the lockscreen
...
Bug: 15381356
Bug: 15181880
Change-Id: I2dd08b80d2c6b7710d2772c8880b32ab23ec42f9
2014-06-10 10:47:05 +02:00
Lorenzo Colitti
beacf8d64c
Don't enable Ethernet on the emulator.
...
Don't start the Ethernet service on the emulator because it
interferes with qemu's SLIRP emulation, which uses IPv4 over
eth0.
Bug: 15341003
Change-Id: I4041a17b19a4861cae4fbf47ab5e05b007385e19
2014-06-10 14:53:22 +09:00
Chris Craik
9a9d1d5ad2
Merge "Tessellate on worker threads" into lmp-preview-dev
2014-06-10 04:52:12 +00:00
Jungshik Jang
2ae1019c97
Merge "Implement cec message cache."
2014-06-10 04:40:40 +00:00
Jungshik Jang
e81e108c40
Implement cec message cache.
...
HDMI bus for CEC is quite slow and it may cause conflict
or timeout during device discovery stage or hot-plug
detection stage. However, some static information, such
as physical address, vendor id or osd name are usually
sent automatically when a device is connected, and
almost never change after updated.
Change-Id: I4df9d27ef1af04ee35d63a764580fed07c32d15d
2014-06-10 13:39:19 +09:00
Igor Murashkin
3721cbaf01
Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev
2014-06-10 04:02:28 +00:00
Matthew Williams
2368014073
Remove SyncRequest.setPriority from public API
...
Bug: 15517262
Change-Id: If62b6f3bf339011dd504889aa24c71a22cb08ed8
2014-06-09 20:18:25 -07:00
Robert Ly
748856f2d9
am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
...
* commit 'a7ddd0292420c2e8869e093d8bdad5cdc1f199cc':
Add documentation for AndroidKeyStore
2014-06-10 02:49:18 +00:00
Robert Ly
a7ddd02924
am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
...
* commit '80e84e2db92ba190c6c517dd4c71cd12c0adb249':
Add documentation for AndroidKeyStore
2014-06-10 02:44:08 +00:00
Robert Ly
80e84e2db9
am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
...
* commit 'f3cecfa2185ef5622992b21da8204b8b6590ef2d':
Add documentation for AndroidKeyStore
2014-06-10 02:39:28 +00:00
Robert Ly
f3cecfa218
am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
...
* commit '55d525b26b716351625798675afe69c6cf43cf5a':
Add documentation for AndroidKeyStore
2014-06-10 02:36:10 +00:00
Robert Ly
55d525b26b
am 716cc7dc: Add documentation for AndroidKeyStore
...
* commit '716cc7dcac1bb9279326ab92a78a246b3a70de4e':
Add documentation for AndroidKeyStore
2014-06-10 02:32:29 +00:00
Adam Lesinski
cbb0213d81
DO NOT MERGE - Creating an empty package should be succesfull
...
Bug: 15473436
Change-Id: I788deb21a1298281c508429bab635aa713803984
(cherry picked from commit 807efa884ba01e0213667000a21908bfb04e8624)
2014-06-10 01:56:03 +00:00
Chris Craik
05f3d6e511
Tessellate on worker threads
...
Tessellate and cache (where possible) shadow and round rect
tessellation tasks.
Change-Id: I2cfda8e11d83d51ea74af871235cf26e8f831d40
2014-06-10 01:53:17 +00:00
Jeff Brown
8c90ff3b8a
Merge "Delete stale commented out declarations."
2014-06-10 01:43:44 +00:00
Jeff Brown
465c5de4ee
@hide ACCESS_INPUT_FLINGER permission.
...
Bug: 15516225
Change-Id: Ief70650d956a7161153e283c24f553fcfa7996b1
2014-06-10 01:43:14 +00:00
Justin Koh
0c4122c9b5
am ce8c1086: am eba8782a: Add NPE check to getSystemWindowInsets
...
* commit 'ce8c1086fbc42e80056b59d9dbbd6144cb85f20d':
Add NPE check to getSystemWindowInsets
2014-06-10 01:30:21 +00:00
Justin Koh
36b0cae955
am 2be4ddc4: am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev
...
* commit '2be4ddc403b55e3c5107609a2eaeed4ddc0f23f0':
Fix Browser when running on a platform without webview
2014-06-10 01:30:16 +00:00
Robert Ly
55762575b0
am a60406f5: am e70609c8: am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs
...
* commit 'a60406f5465208079c14770defcfcced10432481':
remove erroneous file
2014-06-10 01:30:11 +00:00
Adam Lesinski
3cfe720a0d
am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev
...
* commit '5fed49f7d614ae9e83db04703484b31c8077b78c':
Allow for a NoOp implementation of DrmManagerClientImpl
2014-06-10 01:30:05 +00:00
Craig Mautner
df8e542a8a
Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev
2014-06-10 01:29:43 +00:00