overlay: Clean up Settings overlay
* Merge bools.xml into config.xml for 10.
* Remove dead overlays.
Change-Id: I7773adb71aa20337395236f7a8ad334b03cc99de
diff --git a/overlay/common/packages/apps/Settings/res/values/bools.xml b/overlay/common/packages/apps/Settings/res/values/bools.xml
deleted file mode 100644
index 2060de1..0000000
--- a/overlay/common/packages/apps/Settings/res/values/bools.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources>
- <!-- Whether to show a preference item for mobile plan -->
- <bool name="config_show_mobile_plan">false</bool>
-
- <!-- Whether wallpaper attribution should be shown or not. -->
- <bool name="config_show_wallpaper_attribution">false</bool>
-</resources>
diff --git a/overlay/common/packages/apps/Settings/res/values/config.xml b/overlay/common/packages/apps/Settings/res/values/config.xml
index 79be7c5..480dcba 100644
--- a/overlay/common/packages/apps/Settings/res/values/config.xml
+++ b/overlay/common/packages/apps/Settings/res/values/config.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright 2016 The ??? Project
+ Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -21,6 +21,9 @@
<!-- If the Storage Manager settings are enabled. -->
<bool name="config_storage_manager_settings_enabled">true</bool>
- <!-- Does the device allow updating the recovery. -->
- <bool name="config_enableRecoveryUpdater">false</bool>
+ <!-- Whether to show a preference item for mobile plan -->
+ <bool name="config_show_mobile_plan">false</bool>
+
+ <!-- Whether wallpaper attribution should be shown or not. -->
+ <bool name="config_show_wallpaper_attribution">false</bool>
</resources>
diff --git a/overlay/common/packages/apps/Settings/res/values/dimens.xml b/overlay/common/packages/apps/Settings/res/values/dimens.xml
index 5c0b800..6605b9e 100644
--- a/overlay/common/packages/apps/Settings/res/values/dimens.xml
+++ b/overlay/common/packages/apps/Settings/res/values/dimens.xml
@@ -16,5 +16,4 @@
<resources>
<dimen name="search_bar_corner_radius">24.0dip</dimen>
- <dimen name="suggestion_card_corner_radius">8.0dip</dimen>
</resources>