diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-03 10:27:13 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-05-03 12:01:21 -0700 |
commit | 8369df095a73a77b3715f8ae7ba06089cebca4ce (patch) | |
tree | 1a45d60921e293c6088efeaf4d9c408456f3e0e2 /java/com/android/dialer/shortcuts | |
parent | afa29d4a8659eeffc8d92a6216b154f594eeb895 (diff) |
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
Diffstat (limited to 'java/com/android/dialer/shortcuts')
-rw-r--r-- | java/com/android/dialer/shortcuts/CallContactActivity.java | 10 | ||||
-rw-r--r-- | java/com/android/dialer/shortcuts/res/values-b+sr+Latn/strings.xml | 25 |
2 files changed, 31 insertions, 4 deletions
diff --git a/java/com/android/dialer/shortcuts/CallContactActivity.java b/java/com/android/dialer/shortcuts/CallContactActivity.java index d2c9a760d..b80797984 100644 --- a/java/com/android/dialer/shortcuts/CallContactActivity.java +++ b/java/com/android/dialer/shortcuts/CallContactActivity.java @@ -21,8 +21,8 @@ import android.net.Uri; import android.os.Bundle; import android.support.v4.app.ActivityCompat; import android.widget.Toast; -import com.android.dialer.callintent.nano.CallInitiationType; -import com.android.dialer.callintent.nano.CallSpecificAppData; +import com.android.dialer.callintent.CallInitiationType; +import com.android.dialer.callintent.CallSpecificAppData; import com.android.dialer.common.LogUtil; import com.android.dialer.interactions.PhoneNumberInteraction; import com.android.dialer.interactions.PhoneNumberInteraction.InteractionErrorCode; @@ -68,8 +68,10 @@ public class CallContactActivity extends TransactionSafeActivity * user can choose to grant or deny them. */ private void makeCall() { - CallSpecificAppData callSpecificAppData = new CallSpecificAppData(); - callSpecificAppData.callInitiationType = CallInitiationType.Type.LAUNCHER_SHORTCUT; + CallSpecificAppData callSpecificAppData = + CallSpecificAppData.newBuilder() + .setCallInitiationType(CallInitiationType.Type.LAUNCHER_SHORTCUT) + .build(); PhoneNumberInteraction.startInteractionForPhoneCall( this, contactUri, false /* isVideoCall */, callSpecificAppData); } diff --git a/java/com/android/dialer/shortcuts/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/shortcuts/res/values-b+sr+Latn/strings.xml new file mode 100644 index 000000000..86ce91524 --- /dev/null +++ b/java/com/android/dialer/shortcuts/res/values-b+sr+Latn/strings.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2016 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="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Novo"</string> + <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Novi kontakt"</string> + <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Prečica ne funkcioniše. Prevucite da biste je uklonili."</string> + <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakt više nije dostupan."</string> + <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Ne možete da pozovete jer nemate dozvole."</string> +</resources> |