summaryrefslogtreecommitdiff
path: root/InCallUI/src/com/android/incallui/InCallActivity.java
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-05-15 09:35:23 -0700
committerYorke Lee <yorkelee@google.com>2014-05-15 14:41:06 -0700
commit8ef5cf3987ab9f7988d0ce7b033270095e05481d (patch)
tree62c1473a39bb8e7c3e62fdfb7226322b602ceeb0 /InCallUI/src/com/android/incallui/InCallActivity.java
parentcb2f51bf1acf387f391ca9c8cae8a2344eb2936a (diff)
First pass at Dialer to InCall transition
* Modify InCallActivity to perform an animation only on a new outgoing call * Add an animated scrim to call_card.xml that serves as the backdrop of the full screen animated reveal * Add resize animation * Add circular reveal animation Bug: 14820894 Change-Id: Iaa7e87e8a96dcd269e444a40eadac9d912625c01
Diffstat (limited to 'InCallUI/src/com/android/incallui/InCallActivity.java')
-rw-r--r--InCallUI/src/com/android/incallui/InCallActivity.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 5262045f2..7769a0b7b 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -41,6 +41,7 @@ import com.android.incallui.Call.State;
public class InCallActivity extends Activity {
public static final String SHOW_DIALPAD_EXTRA = "InCallActivity.show_dialpad";
+ public static final String NEW_OUTGOING_CALL = "InCallActivity.new_outgoing_call";
private static final int INVALID_RES_ID = -1;
@@ -83,6 +84,8 @@ public class InCallActivity extends Activity {
setContentView(R.layout.incall_screen);
initializeInCall();
+
+ internalResolveIntent(getIntent());
Log.d(this, "onCreate(): exit");
}
@@ -342,6 +345,10 @@ public class InCallActivity extends Activity {
relaunchedFromDialer(showDialpad);
}
+ if (intent.getBooleanExtra(NEW_OUTGOING_CALL, false)) {
+ mCallCardFragment.animateForNewOutgoingCall();
+ }
+
return;
}
}