diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-15 11:54:10 +0100 |
| commit | 60e5a34630c69e575f157a2babac70048cc3bdb1 (patch) | |
| tree | 9691d92caa5fba82bf307cf2af3374c616053bb8 /overlay/packages/apps/Settings/res/values/config.xml | |
| parent | 8d57bd027ab7f354e1707510d3ba5654ba16c0aa (diff) | |
| parent | 02a3b7b2c85b056f6172668ac9d2008a941a6df5 (diff) | |
| download | device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.zip device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.gz device_samsung_smdk4412-common-60e5a34630c69e575f157a2babac70048cc3bdb1.tar.bz2 | |
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
Conflicts:
BoardCommonConfig.mk
camera/Android.mk
common.mk
configs/80cfw
lpm.rc
overlay/frameworks/base/core/res/res/values/config.xml
overlay/packages/apps/Camera2/res/values/config.xml
Diffstat (limited to 'overlay/packages/apps/Settings/res/values/config.xml')
| -rw-r--r-- | overlay/packages/apps/Settings/res/values/config.xml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml index f33a11e..5ba34c6 100644 --- a/overlay/packages/apps/Settings/res/values/config.xml +++ b/overlay/packages/apps/Settings/res/values/config.xml @@ -16,12 +16,9 @@ --> <resources xmlns:xliff="urnasis:names:tc:xliff:document:1.2 "> - <!-- LED Flashlight --> - <bool name="has_led_flash">true</bool> - - <!-- Dock Settings --> - <bool name="has_dock_settings">true</bool> - <!-- Volume Rocker Wake --> <bool name="config_show_volumeRockerWake">true</bool> + + <!-- Home button wake support --> + <bool name="config_show_homeWake">true</bool> </resources> |