Fan Zhang
1d090c798f
Merge "Dashboard status cards UI."
2016-04-07 23:10:07 +00:00
Fan Zhang
d42e233bf0
Dashboard status cards UI.
...
Bug: 27907841
This adds a card view type to display status in Settings dashboard. Also
added necessary pieces to layout status and condition views properly.
The data for status is not wired up yet.
Change-Id: I8ed624177645f389ec0bb71420f073c6dbc03ccb
2016-04-07 13:23:37 -07:00
Ricky Wai
473e0c1891
Fix work profile screen timeout policy am: 36cce83
...
am: 0a18f9d
2016-04-07 16:34:04 +00:00
Ricky Wai
0a18f9d94c
Fix work profile screen timeout policy
...
am: 36cce83
2016-04-07 16:30:20 +00:00
Ricky Wai
36cce830b9
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: I09e815d6c6ae6ecd554316cfac82daf0ad0b0cdf
2016-04-07 17:18:04 +01:00
Ricky Wai
3a9c80a2d2
Delete all work fingerprints when unified lock changes to None/Swipe am: 751de37
...
am: d82f072
2016-04-07 16:02:18 +00:00
Ricky Wai
d82f072e0c
Delete all work fingerprints when unified lock changes to None/Swipe
...
am: 751de37
2016-04-07 15:53:08 +00:00
Ricky Wai
858b6b9262
Fingerprint should confirm device lock when unified am: 996d0df
...
am: e9da442
2016-04-07 15:42:45 +00:00
Ricky Wai
751de37275
Delete all work fingerprints when unified lock changes to None/Swipe
...
Bug: 27551139
Change-Id: I64105621057e04be0e4d8073626ac3ed0f1e72d2
2016-04-07 15:41:18 +00:00
Ricky Wai
e9da44277d
Fingerprint should confirm device lock when unified
...
am: 996d0df
2016-04-07 15:39:00 +00:00
Ricky Wai
996d0dfa6e
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: I6cfa8c276ae69a0af51580be390c3da4e9596874
2016-04-07 15:11:14 +00:00
Ricky Wai
93eedb5de3
Keymaster init for work profile am: 4bbf065
...
am: 3c6e000
2016-04-07 14:44:17 +00:00
Ricky Wai
3c6e0008d6
Keymaster init for work profile
...
am: 4bbf065
2016-04-07 14:38:22 +00:00
Ricky Wai
4bbf0653c0
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: Id7464c178e6ea7b561643477e7cd84f963048c87
2016-04-07 14:23:55 +00:00
Robin Lee
d49caa77e1
Merge "Guard double-showing of user credentials dialog" into nyc-dev am: 1dea763
...
am: 73925bf
2016-04-07 13:43:34 +00:00
Robin Lee
73925bfe54
Merge "Guard double-showing of user credentials dialog" into nyc-dev
...
am: 1dea763
2016-04-07 13:40:21 +00:00
Robin Lee
1dea763d05
Merge "Guard double-showing of user credentials dialog" into nyc-dev
2016-04-07 13:32:53 +00:00
Robin Lee
f8e2dbf2d2
Guard double-showing of user credentials dialog
...
Only create & show the dialogfragment if it does not already exist.
Bug: 28058930
Change-Id: Ia48cc8a5fd60a12c3beb6c9263036a449cf8d67c
2016-04-07 13:20:21 +01:00
Nicolas Prévot
856a7ae8ad
Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev am: 74777cc
...
am: 195eadc
2016-04-07 09:39:22 +00:00
Nicolas Prevot
195eadc1b0
Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev
...
am: 74777cc
2016-04-07 09:30:19 +00:00
Nicolas Prévot
74777ccd90
Merge "Ask the user to unlock the work profile before adding a work account." into nyc-dev
2016-04-07 09:23:19 +00:00
Ryoji Miyazaki
298ec9bd44
Merge "Fix user photo popup layout for RTL" am: 6186414 am: d0d0af8
...
am: 3c51422
2016-04-07 00:58:00 +00:00
Suprabh Shukla
90b71c644d
Merge "Fix user photo popup layout for RTL" into nyc-dev
2016-04-07 00:56:04 +00:00
Amith Yamasani
3c51422067
Merge "Fix user photo popup layout for RTL" am: 6186414
...
am: d0d0af8
2016-04-07 00:53:05 +00:00
Amith Yamasani
6186414be8
Merge "Fix user photo popup layout for RTL"
2016-04-07 00:44:06 +00:00
Ryoji Miyazaki
9238e50a80
Fix user photo popup layout for RTL
...
When RTL language is set, the edit-photo popup window
on user profile info is not shown fully.
The popup window should be aligned with the anchor.
Cherrypick of https://android-review.googlesource.com/#/c/207762/
Bug: 27955356
Change-Id: Ia928c99fbfff3596b048cc3949aef6d03594fed7
2016-04-06 17:24:16 -07:00
Andres Morales
139d1999e7
Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev am: 2006403
...
am: 11dcefc
2016-04-07 00:14:16 +00:00
Andres Morales
11dcefc9a8
Merge "handle devices that don\'t support FLASH_LOCK_STATE" into nyc-dev
...
am: 2006403
2016-04-07 00:09:13 +00:00
Andres Morales
20064037a7
Merge "handle devices that don't support FLASH_LOCK_STATE" into nyc-dev
2016-04-07 00:00:38 +00:00
Andres Morales
ce4bdca151
handle devices that don't support FLASH_LOCK_STATE
...
only disable OEM unlocking pref for devices that report
FLASH_LOCK_UNLOCKED.
Bug: 27967926
Change-Id: Ia41b0dc9249e11df2fb35263ebde05f3a2e0d29a
2016-04-06 15:04:48 -07:00
Fan Zhang
a911917162
Merge "Add a RecyclerView adapter for first tab in settings."
2016-04-06 20:40:28 +00:00
Fan Zhang
228a0e49c2
Merge "Fix animation when expand conditional notices in Settings." into nyc-dev am: df634d0
...
am: 4b2519d
2016-04-06 19:31:51 +00:00
Fan Zhang
4b2519d3c1
Merge "Fix animation when expand conditional notices in Settings." into nyc-dev
...
am: df634d0
2016-04-06 19:26:11 +00:00
Fan Zhang
df634d03c5
Merge "Fix animation when expand conditional notices in Settings." into nyc-dev
2016-04-06 19:07:10 +00:00
Anna Galusza
b95de86ae3
Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev am: a3d8c31
...
am: 8e13f72
2016-04-06 17:51:21 +00:00
Anna Galusza
8e13f725dc
Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev
...
am: a3d8c31
2016-04-06 17:48:16 +00:00
Anna Galusza
a3d8c316d4
Merge "Revert "Fix issues with wrong configuration being used to inflate layouts. Bug: 27700406" Framework bug was fixed by ag/900274, so this is no longer needed." into nyc-dev
2016-04-06 17:47:09 +00:00
Fan Zhang
44e7be1289
Add a RecyclerView adapter for first tab in settings.
...
Bug: 27907841
The new adapter eventually will contain: conditionals, status,
suggestions.
Change-Id: I62f9db3db6557b16255ad94e2ce166b3c376e1bb
2016-04-06 10:13:38 -07:00
Fan Zhang
905002a01d
Fix animation when expand conditional notices in Settings.
...
Bug: 28017593
Change-Id: I8275cb2050f79d26e58c02ffd91cb1a3e32a5ff2
2016-04-06 10:07:03 -07:00
Jason Monk
9964504e51
Merge "Add dev options to set swXdp" into nyc-dev am: b22dd20
...
am: 51970c8
2016-04-06 13:31:44 +00:00
Jason Monk
51970c8558
Merge "Add dev options to set swXdp" into nyc-dev
...
am: b22dd20
2016-04-06 13:29:09 +00:00
Jason Monk
b22dd2071f
Merge "Add dev options to set swXdp" into nyc-dev
2016-04-06 13:20:07 +00:00
Victor Chang
67691696f2
Merge "Add button to trust a CA cert" into nyc-dev am: b49c901
...
am: 2bd4e16
2016-04-06 11:07:55 +00:00
Victor Chang
2bd4e1689f
Merge "Add button to trust a CA cert" into nyc-dev
...
am: b49c901
2016-04-06 11:04:59 +00:00
Victor Chang
b49c901f8e
Merge "Add button to trust a CA cert" into nyc-dev
2016-04-06 10:59:20 +00:00
Nicolas Prevot
a599c8fd04
Ask the user to unlock the work profile before adding a work account.
...
If the work profile is locked, and the user tries to add a
work account from Settings:
Show the work profile security challenge.
BUG:28005200
Change-Id: I87ff25d9de94026b0d7ac307ea3a541e77989aa6
2016-04-06 11:19:08 +01:00
Oleksandr Peletskyi
28489bbd72
Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev am: 4ffa5c8
...
am: a2810b8
2016-04-06 09:38:58 +00:00
Oleksandr Peletskyi
a2810b8eaa
Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev
...
am: 4ffa5c8
2016-04-06 09:36:14 +00:00
Oleksandr Peletskyi
4ffa5c8af5
Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev
2016-04-06 09:31:22 +00:00
Sanket Agarwal
c051e25d6a
Merge "PBAP Pairing Permission" into nyc-dev am: e5b8ec0
...
am: 4c74ed33
2016-04-05 23:45:17 +00:00
