Merge "Update changelog for M8" into cm-11.0
diff --git a/config/common_full.mk b/config/common_full.mk
index 9f51f80..e580b4c 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -21,7 +21,8 @@
PhaseBeam \
VisualizationWallpapers \
PhotoTable \
- SoundRecorder
+ SoundRecorder \
+ PhotoPhase
PRODUCT_PACKAGES += \
VideoEditor \
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 3d88e3a..6606ea8 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -32,6 +32,7 @@
<item>com.google.android.gms/com.google.android.gms.update.SystemUpdateActivity</item>
<item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService</item>
<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>
</string-array>
<string name="config_mms_user_agent">CyanogenMod</string>
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
index f51e7b6..9058a19 100644
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -1,26 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
-** Copyright 2011, The CyanogenMod Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
+ Copyright (C) 2014 The CyanogenMod Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<!-- These resources are around just to allow their values to be customized
for different hardware and product builds. -->
<resources>
- <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices -->
+<!-- Control whether status bar should distinguish HSPA data icon
+ from UMTS data icon on devices -->
<bool name="config_hspa_data_distinguishable">true</bool>
-</resources>
+<!-- Should "4G" be shown instead of "LTE" when the network is NETWORK_TYPE_LTE? -->
+ <bool name="config_show4GForLTE">false</bool>
+</resources>