Kenny Root
775c73f647
Merge "Use canonical name for SHA1withECDSA" into nyc-dev
...
am: 4bbe428
* commit '4bbe428418d64e240a9a26438d199b156e8fc831':
Use canonical name for SHA1withECDSA
2016-03-23 22:21:05 +00:00
Wale Ogunwale
4742271805
Merge "Don\'t save secure surfaces." into nyc-dev
...
am: b173b7c
* commit 'b173b7c8d8bf8b76931afcf691147d1ad10ef65f':
Don't save secure surfaces.
2016-03-23 22:21:03 +00:00
Kenny Root
4bbe428418
Merge "Use canonical name for SHA1withECDSA" into nyc-dev
2016-03-23 22:17:06 +00:00
Wale Ogunwale
b173b7c8d8
Merge "Don't save secure surfaces." into nyc-dev
2016-03-23 22:14:06 +00:00
Samuel Tan
91a8249f93
[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab am: 3253022 am: f4fd201 -s ours am: 1450b69 am: 1d508de am: 3b2ed11 am: 070b76e -s ours
...
am: 96fe195
* commit '96fe195bddf11371177c868f534e3e1f988b2c83':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 22:11:17 +00:00
Samuel Tan
96fe195bdd
[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab am: 3253022 am: f4fd201 -s ours am: 1450b69 am: 1d508de am: 3b2ed11
...
am: 070b76e -s ours
* commit '070b76e52100f0b9d2ce45f2884c639507c4c7d2':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 22:08:31 +00:00
Samuel Tan
070b76e521
[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab am: 3253022 am: f4fd201 -s ours am: 1450b69 am: 1d508de
...
am: 3b2ed11
* commit '3b2ed11851f342f01bef3832e8603122698a3588':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 22:05:50 +00:00
Samuel Tan
3b2ed11851
[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab am: 3253022 am: f4fd201 -s ours am: 1450b69
...
am: 1d508de
* commit '1d508decacf84e26db6164d30006166e0fc74f5f':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 21:58:28 +00:00
Samuel Tan
1d508decac
[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab am: 3253022 am: f4fd201 -s ours
...
am: 1450b69
* commit '1450b69182fd9b360d9dd4ec54d431560eb775e6':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 21:53:57 +00:00
Samuel Tan
d2183a3132
[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d8c3ca4 am: 542bb73 am: fbfd7d0 am: 7dfe3d4 -s ours
...
am: fbc98e1
* commit 'fbc98e1c30e9ef6827f0dcd8024b0fd2de28cf33':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 21:53:53 +00:00
Yohei Yukawa
8460701b3c
Merge "Make sure to call back reportFinish() on the desired Handler." into nyc-dev
...
am: 2c8d528
* commit '2c8d528188f2ac9e482fe29d06ca5eb683be9b87':
Make sure to call back reportFinish() on the desired Handler.
2016-03-23 21:53:50 +00:00
Samuel Tan
fbc98e1c30
[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d8c3ca4 am: 542bb73 am: fbfd7d0
...
am: 7dfe3d4 -s ours
* commit '7dfe3d4457cd3ff952c65c7fe0816e19b42e945f':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 21:51:40 +00:00
Samuel Tan
1450b69182
[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab am: 3253022
...
am: f4fd201 -s ours
* commit 'f4fd20168fdf1ee19da63cc82c0893a288d8b759':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 21:49:16 +00:00
Yohei Yukawa
2c8d528188
Merge "Make sure to call back reportFinish() on the desired Handler." into nyc-dev
2016-03-23 21:48:51 +00:00
Samuel Tan
f4fd20168f
[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab
...
am: 3253022
* commit '325302206a0129bdf16a486232d5864d71e62a44':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 21:45:25 +00:00
Samuel Tan
7dfe3d4457
[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d8c3ca4 am: 542bb73
...
am: fbfd7d0
* commit 'fbfd7d0c91ef84d12ca036462b54794076d06cdc':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 21:45:23 +00:00
Kenny Root
8d0c0ecbc5
Merge "Use canonical name for SHA1withECDSA" am: 4a0497c
...
am: fa733d0
* commit 'fa733d0b70b891a04358faac75fc55fb035a98cd':
Use canonical name for SHA1withECDSA
2016-03-23 21:40:50 +00:00
Samuel Tan
325302206a
[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours
...
am: c2712ab
* commit 'c2712ab7bd3bdeaf8945bc80154f402e1cf727bc':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 21:40:45 +00:00
Samuel Tan
fbfd7d0c91
[DO NOT MERGE] Disallow guest user from changing Wifi settings am: d8c3ca4
...
am: 542bb73
* commit '542bb7307b2bf3dab337b56e392b778896f88ec6':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 21:40:23 +00:00
Xiaohui Chen
6aec73e49a
Merge "sysui: refactor for extensibility" into nyc-dev
...
am: 0997bc8
* commit '0997bc8a85c7d7a83e0f590432d10fab89f2c900':
sysui: refactor for extensibility
2016-03-23 21:35:43 +00:00
Samuel Tan
c2712ab7bd
[DO NOT MERGE] Disallow guest user from changing Wifi settings
...
am: d385a6d -s ours
* commit 'd385a6d95fc830ecc8d55937e9f46b14165d4b34':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 21:35:32 +00:00
Samuel Tan
542bb7307b
[DO NOT MERGE] Disallow guest user from changing Wifi settings
...
am: d8c3ca4
* commit 'd8c3ca43163427a75c8b70114096238177f97af0':
[DO NOT MERGE] Disallow guest user from changing Wifi settings
2016-03-23 21:35:30 +00:00
Kenny Root
fa733d0b70
Merge "Use canonical name for SHA1withECDSA"
...
am: 4a0497c
* commit '4a0497c8e47f2775aa5787cf624abd24680e5950':
Use canonical name for SHA1withECDSA
2016-03-23 21:35:29 +00:00
Kenny Root
f78cae3cb4
Use canonical name for SHA1withECDSA
...
The Standard Names documentation says that "ECDSA" should not be used
due to its ambiguity. Bouncycastle has switched from "ECDSA" to
"SHA1withECDSA" so therefore we should switch this "workaround" Provider
to use the same name to keep it functioning correctly.
(cherry picked from commit 8a6c191094b3d1f74dbb71a7f262496377596ba8)
Bug: 27753949
Change-Id: I5acfca9d89c85bf005902a2f06cb5d7b1ef9dff2
2016-03-23 14:29:33 -07:00
Kenny Root
4a0497c8e4
Merge "Use canonical name for SHA1withECDSA"
2016-03-23 21:29:00 +00:00
Xiaohui Chen
0997bc8a85
Merge "sysui: refactor for extensibility" into nyc-dev
2016-03-23 21:24:12 +00:00
Deepanshu Gupta
f42350287c
Merge "Exclude java namespace classes from layoutlib" into nyc-dev
...
am: 3e2b413
* commit '3e2b413dc72f267571421cfb0c8ced7a4778704a':
Exclude java namespace classes from layoutlib
2016-03-23 20:57:21 +00:00
Philip P. Moltmann
31c3688d0f
Merge "Remove unnecessary strings and labels." into nyc-dev
...
am: a785c80
* commit 'a785c80a5ec3cdd4c14dc8519a2d8cbcc716a0f2':
Remove unnecessary strings and labels.
2016-03-23 20:48:59 +00:00
Rebecca Silberstein
097e23850d
Merge "handle wifi interface changes with interfaceRemoved" into nyc-dev
...
am: 602123a
* commit '602123a14ac316fe0d08a9417f3d38f7d566c83b':
handle wifi interface changes with interfaceRemoved
2016-03-23 20:48:57 +00:00
Deepanshu Gupta
3e2b413dc7
Merge "Exclude java namespace classes from layoutlib" into nyc-dev
2016-03-23 20:48:15 +00:00
Philip P. Moltmann
a785c80a5e
Merge "Remove unnecessary strings and labels." into nyc-dev
2016-03-23 20:45:35 +00:00
Rebecca Silberstein
602123a14a
Merge "handle wifi interface changes with interfaceRemoved" into nyc-dev
2016-03-23 20:41:06 +00:00
Philip P. Moltmann
30b0752ef5
Remove unnecessary strings and labels.
...
Bug: 27815807
Change-Id: I6388055938afbbadc954c913ce0554f9a4a313e8
2016-03-23 13:32:35 -07:00
Chris Craik
044cb78a52
Merge "Precache/early kick off of op work for non-shadow ops." into nyc-dev
...
am: 6e379cd
* commit '6e379cddbcf658cf177e4adf44046c836f543772':
Precache/early kick off of op work for non-shadow ops.
2016-03-23 20:32:30 +00:00
Chris Craik
6e379cddbc
Merge "Precache/early kick off of op work for non-shadow ops." into nyc-dev
2016-03-23 20:24:26 +00:00
Wale Ogunwale
945d197182
Don't save secure surfaces.
...
We don't want to save secure surfaces since their content shouldn't
be shown while the app isn't on screen and content might leak
through during the transition animation with saved surface.
Bug: 19940527
Bug: 27747315
Change-Id: Ie664e1015845e05ec01572a9d9c3574173ac2f91
2016-03-23 13:16:41 -07:00
Chris Craik
3a5811b501
Precache/early kick off of op work for non-shadow ops.
...
bug:26562703
bug:27052145
Change-Id: Ic452bfe75da849ffdd47fecdd6eb1472fd0c806e
2016-03-23 12:55:12 -07:00
Deepanshu Gupta
fa5f55fe90
Exclude java namespace classes from layoutlib
...
Such classes can't be loaded anyway. No point including them
Change-Id: I26934014de96aa59f0d4aef59f61d1e4f71b86ea
2016-03-23 12:39:27 -07:00
Xiaohui Chen
eb04a9992e
sysui: refactor for extensibility
...
Bug: 27357836
Change-Id: I793fc1a6c17a7b5f66e4803e7f51a373b47e5733
2016-03-23 19:38:37 +00:00
Abodunrinwa Toki
f227ca6b8e
Merge "FloatingToolbar: Make it more obvious that there are more items in the overflow." into nyc-dev
...
am: 7c89170
* commit '7c891700995276c9f6952d0e1f2a2c1882d66f3d':
FloatingToolbar: Make it more obvious that there are more items in the overflow.
2016-03-23 19:11:05 +00:00
Abodunrinwa Toki
7c89170099
Merge "FloatingToolbar: Make it more obvious that there are more items in the overflow." into nyc-dev
2016-03-23 19:03:51 +00:00
Abodunrinwa Toki
f0f4d73b5b
FloatingToolbar: Make it more obvious that there are more items in the overflow.
...
1. Make the overflow show part of the items hidden behind the scroll view
2. Increase the time the scrollbar is on screen so users are less likely to miss it
Bug: 27427333
Change-Id: Ia0bff5fa29cba3103263bc7d063176b0ba7ff7b9
2016-03-23 19:02:32 +00:00
Diego Perez
29fdb0f752
Merge "Add fill type support to vector drawable" into nyc-dev
...
am: f0fce3e
* commit 'f0fce3e9ceb6cd165488c28f390181c5b2877cee':
Add fill type support to vector drawable
2016-03-23 18:55:30 +00:00
Diego Perez
f0fce3e9ce
Merge "Add fill type support to vector drawable" into nyc-dev
2016-03-23 18:45:29 +00:00
Adrian Roos
3533d5fa84
Merge "Follow-up to "Close notification panel when user button is tapped"" into nyc-dev
...
am: b320eb9
* commit 'b320eb928f17e6aba0c833281970d1def3834755':
Follow-up to "Close notification panel when user button is tapped"
2016-03-23 18:44:07 +00:00
Yigit Boyar
f99b25fd67
Merge "Fix generate layout params to preserve margins" into nyc-dev
...
am: 8b88a85
* commit '8b88a85032550dfd344e59dc419b0d9bb02c84b6':
Fix generate layout params to preserve margins
2016-03-23 18:44:05 +00:00
John Reck
9991098c0b
Merge "Fix missing first frame" into nyc-dev
...
am: 66d16f1
* commit '66d16f12148ccfb0815f3da751978c3f3c56f1c0':
Fix missing first frame
2016-03-23 18:44:03 +00:00
Adrian Roos
e933de8e76
Merge "Ensure notification color contrast" into nyc-dev
...
am: 9b95f61
* commit '9b95f615c45b2dac053aa45d881f6a4b3c301342':
Ensure notification color contrast
2016-03-23 18:44:00 +00:00
Adrian Roos
b320eb928f
Merge "Follow-up to "Close notification panel when user button is tapped"" into nyc-dev
2016-03-23 18:27:11 +00:00
Adrian Roos
bc3e2e11cc
Follow-up to "Close notification panel when user button is tapped"
...
The original CL just collapsed the panel. Instead, we're using the
dedicated startActivityDismissingKeyguard to make sure the Keyguard
gets properly dismissed first.
Follow-Up-To: I66ebcb66c898dfebe1d09b798f750f696c360da8
Bug: 27790403
Change-Id: I41c02221de951df885ecfb4f2869820b38410f18
2016-03-23 11:24:07 -07:00