OSDN Git Service

User should confirm device lock before un-unifying
authorMahaver Chopra <mahaver@google.com>
Fri, 18 Mar 2016 19:08:05 +0000 (19:08 +0000)
committerMahaver Chopra <mahaver@google.com>
Fri, 18 Mar 2016 19:36:47 +0000 (19:36 +0000)
commit26632097ba7ae5d9a4fb3db08be588e686520f55
tree26e4f953da85c0dc2675b06961209e58bd673734
parent2bfbcfae13afd00b7e7e28031a9bda5f7de753f8
User should confirm device lock before un-unifying

User should confirm device lock before un-unifying
Move Use the same lock toggle the first option
When Unifying Title while confirming device password is of profile.

Bug: 26815727
Bug: 27523804
Bug: 27547551

Change-Id: I44857f7dcff3d68486e7e4d2ae8565b56d7c91b7
res/values/strings.xml
src/com/android/settings/SecuritySettings.java