diff options
author | yueg <yueg@google.com> | 2018-03-21 12:14:04 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-21 13:01:22 -0700 |
commit | 7642b8011e00bf353504440754ffa3f3a7cd8f8c (patch) | |
tree | 8c1601b2c250506df8aaf94dad89b5df2fb277d0 /java/com/android/incallui/calllocation/impl/res/values | |
parent | ab661fe03bd570bf713e8f040784fba3a504ec9d (diff) |
Show error when finding location time out.
If we get no location data for emergency call, we used to show spinner forever. This change shows error after 5s with no data, but still tries to get location.
Test: LocationFragmentTest
PiperOrigin-RevId: 189946803
Change-Id: Iaa0b429eec806337b9ab9cae3ca95e737fc667bf
Diffstat (limited to 'java/com/android/incallui/calllocation/impl/res/values')
-rw-r--r-- | java/com/android/incallui/calllocation/impl/res/values/strings.xml | 3 | ||||
-rw-r--r-- | java/com/android/incallui/calllocation/impl/res/values/styles.xml | 23 |
2 files changed, 24 insertions, 2 deletions
diff --git a/java/com/android/incallui/calllocation/impl/res/values/strings.xml b/java/com/android/incallui/calllocation/impl/res/values/strings.xml index 573f33cda..732b4efbd 100644 --- a/java/com/android/incallui/calllocation/impl/res/values/strings.xml +++ b/java/com/android/incallui/calllocation/impl/res/values/strings.xml @@ -29,4 +29,7 @@ <!-- Progress indicator loading text. [CHAR LIMIT=20] --> <string name="location_loading">Finding your location…</string> + <!-- Error message shown when we can't get device location. [CHAR LIMIT=NONE] --> + <string name="location_error">Error, could not retrieve your location</string> + </resources> diff --git a/java/com/android/incallui/calllocation/impl/res/values/styles.xml b/java/com/android/incallui/calllocation/impl/res/values/styles.xml index 866a4edb6..45e9c98d4 100644 --- a/java/com/android/incallui/calllocation/impl/res/values/styles.xml +++ b/java/com/android/incallui/calllocation/impl/res/values/styles.xml @@ -1,5 +1,18 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright 2015 Google Inc. All Rights Reserved. --> +<!-- + ~ 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> <style name="LocationAddressTitleTextStyle"> @@ -25,4 +38,10 @@ <item name="android:textColor">#dd000000</item> <item name="android:fontFamily">sans-serif</item> </style> + + <style name="LocationErrorTextStyle"> + <item name="android:textSize">14sp</item> + <item name="android:textColor">#dd000000</item> + <item name="android:fontFamily">sans-serif</item> + </style> </resources> |