summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/phonelookup/consolidator/res/values
diff options
context:
space:
mode:
authorlinyuh <linyuh@google.com>2018-01-17 10:39:26 -0800
committerCopybara-Service <copybara-piper@google.com>2018-01-17 11:25:43 -0800
commit31e83f3eb7e6ce06c7fb93b621f6086e7d5cd8c2 (patch)
tree9e7ee23475307895f1862b1c1fc5cbb9a5731a86 /java/com/android/dialer/phonelookup/consolidator/res/values
parentbb41b26b5d8b438f6d163c56e31f0ff3801c7ed0 (diff)
Replace PhoneLookupSelector with PhoneLookupInfoConsolidator.
PhoneLookupInfoConsolidator is designed for the following two purposes. (1) Different sub-messages in a PhoneLookupInfo proto can contain information for the same purpose. For example, all of cp2_local_info, cp2_remote_info, and people_api_info have the information for a contact's name. PhoneLookupInfoConsolidator defines the rules that determine which sub-message should be used to display the name in the UI. This is the same as PhoneLookupSelector. (2) Avoid mixing info from different sub-messages when we are supposed to stick with only one sub-message. For example, if a PhoneLookupInfo proto has both cp2_local_info and cp2_remote_info but only cp2_remote_info has a photo URI, PhoneLookupInfoConsolidator should return an *empty* photo URI as cp2_local_info has higher priority and we should not use cp2_remote_info's photo URI to display the contact's photo. This is what PhoneLookupSelector is unable to do. Bug: 71763594 Test: PhoneLookupInfoConsolidatorTest PiperOrigin-RevId: 182236013 Change-Id: If19cdc1a9e076f3ebc8f9e2901f050b519e273f2
Diffstat (limited to 'java/com/android/dialer/phonelookup/consolidator/res/values')
-rw-r--r--java/com/android/dialer/phonelookup/consolidator/res/values/strings.xml22
1 files changed, 22 insertions, 0 deletions
diff --git a/java/com/android/dialer/phonelookup/consolidator/res/values/strings.xml b/java/com/android/dialer/phonelookup/consolidator/res/values/strings.xml
new file mode 100644
index 000000000..2080b3975
--- /dev/null
+++ b/java/com/android/dialer/phonelookup/consolidator/res/values/strings.xml
@@ -0,0 +1,22 @@
+<!--
+ ~ 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Label under the name of a blocked number in the call log. [CHAR LIMIT=15] -->
+ <string name="blocked_number_new_call_log_label">Blocked</string>
+
+</resources>