Merge "cm: Make CyanBread the default theme" into gingerbread

8 files changed, 15 insertions, 27 deletions

diff --git a/products/common_full.mk b/products/common_full.mk
index d5fc4a2..73c8a96 100644
--- a/products/common_full.mk
+++ b/products/common_full.mk
@@ -1,21 +1,5 @@
 # Inherit common CM stuff
-$(call inherit-product, vendor/cyanogen/products/common.mk)
-
-# CyanogenMod specific product packages
-PRODUCT_PACKAGES += \
-    CMWallpapers
-
-# Bring in all audio files
-include frameworks/base/data/sounds/AllAudio.mk
+$(call inherit-product, vendor/cyanogen/products/common_full_no_themes.mk)
 
 # Theme packages
 include vendor/cyanogen/products/themes.mk
-
-# Include extra dictionaries for LatinIME
-PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dictionaries
-
-# Default ringtone
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.config.ringtone=Playa.ogg \
-    ro.config.notification_sound=regulus.ogg \
-    ro.config.alarm_alert=Alarm_Beep_03.ogg
diff --git a/products/common_full_no_themes.mk b/products/common_full_no_themes.mk
index c45a069..177f8d8 100644
--- a/products/common_full_no_themes.mk
+++ b/products/common_full_no_themes.mk
@@ -11,7 +11,7 @@ include frameworks/base/data/sounds/AllAudio.mk
 # Include extra dictionaries for LatinIME
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dictionaries
 
-# Default ringtone
+# Default Ringtone
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.ringtone=Playa.ogg \
     ro.config.notification_sound=regulus.ogg \
diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk
index 876e6c2..84ca212 100644
--- a/products/cyanogen_buzz.mk
+++ b/products/cyanogen_buzz.mk
@@ -1,14 +1,14 @@
-# Inherit AOSP device configuration for buzz.
+# Inherit AOSP device configuration for buzz
 $(call inherit-product, device/htc/buzz/buzz.mk)
 
-# Inherit some common cyanogenmod stuff.
+# Inherit some common cyanogenmod stuff
 $(call inherit-product, vendor/cyanogen/products/common_full_no_themes.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
 
 #
-# Setup device specific product configuration.
+# Setup device specific product configuration
 #
 PRODUCT_NAME := cyanogen_buzz
 PRODUCT_BRAND := htc_wwe
diff --git a/products/cyanogen_click.mk b/products/cyanogen_click.mk
index bdcde71..0290080 100644
--- a/products/cyanogen_click.mk
+++ b/products/cyanogen_click.mk
@@ -1,7 +1,7 @@
-# Inherit AOSP device configuration for click.
+# Inherit AOSP device configuration for click
 $(call inherit-product, device/htc/click/click.mk)
 
-# Inherit some common cyanogenmod stuff.
+# Inherit some common cyanogenmod stuff
 $(call inherit-product, vendor/cyanogen/products/common_full_no_themes.mk)
 
 # Include GSM stuff
@@ -14,7 +14,7 @@ $(call inherit-product, vendor/cyanogen/products/ti_fm_radio.mk)
 PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/click/kernel
 
 #
-# Setup device specific product configuration.
+# Setup device specific product configuration
 #
 PRODUCT_NAME := cyanogen_click
 PRODUCT_BRAND := htc_wwe
diff --git a/products/cyanogen_mimmi.mk b/products/cyanogen_mimmi.mk
index af01135..93c75bb 100644
--- a/products/cyanogen_mimmi.mk
+++ b/products/cyanogen_mimmi.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/semc/mimmi/device_mimmi.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full_no_themes.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_robyn.mk b/products/cyanogen_robyn.mk
index 9256c7b..a2bd152 100644
--- a/products/cyanogen_robyn.mk
+++ b/products/cyanogen_robyn.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/semc/robyn/device_robyn.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full_no_themes.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_tass.mk b/products/cyanogen_tass.mk
index f8cfad8..fb45b5c 100644
--- a/products/cyanogen_tass.mk
+++ b/products/cyanogen_tass.mk
@@ -2,7 +2,7 @@
 $(call inherit-product, device/samsung/tass/device_tass.mk)
 
 # Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full_no_themes.mk)
 
 # Include GSM stuff
 $(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/themes.mk b/products/themes.mk
index 39d6ffa..c0eadae 100644
--- a/products/themes.mk
+++ b/products/themes.mk
@@ -2,3 +2,7 @@
 PRODUCT_PACKAGES += \
        Androidian \
        Cyanbread
+
+PRODUCT_PROPERTY_OVERRIDES += \
+       persist.sys.themeId = Cyanbread \
+       persist.sys.themePackageName = com.tmobile.theme.Cyanbread