From 01ba22cd5277d3a6a5189dd6154f80764d5d4b0b Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Sun, 24 Jun 2012 12:52:17 +0200 Subject: split overlay --- .../base/core/res/res/values-large/config.xml | 24 +++ .../base/core/res/res/values-sw600dp/config.xml | 24 +++ .../frameworks/base/core/res/res/values/arrays.xml | 37 ++++ .../frameworks/base/core/res/res/values/config.xml | 209 +++++++++++++++++++++ .../base/core/res/res/xml/power_profile.xml | 62 ++++++ .../base/core/res/res/xml/storage_list.xml | 51 +++++ .../SettingsProvider/res/values/defaults.xml | 21 +++ .../base/packages/SystemUI/res/values/config.xml | 27 +++ .../base/core/res/res/values-large/config.xml | 24 --- .../base/core/res/res/values-sw600dp/config.xml | 24 --- .../frameworks/base/core/res/res/values/arrays.xml | 37 ---- .../frameworks/base/core/res/res/values/config.xml | 185 ------------------ .../base/core/res/res/xml/power_profile.xml | 62 ------ .../base/core/res/res/xml/storage_list.xml | 51 ----- .../SettingsProvider/res/values/defaults.xml | 21 --- .../base/packages/SystemUI/res/values/config.xml | 27 --- p5100.mk | 2 + p51xx-common.mk | 2 +- 18 files changed, 458 insertions(+), 432 deletions(-) create mode 100644 common-overlay/frameworks/base/core/res/res/values-large/config.xml create mode 100644 common-overlay/frameworks/base/core/res/res/values-sw600dp/config.xml create mode 100644 common-overlay/frameworks/base/core/res/res/values/arrays.xml create mode 100644 common-overlay/frameworks/base/core/res/res/values/config.xml create mode 100644 common-overlay/frameworks/base/core/res/res/xml/power_profile.xml create mode 100644 common-overlay/frameworks/base/core/res/res/xml/storage_list.xml create mode 100644 common-overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml create mode 100644 common-overlay/frameworks/base/packages/SystemUI/res/values/config.xml delete mode 100644 overlay/frameworks/base/core/res/res/values-large/config.xml delete mode 100644 overlay/frameworks/base/core/res/res/values-sw600dp/config.xml delete mode 100644 overlay/frameworks/base/core/res/res/values/arrays.xml delete mode 100644 overlay/frameworks/base/core/res/res/xml/power_profile.xml delete mode 100644 overlay/frameworks/base/core/res/res/xml/storage_list.xml delete mode 100644 overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/config.xml diff --git a/common-overlay/frameworks/base/core/res/res/values-large/config.xml b/common-overlay/frameworks/base/core/res/res/values-large/config.xml new file mode 100644 index 0000000..27d1d32 --- /dev/null +++ b/common-overlay/frameworks/base/core/res/res/values-large/config.xml @@ -0,0 +1,24 @@ + + + + + + 1 + diff --git a/common-overlay/frameworks/base/core/res/res/values-sw600dp/config.xml b/common-overlay/frameworks/base/core/res/res/values-sw600dp/config.xml new file mode 100644 index 0000000..27d1d32 --- /dev/null +++ b/common-overlay/frameworks/base/core/res/res/values-sw600dp/config.xml @@ -0,0 +1,24 @@ + + + + + + 1 + diff --git a/common-overlay/frameworks/base/core/res/res/values/arrays.xml b/common-overlay/frameworks/base/core/res/res/values/arrays.xml new file mode 100644 index 0000000..6d169e6 --- /dev/null +++ b/common-overlay/frameworks/base/core/res/res/values/arrays.xml @@ -0,0 +1,37 @@ + + + + + + + @string/reboot_reboot + @string/reboot_recovery + @string/reboot_download + + + + + + recovery + bootloader + + + diff --git a/common-overlay/frameworks/base/core/res/res/values/config.xml b/common-overlay/frameworks/base/core/res/res/values/config.xml new file mode 100644 index 0000000..80b98b4 --- /dev/null +++ b/common-overlay/frameworks/base/core/res/res/values/config.xml @@ -0,0 +1,209 @@ + + + + + + + + true + + true + + + true + + + + 6 + 12 + 18 + 28 + 40 + 65 + 100 + 150 + 250 + 350 + 500 + 800 + 1200 + 1800 + 3000 + 6000 + 12000 + 24000 + 36000 + 42700 + + + + + 20 + 23 + 26 + 29 + 35 + 40 + 45 + 50 + 55 + 60 + 80 + 100 + 120 + 150 + 180 + 200 + 210 + 220 + 230 + 240 + 250 + + + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + 20 + + + + "rndis0" + + + + + "wlan0" + + + + + "bnep\\d" + + + + true + + + true + + + com.google.android.location.NetworkLocationProvider + + + com.google.android.location.GeocodeProvider + + + + 20 + 40 + + + + + 0 + 15 + 25 + 35 + + + + + 50 + + + true + diff --git a/common-overlay/frameworks/base/core/res/res/xml/power_profile.xml b/common-overlay/frameworks/base/core/res/res/xml/power_profile.xml new file mode 100644 index 0000000..8dc8f8f --- /dev/null +++ b/common-overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -0,0 +1,62 @@ + + + + 0 + 247 + 30 + 1 + 35690 + 630 + 13 + 90 + 170 + 120 + 758 + 139 + 25 + 40 + + 4 + 4 + + + + 1504000 + 1400000 + 1200000 + 1000000 + 800000 + 600000 + 300000 + + + 2.9 + + 530 + 470 + 370 + 280 + 200 + 120 + 40 + + + + 6860 + diff --git a/common-overlay/frameworks/base/core/res/res/xml/storage_list.xml b/common-overlay/frameworks/base/core/res/res/xml/storage_list.xml new file mode 100644 index 0000000..a96fca9 --- /dev/null +++ b/common-overlay/frameworks/base/core/res/res/xml/storage_list.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + diff --git a/common-overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/common-overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml new file mode 100644 index 0000000..ba79867 --- /dev/null +++ b/common-overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml @@ -0,0 +1,21 @@ + + + + true + diff --git a/common-overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/common-overlay/frameworks/base/packages/SystemUI/res/values/config.xml new file mode 100644 index 0000000..4af4a5a --- /dev/null +++ b/common-overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -0,0 +1,27 @@ + + + + + + + + true + diff --git a/overlay/frameworks/base/core/res/res/values-large/config.xml b/overlay/frameworks/base/core/res/res/values-large/config.xml deleted file mode 100644 index 27d1d32..0000000 --- a/overlay/frameworks/base/core/res/res/values-large/config.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - 1 - diff --git a/overlay/frameworks/base/core/res/res/values-sw600dp/config.xml b/overlay/frameworks/base/core/res/res/values-sw600dp/config.xml deleted file mode 100644 index 27d1d32..0000000 --- a/overlay/frameworks/base/core/res/res/values-sw600dp/config.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - 1 - diff --git a/overlay/frameworks/base/core/res/res/values/arrays.xml b/overlay/frameworks/base/core/res/res/values/arrays.xml deleted file mode 100644 index 6d169e6..0000000 --- a/overlay/frameworks/base/core/res/res/values/arrays.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - @string/reboot_reboot - @string/reboot_recovery - @string/reboot_download - - - - - - recovery - bootloader - - - diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index c31e2c9..0a3d964 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -21,138 +21,6 @@ for different hardware and product builds. --> - - true - - true - - - true - - - - 6 - 12 - 18 - 28 - 40 - 65 - 100 - 150 - 250 - 350 - 500 - 800 - 1200 - 1800 - 3000 - 6000 - 12000 - 24000 - 36000 - 42700 - - - - - 20 - 23 - 26 - 29 - 35 - 40 - 45 - 50 - 55 - 60 - 80 - 100 - 120 - 150 - 180 - 200 - 210 - 220 - 230 - 240 - 250 - - - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - 20 - - - "rndis0" - - - - - "wlan0" - - - - - "bnep\\d" - - @@ -219,36 +66,4 @@ pdp0 - - true - - - true - - - com.google.android.location.NetworkLocationProvider - - - com.google.android.location.GeocodeProvider - - - - 20 - 40 - - - - - 0 - 15 - 25 - 35 - - - - - 50 - - - true diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml deleted file mode 100644 index 8dc8f8f..0000000 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - 0 - 247 - 30 - 1 - 35690 - 630 - 13 - 90 - 170 - 120 - 758 - 139 - 25 - 40 - - 4 - 4 - - - - 1504000 - 1400000 - 1200000 - 1000000 - 800000 - 600000 - 300000 - - - 2.9 - - 530 - 470 - 370 - 280 - 200 - 120 - 40 - - - - 6860 - diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml deleted file mode 100644 index a96fca9..0000000 --- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml deleted file mode 100644 index ba79867..0000000 --- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - true - diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml deleted file mode 100644 index 4af4a5a..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - true - diff --git a/p5100.mk b/p5100.mk index f49eb13..9669220 100644 --- a/p5100.mk +++ b/p5100.mk @@ -18,6 +18,8 @@ $(call inherit-product, device/samsung/p5100/p51xx-common.mk) LOCAL_PATH := device/samsung/p5100 +DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay + # Packages PRODUCT_PACKAGES += \ SamsungServiceMode diff --git a/p51xx-common.mk b/p51xx-common.mk index 05f20db..0d417bd 100755 --- a/p51xx-common.mk +++ b/p51xx-common.mk @@ -14,7 +14,7 @@ # limitations under the License. # -DEVICE_PACKAGE_OVERLAYS += device/samsung/p5100/overlay +DEVICE_PACKAGE_OVERLAYS += device/samsung/p5100/common-overlay $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) -- cgit v1.1