commit 3072b0c6b25cf19b7bde38d633788172212d5e34
author Brandon Maxwell <maxwelb@google.com> Fri Feb 19 03:05:31 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 19 03:05:31 2016 +0000
tree 690adba2922b1043769ac2ac837034a40e96d59e
parent 73fb5b37a7b49995f7a5ce7e99d637ac9c042c0e
parent 7566cd716e33ee61047e431974c6d4a1ef8aa385

Merge "Checking for READ_CONTACTS permission" into nyc-dev

InCallUI/src/com/android/incallui/InCallActivity.java

diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index dff2747..73155a4 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -780,9 +780,11 @@
                 showFragment(TAG_DIALPAD_FRAGMENT, true, true);
                 mDialpadFragment.animateShowDialpad();
             }
-            mCallCardFragment.onDialpadVisibilityChange(show);
             mDialpadFragment.getView().startAnimation(show ? mSlideIn : mSlideOut);
         }
+        // Note:  onDialpadVisibilityChange is called here to ensure that the dialpad FAB
+        // repositions itself.
+        mCallCardFragment.onDialpadVisibilityChange(show);
 
         final ProximitySensor sensor = InCallPresenter.getInstance().getProximitySensor();
         if (sensor != null) {

InCallUI/src/com/android/incallui/VideoCallFragment.java

diff --git a/InCallUI/src/com/android/incallui/VideoCallFragment.java b/InCallUI/src/com/android/incallui/VideoCallFragment.java
index 2c06303..f80b04c 100644
--- a/InCallUI/src/com/android/incallui/VideoCallFragment.java
+++ b/InCallUI/src/com/android/incallui/VideoCallFragment.java
@@ -371,9 +371,10 @@
             mWidth = width;
             mHeight = height;
 
-            if (mSavedSurfaceTexture != null) {
+            if (width != DIMENSIONS_NOT_SET && height != DIMENSIONS_NOT_SET
+                    && mSavedSurfaceTexture != null) {
                 Log.d(this, "setSurfaceDimensions, mSavedSurfaceTexture is NOT equal to null.");
-                createSurface(width, height);
+                mSavedSurfaceTexture.setDefaultBufferSize(width, height);
             }
         }