summaryrefslogtreecommitdiff
authorTellen Yu <tellen.yu@amlogic.com>2017-08-25 06:59:42 (GMT)
committer Gerrit Code Review <gituser@scgit.amlogic.com>2017-08-25 06:59:42 (GMT)
commite7ead420d3e3190ef2f9dd599493fb37f0cfed93 (patch)
treef9cadf648f0ed72bc28bf73eb9de07c4d73a1cb9
parentf1031045f30bfac6f7cb6180f318724fca2afa0b (diff)
parentf55d66b58fa24464668e973ff4e1f916b8dd17a6 (diff)
downloadamlogic-o-e7ead420d3e3190ef2f9dd599493fb37f0cfed93.zip
amlogic-o-e7ead420d3e3190ef2f9dd599493fb37f0cfed93.tar.gz
amlogic-o-e7ead420d3e3190ef2f9dd599493fb37f0cfed93.tar.bz2
Merge "Overlay:enable wallpaper service[1/2]" into o-amlogic
Diffstat
-rw-r--r--p212/overlay/frameworks/base/core/res/res/values/config.xml7
-rw-r--r--p230/overlay/frameworks/base/core/res/res/values/config.xml6
2 files changed, 0 insertions, 13 deletions
diff --git a/p212/overlay/frameworks/base/core/res/res/values/config.xml b/p212/overlay/frameworks/base/core/res/res/values/config.xml
index 3bf61aa..10b7a06 100644
--- a/p212/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/p212/overlay/frameworks/base/core/res/res/values/config.xml
@@ -90,11 +90,4 @@
</string-array>
<!-- Maximum number of supported users -->
<integer name="config_multiuserMaximumUsers">2</integer>
-
- <!-- Keyguard component -->
- <string name="config_keyguardComponent" translatable="false">com.droidlogic.tv.settings/com.droidlogic.tv.settings.StubKeyguardService</string>
-
- <!-- disable wallpaper, which may consume too much boot time -->
- <bool name="config_enableWallpaperService">false</bool>
-
</resources>
diff --git a/p230/overlay/frameworks/base/core/res/res/values/config.xml b/p230/overlay/frameworks/base/core/res/res/values/config.xml
index 4b6b8ba..10b7a06 100644
--- a/p230/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/p230/overlay/frameworks/base/core/res/res/values/config.xml
@@ -90,10 +90,4 @@
</string-array>
<!-- Maximum number of supported users -->
<integer name="config_multiuserMaximumUsers">2</integer>
-
- <!-- Keyguard component -->
- <string name="config_keyguardComponent" translatable="false">com.droidlogic.tv.settings/com.droidlogic.tv.settings.StubKeyguardService</string>
-
- <!-- disable wallpaper, which may consume too much boot time -->
- <bool name="config_enableWallpaperService">false</bool>
</resources>