OSDN Git Service
Xiaohui Chen [Thu, 7 Apr 2016 20:15:29 +0000 (20:15 +0000)]
Merge "sysui: refactoring qs for extensibility" into nyc-dev
am:
a01582a
* commit '
a01582ac87c3d3f3b25ebe4fdb41f2c058041247':
sysui: refactoring qs for extensibility
Change-Id: I94b148c241053ea6bc7c350a651ba8293c7e3bc5
Alex Hills [Thu, 7 Apr 2016 20:08:33 +0000 (20:08 +0000)]
Merge "Adds support for MessagingStyle" into nyc-dev
am:
5418765
* commit '
5418765d4d0e4befef811c0a2cbc5d8a69ed6cfd':
Adds support for MessagingStyle
Change-Id: I77354888ee4a6292896b0a6b5e85cee4f63af606
Xiaohui Chen [Thu, 7 Apr 2016 20:07:29 +0000 (20:07 +0000)]
Merge "sysui: refactoring qs for extensibility" into nyc-dev
Selim Cinek [Thu, 7 Apr 2016 20:01:15 +0000 (20:01 +0000)]
Merge "Fixed a bug with talkback where the panel could be expanded" into nyc-dev
am:
64954eb
* commit '
64954eb77221e87a808ca19937668a7221cbafb6':
Fixed a bug with talkback where the panel could be expanded
Change-Id: I9becd686d5f4cbf1254bf7810b3988b8c4241695
Alexander Hills [Thu, 7 Apr 2016 19:59:19 +0000 (19:59 +0000)]
Merge "Adds support for MessagingStyle" into nyc-dev
Selim Cinek [Thu, 7 Apr 2016 19:54:16 +0000 (19:54 +0000)]
Merge "Fixed a bug with talkback where the panel could be expanded" into nyc-dev
Sid Soundararajan [Thu, 7 Apr 2016 19:50:40 +0000 (19:50 +0000)]
Merge "Add Home Recents Transition Animations" into nyc-dev
am:
7323fa9
* commit '
7323fa91f535815e245d2bb653bfaf83c326f558':
Add Home Recents Transition Animations
Change-Id: I2cb7aa3f53e865131af73550f6247383217135fa
Lifu Tang [Thu, 7 Apr 2016 19:44:15 +0000 (19:44 +0000)]
Merge "Addressed API review comments and updated JavaDoc" into nyc-dev
am:
80fa590
* commit '
80fa590644f585a64103e3d3a6688c2e88f61592':
Addressed API review comments and updated JavaDoc
Change-Id: I6ef6d2e7e770af2dbf257faeb8abfd1c9f79f0b9
Muyuan Li [Thu, 7 Apr 2016 19:44:13 +0000 (19:44 +0000)]
sysui: refactor for extensibility.
am:
4fe4a40
* commit '
4fe4a409bca01e16c807f3f76633afc1d9797e2a':
sysui: refactor for extensibility.
Change-Id: Ibb9d817220e2646fe0e37b02afa8a5257702e74f
Sid Soundararajan [Thu, 7 Apr 2016 19:41:46 +0000 (19:41 +0000)]
Merge "Add Home Recents Transition Animations" into nyc-dev
Yi Kong [Thu, 7 Apr 2016 19:36:29 +0000 (19:36 +0000)]
Merge "Track libcore change
c5c1e2717349a96913dc88722a20c7c1ec2cae68" into nyc-dev
am:
b9aef08
* commit '
b9aef080598c8ff142b22bc46cc3ec16a9fa0d7c':
Track libcore change
c5c1e2717349a96913dc88722a20c7c1ec2cae68
Change-Id: I813865c51ba02330675a83c9bdc77a592191ffb4
Roshan Pius [Thu, 7 Apr 2016 19:36:27 +0000 (19:36 +0000)]
Merge "WifiScanner: Remove pnosetting stopPno API (1/2)" into nyc-dev
am:
5a4027e
* commit '
5a4027e26ca07b921824757433bfd62481a6a78c':
WifiScanner: Remove pnosetting stopPno API (1/2)
Change-Id: Ia4038fc1f06a16f78a328ff6709f48886242eb77
Lifu Tang [Thu, 7 Apr 2016 19:36:01 +0000 (19:36 +0000)]
Merge "Addressed API review comments and updated JavaDoc" into nyc-dev
Muyuan Li [Wed, 30 Mar 2016 23:50:11 +0000 (16:50 -0700)]
sysui: refactor for extensibility.
1. Refactored container height calculation out of updateBottom of QSContainer;
2. Added a method in QSContainer to return min expansion height.
Bug:
27929808
Change-Id: I5a6d04ffb225bccfc56fa5f4ab98d330ed763a8c
(cherry picked from commit
9e874950195d6b76a64e28c236e8d109d551281f)
Yi Kong [Thu, 7 Apr 2016 19:29:17 +0000 (19:29 +0000)]
Merge "Track libcore change
c5c1e2717349a96913dc88722a20c7c1ec2cae68" into nyc-dev
Roshan Pius [Thu, 7 Apr 2016 19:28:22 +0000 (19:28 +0000)]
Merge "WifiScanner: Remove pnosetting stopPno API (1/2)" into nyc-dev
Yi Kong [Thu, 7 Apr 2016 17:06:45 +0000 (18:06 +0100)]
Track libcore change
c5c1e2717349a96913dc88722a20c7c1ec2cae68
Bug:
28058863
Change-Id: Id4bfeaf0f85d63b658dee3b74f91d7468c8eab95
(cherry picked from commit
b443d5d171fdbe00bf9806645776c8da3f6b85ba)
(cherry picked from commit
0201c5566dd09a19a05b04ba5b803f60b4111b76)
Alex Hills [Wed, 23 Mar 2016 21:33:02 +0000 (17:33 -0400)]
Adds support for MessagingStyle
This change adds support for the new MessagingStyle, which
supports a fully back-and-forth messaging/chat experience
within the notification display itself.
Bug:
28043958
Change-Id: Ibb9c2a0784f028d8cf01bd3cee4fecc5f72d68cd
Diego Perez [Thu, 7 Apr 2016 19:06:38 +0000 (19:06 +0000)]
Merge "Fix NPE when runnin testActivity" into nyc-dev
am:
2155ad8
* commit '
2155ad82042eb2f69b9c9d2a9ecf3884d265ad7b':
Fix NPE when runnin testActivity
Change-Id: I5b0c4b2686ebee6814866edf0c9e30e12ea14d26
Diego Perez [Thu, 7 Apr 2016 19:02:33 +0000 (19:02 +0000)]
Merge "Fix NPE when runnin testActivity" into nyc-dev
Jeff Sharkey [Thu, 7 Apr 2016 18:52:41 +0000 (18:52 +0000)]
Merge "Unlock newly created managed profiles." into nyc-dev
am:
8cd2243
* commit '
8cd2243d8ca6838ad154a70e7d4d31124225444b':
Unlock newly created managed profiles.
Change-Id: I6a74d247072346c2ba8ff9210fb3314cbfc1ebbb
Jeff Sharkey [Thu, 7 Apr 2016 18:46:36 +0000 (18:46 +0000)]
Merge "Unlock newly created managed profiles." into nyc-dev
Makoto Onuki [Thu, 7 Apr 2016 18:45:50 +0000 (18:45 +0000)]
Merge "Fix sqlite time measurement." into nyc-dev
am:
c2c5b23
* commit '
c2c5b230995d8880c74b1cf6043cd43b317efabc':
Fix sqlite time measurement.
Change-Id: I12afbae0eec6db332aae1b2e5fdf0300a36a8bd8
Xiaohui Chen [Thu, 7 Apr 2016 17:37:25 +0000 (10:37 -0700)]
sysui: refactoring qs for extensibility
Bug:
27100060
Change-Id: I4913999e57ff1a1b473649009b8822e24c0393c8
Jeff Sharkey [Thu, 7 Apr 2016 18:39:57 +0000 (12:39 -0600)]
Unlock newly created managed profiles.
We only need to delay unlocking managed profiles if the parent user
is currently locked.
Bug:
28068215
Change-Id: Ic59872a10417cfc166bd6e79cf94719545c7f45a
Makoto Onuki [Thu, 7 Apr 2016 18:38:41 +0000 (18:38 +0000)]
Merge "Fix sqlite time measurement." into nyc-dev
Jeff Sharkey [Thu, 7 Apr 2016 18:03:17 +0000 (18:03 +0000)]
Merge "Revert "Remove old FUSE bypass now that we have sdcardfs."" into nyc-dev
am:
8b704d44
* commit '
8b704d4474caf9fa0c7a734582fb6cce55248de4':
Revert "Remove old FUSE bypass now that we have sdcardfs."
Change-Id: I65236959348e3a2781e82e9d56eecb58f5d7fcce
Fyodor Kupolov [Thu, 7 Apr 2016 17:56:34 +0000 (17:56 +0000)]
Merge "Lock down access to getProfiles for 3P apps" into nyc-dev
am:
d67ac0a
* commit '
d67ac0a9060468973157d76cac01cf35fa722527':
Lock down access to getProfiles for 3P apps
Change-Id: Iecf9c66410656cf9af42f35a78f0a0339db981f9
Jeff Sharkey [Thu, 7 Apr 2016 17:56:33 +0000 (17:56 +0000)]
Merge "Give users and devices control over sdcardfs." into nyc-dev
am:
7d66e83
* commit '
7d66e8313958e8225ea6c3df2ca6696dbc6d3d79':
Give users and devices control over sdcardfs.
Change-Id: Ie2861a3268768fd6ed55e20bc8a746bb3bc61fff
Chris Wren [Thu, 7 Apr 2016 17:56:30 +0000 (17:56 +0000)]
Merge "add an onListenerDisconnected() callback to NLS" into nyc-dev
am:
e7e7cb2
* commit '
e7e7cb2d057348644002e986eeb68c211c8fa071':
add an onListenerDisconnected() callback to NLS
Change-Id: I1448b1e8c368c083313afb6c31582e32a502a684
Jeff Sharkey [Thu, 7 Apr 2016 17:56:20 +0000 (17:56 +0000)]
Merge "Revert "Remove old FUSE bypass now that we have sdcardfs."" into nyc-dev
Jeff Sharkey [Thu, 7 Apr 2016 17:56:06 +0000 (17:56 +0000)]
Revert "Remove old FUSE bypass now that we have sdcardfs."
This reverts commit
feef8b62ee60c8418bd7238522c06098e61eecff.
Change-Id: I90a3b8edf95cb5b631a85168671cf8b5a406d9ea
Fyodor Kupolov [Thu, 7 Apr 2016 17:52:52 +0000 (17:52 +0000)]
Merge "Lock down access to getProfiles for 3P apps" into nyc-dev
Jeff Sharkey [Thu, 7 Apr 2016 17:52:39 +0000 (17:52 +0000)]
Merge "Give users and devices control over sdcardfs." into nyc-dev
Yi Kong [Thu, 7 Apr 2016 17:46:22 +0000 (17:46 +0000)]
Merge "Track libcore change
e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4" into nyc-dev
am:
2ada7bc
* commit '
2ada7bc851ad17790a15f029802a8e4eb2af0e9a':
Track libcore change
e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4
Change-Id: I8c391099d14101174672e5dee04fcba8bcf71313
Chris Wren [Thu, 7 Apr 2016 17:44:09 +0000 (17:44 +0000)]
Merge "add an onListenerDisconnected() callback to NLS" into nyc-dev
Mady Mellor [Thu, 7 Apr 2016 17:42:54 +0000 (17:42 +0000)]
Merge "Make it easier to reveal gear on non-clearable notifications" into nyc-dev
am:
9713651
* commit '
9713651b261c33eb8c9af422eacb140160d3c481':
Make it easier to reveal gear on non-clearable notifications
Change-Id: I5da46acd0342d6f0bf17a936bfa3ca511b746816
Yi Kong [Thu, 7 Apr 2016 17:41:54 +0000 (17:41 +0000)]
Merge "Track libcore change
e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4" into nyc-dev
Yi Kong [Thu, 7 Apr 2016 16:48:19 +0000 (17:48 +0100)]
Track libcore change
e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4
Change-Id: I272d9d8a15034dce4e0858b76e1ca22e315e4acd
(cherry picked from commit
3f0f27f6cc35d75691b722c4841e435ac9b2d439)
(cherry picked from commit
abd00ff0e742d5e4849af9fad51f9e1b6bd3463a)
Yi Kong [Thu, 7 Apr 2016 17:36:18 +0000 (17:36 +0000)]
Marco Nelissen [Thu, 7 Apr 2016 17:33:13 +0000 (17:33 +0000)]
Merge "Expand mediaextractor dumpsys" into nyc-dev
am:
aaacd00
* commit '
aaacd001fba22ef5ed9ca882749919034f1720c4':
Expand mediaextractor dumpsys
Change-Id: Ie70b95d73a0994285c55dca1729cd782331b35bd
Yi Kong [Thu, 7 Apr 2016 17:32:40 +0000 (17:32 +0000)]
Roshan Pius [Thu, 7 Apr 2016 17:31:23 +0000 (10:31 -0700)]
WifiScanner: Remove pnosetting stopPno API (1/2)
BUG:
27532350
Change-Id: I6df3df56e66c7bbb8443c038cd8345989cf2d57e
Mady Mellor [Thu, 7 Apr 2016 17:31:58 +0000 (17:31 +0000)]
Merge "Make it easier to reveal gear on non-clearable notifications" into nyc-dev
Jeff Sharkey [Thu, 7 Apr 2016 17:05:33 +0000 (11:05 -0600)]
Give users and devices control over sdcardfs.
Instead of relying only on kernel support for sdcardfs, give each
device the ability to quickly toggle between sdcardfs and FUSE. Also
add the ability to users to explicitly enable/disable the behavior
for testing and debugging purposes.
Bug:
27991427
Change-Id: Ia57f12f6ead888ab85101004bdd8c8003537b116
Marco Nelissen [Thu, 7 Apr 2016 17:26:17 +0000 (17:26 +0000)]
Merge "Expand mediaextractor dumpsys" into nyc-dev
Randy Pan [Thu, 7 Apr 2016 17:26:06 +0000 (17:26 +0000)]
Merge "Enable/disable WifiConnectivityManager at runtime" into nyc-dev
am:
429b9fc
* commit '
429b9fcb7b8d9f22ac70643d3423c01da1a76458':
Enable/disable WifiConnectivityManager at runtime
Change-Id: I093d1c3c3fba444a1869e910ff04e453ebb56a6b
Yi Kong [Thu, 7 Apr 2016 17:23:58 +0000 (17:23 +0000)]
Randy Pan [Thu, 7 Apr 2016 17:22:47 +0000 (17:22 +0000)]
Merge "Enable/disable WifiConnectivityManager at runtime" into nyc-dev
Chris Wren [Wed, 6 Apr 2016 22:15:46 +0000 (18:15 -0400)]
add an onListenerDisconnected() callback to NLS
Also block all callbacks if the listener is not connected.
Also update the documentation to make lifecycle restictions
more clear.
Bug:
27582839
Change-Id: I029304e1fb87bd8d754cfb4641ba8cc095fc2b2e
Adam Lesinski [Thu, 7 Apr 2016 17:08:33 +0000 (17:08 +0000)]
Merge "Remove tests that have been moved to CTS" into nyc-dev
am:
41c1bb8
* commit '
41c1bb8f4a5a1f2f0a23d6cece525eaea50f57b3':
Remove tests that have been moved to CTS
Change-Id: I39012b182d637d37fccafbc13677089885dcbcdb
Adam Lesinski [Thu, 7 Apr 2016 17:08:32 +0000 (17:08 +0000)]
Merge "AAPT2: Enable windows build and make sure it builds" into nyc-dev
am:
f22df48
* commit '
f22df48067ec8f0a2c609c40ba842a0e5a0812b0':
AAPT2: Enable windows build and make sure it builds
Change-Id: I4a576df3e8d90546bb9d510821bcf1fbc349bdca
Adam Lesinski [Thu, 7 Apr 2016 17:08:30 +0000 (17:08 +0000)]
Merge "AAPT: Dump uses-feature version in dump badging" into nyc-dev
am:
c399df7
* commit '
c399df7a683d831f55b5afdb6945ef86bfe0e181':
AAPT: Dump uses-feature version in dump badging
Change-Id: I9fc30542458cd4a94ac6b00fb8dc943271961516
Adam Lesinski [Thu, 7 Apr 2016 17:04:12 +0000 (17:04 +0000)]
Merge "Remove tests that have been moved to CTS" into nyc-dev
Adam Lesinski [Thu, 7 Apr 2016 17:03:54 +0000 (17:03 +0000)]
Merge "AAPT2: Enable windows build and make sure it builds" into nyc-dev
Adam Lesinski [Thu, 7 Apr 2016 17:03:21 +0000 (17:03 +0000)]
Merge "AAPT: Dump uses-feature version in dump badging" into nyc-dev
Yi Kong [Thu, 7 Apr 2016 17:01:58 +0000 (17:01 +0000)]
Diego Perez [Thu, 7 Apr 2016 17:00:17 +0000 (18:00 +0100)]
Fix NPE when runnin testActivity
Change-Id: I7ac81cb286b8d5593ae7f5fedb99bfd0fda791c5
Yi Kong [Thu, 7 Apr 2016 16:58:28 +0000 (16:58 +0000)]
Todd Kennedy [Thu, 7 Apr 2016 16:58:21 +0000 (16:58 +0000)]
Merge "Only parse an APK once" into nyc-dev
am:
9d8da4c
* commit '
9d8da4cdf182643cd015bbf7a8ae1da9e53eb8b4':
Only parse an APK once
Change-Id: I8e8b09edd75912d4bac7556c3788d350599e9bd8
Todd Kennedy [Thu, 7 Apr 2016 16:51:10 +0000 (16:51 +0000)]
Merge "Only parse an APK once" into nyc-dev
Yi Kong [Thu, 7 Apr 2016 16:50:51 +0000 (16:50 +0000)]
Robin Lee [Thu, 7 Apr 2016 16:48:05 +0000 (16:48 +0000)]
Merge "Internal API for system apps to determine default network for other apps" into nyc-dev
am:
1b83651
* commit '
1b83651e7fca620589a6317d3a8559e43a19485c':
Internal API for system apps to determine default network for other apps
Change-Id: Ia928e2621e61946cdfa70ea186e9a00036dec4de
Oren Blasberg [Thu, 7 Apr 2016 16:48:03 +0000 (16:48 +0000)]
Merge "Fix icon spacing on both MenuPopup implementations." into nyc-dev
am:
1b65b01
* commit '
1b65b01f9317f8438e53e2b76d4790d8ed11c346':
Fix icon spacing on both MenuPopup implementations.
Change-Id: Ie5ead0b76552b7b93cd69fdc475ad74554711fed
Phil Weaver [Thu, 7 Apr 2016 16:48:01 +0000 (16:48 +0000)]
Merge "Allow tests to change UiAutomation flags." into nyc-dev
am:
d408b99
* commit '
d408b995c32710f8306af83c13cccdfa70cca242':
Allow tests to change UiAutomation flags.
Change-Id: I2b59047a63905fd8c41e08d6aa140be10c463de9
Robin Lee [Thu, 7 Apr 2016 16:43:13 +0000 (16:43 +0000)]
Merge "Internal API for system apps to determine default network for other apps" into nyc-dev
Makoto Onuki [Thu, 7 Apr 2016 16:07:04 +0000 (09:07 -0700)]
Fix sqlite time measurement.
SystemClock.uptimeMillis() should be used to calculate duration.
Bug
28054535
Change-Id: Idadee1ee47cea22d58dba2163cb843402e39b196
Svet Ganov [Thu, 7 Apr 2016 16:41:23 +0000 (16:41 +0000)]
Merge "Fix a NPE" into nyc-dev
am:
76cda85
* commit '
76cda85895b7b18b7e13d1cc02c665a15b9cc2b4':
Fix a NPE
Change-Id: Id1009015e1035f16b04d6245df900494e3c8751b
Oren Blasberg [Thu, 7 Apr 2016 16:37:46 +0000 (16:37 +0000)]
Merge "Fix icon spacing on both MenuPopup implementations." into nyc-dev
Phil Weaver [Thu, 7 Apr 2016 16:35:25 +0000 (16:35 +0000)]
Merge "Allow tests to change UiAutomation flags." into nyc-dev
Yorke Lee [Thu, 7 Apr 2016 16:34:43 +0000 (16:34 +0000)]
Merge "Pass button index into inflateButton" into nyc-dev
am:
6e6c647
* commit '
6e6c64702e8a084d32bbb9804c26f74e47d63fb6':
Pass button index into inflateButton
Change-Id: I4b31995b816b339ef0f9f84159c3c430e62f417d
Diego Perez [Thu, 7 Apr 2016 16:34:41 +0000 (16:34 +0000)]
Merge "Fix rect shadow detection" into nyc-dev
am:
8d35506
* commit '
8d35506e512cbbce09cedfe8e1d76653440ca3a5':
Fix rect shadow detection
Change-Id: I499e845d9f28f094f15284f3450c2852a2046713
Svetoslav Ganov [Thu, 7 Apr 2016 16:32:00 +0000 (16:32 +0000)]
Merge "Fix a NPE" into nyc-dev
Yorke Lee [Thu, 7 Apr 2016 16:31:39 +0000 (16:31 +0000)]
Merge "Pass button index into inflateButton" into nyc-dev
Svet Ganov [Thu, 7 Apr 2016 16:27:58 +0000 (09:27 -0700)]
Fix a NPE
bug:
27999133
Change-Id: Icacb8f440bca2f720c15ee5548495fad50502fa0
Ricky Wai [Thu, 7 Apr 2016 16:28:00 +0000 (16:28 +0000)]
Merge "Fix work profile screen timeout policy" into nyc-dev
am:
bdc3961
* commit '
bdc3961fef7b57f98bd6091b79fb511081237d8e':
Fix work profile screen timeout policy
Change-Id: I4ebf3e47cfadcfe3f689e28f2a487c384278fb83
Diego Perez [Thu, 7 Apr 2016 16:26:58 +0000 (16:26 +0000)]
Merge "Fix rect shadow detection" into nyc-dev
Ricky Wai [Thu, 7 Apr 2016 16:20:42 +0000 (16:20 +0000)]
Merge "Fix work profile screen timeout policy" into nyc-dev
Yi Kong [Thu, 7 Apr 2016 16:20:31 +0000 (17:20 +0100)]
Track libcore change
c5c1e2717349a96913dc88722a20c7c1ec2cae68
Bug:
28058863
Change-Id: Id4bfeaf0f85d63b658dee3b74f91d7468c8eab95
Yi Kong [Wed, 6 Apr 2016 12:15:34 +0000 (13:15 +0100)]
Track libcore change
e9d9ae3d5e57a60e20c2c01e3dceb3e51de8b9f4
Change-Id: I272d9d8a15034dce4e0858b76e1ca22e315e4acd
Ricky Wai [Fri, 18 Mar 2016 16:43:31 +0000 (16:43 +0000)]
Fix work profile screen timeout policy
Settings screen should apply both primary and managed maximum
timeout policy, even separate profile challenge is enabled.
Bug:
27493348
Change-Id: Ia1ec1cafc7665c54816833af64e0f446a77a55b2
Jason Monk [Thu, 7 Apr 2016 15:56:43 +0000 (15:56 +0000)]
Merge "Fix QS expanding" into nyc-dev
am:
c2c19e3
* commit '
c2c19e34e6d2b1c68c36a2f8275a302b38ea9c83':
Fix QS expanding
Change-Id: I0984dbddd289247c897643c12ddb7fb751a7564e
Jason Monk [Thu, 7 Apr 2016 15:51:04 +0000 (15:51 +0000)]
Merge "Fix QS expanding" into nyc-dev
Jeff Sharkey [Thu, 7 Apr 2016 15:50:08 +0000 (15:50 +0000)]
Merge "Delay unlock attempts for managed profiles." into nyc-dev
am:
6e0b305
* commit '
6e0b305fc03f7bdc8400ebd283b55a057518f040':
Delay unlock attempts for managed profiles.
Change-Id: I942bb9d7abe9abe3f7993636c333b8d1ff4d9a89
Ricky Wai [Thu, 7 Apr 2016 15:50:06 +0000 (15:50 +0000)]
Delete all work fingerprints when unified lock changes to None/Swipe
am:
f86f986
* commit '
f86f986728b5844a48e2e7bbd4927d2f5500c682':
Delete all work fingerprints when unified lock changes to None/Swipe
Change-Id: I683d05a106119af74fe920b37be4e26e158e5cbc
Jason Monk [Thu, 7 Apr 2016 15:48:49 +0000 (11:48 -0400)]
Fix QS expanding
The QS host triggers the expand by clicking on a view that will
expand QS, but the header itself doesn't handle expands anymore,
it is handled by the expand indicator.
Bug:
28060735
Change-Id: I4daaeb754d294d5e6647dedf36ab2161c6a0fa56
Jeff Sharkey [Thu, 7 Apr 2016 15:42:48 +0000 (15:42 +0000)]
Merge "Delay unlock attempts for managed profiles." into nyc-dev
Ricky Wai [Wed, 23 Mar 2016 12:05:42 +0000 (12:05 +0000)]
Delete all work fingerprints when unified lock changes to None/Swipe
Bug:
27551139
Change-Id: Ida398a922d9c42e65001b0a10e13552505824d2d
Ricky Wai [Thu, 7 Apr 2016 15:36:48 +0000 (15:36 +0000)]
Fingerprint should confirm device lock when unified
am:
53940d4
* commit '
53940d4c7f45a26d8b571982a1f8f4b8094aa5e0':
Fingerprint should confirm device lock when unified
Change-Id: Ic4849d86219fc528862fb50e0670a243ddd60868
Ricky Wai [Tue, 5 Apr 2016 14:29:24 +0000 (15:29 +0100)]
Fingerprint should confirm device lock when unified
When unified and adding a fingerprint, the user is prompted to set up
a backup
Bug:
27419438
Change-Id: I3e857fa07c50ee0904f685b721595ef6cfe729f9
Rubin Xu [Thu, 7 Apr 2016 15:04:07 +0000 (15:04 +0000)]
Fix wrong condition am:
492ed58
am:
f5c0a55
* commit '
f5c0a55d1eca29be3f63fbf07f7bd35ff5a68a62':
Fix wrong condition
Change-Id: I677d5bed9d21dfc502897f580268f718505d1931
Rubin Xu [Thu, 7 Apr 2016 15:00:59 +0000 (15:00 +0000)]
Fix wrong condition
am:
492ed58
* commit '
492ed589df3609a15dd6a33709fc8d855ec1072d':
Fix wrong condition
Change-Id: I23f23c4b77d19286915e501bea482e4d1fe7e714
Robin Lee [Thu, 24 Mar 2016 12:07:00 +0000 (12:07 +0000)]
Internal API for system apps to determine default network for other apps
Callers with CONNECTIVITY_INTERNAL permission can read off the netId
that an application is assigned to by default.
Necessary for making connections as the default network for a client
app eg. when downloading stuff on its behalf.
Bug:
27074270
Change-Id: I8d35e8e99126875f55f3c545090326f3e9be43fb
Jason Monk [Thu, 7 Apr 2016 14:35:55 +0000 (14:35 +0000)]
Merge "Work on QS landscape fitting" into nyc-dev
am:
917c06a
* commit '
917c06a0fb51bf13170759bf98f1e1c1c9f67fd5':
Work on QS landscape fitting
Change-Id: Ib3cc80d55611d50f3b05922a8a0e45dbebf93dbe
Ricky Wai [Thu, 7 Apr 2016 14:28:55 +0000 (14:28 +0000)]
Keymaster init for work profile
am:
dc283a8
* commit '
dc283a897680ffd33c4d15535ebe778ba5b42c43':
Keymaster init for work profile
Change-Id: I131c93404eca82fa174527c6f2fb4a8aa72f7b35
Daniel U [Thu, 7 Apr 2016 14:28:54 +0000 (14:28 +0000)]
Merge "Refresh cached user array upon lockscreen settings changed" into nyc-dev
am:
eb33f49
* commit '
eb33f49232a0a7a1c20aba4bdecad4ab5da7cfc9':
Refresh cached user array upon lockscreen settings changed
Change-Id: I1ab047796aa11a7e48d4591d5baa67bf2d9ea63b
Jason Monk [Thu, 7 Apr 2016 14:27:41 +0000 (14:27 +0000)]
Merge "Work on QS landscape fitting" into nyc-dev
Ricky Wai [Thu, 24 Mar 2016 19:55:08 +0000 (19:55 +0000)]
Keymaster init for work profile
Changes:
(1) When unified work challenge is enabled and screen lock is secure
- Store work profile secure key in primary profile
- When primary user keystore unlocked, unlock work profile keystore
- When primary user change lock to none, remove work secure key
(2) When unified work challenge is enabled but screen lock is not secure
- When screen lock changes to secure, store work secure key in primary
(3) When user changes work challenge from unified to separated
- Remove work secure key in primary
(4) When user changes work challenge from separate to unified
- Do (1) and (2)
Bug:
27460698
Change-Id: I8f77bde5dc6b8e59c90256e75c5990100e93366b
Daniel U [Thu, 7 Apr 2016 14:20:13 +0000 (14:20 +0000)]
Merge "Refresh cached user array upon lockscreen settings changed" into nyc-dev
Ashutosh Joshi [Thu, 7 Apr 2016 14:06:16 +0000 (14:06 +0000)]
Merge "Add dumpsys capabilities for context hub service" into nyc-dev
am:
7d4a7fa
* commit '
7d4a7fa333c4d73ed36d3729b43a5f3ae82cdc93':
Add dumpsys capabilities for context hub service
Change-Id: Iabe5f35caa73bdb8beccc6d5e3596a0478a62266
OSDN Git Service
