Merge with 68eb8dff3a87698ace057447dff40a07cf673f2e

2010-10-26 19:39:20 -07:00
parent dbd8e6c0e9
commit 948fe0c0e6
3 changed files with 80 additions and 6 deletions
@@ -147,6 +147,14 @@ limitations under the License.
    <item>1 分钟</item>
  </string-array>

+  <!-- Auto-resume track timeout -->
+  <string-array name="auto_resume_track_timeout_options">
+    <item>从不</item>
+    <item>5 分钟</item>
+    <item>10 分钟</item>
+    <item>15 分钟</item>
+    <item>总是</item>
+  </string-array>
  <!-- Other non-preference arrays -->
  <array name="activity_types">
    <item>未知</item>