merge in klp-release history after reset to klp-dev
diff --git a/InCallUI/src/com/android/incallui/CallList.java b/InCallUI/src/com/android/incallui/CallList.java
index 1b7e10d..8249fd4 100644
--- a/InCallUI/src/com/android/incallui/CallList.java
+++ b/InCallUI/src/com/android/incallui/CallList.java
@@ -262,7 +262,7 @@
/**
* Returns the [position]th call found in the call map with the specified state.
- * TODO(klp): Improve this logic to sort by call time.
+ * TODO: Improve this logic to sort by call time.
*/
public Call getCallWithState(int state, int positionToFind) {
Call retval = null;
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index f4ddf62..15e48c5 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -180,6 +180,9 @@
if (mDialpadFragment.isVisible()) {
mCallButtonFragment.displayDialpad(false); // do the "closing" animation
return;
+ } else if (mConferenceManagerFragment.isVisible()) {
+ mConferenceManagerFragment.setVisible(false);
+ return;
}
// Nothing special to do. Fall back to the default behavior.
diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index bfff83f..8c52aab 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -35,7 +35,7 @@
* are disconnected.
* Creates and manages the in-call state and provides a listener pattern for the presenters
* that want to listen in on the in-call state changes.
- * TODO(klp): This class has become more of a state machine at this point. Consider renaming.
+ * TODO: This class has become more of a state machine at this point. Consider renaming.
*/
public class InCallPresenter implements CallList.Listener {
@@ -60,7 +60,7 @@
* in-call session (e.g., StatusBarNotifier). This gets reset when the session ends in the
* tear-down method.
*/
- private boolean mActivityPreviouslyStarted = false;
+ private boolean mIsActivityPreviouslyStarted = false;
public static synchronized InCallPresenter getInstance() {
if (sInCallPresenter == null) {
@@ -295,7 +295,7 @@
}
public boolean isActivityPreviouslyStarted() {
- return mActivityPreviouslyStarted;
+ return mIsActivityPreviouslyStarted;
}
/**
@@ -313,7 +313,7 @@
}
if (showing) {
- mActivityPreviouslyStarted = true;
+ mIsActivityPreviouslyStarted = true;
}
}
@@ -322,11 +322,10 @@
*/
public void bringToForeground(boolean showDialpad) {
// Before we bring the incall UI to the foreground, we check to see if:
- // 1. there is an activity
- // 2. the activity is not already in the foreground
+ // 1. We've already started the activity once for this session
+ // 2. If it exists, the activity is not already in the foreground
// 3. We are in a state where we want to show the incall ui
- if (isActivityStarted() &&
- !isShowingInCallUi() &&
+ if (mIsActivityPreviouslyStarted && !isShowingInCallUi() &&
mInCallState != InCallState.NO_CALLS) {
showInCall(showDialpad);
}
@@ -343,7 +342,7 @@
private InCallState startOrFinishUi(InCallState newState) {
Log.d(this, "startOrFinishUi: " + mInCallState + " -> " + newState);
- // TODO(klp): Consider a proper state machine implementation
+ // TODO: Consider a proper state machine implementation
// If the state isn't changing, we have already done any starting/stopping of
// activities in a previous pass...so lets cut out early
@@ -427,7 +426,7 @@
Log.i(this, "attemptCleanup? " + shouldCleanup);
if (shouldCleanup) {
- mActivityPreviouslyStarted = false;
+ mIsActivityPreviouslyStarted = false;
// blow away stale contact info so that we get fresh data on
// the next set of calls
@@ -514,7 +513,7 @@
* Interface implemented by classes that need to know about the InCall State.
*/
public interface InCallStateListener {
- // TODO(klp): Enhance state to contain the call objects instead of passing CallList
+ // TODO: Enhance state to contain the call objects instead of passing CallList
public void onStateChange(InCallState state, CallList callList);
}