Merge "CM11 Themes: Add feature for new themes." into cm-11.0
diff --git a/config/common_full.mk b/config/common_full.mk
index 2eccc56..9f51f80 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -21,7 +21,6 @@
PhaseBeam \
VisualizationWallpapers \
PhotoTable \
- VoiceDialer \
SoundRecorder
PRODUCT_PACKAGES += \
diff --git a/config/telephony.mk b/config/telephony.mk
index eeccc42..1c0c4a6 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -16,6 +16,7 @@
Mms \
Stk \
CellBroadcastReceiver \
+ VoiceDialer \
WhisperPush
# Mms depends on SoundRecorder for recorded audio messages
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 51ebdd7..5036580 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -25,8 +25,4 @@
<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>
- <string name="def_lockscreen_targets_no_telephony">empty|#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;component=com.android.browser/.BrowserActivity;S.icon_resource=ic_lockscreen_browser_normal;end|empty|#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</string>
-
</resources>
diff --git a/vendorsetup.sh b/vendorsetup.sh
index a6ebd30..221f24d 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,4 +1,4 @@
-for combo in $(curl -s https://raw.github.com/CyanogenMod/hudson/master/cm-build-targets | sed -e 's/#.*$//' | grep cm-11.0 | awk {'print $1'})
+for combo in $(curl -s https://raw.githubusercontent.com/CyanogenMod/hudson/master/cm-build-targets | sed -e 's/#.*$//' | grep cm-11.0 | awk {'print $1'})
do
add_lunch_combo $combo
done