summaryrefslogtreecommitdiff
path: root/InCallUI/src/com/android/incallui/InCallActivity.java
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-02-19 18:03:00 -0800
committerYorke Lee <yorkelee@google.com>2015-03-04 15:59:10 -0800
commit6596e1be9d3e15e2cbe4a5e9c3824ee47a0e2744 (patch)
tree6c0d966c46d74faa69dc237455218e10c00436e6 /InCallUI/src/com/android/incallui/InCallActivity.java
parentc4bb1c74483332ecdb11f1c50eee3433001b5cd8 (diff)
Remove CircularRevealActivity
Replace CircularRevealActivity with a fragment that is tied to the lifecycle of InCallActivity so that InCallActivity is the only activity that is involved in the outgoing call process. Simplify some of the intent creation logic that is used to launch InCallActivity since we no longer need some of the flags that were currently provided via various method overloads in InCallPresenter.getAnimationIntent and getInCallIntent. To further simplify this CL, a very rudimentary approach is taken to track the state where we are starting up the UI but haven't received a call from Telecom yet. This is done by a boolean flag set on the InCallPresenter: mBoundAndWaitingForOutgoingCall. Further changes will build upon and improve this. Also set most elements inside primary_call_info.xml to visibility: GONE by default to fix some animation jank where a empty but not GONE view would continue to take up space. Change-Id: Ic70857685680af6868d4b2153d942d73eef3ca56
Diffstat (limited to 'InCallUI/src/com/android/incallui/InCallActivity.java')
-rw-r--r--InCallUI/src/com/android/incallui/InCallActivity.java10
1 files changed, 3 insertions, 7 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 32bee93a7..f692627a1 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -66,7 +66,6 @@ public class InCallActivity extends Activity {
public static final String SHOW_DIALPAD_EXTRA = "InCallActivity.show_dialpad";
public static final String DIALPAD_TEXT_EXTRA = "InCallActivity.dialpad_text";
public static final String NEW_OUTGOING_CALL_EXTRA = "InCallActivity.new_outgoing_call";
- public static final String SHOW_CIRCULAR_REVEAL_EXTRA = "InCallActivity.show_circular_reveal";
private CallButtonFragment mCallButtonFragment;
private CallCardFragment mCallCardFragment;
@@ -489,12 +488,9 @@ public class InCallActivity extends Activity {
}
}
- // This is only true in the case where an outgoing call is initiated by tapping
- // on the "Select account dialog", in which case we skip the initial animation. In
- // most other cases the circular reveal is done by OutgoingCallAnimationActivity.
- final boolean showCircularReveal =
- intent.getBooleanExtra(SHOW_CIRCULAR_REVEAL_EXTRA, false);
- mCallCardFragment.animateForNewOutgoingCall(touchPoint, showCircularReveal);
+ // Start animation for new outgoing call
+ CircularRevealFragment.startCircularReveal(getFragmentManager(), touchPoint,
+ InCallPresenter.getInstance());
// InCallActivity is responsible for disconnecting a new outgoing call if there
// is no way of making it (i.e. no valid call capable accounts)