cm: Update projects and overlays

* Disable non-working stuff (themes)
 * Re-enable now-working stuff

Change-Id: I929fabb2d9068616c48b5f16672cbb66f2600490

config/common.mk

@@ -133,12 +133,11 @@ endif
 
 # Required CM packages
 PRODUCT_PACKAGES += \
+    BluetoothExt \
     CMAudioService \
     CMParts \
     Development \
-    BluetoothExt \
     Profiles \
-    ThemeManagerService \
     WeatherManagerService
 
 # Optional CM packages
@@ -164,9 +163,7 @@ PRODUCT_PACKAGES += \
     CMSettingsProvider \
     ExactCalculator \
     LiveLockScreenService \
-    WeatherProvider \
-    DataUsageProvider \
-    WallpaperPicker
+    WeatherProvider
 
 # Exchange support
 PRODUCT_PACKAGES += \
@@ -223,14 +220,14 @@ PRODUCT_PACKAGES += \
     rsync
 
 # Stagefright FFMPEG plugin
-PRODUCT_PACKAGES += \
-    libffmpeg_extractor \
-    libffmpeg_omx \
-    media_codecs_ffmpeg.xml
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    media.sf.omx-plugin=libffmpeg_omx.so \
-    media.sf.extractor-plugin=libffmpeg_extractor.so
+#PRODUCT_PACKAGES += \
+#    libffmpeg_extractor \
+#    libffmpeg_omx \
+#    media_codecs_ffmpeg.xml
+#
+#PRODUCT_PROPERTY_OVERRIDES += \
+#    media.sf.omx-plugin=libffmpeg_omx.so \
+#    media.sf.extractor-plugin=libffmpeg_extractor.so
 
 # These packages are excluded from user builds
 ifneq ($(TARGET_BUILD_VARIANT),user)

config/themes_common.mk

@@ -1,5 +0,0 @@
-# Theme engine
-PRODUCT_PACKAGES += \
-    aapt \
-    ThemeChooser \
-    ThemesProvider

overlay/common/frameworks/base/core/res/res/values/cm_arrays.xml

@@ -15,12 +15,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-<!--
     <string-array name="config_enabledPreinstalledCarrierApps" translatable="false">
         <item>com.cyanogen.ambient.core</item>
         <item>com.cyanogen.ambient.updater</item>
         <item>com.cyngn.devicemanager</item>
         <item>com.cyngn.discovery</item>
     </string-array>
--->
-</resources>
+</resources>

overlay/common/frameworks/base/core/res/res/values/config.xml

@@ -24,7 +24,7 @@
 
     <bool name="config_cellBroadcastAppLinks">true</bool>
 
-    <!-- Disable stock OTA components if installed
+    <!-- Disable stock OTA components if installed -->
     <string-array name="config_disabledComponents" translatable="false">
         <item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateActivity</item>
         <item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService$Receiver</item>
@@ -33,13 +33,13 @@
         <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService$Receiver</item>
         <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService$ActiveReceiver</item>
         <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService$SecretCodeReceiver</item>
-    </string-array> -->
+    </string-array>
 
-    <!-- Force enabling of some services that could have been previously disabled
+    <!-- Force enabling of some services that could have been previously disabled -->
     <string-array name="config_forceEnabledComponents" translatable="false">
         <item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService</item>
         <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService</item>
-    </string-array> -->
+    </string-array>
 
     <string name="config_mms_user_agent">CyanogenMod</string>
     <string name="config_mms_user_agent_profile_url">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
@@ -57,6 +57,6 @@
     <!-- Enable lockscreen rotation by default -->
     <bool name="config_enableLockScreenRotation">true</bool>
 
-    <!-- Whether to persist the notification for when a usb drive device is plugged in
-    <bool name="config_persistUsbDriveNotification">true</bool> -->
+    <!-- Whether to persist the notification for when a usb drive device is plugged in -->
+    <bool name="config_persistUsbDriveNotification">true</bool>
 </resources>

overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml

@@ -19,6 +19,6 @@
 <resources>
     <string name="def_backup_transport">com.google.android.gms/.backup.BackupTransportService</string>
 
-    <!-- Enable notification counters in statusbar
-    <integer name="def_notif_count">1</integer> -->
+    <!-- Enable notification counters in statusbar -->
+    <integer name="def_notif_count">1</integer>
 </resources>