Merge "Import translations. DO NOT MERGE" into oc-dev
diff --git a/Android.mk b/Android.mk
index 24fb423..28eb5dc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,12 +16,14 @@
org.apache.http.legacy
LOCAL_STATIC_JAVA_LIBRARIES := \
+ guava \
+ volley
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-v7-appcompat \
android-support-v7-preference \
android-support-v7-recyclerview \
- android-support-v14-preference \
- guava \
- volley
+ android-support-v14-preference
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
LOCAL_SRC_FILES += \
@@ -30,6 +32,8 @@
src/com/android/phone/INetworkQueryServiceCallback.aidl
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
+LOCAL_USE_AAPT2 := true
+
LOCAL_AAPT_FLAGS := \
--auto-add-overlay \
--extra-packages com.android.phone.common \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3ee345e..9e39d30 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -62,6 +62,7 @@
<protected-broadcast android:name= "com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED" />
<protected-broadcast android:name= "com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED" />
<protected-broadcast android:name= "com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE" />
+ <protected-broadcast android:name= "com.android.internal.telephony.CARRIER_SIGNAL_RESET" />
<protected-broadcast android:name= "com.android.internal.provider.action.VOICEMAIL_SMS_RECEIVED" />
<protected-broadcast android:name= "com.android.intent.isim_refresh" />
<protected-broadcast android:name= "com.android.ims.IMS_SERVICE_UP" />