Merge "RCS: Support for Enrich Call"
diff --git a/InCallUI/src/com/android/incallui/InCallLowBatteryListener.java b/InCallUI/src/com/android/incallui/InCallLowBatteryListener.java
index bdc46e1..c413b07 100644
--- a/InCallUI/src/com/android/incallui/InCallLowBatteryListener.java
+++ b/InCallUI/src/com/android/incallui/InCallLowBatteryListener.java
@@ -30,6 +30,7 @@
package com.android.incallui;
import android.app.AlertDialog;
+import android.graphics.Color;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
@@ -401,7 +402,7 @@
});
if (VideoUtils.isIncomingVideoCall(call)) {
- alertDialog.setNegativeButton(R.string.low_battery_convert, new OnClickListener() {
+ alertDialog.setPositiveButton(R.string.low_battery_convert, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Log.d(this, "displayLowBatteryAlert answer as Voice Call");
@@ -411,7 +412,7 @@
});
alertDialog.setMessage(R.string.low_battery_msg);
- alertDialog.setPositiveButton(R.string.low_battery_yes, new OnClickListener() {
+ alertDialog.setNegativeButton(R.string.low_battery_yes, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Log.d(this, "displayLowBatteryAlert answer as Video Call");
@@ -420,7 +421,7 @@
}
});
} else if (VideoUtils.isOutgoingVideoCall(call)) {
- alertDialog.setNegativeButton(R.string.low_battery_convert, new OnClickListener() {
+ alertDialog.setPositiveButton(R.string.low_battery_convert, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Log.d(this, "displayLowBatteryAlert place Voice Call");
@@ -437,7 +438,7 @@
});
alertDialog.setMessage(R.string.low_battery_msg);
- alertDialog.setPositiveButton(R.string.low_battery_yes, new OnClickListener() {
+ alertDialog.setNegativeButton(R.string.low_battery_yes, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Log.d(this, "displayLowBatteryAlert place Video Call");
@@ -453,8 +454,8 @@
if (QtiCallUtils.hasVoiceCapabilities(call)) {
//active video call can be downgraded to voice
alertDialog.setMessage(R.string.low_battery_msg);
- alertDialog.setPositiveButton(R.string.low_battery_yes, null);
- alertDialog.setNegativeButton(R.string.low_battery_convert, new OnClickListener() {
+ alertDialog.setNegativeButton(R.string.low_battery_yes, null);
+ alertDialog.setPositiveButton(R.string.low_battery_convert, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Log.d(this, "displayLowBatteryAlert downgrading to voice call");
@@ -465,8 +466,8 @@
/* video call doesn't have downgrade capabilities, so alert the user
with a hangup dialog*/
alertDialog.setMessage(R.string.low_battery_hangup_msg);
- alertDialog.setNegativeButton(R.string.low_battery_no, null);
- alertDialog.setPositiveButton(R.string.low_battery_yes, new OnClickListener() {
+ alertDialog.setPositiveButton(R.string.low_battery_no, null);
+ alertDialog.setNegativeButton(R.string.low_battery_yes, new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Log.d(this, "displayLowBatteryAlert hanging up the call: " + call);
@@ -495,6 +496,11 @@
mAlert.setCanceledOnTouchOutside(false);
mAlert.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
mAlert.show();
+ /*
+ * By default both the buttons will have same color. In case we want to have different color
+ * we need to set specifically.
+ */
+ mAlert.getButton(DialogInterface.BUTTON_NEGATIVE).setTextColor(Color.BLACK);
}
/*
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index 96551a4..ae24b8d 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -444,7 +444,10 @@
if (!menuVisible) {
updateOnTransition();
} else if (isResumed()) {
- refreshData();
+ if (mRefreshDataRequired) {
+ refreshData();
+ mAdapter.onResume();
+ }
}
}
}
diff --git a/src/com/android/dialer/calllog/MSimCallLogFragment.java b/src/com/android/dialer/calllog/MSimCallLogFragment.java
index 1eefe53..436145d 100644
--- a/src/com/android/dialer/calllog/MSimCallLogFragment.java
+++ b/src/com/android/dialer/calllog/MSimCallLogFragment.java
@@ -489,7 +489,10 @@
if (!menuVisible) {
updateOnTransition(false /* onEntry */);
} else if (isResumed()) {
- refreshData();
+ if (mRefreshDataRequired) {
+ refreshData();
+ mAdapter.onResume();
+ }
}
}
}
diff --git a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
index f82dbf8..1c18206 100644
--- a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
+++ b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
@@ -476,7 +476,7 @@
for (int i = 0; i < indexs.length; i = i + 2) {
int start = indexs[i];
int end = indexs[i + 1];
- if (start >= 0 && end >= 0) {
+ if (start >= 0 && end >= 0 && start < builder.length() - 1 && end < builder.length()) {
matchList.add(new SmartDialMatchPosition(start, end + 1));
} else {
Log.d(TAG, "Invalid index, start is:" + start + " end is:"