commit 56462d668a7a81ef17c01b1ca70a9d462eae79d2
author Clara Bayarri <clarabayarri@google.com> Fri Feb 12 13:55:36 2016 +0000
committer Clara Bayarri <clarabayarri@google.com> Tue Feb 23 11:48:56 2016 -0800
tree 963a4fc22c19b4c1c2f0b8b7148ba08966953973
parent 7f9c2849f7bceb22e7cfc4670f40c5c7c7bcc8b2

Make Work profile lock unification a toggle

The setting to unify work and personal locks is now a toggle,
and therefore always available.

When unifying, if the work lock is sufficient as a device lock
we confirm both locks and set the work lock as the device lock.
If the work lock is not sufficient for the device, the user is
informed and taken to the lock setup flow to set a new unified
lock for both.

Also fix related Strings given UX feedback.

Bug: 26816580
Change-Id: Id019234b0a5ff4462c5f9ba86e53e30981a03e0d