summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/res
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-10-06 19:19:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-06 19:19:18 -0700
commit4818db0fc5dec465a2cdb76c0faff4750a3a3fff (patch)
tree43a61627332f808dbb5f2b60dcb1460b88924ddf /packages/Keyguard/res
parentd64d41b3345aefd1a73512944e33a38d29d9b15c (diff)
parentb88ede00ac12fb359b490a5167cd595ebde7e805 (diff)
downloadframeworks_base-4818db0fc5dec465a2cdb76c0faff4750a3a3fff.zip
frameworks_base-4818db0fc5dec465a2cdb76c0faff4750a3a3fff.tar.gz
frameworks_base-4818db0fc5dec465a2cdb76c0faff4750a3a3fff.tar.bz2
am b88ede00: am d5102f19: Merge "Transparent system ui flags -> Translucent WM flags." into klp-dev
* commit 'b88ede00ac12fb359b490a5167cd595ebde7e805': Transparent system ui flags -> Translucent WM flags.
Diffstat (limited to 'packages/Keyguard/res')
-rw-r--r--packages/Keyguard/res/values/alias.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/Keyguard/res/values/alias.xml b/packages/Keyguard/res/values/alias.xml
index b22311e..e6657a1 100644
--- a/packages/Keyguard/res/values/alias.xml
+++ b/packages/Keyguard/res/values/alias.xml
@@ -43,8 +43,8 @@
<!-- Alias used to reference framework configuration for screen rotation. -->
<item type="bool" name="config_enableLockScreenRotation">@*android:bool/config_enableLockScreenRotation</item>
- <!-- Alias used to reference framework configuration for transparent bars. -->
- <item type="bool" name="config_enableLockScreenTransparentBars">@*android:bool/config_enableLockScreenTransparentBars</item>
+ <!-- Alias used to reference framework configuration for translucent decor. -->
+ <item type="bool" name="config_enableLockScreenTranslucentDecor">@*android:bool/config_enableLockScreenTranslucentDecor</item>
<!-- Alias used to reference framework activity duration. -->
<item type="integer" name="config_activityDefaultDur">@*android:integer/config_activityDefaultDur</item>