From 8369df095a73a77b3715f8ae7ba06089cebca4ce Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Wed, 3 May 2017 10:27:13 -0700
Subject: This change reflects the Dialer V10 RC00 branch.

RC00 is based on:
branch: dialer-android_release_branch/153304843.1
synced to: 153304843

following the instructions at go/dialer-aosp-release.

In this release:

* Removes final apache sources.
* Uses native lite compilation.

More drops will follow with subsequent release candidates
until we reach our final v10 release, in cadence with our
prebuilt drops.

Test: TreeHugger, on device
Change-Id: Ic9684057230f9b579c777820c746cd21bf45ec0f
---
 .../notification/NotificationChannelManager.java   |  2 +-
 .../notification/res/values-b+sr+Latn/strings.xml  | 26 ++++++++++++++++++++++
 .../android/dialer/notification/res/values/ids.xml |  3 ++-
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml

(limited to 'java/com/android/dialer/notification')

diff --git a/java/com/android/dialer/notification/NotificationChannelManager.java b/java/com/android/dialer/notification/NotificationChannelManager.java
index b795ffe5d..db7ded781 100644
--- a/java/com/android/dialer/notification/NotificationChannelManager.java
+++ b/java/com/android/dialer/notification/NotificationChannelManager.java
@@ -159,7 +159,7 @@ public class NotificationChannelManager {
           "Null PhoneAccountHandle with channel " + channelName);
     }
 
-    Uri silentRingtone = Uri.parse("");
+    Uri silentRingtone = Uri.EMPTY;
 
     CharSequence name;
     int importance;
diff --git a/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 000000000..c5fd5e7fa
--- /dev/null
+++ b/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  ~ Copyright (C) 2017 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Dolazni pozivi"</string>
+    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pozivi u toku"</string>
+    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Propušteni pozivi"</string>
+    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Govorne poruke"</string>
+    <string name="notification_channel_external_call" msgid="2200143959948071132">"Spoljni pozivi"</string>
+    <string name="notification_channel_misc" msgid="5181419532951960166">"Razno"</string>
+</resources>
diff --git a/java/com/android/dialer/notification/res/values/ids.xml b/java/com/android/dialer/notification/res/values/ids.xml
index 6bdb489a7..dc071e2ed 100644
--- a/java/com/android/dialer/notification/res/values/ids.xml
+++ b/java/com/android/dialer/notification/res/values/ids.xml
@@ -19,7 +19,8 @@
   <item name="notification_incoming_call" type="id"/>
   <item name="notification_ongoing_call" type="id"/>
   <item name="notification_missed_call" type="id"/>
-  <item name="notification_voicemail" type="id"/>
+  <item name="notification_visual_voicemail" type="id"/>
+  <item name="notification_legacy_voicemail" type="id"/>
   <item name="notification_external_call" type="id"/>
   <item name="notification_call_blocking_disabled_by_emergency_call" type="id"/>
   <item name="notification_spam_call" type="id"/>
-- 
cgit v1.2.3