From 69674662dbcf4b88fc4f2b290bd3ab925ae411c8 Mon Sep 17 00:00:00 2001 From: wangqi Date: Thu, 29 Jun 2017 13:14:51 -0700 Subject: Add video call not available dialog. When telecom disconnect the video call with the code of DisconnectCause.ERROR and the DisconnectCause#getReason() of "IMS_ACCESS_BLOCKED", we should show an error dialog to user indicating that video call is not available and providing a option to make a voice call instead. Screenshots: https://screenshot.googleplex.com/YTUGVouoLmj Bug: 33821263 Test: manual, VideoCallNotAvailablePromptTest PiperOrigin-RevId: 160563754 Change-Id: Ie2eb735a92c577b5ae5a5e8b7efa2d699fc964bc --- .../dialer/callintent/call_initiation_type.proto | 2 + java/com/android/incallui/InCallActivity.java | 6 +- .../com/android/incallui/InCallActivityCommon.java | 38 ++-------- java/com/android/incallui/InCallPresenter.java | 4 +- .../incallui/disconnectdialog/AndroidManifest.xml | 19 +++++ .../disconnectdialog/DefaultErrorDialog.java | 50 +++++++++++++ .../disconnectdialog/DisconnectDialog.java | 32 +++++++++ .../disconnectdialog/DisconnectMessage.java | 66 +++++++++++++++++ .../disconnectdialog/EnableWifiCallingPrompt.java | 75 ++++++++++++++++++++ .../VideoCallNotAvailablePrompt.java | 77 ++++++++++++++++++++ .../disconnectdialog/res/values/strings.xml | 32 +++++++++ java/com/android/incallui/wifi/AndroidManifest.xml | 3 - .../incallui/wifi/EnableWifiCallingPrompt.java | 82 ---------------------- .../incallui/wifi/res/values-af/strings.xml | 5 -- .../incallui/wifi/res/values-am/strings.xml | 5 -- .../incallui/wifi/res/values-ar/strings.xml | 5 -- .../incallui/wifi/res/values-az/strings.xml | 5 -- .../incallui/wifi/res/values-b+sr+Latn/strings.xml | 5 -- .../incallui/wifi/res/values-be/strings.xml | 5 -- .../incallui/wifi/res/values-bg/strings.xml | 5 -- .../incallui/wifi/res/values-bn/strings.xml | 5 -- .../incallui/wifi/res/values-bs/strings.xml | 5 -- .../incallui/wifi/res/values-ca/strings.xml | 5 -- .../incallui/wifi/res/values-cs/strings.xml | 5 -- .../incallui/wifi/res/values-da/strings.xml | 5 -- .../incallui/wifi/res/values-de/strings.xml | 5 -- .../incallui/wifi/res/values-el/strings.xml | 5 -- .../incallui/wifi/res/values-en-rAU/strings.xml | 5 -- .../incallui/wifi/res/values-en-rGB/strings.xml | 5 -- .../incallui/wifi/res/values-en-rIN/strings.xml | 5 -- .../incallui/wifi/res/values-es-rUS/strings.xml | 5 -- .../incallui/wifi/res/values-es/strings.xml | 5 -- .../incallui/wifi/res/values-et/strings.xml | 5 -- .../incallui/wifi/res/values-eu/strings.xml | 5 -- .../incallui/wifi/res/values-fa/strings.xml | 5 -- .../incallui/wifi/res/values-fi/strings.xml | 5 -- .../incallui/wifi/res/values-fr-rCA/strings.xml | 5 -- .../incallui/wifi/res/values-fr/strings.xml | 5 -- .../incallui/wifi/res/values-gl/strings.xml | 5 -- .../incallui/wifi/res/values-gu/strings.xml | 5 -- .../incallui/wifi/res/values-hi/strings.xml | 5 -- .../incallui/wifi/res/values-hr/strings.xml | 5 -- .../incallui/wifi/res/values-hu/strings.xml | 5 -- .../incallui/wifi/res/values-hy/strings.xml | 5 -- .../incallui/wifi/res/values-in/strings.xml | 5 -- .../incallui/wifi/res/values-is/strings.xml | 5 -- .../incallui/wifi/res/values-it/strings.xml | 5 -- .../incallui/wifi/res/values-iw/strings.xml | 5 -- .../incallui/wifi/res/values-ja/strings.xml | 5 -- .../incallui/wifi/res/values-ka/strings.xml | 5 -- .../incallui/wifi/res/values-kk/strings.xml | 5 -- .../incallui/wifi/res/values-km/strings.xml | 5 -- .../incallui/wifi/res/values-kn/strings.xml | 5 -- .../incallui/wifi/res/values-ko/strings.xml | 5 -- .../incallui/wifi/res/values-ky/strings.xml | 5 -- .../incallui/wifi/res/values-lo/strings.xml | 5 -- .../incallui/wifi/res/values-lt/strings.xml | 5 -- .../incallui/wifi/res/values-lv/strings.xml | 5 -- .../incallui/wifi/res/values-mk/strings.xml | 5 -- .../incallui/wifi/res/values-ml/strings.xml | 5 -- .../incallui/wifi/res/values-mn/strings.xml | 5 -- .../incallui/wifi/res/values-mr/strings.xml | 5 -- .../incallui/wifi/res/values-ms/strings.xml | 5 -- .../incallui/wifi/res/values-my/strings.xml | 5 -- .../incallui/wifi/res/values-nb/strings.xml | 5 -- .../incallui/wifi/res/values-ne/strings.xml | 5 -- .../incallui/wifi/res/values-nl/strings.xml | 5 -- .../incallui/wifi/res/values-no/strings.xml | 5 -- .../incallui/wifi/res/values-pa/strings.xml | 5 -- .../incallui/wifi/res/values-pl/strings.xml | 5 -- .../incallui/wifi/res/values-pt-rBR/strings.xml | 5 -- .../incallui/wifi/res/values-pt-rPT/strings.xml | 5 -- .../incallui/wifi/res/values-pt/strings.xml | 5 -- .../incallui/wifi/res/values-ro/strings.xml | 5 -- .../incallui/wifi/res/values-ru/strings.xml | 5 -- .../incallui/wifi/res/values-si/strings.xml | 5 -- .../incallui/wifi/res/values-sk/strings.xml | 5 -- .../incallui/wifi/res/values-sl/strings.xml | 5 -- .../incallui/wifi/res/values-sq/strings.xml | 5 -- .../incallui/wifi/res/values-sr/strings.xml | 5 -- .../incallui/wifi/res/values-sv/strings.xml | 5 -- .../incallui/wifi/res/values-sw/strings.xml | 5 -- .../incallui/wifi/res/values-ta/strings.xml | 5 -- .../incallui/wifi/res/values-te/strings.xml | 5 -- .../incallui/wifi/res/values-th/strings.xml | 5 -- .../incallui/wifi/res/values-tl/strings.xml | 5 -- .../incallui/wifi/res/values-tr/strings.xml | 5 -- .../incallui/wifi/res/values-uk/strings.xml | 5 -- .../incallui/wifi/res/values-ur/strings.xml | 5 -- .../incallui/wifi/res/values-uz/strings.xml | 5 -- .../incallui/wifi/res/values-vi/strings.xml | 5 -- .../incallui/wifi/res/values-zh-rCN/strings.xml | 5 -- .../incallui/wifi/res/values-zh-rHK/strings.xml | 5 -- .../incallui/wifi/res/values-zh-rTW/strings.xml | 5 -- .../incallui/wifi/res/values-zu/strings.xml | 5 -- .../android/incallui/wifi/res/values/strings.xml | 9 --- 96 files changed, 366 insertions(+), 539 deletions(-) create mode 100644 java/com/android/incallui/disconnectdialog/AndroidManifest.xml create mode 100644 java/com/android/incallui/disconnectdialog/DefaultErrorDialog.java create mode 100644 java/com/android/incallui/disconnectdialog/DisconnectDialog.java create mode 100644 java/com/android/incallui/disconnectdialog/DisconnectMessage.java create mode 100644 java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java create mode 100644 java/com/android/incallui/disconnectdialog/VideoCallNotAvailablePrompt.java create mode 100644 java/com/android/incallui/disconnectdialog/res/values/strings.xml delete mode 100644 java/com/android/incallui/wifi/AndroidManifest.xml delete mode 100644 java/com/android/incallui/wifi/EnableWifiCallingPrompt.java delete mode 100644 java/com/android/incallui/wifi/res/values-af/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-am/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ar/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-az/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-b+sr+Latn/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-be/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-bg/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-bn/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-bs/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ca/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-cs/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-da/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-de/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-el/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-en-rAU/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-en-rGB/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-en-rIN/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-es-rUS/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-es/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-et/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-eu/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-fa/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-fi/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-fr-rCA/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-fr/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-gl/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-gu/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-hi/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-hr/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-hu/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-hy/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-in/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-is/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-it/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-iw/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ja/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ka/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-kk/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-km/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-kn/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ko/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ky/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-lo/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-lt/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-lv/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-mk/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ml/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-mn/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-mr/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ms/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-my/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-nb/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ne/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-nl/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-no/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-pa/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-pl/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-pt-rBR/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-pt-rPT/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-pt/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ro/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ru/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-si/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-sk/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-sl/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-sq/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-sr/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-sv/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-sw/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ta/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-te/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-th/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-tl/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-tr/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-uk/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-ur/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-uz/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-vi/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-zh-rCN/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-zh-rHK/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-zh-rTW/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values-zu/strings.xml delete mode 100644 java/com/android/incallui/wifi/res/values/strings.xml (limited to 'java/com') diff --git a/java/com/android/dialer/callintent/call_initiation_type.proto b/java/com/android/dialer/callintent/call_initiation_type.proto index 6b85fbf81..32e4e49fc 100644 --- a/java/com/android/dialer/callintent/call_initiation_type.proto +++ b/java/com/android/dialer/callintent/call_initiation_type.proto @@ -58,5 +58,7 @@ message CallInitiationType { MISSED_CALL_NOTIFICATION = 15; CALL_SUBJECT_DIALOG = 16; + + IMS_VIDEO_BLOCKED_FALLBACK_TO_VOICE = 17; } } diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java index 6ea31fc4c..c95086c1e 100644 --- a/java/com/android/incallui/InCallActivity.java +++ b/java/com/android/incallui/InCallActivity.java @@ -28,7 +28,6 @@ import android.support.annotation.Nullable; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v4.graphics.ColorUtils; -import android.telecom.DisconnectCause; import android.telephony.TelephonyManager; import android.view.KeyEvent; import android.view.MenuItem; @@ -48,6 +47,7 @@ import com.android.incallui.answerproximitysensor.PseudoScreenState; import com.android.incallui.call.CallList; import com.android.incallui.call.DialerCall; import com.android.incallui.call.DialerCall.State; +import com.android.incallui.disconnectdialog.DisconnectMessage; import com.android.incallui.incall.bindings.InCallBindings; import com.android.incallui.incall.protocol.InCallButtonUiDelegate; import com.android.incallui.incall.protocol.InCallButtonUiDelegateFactory; @@ -393,8 +393,8 @@ public class InCallActivity extends TransactionSafeFragmentActivity common.showPostCharWaitDialog(callId, chars); } - public void maybeShowErrorDialogOnDisconnect(DisconnectCause disconnectCause) { - common.maybeShowErrorDialogOnDisconnect(disconnectCause); + public void maybeShowErrorDialogOnDisconnect(DisconnectMessage disconnectMessage) { + common.maybeShowErrorDialogOnDisconnect(disconnectMessage); } public void dismissPendingDialogs() { diff --git a/java/com/android/incallui/InCallActivityCommon.java b/java/com/android/incallui/InCallActivityCommon.java index 4b0a3cd05..3a264bed7 100644 --- a/java/com/android/incallui/InCallActivityCommon.java +++ b/java/com/android/incallui/InCallActivityCommon.java @@ -21,7 +21,6 @@ import android.app.ActivityManager.AppTask; import android.app.ActivityManager.TaskDescription; import android.app.AlertDialog; import android.app.Dialog; -import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnDismissListener; @@ -36,10 +35,7 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v4.content.res.ResourcesCompat; -import android.telecom.DisconnectCause; import android.telecom.PhoneAccountHandle; -import android.text.TextUtils; -import android.util.Pair; import android.view.KeyEvent; import android.view.View; import android.view.Window; @@ -62,9 +58,9 @@ import com.android.incallui.call.CallList; import com.android.incallui.call.DialerCall; import com.android.incallui.call.DialerCall.State; import com.android.incallui.call.TelecomAdapter; +import com.android.incallui.disconnectdialog.DisconnectMessage; import com.android.incallui.telecomeventui.InternationalCallOnWifiDialogFragment; import com.android.incallui.telecomeventui.InternationalCallOnWifiDialogFragment.Callback; -import com.android.incallui.wifi.EnableWifiCallingPrompt; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; @@ -497,18 +493,15 @@ public class InCallActivityCommon { } } - public void maybeShowErrorDialogOnDisconnect(DisconnectCause cause) { + public void maybeShowErrorDialogOnDisconnect(DisconnectMessage disconnectMessage) { LogUtil.i( - "InCallActivityCommon.maybeShowErrorDialogOnDisconnect", "disconnect cause: %s", cause); + "InCallActivityCommon.maybeShowErrorDialogOnDisconnect", + "disconnect cause: %s", + disconnectMessage); if (!inCallActivity.isFinishing()) { - if (EnableWifiCallingPrompt.shouldShowPrompt(cause)) { - Pair pair = - EnableWifiCallingPrompt.createDialog(inCallActivity, cause); - showErrorDialog(pair.first, pair.second); - } else if (shouldShowDisconnectErrorDialog(cause)) { - Pair pair = getDisconnectErrorDialog(inCallActivity, cause); - showErrorDialog(pair.first, pair.second); + if (disconnectMessage.dialog != null) { + showErrorDialog(disconnectMessage.dialog, disconnectMessage.toastMessage); } } } @@ -557,23 +550,6 @@ public class InCallActivityCommon { } } - private static boolean shouldShowDisconnectErrorDialog(@NonNull DisconnectCause cause) { - return !TextUtils.isEmpty(cause.getDescription()) - && (cause.getCode() == DisconnectCause.ERROR - || cause.getCode() == DisconnectCause.RESTRICTED); - } - - private static Pair getDisconnectErrorDialog( - @NonNull Context context, @NonNull DisconnectCause cause) { - CharSequence message = cause.getDescription(); - Dialog dialog = - new AlertDialog.Builder(context) - .setMessage(message) - .setPositiveButton(android.R.string.ok, null) - .create(); - return new Pair<>(dialog, message); - } - private void showErrorDialog(Dialog dialog, CharSequence message) { LogUtil.i("InCallActivityCommon.showErrorDialog", "message: %s", message); inCallActivity.dismissPendingDialogs(); diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index eb0d2d38a..64bc4048c 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -54,6 +54,7 @@ import com.android.incallui.call.CallList; import com.android.incallui.call.DialerCall; import com.android.incallui.call.ExternalCallList; import com.android.incallui.call.TelecomAdapter; +import com.android.incallui.disconnectdialog.DisconnectMessage; import com.android.incallui.latencyreport.LatencyReport; import com.android.incallui.legacyblocking.BlockedNumberContentObserver; import com.android.incallui.spam.SpamCallListListener; @@ -1249,7 +1250,8 @@ public class InCallPresenter implements CallList.Listener { if (call.getAccountHandle() == null && !call.isConferenceCall()) { setDisconnectCauseForMissingAccounts(call); } - mInCallActivity.maybeShowErrorDialogOnDisconnect(call.getDisconnectCause()); + mInCallActivity.maybeShowErrorDialogOnDisconnect( + new DisconnectMessage(mInCallActivity, call)); } } diff --git a/java/com/android/incallui/disconnectdialog/AndroidManifest.xml b/java/com/android/incallui/disconnectdialog/AndroidManifest.xml new file mode 100644 index 000000000..eec9807d8 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/AndroidManifest.xml @@ -0,0 +1,19 @@ + + + + diff --git a/java/com/android/incallui/disconnectdialog/DefaultErrorDialog.java b/java/com/android/incallui/disconnectdialog/DefaultErrorDialog.java new file mode 100644 index 000000000..2ce238718 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/DefaultErrorDialog.java @@ -0,0 +1,50 @@ +/* + * 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 + */ + +package com.android.incallui.disconnectdialog; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.Context; +import android.support.annotation.NonNull; +import android.telecom.DisconnectCause; +import android.text.TextUtils; +import android.util.Pair; +import com.android.incallui.call.DialerCall; + +/** Default error dialog shown to user after disconnect. */ +public class DefaultErrorDialog implements DisconnectDialog { + + @Override + public boolean shouldShow(DisconnectCause disconnectCause) { + return !TextUtils.isEmpty(disconnectCause.getDescription()) + && (disconnectCause.getCode() == DisconnectCause.ERROR + || disconnectCause.getCode() == DisconnectCause.RESTRICTED); + } + + @Override + public Pair createDialog(@NonNull Context context, DialerCall call) { + DisconnectCause disconnectCause = call.getDisconnectCause(); + CharSequence message = disconnectCause.getDescription(); + + Dialog dialog = + new AlertDialog.Builder(context) + .setMessage(message) + .setPositiveButton(android.R.string.cancel, null) + .create(); + return new Pair<>(dialog, message); + } +} diff --git a/java/com/android/incallui/disconnectdialog/DisconnectDialog.java b/java/com/android/incallui/disconnectdialog/DisconnectDialog.java new file mode 100644 index 000000000..0b2b8cc8f --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/DisconnectDialog.java @@ -0,0 +1,32 @@ +/* + * 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 + */ + +package com.android.incallui.disconnectdialog; + +import android.app.Dialog; +import android.content.Context; +import android.support.annotation.NonNull; +import android.telecom.DisconnectCause; +import android.util.Pair; +import com.android.incallui.call.DialerCall; + +/** Interface for disconnect dialog. */ +public interface DisconnectDialog { + + boolean shouldShow(DisconnectCause disconnectCause); + + Pair createDialog(@NonNull Context context, DialerCall call); +} diff --git a/java/com/android/incallui/disconnectdialog/DisconnectMessage.java b/java/com/android/incallui/disconnectdialog/DisconnectMessage.java new file mode 100644 index 000000000..97d58f27c --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/DisconnectMessage.java @@ -0,0 +1,66 @@ +/* + * 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. + */ + +package com.android.incallui.disconnectdialog; + +import android.app.Dialog; +import android.content.Context; +import android.telecom.DisconnectCause; +import android.util.Pair; +import com.android.incallui.call.DialerCall; +import java.util.Locale; + +/** + * Wrapper class around @Code{android.telecom.DisconnectCause} to provide more information to user. + */ +public class DisconnectMessage { + + // Disconnect dialog catalog. Default error dialog MUST be last one. + private static final DisconnectDialog[] DISCONNECT_DIALOGS = + new DisconnectDialog[] { + new EnableWifiCallingPrompt(), new VideoCallNotAvailablePrompt(), new DefaultErrorDialog() + }; + + public final Dialog dialog; + public final CharSequence toastMessage; + private final DisconnectCause cause; + + public DisconnectMessage(Context context, DialerCall call) { + cause = call.getDisconnectCause(); + + for (DisconnectDialog disconnectDialog : DISCONNECT_DIALOGS) { + if (disconnectDialog.shouldShow(cause)) { + Pair pair = disconnectDialog.createDialog(context, call); + dialog = pair.first; + toastMessage = pair.second; + return; + } + } + dialog = null; + toastMessage = null; + } + + @Override + public String toString() { + return String.format( + Locale.ENGLISH, + "DisconnectMessage {code: %d, description: %s, reason: %s, message: %s}", + cause.getCode(), + cause.getDescription(), + cause.getReason(), + toastMessage); + } +} diff --git a/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java b/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java new file mode 100644 index 000000000..da0c9d6be --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java @@ -0,0 +1,75 @@ +/* + * 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 + */ + +package com.android.incallui.disconnectdialog; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.Context; +import android.content.DialogInterface.OnClickListener; +import android.content.Intent; +import android.support.annotation.NonNull; +import android.telecom.DisconnectCause; +import android.util.Pair; +import com.android.dialer.common.Assert; +import com.android.dialer.common.LogUtil; +import com.android.incallui.call.DialerCall; + +/** Prompts the user to enable Wi-Fi calling. */ +public class EnableWifiCallingPrompt implements DisconnectDialog { + // This is a hidden constant in android.telecom.DisconnectCause. Telecom sets this as a disconnect + // reason if it wants us to prompt the user to enable Wi-Fi calling. In Android-O we might + // consider using a more explicit way to signal this. + private static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF"; + private static final String ACTION_WIFI_CALLING_SETTINGS = + "android.settings.WIFI_CALLING_SETTINGS"; + private static final String ANDROID_SETTINGS_PACKAGE = "com.android.settings"; + + @Override + public boolean shouldShow(DisconnectCause disconnectCause) { + String reason = disconnectCause.getReason(); + if (reason.startsWith(REASON_WIFI_ON_BUT_WFC_OFF)) { + LogUtil.i( + "EnableWifiCallingPrompt.shouldShowPrompt", + "showing prompt for disconnect cause: %s", + reason); + return true; + } + return false; + } + + @Override + public Pair createDialog(final @NonNull Context context, DialerCall call) { + Assert.isNotNull(context); + DisconnectCause cause = call.getDisconnectCause(); + CharSequence message = cause.getDescription(); + Dialog dialog = + new AlertDialog.Builder(context) + .setMessage(message) + .setPositiveButton( + R.string.incall_enable_wifi_calling_button, + (OnClickListener) (dialog1, which) -> openWifiCallingSettings(context)) + .setNegativeButton(android.R.string.cancel, null) + .create(); + return new Pair<>(dialog, message); + } + + private static void openWifiCallingSettings(@NonNull Context context) { + LogUtil.i("EnableWifiCallingPrompt.openWifiCallingSettings", "opening settings"); + context.startActivity( + new Intent(ACTION_WIFI_CALLING_SETTINGS).setPackage(ANDROID_SETTINGS_PACKAGE)); + } +} diff --git a/java/com/android/incallui/disconnectdialog/VideoCallNotAvailablePrompt.java b/java/com/android/incallui/disconnectdialog/VideoCallNotAvailablePrompt.java new file mode 100644 index 000000000..34db976b2 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/VideoCallNotAvailablePrompt.java @@ -0,0 +1,77 @@ +/* + * 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 + */ + +package com.android.incallui.disconnectdialog; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.Context; +import android.content.Intent; +import android.support.annotation.NonNull; +import android.telecom.DisconnectCause; +import android.telecom.PhoneAccountHandle; +import android.util.Pair; +import com.android.dialer.callintent.CallInitiationType; +import com.android.dialer.callintent.CallIntentBuilder; +import com.android.dialer.common.LogUtil; +import com.android.dialer.util.DialerUtils; +import com.android.incallui.call.DialerCall; + +/** Prompt user to make voice call if video call is not currently available. */ +public class VideoCallNotAvailablePrompt implements DisconnectDialog { + + private static final String REASON_IMS_ACCESS_BLOCKED = "IMS_ACCESS_BLOCKED"; + + @Override + public boolean shouldShow(DisconnectCause disconnectCause) { + if (disconnectCause.getCode() == DisconnectCause.ERROR + && REASON_IMS_ACCESS_BLOCKED.equals(disconnectCause.getReason())) { + LogUtil.i( + "VideoCallNotAvailablePrompt.shouldShowPrompt", + "showing prompt for disconnect cause: %s", + disconnectCause.getReason()); + return true; + } else { + return false; + } + } + + @Override + public Pair createDialog(@NonNull Context context, DialerCall call) { + CharSequence title = context.getString(R.string.video_call_not_available_title); + + Dialog dialog = + new AlertDialog.Builder(context) + .setTitle(title) + .setMessage(context.getString(R.string.video_call_not_available_message)) + .setPositiveButton( + R.string.voice_call, + (dialog1, which) -> + makeVoiceCall(context, call.getNumber(), call.getAccountHandle())) + .setNegativeButton(android.R.string.cancel, null) + .create(); + return new Pair<>(dialog, title); + } + + private void makeVoiceCall(Context context, String number, PhoneAccountHandle accountHandle) { + LogUtil.enterBlock("VideoCallNotAvailablePrompt.makeVoiceCall"); + Intent intent = + new CallIntentBuilder(number, CallInitiationType.Type.IMS_VIDEO_BLOCKED_FALLBACK_TO_VOICE) + .setPhoneAccountHandle(accountHandle) + .build(); + DialerUtils.startActivityWithErrorToast(context, intent); + } +} diff --git a/java/com/android/incallui/disconnectdialog/res/values/strings.xml b/java/com/android/incallui/disconnectdialog/res/values/strings.xml new file mode 100644 index 000000000..91389db76 --- /dev/null +++ b/java/com/android/incallui/disconnectdialog/res/values/strings.xml @@ -0,0 +1,32 @@ + + + + + + + Enable + + + Video calling is currently not available + + Try calling again later or continue the call as a voice call. + + Voice call + + diff --git a/java/com/android/incallui/wifi/AndroidManifest.xml b/java/com/android/incallui/wifi/AndroidManifest.xml deleted file mode 100644 index 843f8f3e6..000000000 --- a/java/com/android/incallui/wifi/AndroidManifest.xml +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/java/com/android/incallui/wifi/EnableWifiCallingPrompt.java b/java/com/android/incallui/wifi/EnableWifiCallingPrompt.java deleted file mode 100644 index 85603bfb1..000000000 --- a/java/com/android/incallui/wifi/EnableWifiCallingPrompt.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * 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 - */ - -package com.android.incallui.wifi; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; -import android.content.Intent; -import android.support.annotation.NonNull; -import android.telecom.DisconnectCause; -import android.util.Pair; -import com.android.dialer.common.Assert; -import com.android.dialer.common.LogUtil; - -/** Prompts the user to enable Wi-Fi calling. */ -public class EnableWifiCallingPrompt { - // This is a hidden constant in android.telecom.DisconnectCause. Telecom sets this as a disconnect - // reason if it wants us to prompt the user to enable Wi-Fi calling. In Android-O we might - // consider using a more explicit way to signal this. - private static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF"; - private static final String ACTION_WIFI_CALLING_SETTINGS = - "android.settings.WIFI_CALLING_SETTINGS"; - private static final String ANDROID_SETTINGS_PACKAGE = "com.android.settings"; - - public static boolean shouldShowPrompt(@NonNull DisconnectCause cause) { - Assert.isNotNull(cause); - if (cause.getReason() != null && cause.getReason().startsWith(REASON_WIFI_ON_BUT_WFC_OFF)) { - LogUtil.i( - "EnableWifiCallingPrompt.shouldShowPrompt", - "showing prompt for disconnect cause: %s", - cause); - return true; - } - return false; - } - - @NonNull - public static Pair createDialog( - final @NonNull Context context, @NonNull DisconnectCause cause) { - Assert.isNotNull(context); - Assert.isNotNull(cause); - CharSequence message = cause.getDescription(); - Dialog dialog = - new AlertDialog.Builder(context) - .setMessage(message) - .setPositiveButton( - R.string.incall_enable_wifi_calling_button, - new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - openWifiCallingSettings(context); - } - }) - .setNegativeButton(android.R.string.cancel, null) - .create(); - return new Pair(dialog, message); - } - - private static void openWifiCallingSettings(@NonNull Context context) { - LogUtil.i("EnableWifiCallingPrompt.openWifiCallingSettings", "opening settings"); - context.startActivity( - new Intent(ACTION_WIFI_CALLING_SETTINGS).setPackage(ANDROID_SETTINGS_PACKAGE)); - } - - private EnableWifiCallingPrompt() {} -} diff --git a/java/com/android/incallui/wifi/res/values-af/strings.xml b/java/com/android/incallui/wifi/res/values-af/strings.xml deleted file mode 100644 index d9df5c6c9..000000000 --- a/java/com/android/incallui/wifi/res/values-af/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktiveer" - diff --git a/java/com/android/incallui/wifi/res/values-am/strings.xml b/java/com/android/incallui/wifi/res/values-am/strings.xml deleted file mode 100644 index 1aa567318..000000000 --- a/java/com/android/incallui/wifi/res/values-am/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "አንቃ" - diff --git a/java/com/android/incallui/wifi/res/values-ar/strings.xml b/java/com/android/incallui/wifi/res/values-ar/strings.xml deleted file mode 100644 index 972cd37b2..000000000 --- a/java/com/android/incallui/wifi/res/values-ar/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "تمكين" - diff --git a/java/com/android/incallui/wifi/res/values-az/strings.xml b/java/com/android/incallui/wifi/res/values-az/strings.xml deleted file mode 100644 index 46bbda1a9..000000000 --- a/java/com/android/incallui/wifi/res/values-az/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktiv edin" - diff --git a/java/com/android/incallui/wifi/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/wifi/res/values-b+sr+Latn/strings.xml deleted file mode 100644 index 51a57e403..000000000 --- a/java/com/android/incallui/wifi/res/values-b+sr+Latn/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Omogući" - diff --git a/java/com/android/incallui/wifi/res/values-be/strings.xml b/java/com/android/incallui/wifi/res/values-be/strings.xml deleted file mode 100644 index a8277a119..000000000 --- a/java/com/android/incallui/wifi/res/values-be/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Уключыць" - diff --git a/java/com/android/incallui/wifi/res/values-bg/strings.xml b/java/com/android/incallui/wifi/res/values-bg/strings.xml deleted file mode 100644 index ff5b94d90..000000000 --- a/java/com/android/incallui/wifi/res/values-bg/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Активиране" - diff --git a/java/com/android/incallui/wifi/res/values-bn/strings.xml b/java/com/android/incallui/wifi/res/values-bn/strings.xml deleted file mode 100644 index 94e84c371..000000000 --- a/java/com/android/incallui/wifi/res/values-bn/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "সক্ষম করুন" - diff --git a/java/com/android/incallui/wifi/res/values-bs/strings.xml b/java/com/android/incallui/wifi/res/values-bs/strings.xml deleted file mode 100644 index 51a57e403..000000000 --- a/java/com/android/incallui/wifi/res/values-bs/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Omogući" - diff --git a/java/com/android/incallui/wifi/res/values-ca/strings.xml b/java/com/android/incallui/wifi/res/values-ca/strings.xml deleted file mode 100644 index 8af77c9d8..000000000 --- a/java/com/android/incallui/wifi/res/values-ca/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Activa" - diff --git a/java/com/android/incallui/wifi/res/values-cs/strings.xml b/java/com/android/incallui/wifi/res/values-cs/strings.xml deleted file mode 100644 index b057d1cc0..000000000 --- a/java/com/android/incallui/wifi/res/values-cs/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Zapnout" - diff --git a/java/com/android/incallui/wifi/res/values-da/strings.xml b/java/com/android/incallui/wifi/res/values-da/strings.xml deleted file mode 100644 index 81f837ff5..000000000 --- a/java/com/android/incallui/wifi/res/values-da/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktivér" - diff --git a/java/com/android/incallui/wifi/res/values-de/strings.xml b/java/com/android/incallui/wifi/res/values-de/strings.xml deleted file mode 100644 index d6dda7ecb..000000000 --- a/java/com/android/incallui/wifi/res/values-de/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktivieren" - diff --git a/java/com/android/incallui/wifi/res/values-el/strings.xml b/java/com/android/incallui/wifi/res/values-el/strings.xml deleted file mode 100644 index c1817432c..000000000 --- a/java/com/android/incallui/wifi/res/values-el/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Ενεργοποίηση" - diff --git a/java/com/android/incallui/wifi/res/values-en-rAU/strings.xml b/java/com/android/incallui/wifi/res/values-en-rAU/strings.xml deleted file mode 100644 index 6877c4957..000000000 --- a/java/com/android/incallui/wifi/res/values-en-rAU/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Enable" - diff --git a/java/com/android/incallui/wifi/res/values-en-rGB/strings.xml b/java/com/android/incallui/wifi/res/values-en-rGB/strings.xml deleted file mode 100644 index 6877c4957..000000000 --- a/java/com/android/incallui/wifi/res/values-en-rGB/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Enable" - diff --git a/java/com/android/incallui/wifi/res/values-en-rIN/strings.xml b/java/com/android/incallui/wifi/res/values-en-rIN/strings.xml deleted file mode 100644 index 6877c4957..000000000 --- a/java/com/android/incallui/wifi/res/values-en-rIN/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Enable" - diff --git a/java/com/android/incallui/wifi/res/values-es-rUS/strings.xml b/java/com/android/incallui/wifi/res/values-es-rUS/strings.xml deleted file mode 100644 index f460251db..000000000 --- a/java/com/android/incallui/wifi/res/values-es-rUS/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Habilitar" - diff --git a/java/com/android/incallui/wifi/res/values-es/strings.xml b/java/com/android/incallui/wifi/res/values-es/strings.xml deleted file mode 100644 index f460251db..000000000 --- a/java/com/android/incallui/wifi/res/values-es/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Habilitar" - diff --git a/java/com/android/incallui/wifi/res/values-et/strings.xml b/java/com/android/incallui/wifi/res/values-et/strings.xml deleted file mode 100644 index ae447bde1..000000000 --- a/java/com/android/incallui/wifi/res/values-et/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Luba" - diff --git a/java/com/android/incallui/wifi/res/values-eu/strings.xml b/java/com/android/incallui/wifi/res/values-eu/strings.xml deleted file mode 100644 index 557bdfbb9..000000000 --- a/java/com/android/incallui/wifi/res/values-eu/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Gaitu" - diff --git a/java/com/android/incallui/wifi/res/values-fa/strings.xml b/java/com/android/incallui/wifi/res/values-fa/strings.xml deleted file mode 100644 index a1bf8dafb..000000000 --- a/java/com/android/incallui/wifi/res/values-fa/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "فعال کردن" - diff --git a/java/com/android/incallui/wifi/res/values-fi/strings.xml b/java/com/android/incallui/wifi/res/values-fi/strings.xml deleted file mode 100644 index 06aac1d7c..000000000 --- a/java/com/android/incallui/wifi/res/values-fi/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Ota käyttöön" - diff --git a/java/com/android/incallui/wifi/res/values-fr-rCA/strings.xml b/java/com/android/incallui/wifi/res/values-fr-rCA/strings.xml deleted file mode 100644 index ff7bc8b4e..000000000 --- a/java/com/android/incallui/wifi/res/values-fr-rCA/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Activer" - diff --git a/java/com/android/incallui/wifi/res/values-fr/strings.xml b/java/com/android/incallui/wifi/res/values-fr/strings.xml deleted file mode 100644 index ff7bc8b4e..000000000 --- a/java/com/android/incallui/wifi/res/values-fr/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Activer" - diff --git a/java/com/android/incallui/wifi/res/values-gl/strings.xml b/java/com/android/incallui/wifi/res/values-gl/strings.xml deleted file mode 100644 index eb6e93982..000000000 --- a/java/com/android/incallui/wifi/res/values-gl/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Activar" - diff --git a/java/com/android/incallui/wifi/res/values-gu/strings.xml b/java/com/android/incallui/wifi/res/values-gu/strings.xml deleted file mode 100644 index 39b9849e9..000000000 --- a/java/com/android/incallui/wifi/res/values-gu/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "સક્ષમ કરો" - diff --git a/java/com/android/incallui/wifi/res/values-hi/strings.xml b/java/com/android/incallui/wifi/res/values-hi/strings.xml deleted file mode 100644 index f6c6b78ca..000000000 --- a/java/com/android/incallui/wifi/res/values-hi/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "सक्षम करें" - diff --git a/java/com/android/incallui/wifi/res/values-hr/strings.xml b/java/com/android/incallui/wifi/res/values-hr/strings.xml deleted file mode 100644 index 51a57e403..000000000 --- a/java/com/android/incallui/wifi/res/values-hr/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Omogući" - diff --git a/java/com/android/incallui/wifi/res/values-hu/strings.xml b/java/com/android/incallui/wifi/res/values-hu/strings.xml deleted file mode 100644 index c1daa2437..000000000 --- a/java/com/android/incallui/wifi/res/values-hu/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Engedélyezés" - diff --git a/java/com/android/incallui/wifi/res/values-hy/strings.xml b/java/com/android/incallui/wifi/res/values-hy/strings.xml deleted file mode 100644 index e9390bdc2..000000000 --- a/java/com/android/incallui/wifi/res/values-hy/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Միացնել" - diff --git a/java/com/android/incallui/wifi/res/values-in/strings.xml b/java/com/android/incallui/wifi/res/values-in/strings.xml deleted file mode 100644 index c6ed43cbb..000000000 --- a/java/com/android/incallui/wifi/res/values-in/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktifkan" - diff --git a/java/com/android/incallui/wifi/res/values-is/strings.xml b/java/com/android/incallui/wifi/res/values-is/strings.xml deleted file mode 100644 index 03316aa09..000000000 --- a/java/com/android/incallui/wifi/res/values-is/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Kveikja" - diff --git a/java/com/android/incallui/wifi/res/values-it/strings.xml b/java/com/android/incallui/wifi/res/values-it/strings.xml deleted file mode 100644 index d53ccdcff..000000000 --- a/java/com/android/incallui/wifi/res/values-it/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Abilita" - diff --git a/java/com/android/incallui/wifi/res/values-iw/strings.xml b/java/com/android/incallui/wifi/res/values-iw/strings.xml deleted file mode 100644 index c624f6494..000000000 --- a/java/com/android/incallui/wifi/res/values-iw/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "הפעל" - diff --git a/java/com/android/incallui/wifi/res/values-ja/strings.xml b/java/com/android/incallui/wifi/res/values-ja/strings.xml deleted file mode 100644 index e918153be..000000000 --- a/java/com/android/incallui/wifi/res/values-ja/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "有効にする" - diff --git a/java/com/android/incallui/wifi/res/values-ka/strings.xml b/java/com/android/incallui/wifi/res/values-ka/strings.xml deleted file mode 100644 index bd778d58a..000000000 --- a/java/com/android/incallui/wifi/res/values-ka/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "ჩართვა" - diff --git a/java/com/android/incallui/wifi/res/values-kk/strings.xml b/java/com/android/incallui/wifi/res/values-kk/strings.xml deleted file mode 100644 index c0c62a415..000000000 --- a/java/com/android/incallui/wifi/res/values-kk/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Қосу" - diff --git a/java/com/android/incallui/wifi/res/values-km/strings.xml b/java/com/android/incallui/wifi/res/values-km/strings.xml deleted file mode 100644 index 73f194f10..000000000 --- a/java/com/android/incallui/wifi/res/values-km/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "បើក" - diff --git a/java/com/android/incallui/wifi/res/values-kn/strings.xml b/java/com/android/incallui/wifi/res/values-kn/strings.xml deleted file mode 100644 index 2f776cf08..000000000 --- a/java/com/android/incallui/wifi/res/values-kn/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "ಸಕ್ರಿಯಗೊಳಿಸಿ" - diff --git a/java/com/android/incallui/wifi/res/values-ko/strings.xml b/java/com/android/incallui/wifi/res/values-ko/strings.xml deleted file mode 100644 index 354efe699..000000000 --- a/java/com/android/incallui/wifi/res/values-ko/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "사용" - diff --git a/java/com/android/incallui/wifi/res/values-ky/strings.xml b/java/com/android/incallui/wifi/res/values-ky/strings.xml deleted file mode 100644 index 6cf39dbe1..000000000 --- a/java/com/android/incallui/wifi/res/values-ky/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Иштетүү" - diff --git a/java/com/android/incallui/wifi/res/values-lo/strings.xml b/java/com/android/incallui/wifi/res/values-lo/strings.xml deleted file mode 100644 index a34d48ea9..000000000 --- a/java/com/android/incallui/wifi/res/values-lo/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "ເປິດນຳໃຊ້" - diff --git a/java/com/android/incallui/wifi/res/values-lt/strings.xml b/java/com/android/incallui/wifi/res/values-lt/strings.xml deleted file mode 100644 index b473b2d85..000000000 --- a/java/com/android/incallui/wifi/res/values-lt/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Įgalinti" - diff --git a/java/com/android/incallui/wifi/res/values-lv/strings.xml b/java/com/android/incallui/wifi/res/values-lv/strings.xml deleted file mode 100644 index 670484635..000000000 --- a/java/com/android/incallui/wifi/res/values-lv/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Iespējot" - diff --git a/java/com/android/incallui/wifi/res/values-mk/strings.xml b/java/com/android/incallui/wifi/res/values-mk/strings.xml deleted file mode 100644 index 30e6e8496..000000000 --- a/java/com/android/incallui/wifi/res/values-mk/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Овозможи" - diff --git a/java/com/android/incallui/wifi/res/values-ml/strings.xml b/java/com/android/incallui/wifi/res/values-ml/strings.xml deleted file mode 100644 index d20daa1f2..000000000 --- a/java/com/android/incallui/wifi/res/values-ml/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "പ്രവർത്തനക്ഷമമാക്കുക" - diff --git a/java/com/android/incallui/wifi/res/values-mn/strings.xml b/java/com/android/incallui/wifi/res/values-mn/strings.xml deleted file mode 100644 index a0b6bb414..000000000 --- a/java/com/android/incallui/wifi/res/values-mn/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Идэвхжүүлэх" - diff --git a/java/com/android/incallui/wifi/res/values-mr/strings.xml b/java/com/android/incallui/wifi/res/values-mr/strings.xml deleted file mode 100644 index e45dda101..000000000 --- a/java/com/android/incallui/wifi/res/values-mr/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "सक्षम करा" - diff --git a/java/com/android/incallui/wifi/res/values-ms/strings.xml b/java/com/android/incallui/wifi/res/values-ms/strings.xml deleted file mode 100644 index d87f96c89..000000000 --- a/java/com/android/incallui/wifi/res/values-ms/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Dayakan" - diff --git a/java/com/android/incallui/wifi/res/values-my/strings.xml b/java/com/android/incallui/wifi/res/values-my/strings.xml deleted file mode 100644 index 93fba1cca..000000000 --- a/java/com/android/incallui/wifi/res/values-my/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "ဖွင့်ရန်" - diff --git a/java/com/android/incallui/wifi/res/values-nb/strings.xml b/java/com/android/incallui/wifi/res/values-nb/strings.xml deleted file mode 100644 index 0afafec16..000000000 --- a/java/com/android/incallui/wifi/res/values-nb/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Slå på" - diff --git a/java/com/android/incallui/wifi/res/values-ne/strings.xml b/java/com/android/incallui/wifi/res/values-ne/strings.xml deleted file mode 100644 index 0f15de79d..000000000 --- a/java/com/android/incallui/wifi/res/values-ne/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "सक्षम पार्नुहोस्" - diff --git a/java/com/android/incallui/wifi/res/values-nl/strings.xml b/java/com/android/incallui/wifi/res/values-nl/strings.xml deleted file mode 100644 index 4fed4b312..000000000 --- a/java/com/android/incallui/wifi/res/values-nl/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Inschakelen" - diff --git a/java/com/android/incallui/wifi/res/values-no/strings.xml b/java/com/android/incallui/wifi/res/values-no/strings.xml deleted file mode 100644 index 0afafec16..000000000 --- a/java/com/android/incallui/wifi/res/values-no/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Slå på" - diff --git a/java/com/android/incallui/wifi/res/values-pa/strings.xml b/java/com/android/incallui/wifi/res/values-pa/strings.xml deleted file mode 100644 index 33974915a..000000000 --- a/java/com/android/incallui/wifi/res/values-pa/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "ਯੋਗ ਬਣਾਓ" - diff --git a/java/com/android/incallui/wifi/res/values-pl/strings.xml b/java/com/android/incallui/wifi/res/values-pl/strings.xml deleted file mode 100644 index 43ff017d1..000000000 --- a/java/com/android/incallui/wifi/res/values-pl/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Włącz" - diff --git a/java/com/android/incallui/wifi/res/values-pt-rBR/strings.xml b/java/com/android/incallui/wifi/res/values-pt-rBR/strings.xml deleted file mode 100644 index 4f1a42319..000000000 --- a/java/com/android/incallui/wifi/res/values-pt-rBR/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Ativar" - diff --git a/java/com/android/incallui/wifi/res/values-pt-rPT/strings.xml b/java/com/android/incallui/wifi/res/values-pt-rPT/strings.xml deleted file mode 100644 index 4f1a42319..000000000 --- a/java/com/android/incallui/wifi/res/values-pt-rPT/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Ativar" - diff --git a/java/com/android/incallui/wifi/res/values-pt/strings.xml b/java/com/android/incallui/wifi/res/values-pt/strings.xml deleted file mode 100644 index 4f1a42319..000000000 --- a/java/com/android/incallui/wifi/res/values-pt/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Ativar" - diff --git a/java/com/android/incallui/wifi/res/values-ro/strings.xml b/java/com/android/incallui/wifi/res/values-ro/strings.xml deleted file mode 100644 index af9004517..000000000 --- a/java/com/android/incallui/wifi/res/values-ro/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Activați" - diff --git a/java/com/android/incallui/wifi/res/values-ru/strings.xml b/java/com/android/incallui/wifi/res/values-ru/strings.xml deleted file mode 100644 index 00ae00e91..000000000 --- a/java/com/android/incallui/wifi/res/values-ru/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Включить" - diff --git a/java/com/android/incallui/wifi/res/values-si/strings.xml b/java/com/android/incallui/wifi/res/values-si/strings.xml deleted file mode 100644 index a19c389de..000000000 --- a/java/com/android/incallui/wifi/res/values-si/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "සබල කරන්න" - diff --git a/java/com/android/incallui/wifi/res/values-sk/strings.xml b/java/com/android/incallui/wifi/res/values-sk/strings.xml deleted file mode 100644 index 252f6e544..000000000 --- a/java/com/android/incallui/wifi/res/values-sk/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Povoliť" - diff --git a/java/com/android/incallui/wifi/res/values-sl/strings.xml b/java/com/android/incallui/wifi/res/values-sl/strings.xml deleted file mode 100644 index f1efb71f3..000000000 --- a/java/com/android/incallui/wifi/res/values-sl/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Omogoči" - diff --git a/java/com/android/incallui/wifi/res/values-sq/strings.xml b/java/com/android/incallui/wifi/res/values-sq/strings.xml deleted file mode 100644 index c69185da5..000000000 --- a/java/com/android/incallui/wifi/res/values-sq/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktivizo" - diff --git a/java/com/android/incallui/wifi/res/values-sr/strings.xml b/java/com/android/incallui/wifi/res/values-sr/strings.xml deleted file mode 100644 index 8bd22f602..000000000 --- a/java/com/android/incallui/wifi/res/values-sr/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Омогући" - diff --git a/java/com/android/incallui/wifi/res/values-sv/strings.xml b/java/com/android/incallui/wifi/res/values-sv/strings.xml deleted file mode 100644 index d0dbc4067..000000000 --- a/java/com/android/incallui/wifi/res/values-sv/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Aktivera" - diff --git a/java/com/android/incallui/wifi/res/values-sw/strings.xml b/java/com/android/incallui/wifi/res/values-sw/strings.xml deleted file mode 100644 index f0cb2456f..000000000 --- a/java/com/android/incallui/wifi/res/values-sw/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Washa" - diff --git a/java/com/android/incallui/wifi/res/values-ta/strings.xml b/java/com/android/incallui/wifi/res/values-ta/strings.xml deleted file mode 100644 index 38628af21..000000000 --- a/java/com/android/incallui/wifi/res/values-ta/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "இயக்கு" - diff --git a/java/com/android/incallui/wifi/res/values-te/strings.xml b/java/com/android/incallui/wifi/res/values-te/strings.xml deleted file mode 100644 index 40fd08f27..000000000 --- a/java/com/android/incallui/wifi/res/values-te/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "ప్రారంభించు" - diff --git a/java/com/android/incallui/wifi/res/values-th/strings.xml b/java/com/android/incallui/wifi/res/values-th/strings.xml deleted file mode 100644 index f201a20b9..000000000 --- a/java/com/android/incallui/wifi/res/values-th/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "เปิดใช้" - diff --git a/java/com/android/incallui/wifi/res/values-tl/strings.xml b/java/com/android/incallui/wifi/res/values-tl/strings.xml deleted file mode 100644 index b182eec86..000000000 --- a/java/com/android/incallui/wifi/res/values-tl/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "I-enable" - diff --git a/java/com/android/incallui/wifi/res/values-tr/strings.xml b/java/com/android/incallui/wifi/res/values-tr/strings.xml deleted file mode 100644 index 65e70e23f..000000000 --- a/java/com/android/incallui/wifi/res/values-tr/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Etkinleştir" - diff --git a/java/com/android/incallui/wifi/res/values-uk/strings.xml b/java/com/android/incallui/wifi/res/values-uk/strings.xml deleted file mode 100644 index db64076c5..000000000 --- a/java/com/android/incallui/wifi/res/values-uk/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Увімкнути" - diff --git a/java/com/android/incallui/wifi/res/values-ur/strings.xml b/java/com/android/incallui/wifi/res/values-ur/strings.xml deleted file mode 100644 index a78828065..000000000 --- a/java/com/android/incallui/wifi/res/values-ur/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "فعال کریں" - diff --git a/java/com/android/incallui/wifi/res/values-uz/strings.xml b/java/com/android/incallui/wifi/res/values-uz/strings.xml deleted file mode 100644 index dd5c47558..000000000 --- a/java/com/android/incallui/wifi/res/values-uz/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Yoqish" - diff --git a/java/com/android/incallui/wifi/res/values-vi/strings.xml b/java/com/android/incallui/wifi/res/values-vi/strings.xml deleted file mode 100644 index 003d5ad35..000000000 --- a/java/com/android/incallui/wifi/res/values-vi/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Bật" - diff --git a/java/com/android/incallui/wifi/res/values-zh-rCN/strings.xml b/java/com/android/incallui/wifi/res/values-zh-rCN/strings.xml deleted file mode 100644 index a198042c3..000000000 --- a/java/com/android/incallui/wifi/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "启用" - diff --git a/java/com/android/incallui/wifi/res/values-zh-rHK/strings.xml b/java/com/android/incallui/wifi/res/values-zh-rHK/strings.xml deleted file mode 100644 index b7cf926a1..000000000 --- a/java/com/android/incallui/wifi/res/values-zh-rHK/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "啟用" - diff --git a/java/com/android/incallui/wifi/res/values-zh-rTW/strings.xml b/java/com/android/incallui/wifi/res/values-zh-rTW/strings.xml deleted file mode 100644 index b7cf926a1..000000000 --- a/java/com/android/incallui/wifi/res/values-zh-rTW/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "啟用" - diff --git a/java/com/android/incallui/wifi/res/values-zu/strings.xml b/java/com/android/incallui/wifi/res/values-zu/strings.xml deleted file mode 100644 index 6c516e7f2..000000000 --- a/java/com/android/incallui/wifi/res/values-zu/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - "Vumela" - diff --git a/java/com/android/incallui/wifi/res/values/strings.xml b/java/com/android/incallui/wifi/res/values/strings.xml deleted file mode 100644 index 1b52b9fdc..000000000 --- a/java/com/android/incallui/wifi/res/values/strings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - Enable - - -- cgit v1.2.3