summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorZhizhi Liu <zhizhiliu@google.com>2018-06-05 15:31:24 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-06-05 15:31:24 -0700
commit6827e4a066bc730d1f8a18c824c4646503fda0ef (patch)
tree41a48bd6f7e2ce03c5dea9a167da482e08270698 /res
parentacde90a05b1d5256f56587a6678d7be332b49b34 (diff)
parent39184a531709c816a8ae3222f7a9e49660ce97db (diff)
downloadandroid_packages_apps_SettingsIntelligence-6827e4a066bc730d1f8a18c824c4646503fda0ef.tar.gz
android_packages_apps_SettingsIntelligence-6827e4a066bc730d1f8a18c824c4646503fda0ef.tar.bz2
android_packages_apps_SettingsIntelligence-6827e4a066bc730d1f8a18c824c4646503fda0ef.zip
Merge "Increase SI suggestion filter timeout value for TV." into pi-dev
am: 39184a5317 Change-Id: I455725bb3a9ce1d6ba95204465360c13fb561144
Diffstat (limited to 'res')
-rw-r--r--res/values-television/integers.xml19
-rw-r--r--res/values/integers.xml15
2 files changed, 34 insertions, 0 deletions
diff --git a/res/values-television/integers.xml b/res/values-television/integers.xml
new file mode 100644
index 0000000..100a391
--- /dev/null
+++ b/res/values-television/integers.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <integer name="check_task_timeout_ms">700</integer>
+</resources> \ No newline at end of file
diff --git a/res/values/integers.xml b/res/values/integers.xml
new file mode 100644
index 0000000..03f4354
--- /dev/null
+++ b/res/values/integers.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <integer name="check_task_timeout_ms">200</integer>
+</resources> \ No newline at end of file