resolved conflicts for merge of 38b854e6 to master
Change-Id: Ib1d24f3004da13a48dcec8c8044b62d4e0cf6ec7
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index b917b95..d20cad3 100644
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -4,9 +4,9 @@
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.
@@ -34,6 +34,7 @@
<string name="test_category_networking">Networking</string>
<string name="test_category_sensors">Sensors</string>
<string name="test_category_security">Security</string>
+ <string name="test_category_streaming">Streaming</string>
<string name="test_category_features">Features</string>
<string name="test_category_other">Other</string>
<string name="clear">Clear</string>
@@ -47,7 +48,7 @@
<!-- Strings for BackupTestActivity -->
<string name="backup_test">Data Backup Test</string>
- <string name="backup_info">This test checks that data backup and automatic restore works
+ <string name="backup_info">This test checks that data backup and automatic restore works
properly. The test activity lists some preferences and files that are backed up and
restored by the CTS Verifier. If backup and restore is working properly, these values
should be restored after running the backup manager, uninstalling the app, and reinstalling
@@ -62,8 +63,8 @@
<string name="bu_generate_error">Error occurred while generating test data...</string>
<string name="bu_instructions">Random values for the preferences and files have been saved.
\n\nFollow the instructions below to check that the data backup and restore works:
- \n\n1. Make sure backup and automatic restore are enabled in settings. Depending on the
- backup transport supported by the device you may need to do additional steps. For instance
+ \n\n1. Make sure backup and automatic restore are enabled in settings. Depending on the
+ backup transport supported by the device you may need to do additional steps. For instance
you may need to set a Google account as the backup account for the device.
\n\n2. Run the backup manager: adb shell bmgr run
\n\n3. Uninstall the program: adb uninstall com.android.cts.verifier
@@ -110,7 +111,7 @@
<!-- Strings for BluetoothActivity -->
<string name="bluetooth_test">Bluetooth Test</string>
- <string name="bluetooth_test_info">The Bluetooth Control tests check whether or not the device
+ <string name="bluetooth_test_info">The Bluetooth Control tests check whether or not the device
can disable and enable Bluetooth properly.\n\nThe Device Communication tests require two
devices to pair and exchange messages. The two devices must be:
\n\n1. a candidate device implementation running the software build to be tested
@@ -189,7 +190,7 @@
<string name="no_suid_files">No unauthorized suid files detected!</string>
<!-- Strings for Audio Quality Verifier -->
-
+
<!-- Title for Audio Quality Verifier activity -->
<string name="aq_verifier">Audio Quality Verifier</string>
<string name="aq_verifier_info">
@@ -208,7 +209,7 @@
made are also attached as raw 16 bit, 16 kHz audio files to
help you diagnose any failed tests.
</string>
-
+
<!-- Button labels for VerifierActivity -->
<string name="aq_calibrate">Calibrate</string>
<string name="aq_run_all">Run All</string>
@@ -216,14 +217,14 @@
<string name="aq_view_results">Results</string>
<string name="aq_email_results">Send by email</string>
<string name="aq_clear">Clear</string>
-
+
<!-- Title for ViewResultsActivity -->
<string name="aq_view_results_name">Audio Quality Results</string>
<!-- Button label for ViewResultsActivity -->
<string name="aq_dismiss">Dismiss</string>
<!-- E-mail subject line for test results -->
<string name="aq_subject">Android Audio Quality Verifier Test Results</string>
-
+
<!-- Title for CalibrateVolumeActivity -->
<string name="aq_calibrate_volume_name">Calibrate Volume</string>
<!-- Instructions for calibrating the volume -->
@@ -235,7 +236,7 @@
<string name="aq_status_low">Volume too low</string>
<string name="aq_status_high">Volume too high</string>
<string name="aq_status_ok">Volume OK</string>
-
+
<!-- Experiment names -->
<string name="aq_default_exp">Unnamed experiment</string>
<string name="aq_sound_level_exp">Sound level check</string>
@@ -246,12 +247,12 @@
<string name="aq_bias_exp">Bias measurement</string>
<string name="aq_cold_latency">Cold recording latency</string>
<string name="aq_warm_latency">Warm recording latency</string>
-
+
<!-- Experiment outcomes -->
<string name="aq_fail">Fail</string>
<string name="aq_pass">Pass</string>
<string name="aq_complete">Complete</string>
-
+
<!-- Experiment reports -->
<string name="aq_loopback_report">Experiment ran successfully.</string>
<string name="aq_bias_report">Mean = %1$.3g, tolerance = +/- %2$.0f\nRMS = %3$.0f, duration = %4$.1fs</string>
@@ -271,8 +272,8 @@
<string name="aq_cold_latency_report">Latency = %1$dms, maximum allowed = %2$dms</string>
<string name="aq_warm_latency_report_error">RMS = %1$.0f, target = %2$.0f</string>
<string name="aq_warm_latency_report_normal">Latency = %1$dms</string>
-
- <!-- General experiment messages -->
+
+ <!-- General experiment messages -->
<string name="aq_audiorecord_buffer_size_error">Error getting minimum AudioRecord buffer size: %1$d</string>
<string name="aq_audiotrack_buffer_size_error">Error getting minimum AudioTrack buffer size: %1$d</string>
<string name="aq_init_audiorecord_error">Error initializing AudioRecord instance</string>
@@ -284,4 +285,11 @@
<string name="camera_analyzer">Camera Analyzer</string>
<string name="ca_run_label">Find color checker</string>
<string name="ca_result_label">Patch values will be here</string>
+
+ <!-- Strings for StreamingVideoActivity -->
+ <string name="streaming_video">Streaming Video Quality Verifier</string>
+ <string name="streaming_video_info">This is a test for assessing the quality of streaming videos. Play each stream and verify that the video is smooth and in sync with the audio, and that there are no quality problems.</string>
+ <string name="sv_no_data">No videos.</string>
+ <string name="sv_failed_title">Test Failed</string>
+ <string name="sv_failed_message">Unable to play stream. See log for details.</string>
</resources>