diff options
author | wangqi <wangqi@google.com> | 2017-10-26 11:27:19 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-10-26 15:31:05 -0700 |
commit | 8d662cae2c05b5e256e7bb826abf05fb9ace133d (patch) | |
tree | 47eefa3a9b9b172df2db32e2f1b6246bad885a57 /java/com/android/incallui/video/impl | |
parent | 9b99b22391a92fe20a74076bf5e47d36eb9b4ab4 (diff) |
Set incall button color to match sim color.
This change also add a handy adb command script run before UI integration test.
Bug: 67429956
Test: IncallActivityTest
PiperOrigin-RevId: 173565382
Change-Id: I9b8b957f00a0b7d11dbb7f40e8c9f1dbdb8c3928
Diffstat (limited to 'java/com/android/incallui/video/impl')
-rw-r--r-- | java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java | 3 | ||||
-rw-r--r-- | java/com/android/incallui/video/impl/VideoCallFragment.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java index 95bdd6b78..631cc1d68 100644 --- a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java +++ b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java @@ -22,6 +22,7 @@ import android.content.pm.PackageManager; import android.graphics.Point; import android.graphics.drawable.Animatable; import android.os.Bundle; +import android.support.annotation.ColorInt; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; @@ -804,7 +805,7 @@ public class SurfaceViewVideoCallFragment extends Fragment } @Override - public void updateInCallButtonUiColors() {} + public void updateInCallButtonUiColors(@ColorInt int color) {} @Override public Fragment getInCallButtonUiFragment() { diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java index a3614c09c..0793d1830 100644 --- a/java/com/android/incallui/video/impl/VideoCallFragment.java +++ b/java/com/android/incallui/video/impl/VideoCallFragment.java @@ -30,6 +30,7 @@ import android.renderscript.Allocation; import android.renderscript.Element; import android.renderscript.RenderScript; import android.renderscript.ScriptIntrinsicBlur; +import android.support.annotation.ColorInt; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; @@ -845,7 +846,7 @@ public class VideoCallFragment extends Fragment } @Override - public void updateInCallButtonUiColors() {} + public void updateInCallButtonUiColors(@ColorInt int color) {} @Override public Fragment getInCallButtonUiFragment() { |