Updates for CM11
Change-Id: Icb527c5aefa0dd86cc91f42f4f691b5fdf7ead48
diff --git a/config/common.mk b/config/common.mk
index 1b8a5e2..018bad6 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -145,8 +145,10 @@
Basic
# Custom CM packages
+ #Trebuchet \
+
PRODUCT_PACKAGES += \
- Trebuchet \
+ Launcher3 \
DSPManager \
libcyanogen-dsp \
audio_effects.conf \
@@ -234,8 +236,8 @@
PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/common
-PRODUCT_VERSION_MAJOR = 10
-PRODUCT_VERSION_MINOR = 2
+PRODUCT_VERSION_MAJOR = 11
+PRODUCT_VERSION_MINOR = 0
PRODUCT_VERSION_MAINTENANCE = 0-RC0
# Set CM_BUILDTYPE from the env RELEASE_TYPE, for jenkins compat
diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 4a08818..1c4db8e 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -19,13 +19,4 @@
<resources>
<string name="def_backup_transport">com.google.android.backup/.BackupTransportService</string>
- <!-- Circle -->
- <integer name="def_battery_style">2</integer>
- <!-- Enable notification counters in statusbar -->
- <integer name="def_notif_count">1</integer>
- <!-- Right QS pulldown -->
- <integer name="def_qs_quick_pulldown">1</integer>
- <!-- Default lockscreen targets -->
- <string name="def_lockscreen_targets">#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;component=com.android.mms/.ui.ConversationList;S.icon_resource=ic_lockscreen_sms_normal;end|#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;component=com.andrew.apollo/.ui.activities.HomeActivity;S.icon_resource=ic_lockscreen_music_normal;end|#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;component=com.android.dialer/.DialtactsActivity;S.icon_resource=ic_lockscreen_phone_normal;end|#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;component=com.android.browser/.BrowserActivity;S.icon_resource=ic_lockscreen_browser_normal;end</string>
-
</resources>
diff --git a/prebuilt/common/bin/backuptool.functions b/prebuilt/common/bin/backuptool.functions
index 90943b3..6c01da0 100644
--- a/prebuilt/common/bin/backuptool.functions
+++ b/prebuilt/common/bin/backuptool.functions
@@ -5,7 +5,7 @@
export C=/tmp/backupdir
export S=/system
-export V=10.2
+export V=11
backup_file() {
if [ -e "$1" ]; then
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index a45721e..9bd9c12 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -5,7 +5,7 @@
export C=/tmp/backupdir
export S=/system
-export V=10.2
+export V=11
# Preserve /system/addon.d in /tmp/addon.d
preserve_addon_d() {