Merge "New Theme Chooser UI" into cm-11.0
diff --git a/default.xml b/default.xml
index d2f039f..eb4a7d3 100644
--- a/default.xml
+++ b/default.xml
@@ -379,9 +379,10 @@
<project path="packages/apps/SpeechRecorder" name="CyanogenMod/android_packages_apps_SpeechRecorder" />
<project path="packages/apps/Stk" name="CyanogenMod/android_packages_apps_Stk" />
<project path="packages/apps/Tag" name="CyanogenMod/android_packages_apps_Tag" />
- <project path="packages/apps/UnifiedEmail" name="CyanogenMod/android_packages_apps_UnifiedEmail" />
+ <project path="packages/apps/ThemeChooser" name="CyanogenMod/android_packages_apps_ThemeChooser" />
<project path="packages/apps/Torch" name="CyanogenMod/android_packages_apps_Torch" />
<project path="packages/apps/Trebuchet" name="CyanogenMod/android_packages_apps_Trebuchet" />
+ <project path="packages/apps/UnifiedEmail" name="CyanogenMod/android_packages_apps_UnifiedEmail" />
<project path="packages/apps/VideoEditor" name="CyanogenMod/android_packages_apps_VideoEditor" />
<project path="packages/apps/VoiceDialer" name="CyanogenMod/android_packages_apps_VoiceDialer" />
<project path="packages/apps/VoicePlus" name="CyanogenMod/android_packages_apps_VoicePlus" />
@@ -396,6 +397,7 @@
<project path="packages/providers/MediaProvider" name="CyanogenMod/android_packages_providers_MediaProvider" />
<project path="packages/providers/PartnerBookmarksProvider" name="CyanogenMod/android_packages_providers_PartnerBookmarksProvider" />
<project path="packages/providers/TelephonyProvider" name="CyanogenMod/android_packages_providers_TelephonyProvider" />
+ <project path="packages/providers/ThemesProvider" name="CyanogenMod/android_packages_providers_ThemesProvider" />
<project path="packages/providers/UserDictionaryProvider" name="CyanogenMod/android_packages_providers_UserDictionaryProvider" />
<project path="packages/screensavers/Basic" name="CyanogenMod/android_packages_screensavers_Basic" />
<project path="packages/screensavers/PhotoTable" name="CyanogenMod/android_packages_screensavers_PhotoTable" />
@@ -476,7 +478,4 @@
<project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools" remote="aosp" revision="refs/tags/android-4.4.2_r2" />
<project path="vendor/cm" name="CyanogenMod/android_vendor_cm" />
<project path="vendor/cyngn" name="cyngn/android_vendor_cyngn" />
- <project path="vendor/tmobile/apps/ThemeChooser" name="CyanogenMod/themes-platform-vendor-tmobile-apps-ThemeChooser" />
- <project path="vendor/tmobile/libs/com.tmobile.themes" name="CyanogenMod/android_vendor_tmobile_libs_com.tmobile.themes" />
- <project path="vendor/tmobile/providers/ThemeManager" name="CyanogenMod/android_vendor_tmobile_providers_ThemeManager" />
</manifest>