diff options
author | Bill Yi <byi@google.com> | 2014-04-29 15:30:09 -0700 |
---|---|---|
committer | Bill Yi <byi@google.com> | 2014-04-29 15:30:09 -0700 |
commit | f4748e79ccdc8c6f10a5903791cd253bc084a6ef (patch) | |
tree | 2dbb05e45f4a5eea661a6eeacb03f28c85efb5db /InCallUI/src/com/android/incallui/InCallActivity.java | |
parent | a3170fa2e80cd35d1677930d667d518d5d258c7a (diff) | |
parent | 7d4e2d70d7d9f2c53d61fb334079261c73133e01 (diff) |
Merge klp-dev-plus-aosp into stage-aosp-master
Change-Id: I9f294587991055d15c369b3c1c4e23663ce35b9a
Diffstat (limited to 'InCallUI/src/com/android/incallui/InCallActivity.java')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index aa4a715ad..d41cc99ae 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -21,6 +21,7 @@ import com.android.services.telephony.common.Call.State; import android.app.Activity; import android.app.AlertDialog; +import android.app.FragmentTransaction; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnCancelListener; @@ -309,6 +310,10 @@ public class InCallActivity extends Activity { InCallPresenter.getInstance().getProximitySensor().onConfigurationChanged(config); } + public CallButtonFragment getCallButtonFragment() { + return mCallButtonFragment; + } + private void internalResolveIntent(Intent intent) { final String action = intent.getAction(); @@ -366,7 +371,7 @@ public class InCallActivity extends Activity { if (mDialpadFragment == null) { mDialpadFragment = (DialpadFragment) getFragmentManager() .findFragmentById(R.id.dialpadFragment); - mDialpadFragment.getView().setVisibility(View.INVISIBLE); + getFragmentManager().beginTransaction().hide(mDialpadFragment).commit(); } if (mConferenceManagerFragment == null) { @@ -399,13 +404,15 @@ public class InCallActivity extends Activity { } public void displayDialpad(boolean showDialpad) { + final FragmentTransaction ft = getFragmentManager().beginTransaction(); if (showDialpad) { - mDialpadFragment.setVisible(true); - mCallCardFragment.setVisible(false); + ft.setCustomAnimations(R.anim.incall_dialpad_slide_in, 0); + ft.show(mDialpadFragment); } else { - mDialpadFragment.setVisible(false); - mCallCardFragment.setVisible(true); + ft.setCustomAnimations(0, R.anim.incall_dialpad_slide_out); + ft.hide(mDialpadFragment); } + ft.commitAllowingStateLoss(); InCallPresenter.getInstance().getProximitySensor().onDialpadVisible(showDialpad); } |