Daniel U
6655e1b6f5
Hint user that fingerprint cannot unlock FBE keys
...
Show a hint text to user noting that pattern/PIN/password is
required when decrypting the credential based storage when file
based encryption is turned on.
The hint text is the same as that of the device unlock screen after
device reboot.
Bug: 27964055
Change-Id: I0d5a493bab69eae5ce4742bd07d4851387863cac
2016-04-08 15:23:46 +01:00
Ruben Brunk
77359ad761
Merge "Fix Settings activity typo." into nyc-dev
2016-04-08 05:13:18 +00:00
Ruben Brunk
c461d5c03d
Fix Settings activity typo.
...
Bug=28078304
Change-Id: I2744314bbd97b1c330baa53a07534c461dab3c0f
2016-04-07 22:08:09 -07:00
Toni Barzic
e7d6e4ddb2
Teach settings about PASSWORD_QUALITY_MANAGED constant
...
Add hooks for adding an option for selecting a managed password as
lock credential. By default this option will not be visible.
BUG=27923581
Change-Id: Id17bd8074bf23cbcffb96d8576cc760df6f2298a
2016-04-07 10:44:35 -07: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
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
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
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
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
Winston Man
90aec184b4
Amend icon size for delete work profile dialog
...
Changes are referenced from
https://cs.corp.google.com/android/packages/apps/ManagedProvisioning/res/layout/device_manager_icon_label.xml
Fixed screenshot:
https://screenshot.googleplex.com/01qOjUp0rp8
Bug:27636781
Change-Id: Ib6cf303caa388a8b0d2b7664fd9828a8d2f67098
2016-04-07 09:42:11 +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
Suprabh Shukla
90b71c644d
Merge "Fix user photo popup layout for RTL" into nyc-dev
2016-04-07 00:56:04 +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
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
Maurice Lam
a01e2b96f6
Merge "Update fingerprint strings during setup" into nyc-dev
2016-04-06 21:34:34 +00:00
Maurice Lam
1a2c6f464a
Update fingerprint strings during setup
...
Bug: 28004437
Change-Id: I317437ddaf66158e0d30da6d411d9aa7f498688c
2016-04-06 12:25:39 -07: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
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
Alan Viverette
b5e2f54cc3
Merge "Use normal button style for Clear data / cache buttons" into nyc-dev
2016-04-06 17:36:35 +00:00
Bill Yi
2de9313d2c
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-04-06 17:10:09 +00: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
Pankaj Kanwar
e6924ce8ca
Merge "Fix problem with message indent. b/25054130" into nyc-dev
2016-04-06 16:58:09 +00:00
pkanwar
0b390884c2
Fix problem with message indent.
...
b/25054130
Change-Id: I16327683f970c5b9a23316984e1815227d265c57
2016-04-06 16:53:20 +00:00
Jason Monk
b22dd2071f
Merge "Add dev options to set swXdp" into nyc-dev
2016-04-06 13:20:07 +00:00
Bill Yi
51c9a0ec71
Import translations. DO NOT MERGE
...
Change-Id: I0788997407affde8dcfbcbf0f8476bc9d0d14d56
Auto-generated-cl: translation import
2016-04-06 05:47:27 -07: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
4ffa5c8af5
Merge "Block "Screen lock" menu for Work Challenge." into nyc-dev
2016-04-06 09:31:22 +00:00
Sanket Agarwal
e5b8ec020c
Merge "PBAP Pairing Permission" into nyc-dev
2016-04-05 23:39:55 +00:00
Fyodor Kupolov
84948db8d0
Merge "Do not store bitmap into Bundle in onSaveInstanceState" into nyc-dev
2016-04-05 22:20:16 +00:00
Victor Chang
a390d63682
Add button to trust a CA cert
...
- Put Disable button for system cert and Remove button for user cert as action button in cert dialog
- OK (dismiss) button is displayed when trust button is not shown
- Showing chain of cert dialot will be in a later CL
Bug: 18224038
Change-Id: Ieef70e12fd8bdf711be48dc0488f03dbe143d3c5
2016-04-05 22:22:41 +01:00
Jason Monk
449f97204a
Add dev options to set swXdp
...
Change-Id: Ibe88e2b1a2e818838baf452b6da204fc9e004a42
Fixes: 27734698
2016-04-05 16:47:44 -04:00
Bill Yi
e303983e5d
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-04-05 18:44:35 +00:00
Bill Yi
c75d555a33
Import translations. DO NOT MERGE
...
Change-Id: I9359139bccc9223f079201807385a9b4f531474a
Auto-generated-cl: translation import
2016-04-05 11:25:39 -07:00
Fyodor Kupolov
7a5e897db0
Do not store bitmap into Bundle in onSaveInstanceState
...
It may cause TransactionTooLargeException because of the parcel size limit
Bug: 27990767
Change-Id: Ie1a702810a5c26e25fc485ebae09dc65e2b48e41
2016-04-05 10:46:20 -07:00
Anna Galusza
da0e4d3280
Merge "Add Tron Logging to portion of A11y SUW that lives in Settings. Bug: 27777706" into nyc-dev
2016-04-05 16:46:29 +00:00
Jason Monk
72304b5edd
Merge "Update data saver icon" into nyc-dev
2016-04-05 16:38:38 +00:00
Jason Monk
4145fb96d4
Update data saver icon
...
Change-Id: I9ffd81224da2601a9c4618da04a058da1c08d38e
Fixes: 28004364
2016-04-05 12:36:24 -04:00
Rubin Xu
29e73f2d4c
Merge "Listen on new broadcasts for profile changes." into nyc-dev
2016-04-05 14:52:00 +00:00
Bill Yi
196c7f74db
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-04-05 03:22:40 +00:00
Bill Yi
30ea505237
Import translations. DO NOT MERGE
...
Change-Id: I38d52ee3540f9b1e593d482d2eccb180d7936212
Auto-generated-cl: translation import
2016-04-04 18:10:36 -07:00
Udam Saini
9a8f009880
Merge "Adds a multi line preference class." into nyc-dev
2016-04-04 20:06:30 +00:00
Julia Reynolds
a003fa583c
Merge "Show fewer filters on notifications page." into nyc-dev
2016-04-04 19:39:26 +00:00
Julia Reynolds
cd37e59b9a
Merge "Fix ringtone persistance after device rotation." into nyc-dev
2016-04-04 19:39:13 +00:00
Jason Monk
da6ae856a9
Merge "Add moar dividers" into nyc-dev
2016-04-04 19:29:55 +00:00
Julia Reynolds
1e91f9f30e
Show fewer filters on notifications page.
...
Bug: 27834480
Change-Id: Ibdc9924a7ea1b1db7be089507485de5c4fd41b58
2016-04-04 15:20:11 -04:00
Julia Reynolds
c736efcb61
Fix ringtone persistance after device rotation.
...
Bug: 26122624
Change-Id: I187fe673dea250e93c6e9603239f01845ed378a3
2016-04-04 15:20:11 -04:00
Maurice Lam
f9db17e3cc
Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev
2016-04-04 17:57:52 +00:00