auto import from //depot/cupcake/@137055

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0ca42d9..b6d2f19 100644 (file)
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"Zahodit"</string>
     <string name="button_ok">"OK"</string>
     <string name="press_record">"Stiskněte tlačítko Záznam"</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"Vaše záznamy"</string>
     <string name="audio_db_album_name">"Zvukové záznamy"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4f5b025..5c055e1 100644 (file)
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"Verwerfen"</string>
     <string name="button_ok">"OK"</string>
     <string name="press_record">"Aufnahmetaste drücken"</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"Ihre Aufnahmen"</string>
     <string name="audio_db_album_name">"Audioaufnahmen"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f31b073..dc2caef 100644 (file)
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"Descartar"</string>
     <string name="button_ok">"Aceptar"</string>
     <string name="press_record">"Pulsa el botón de grabación."</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"Tus grabaciones"</string>
     <string name="audio_db_album_name">"Grabaciones de audio"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6bef2b3..4f9e0f7 100644 (file)
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"Supprimer"</string>
     <string name="button_ok">"OK"</string>
     <string name="press_record">"Appuyez sur \"Enregistrer\""</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"Vos enregistrements audio"</string>
     <string name="audio_db_album_name">"Enregistrements audio"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e8cda2a..95a7a58 100644 (file)
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"Ignora"</string>
     <string name="button_ok">"OK"</string>
     <string name="press_record">"Premi Registra"</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"Registrazioni"</string>
     <string name="audio_db_album_name">"Registrazioni audio"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a4b24b1..98ffb20 100644 (file)
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"破棄"</string>
     <string name="button_ok">"OK"</string>
     <string name="press_record">"録音ボタンを押して録音"</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"録音リスト"</string>
     <string name="audio_db_album_name">"録音"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5f65283..2d1a523 100644 (file)
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"삭제"</string>
     <string name="button_ok">"확인"</string>
     <string name="press_record">"녹음 누르기"</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"녹음"</string>
     <string name="audio_db_album_name">"오디오 녹음"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1b66659..9239c21 100644 (file)
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"Forkast"</string>
     <string name="button_ok">"OK"</string>
     <string name="press_record">"Trykk «ta opp»"</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"Dine opptak"</string>
     <string name="audio_db_album_name">"Lydopptak"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c87846b..948e30d 100644 (file)
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"Weggooien"</string>
     <string name="button_ok">"OK"</string>
     <string name="press_record">"Druk op \'Opnemen\'"</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"Uw opnamen"</string>
     <string name="audio_db_album_name">"Audio-opnamen"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d6906a5..d0474b1 100644 (file)
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"Odrzuć"</string>
     <string name="button_ok">"OK"</string>
     <string name="press_record">"Naciśnij przycisk nagrywania"</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"Twoje nagrania"</string>
     <string name="audio_db_album_name">"Nagrania audio"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3b2d42b..1bc67c0 100644 (file)
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"Закрыть"</string>
     <string name="button_ok">"ОК"</string>
     <string name="press_record">"Нажмите \"Запись\""</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"Ваши записи"</string>
     <string name="audio_db_album_name">"Звуковые записи"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 9100959..68319f6 100644 (file)
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"放弃"</string>
     <string name="button_ok">"确定"</string>
     <string name="press_record">"按录音键"</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"您的录音"</string>
     <string name="audio_db_album_name">"录音"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 29bd7a7..e4eb25e 100644 (file)
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -30,7 +30,7 @@
     <string name="discard">"放棄"</string>
     <string name="button_ok">"確定"</string>
     <string name="press_record">"按下 [錄音]"</string>
-    <!-- no translation found for audio_db_title_format (7912182366970749312) -->
+    <!-- no translation found for audio_db_title_format (7616097189642558199) -->
     <skip />
     <string name="audio_db_artist_name">"您的錄音"</string>
     <string name="audio_db_album_name">"錄音"</string>

diff --git a/src/com/android/soundrecorder/SoundRecorder.java b/src/com/android/soundrecorder/SoundRecorder.java
index 2338362..45eaa70 100644 (file)
--- a/src/com/android/soundrecorder/SoundRecorder.java
+++ b/src/com/android/soundrecorder/SoundRecorder.java
@@ -332,6 +332,19 @@ public class SoundRecorder extends Activity
     }
     
     /*
+     * Make sure we're not recording music playing in the background, ask
+     * the MediaPlaybackService to pause playback.
+     */
+    private void stopAudioPlayback() {
+        // Shamelessly copied from MediaPlaybackService.java, which
+        // should be public, but isn't.
+        Intent i = new Intent("com.android.music.musicservicecommand");
+        i.putExtra("command", "pause");
+
+        sendBroadcast(i);
+    }
+
+    /*
      * Handle the buttons.
      */
     public void onClick(View button) {
@@ -350,6 +363,8 @@ public class SoundRecorder extends Activity
                     mErrorUiMessage = getResources().getString(R.string.storage_is_full);
                     updateUi();
                 } else {
+                    stopAudioPlayback();
+
                     if (AUDIO_AMR.equals(mRequestedType)) {
                         mRemainingTimeCalculator.setBitRate(BITRATE_AMR);
                         mRecorder.startRecording(MediaRecorder.OutputFormat.RAW_AMR, ".amr");