diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-06 07:28:14 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-06 07:28:14 +0000 |
commit | 63d84d7657723aaf7c25eddf1fbb0cc099051aaa (patch) | |
tree | 41a48bd6f7e2ce03c5dea9a167da482e08270698 | |
parent | 045db884ddb1b06791394cbb5b2d61230b049cce (diff) | |
parent | 39184a531709c816a8ae3222f7a9e49660ce97db (diff) | |
download | SettingsIntelligence-pie-release.tar.gz |
Snap for 4824048 from 39184a531709c816a8ae3222f7a9e49660ce97db to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: I9cd1c2f80498c9d0efe0d25c9bec114038a8e775
-rw-r--r-- | AndroidManifest.xml | 3 | ||||
-rw-r--r-- | res/values-television/integers.xml | 19 | ||||
-rw-r--r-- | res/values/integers.xml | 15 | ||||
-rw-r--r-- | src/com/android/settings/intelligence/suggestions/eligibility/CandidateSuggestionFilter.java | 6 |
4 files changed, 40 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ca14a02..5d1a1b9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -27,7 +27,8 @@ <application android:label="@string/app_name_settings_intelligence" - android:icon="@mipmap/ic_launcher"> + android:icon="@mipmap/ic_launcher" + android:supportsRtl="true"> <service android:name=".suggestions.SuggestionService" android:exported="true" 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 diff --git a/src/com/android/settings/intelligence/suggestions/eligibility/CandidateSuggestionFilter.java b/src/com/android/settings/intelligence/suggestions/eligibility/CandidateSuggestionFilter.java index 5f614f6..5268ca7 100644 --- a/src/com/android/settings/intelligence/suggestions/eligibility/CandidateSuggestionFilter.java +++ b/src/com/android/settings/intelligence/suggestions/eligibility/CandidateSuggestionFilter.java @@ -30,6 +30,7 @@ import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; +import com.android.settings.intelligence.R; import com.android.settings.intelligence.suggestions.model.CandidateSuggestion; import java.util.ArrayList; @@ -48,7 +49,6 @@ import java.util.concurrent.TimeoutException; public class CandidateSuggestionFilter { private static final String TAG = "CandidateSuggestionFilter"; - private static final long CHECK_TASK_TIMEOUT_MS = 200; private static CandidateSuggestionFilter sChecker; private static ExecutorService sExecutorService; @@ -78,7 +78,9 @@ public class CandidateSuggestionFilter { } for (CandidateFilterTask task : checkTasks) { try { - final CandidateSuggestion candidate = task.get(CHECK_TASK_TIMEOUT_MS, + long checkTaskTimeOutValue = + context.getResources().getInteger(R.integer.check_task_timeout_ms); + final CandidateSuggestion candidate = task.get(checkTaskTimeOutValue, TimeUnit.MILLISECONDS); if (candidate != null) { incompleteCandidates.add(candidate); |