app_Settings

Go to file

Benjamin Franz ae07b5080a Resolve new intent that allows setting the parent challenge

Have ChooseLockGeneric resolve the new intent that allows setting the
parent challenge. If the new intent is received or seperate work
challenge is not supported, default to setting the challenge of the
parent user, otherwise use the calling user.

Change-Id: Ibd0ce8ce81b1d5c9073d4eb0096fdc74de12ee95

2016-01-15 11:38:41 +00:00

res

resolve merge conflicts of 7e0586b7a6 to master.

2016-01-13 21:39:37 -08:00

src/com/android/settings

Resolve new intent that allows setting the parent challenge

2016-01-15 11:38:41 +00:00

tests

Import translations. DO NOT MERGE

2016-01-05 07:56:37 -08:00

Android.mk

Depend on support lib preferences