From d538e0b42004524abe36ac17606d3915a14f5dae Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Fri, 30 Jun 2017 15:26:17 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/160679286. Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/159771812 (6/22/2017) to 160679286 (6/30/2017). These changes track the dialer V11 release. This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Change-Id: I7e7b41ce472b85a9d5a6728d5c8b3c045c09e095 Merged-In: Ie2eb735a92c577b5ae5a5e8b7efa2d699fc964bc --- .../incallui/wifi/EnableWifiCallingPrompt.java | 82 ---------------------- 1 file changed, 82 deletions(-) delete mode 100644 java/com/android/incallui/wifi/EnableWifiCallingPrompt.java (limited to 'java/com/android/incallui/wifi/EnableWifiCallingPrompt.java') 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() {} -} -- cgit v1.2.3