Merge "Dialer: Check the state of writing system settings permission." into atel.lnx.2.0-dev
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index d1a19e6..9d2820d 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -330,6 +330,11 @@
mProximitySensor = proximitySensor;
addListener(mProximitySensor);
+ // dismiss any pending dialogues related to earlier call, which
+ // are no longer relevant now.
+ if (isActivityStarted()) {
+ mInCallActivity.dismissPendingDialogs();
+ }
addIncomingCallListener(mAnswerPresenter);
addInCallUiListener(mAnswerPresenter);
mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 48d49af..98d9dc6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1160,7 +1160,8 @@
<string name="call_data_info_description">Voice call usage time and data usage time</string>
<string name="alert_call_over_wifi">Calls will be made over Wi-Fi.</string>
<string name="alert_call_no_cellular_coverage">No cellular network available. Connect to available Wi-Fi to make calls.</string>
- <string name="alert_user_connect_to_wifi_for_call">Connect to Wi-Fi to make calls.</string>
+ <string name="alert_user_connect_to_wifi_for_call">Connect to Wi-Fi to make calls</string>
+ <string name="alert_user_connect_to_wifi_for_call_text">Tap here to view available networks</string>
<string name="missing_account_type">(No type)</string>
<string name="missing_account_name">(No name)</string>
</resources>
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 0e89101..78e4760 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -2033,6 +2033,7 @@
} else {
if(WifiCallUtils.shallShowWifiCallDialog(getActivity())) {
WifiCallUtils.showWifiCallDialog(getActivity());
+ WifiCallUtils.showWifiCallNotification(getActivity());
} else {
getView().performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
handleDialButtonPressed();
diff --git a/src/com/android/dialer/util/WifiCallUtils.java b/src/com/android/dialer/util/WifiCallUtils.java
index 0aa9a43..5e789ed 100644
--- a/src/com/android/dialer/util/WifiCallUtils.java
+++ b/src/com/android/dialer/util/WifiCallUtils.java
@@ -149,16 +149,13 @@
public static void showWifiCallDialog(final Context context) {
String promptMessage = context.getString(com.android.dialer.R.string
- .alert_call_no_cellular_coverage) +"\n"+ context.getString(com.android.dialer.R
- .string.alert_user_connect_to_wifi_for_call);
+ .alert_call_no_cellular_coverage);
AlertDialog.Builder diaBuilder = new AlertDialog.Builder(context);
diaBuilder.setMessage(promptMessage);
diaBuilder.setPositiveButton(com.android.internal.R.string.ok, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
- Intent intent = new Intent(Intent.ACTION_MAIN);
- intent.setClassName("com.qualcomm.qti.extsettings",
- "com.qualcomm.qti.extsettings.wificall.WifiCallingEnhancedSettings");
+ Intent intent = new Intent(android.provider.Settings.ACTION_WIFI_SETTINGS);
context.startActivity(intent);
}
});
@@ -211,16 +208,18 @@
builder.setAutoCancel(true);
builder.setSmallIcon(R.drawable.wifi_calling_on_notification);
builder.setContentTitle(
- context.getResources().getString(R.string.alert_user_connect_to_wifi_for_call));
+ context.getResources().getString(
+ R.string.alert_user_connect_to_wifi_for_call));
builder.setContentText(
- context.getResources().getString(R.string.alert_user_connect_to_wifi_for_call));
+ context.getResources().getString(
+ R.string.alert_user_connect_to_wifi_for_call_text));
notiManager.notify(NOTIFICATION_WIFI_CALL_ID, builder.build());
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
notiManager.cancel(NOTIFICATION_WIFI_CALL_ID);
}
- }, 2000);
+ }, 5000);
}
}
}