diff options
| author | Craig Mautner <cmautner@google.com> | 2015-04-28 16:21:06 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2015-05-12 10:26:13 -0700 |
| commit | 61e1e09a2b6471defa1032a44a20090618c21d3f (patch) | |
| tree | e599662f77773f82f4327af20b132f5db4e5ad6f /tests/LockTaskTests/res | |
| parent | eeb60bc7bbba2eed29d78dcc56ec1760655c5481 (diff) | |
| download | frameworks_base-61e1e09a2b6471defa1032a44a20090618c21d3f.zip frameworks_base-61e1e09a2b6471defa1032a44a20090618c21d3f.tar.gz frameworks_base-61e1e09a2b6471defa1032a44a20090618c21d3f.tar.bz2 | |
Change attribute values per API council.
lockTaskModeDefault => default
lockTaskModeNever => never
lockTaskModeIfWhitelisted => if_whitelisted
lockTaskModeAlways => always
Fixes bug 20642190.
Change-Id: I29cc546e12c330df9ec9af3cc91faf0d0f3df3b4
Diffstat (limited to 'tests/LockTaskTests/res')
| -rw-r--r-- | tests/LockTaskTests/res/values/strings.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/LockTaskTests/res/values/strings.xml b/tests/LockTaskTests/res/values/strings.xml index 61c029f..3bcae80 100644 --- a/tests/LockTaskTests/res/values/strings.xml +++ b/tests/LockTaskTests/res/values/strings.xml @@ -7,16 +7,17 @@ <string name="title_activity_whitelist">LockWhitelistedActivity</string> <string name="title_activity_always">LockAtLaunchActivity</string> <string name="launch_default">android:lockTaskMode=\n - \"lockTaskModeDefault\"\n + \"default\"\n Pinnable from Overview.</string> <string name="launch_never">android:lockTaskMode=\n - \"lockTaskModeNever\"\n + \"never\"\n Not Lockable or Pinnable.</string> - <string name="launch_whitelist">android:lockTaskMode=\n\"lockTaskModeIfWhitelisted\"\n + <string name="launch_whitelist">android:lockTaskMode=\n + \"if_whitelisted\"\n Lockable if whitelisted, Pinnable.\n Use SampleDeviceOwner app to set whitelist.</string> <string name="launch_always">android:lockTaskMode=\n - \"lockTaskModeAlways\"\n + \"always\"\n Launches into lock mode.</string> <string name="launch_main">launch MainActivity (as activity)"</string> <string name="try_lock">Call startLockMode()</string> |