diff options
author | Steve Kondik <shade@chemlab.org> | 2012-11-18 22:36:25 -0800 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 22:36:25 -0800 |
commit | 67abadb0bf71a65d680beccc762e1a9eb49cc529 (patch) | |
tree | 17ee8edf4dfe7f4f0f3b79848b558fa48af318ff | |
parent | 793edc479e190f39f0036e7506bea9bf3cab5e80 (diff) | |
parent | 58b8a2b8822b7356f8da1d30f79cda6e775cef4c (diff) | |
download | android_packages_apps_BasicSmsReceiver-67abadb0bf71a65d680beccc762e1a9eb49cc529.tar.gz android_packages_apps_BasicSmsReceiver-67abadb0bf71a65d680beccc762e1a9eb49cc529.tar.bz2 android_packages_apps_BasicSmsReceiver-67abadb0bf71a65d680beccc762e1a9eb49cc529.zip |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/BasicSmsReceiver into HEADcm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1
-rwxr-xr-x | Android.mk | 1 | ||||
-rw-r--r-- | res/values-da/strings.xml | 2 | ||||
-rw-r--r-- | tests/Android.mk | 2 | ||||
-rw-r--r-- | tests/src/com/android/basicsmsreceiver/DialogSmsDisplayTests.java | 1 |
4 files changed, 3 insertions, 3 deletions
@@ -5,6 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional +LOCAL_JAVA_LIBRARIES := telephony-common LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := BasicSmsReceiver diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index d08dbf6..7f2566e 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -18,5 +18,5 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="sms_app_name" msgid="3641211328012514267">"Enkel beskedmodtager"</string> <string name="sms_message_from_format" msgid="7163240046237558485">"Meddelelse fra <xliff:g id="USERNAME">%1$s</xliff:g>"</string> - <string name="sms_done_button" msgid="4063239029747798890">"Udfør"</string> + <string name="sms_done_button" msgid="4063239029747798890">"Færdig"</string> </resources> diff --git a/tests/Android.mk b/tests/Android.mk index fe54a33..892a3b8 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -18,7 +18,7 @@ include $(CLEAR_VARS) # We only want this apk build for tests. LOCAL_MODULE_TAGS := tests -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/src/com/android/basicsmsreceiver/DialogSmsDisplayTests.java b/tests/src/com/android/basicsmsreceiver/DialogSmsDisplayTests.java index 265e9e8..5994861 100644 --- a/tests/src/com/android/basicsmsreceiver/DialogSmsDisplayTests.java +++ b/tests/src/com/android/basicsmsreceiver/DialogSmsDisplayTests.java @@ -29,7 +29,6 @@ import android.database.Cursor; import android.graphics.Color; import android.os.Bundle; import android.provider.Telephony; -import android.provider.Telephony.Sms.Intents; import android.telephony.SmsManager; import android.telephony.SmsMessage; import android.telephony.TelephonyManager; |