Merge changes I0cad28e7,Ibecda05f
* changes:
Fix secondary color on incall screen.
Fix NPE issue when tapping speaker button on VT call ended screen
diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml
index e6d6b07..5b65cc3 100644
--- a/java/com/android/incallui/theme/res/values/styles.xml
+++ b/java/com/android/incallui/theme/res/values/styles.xml
@@ -35,6 +35,7 @@
<style name="Theme.InCallScreen" parent="@style/Dialer.Dark.ThemeBase.NoActionBar">
<item name="android:textColorPrimary">@android:color/white</item>
+ <item name="android:textColorSecondary">#DDFFFFFF</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
diff --git a/java/com/android/incallui/video/impl/SpeakerButtonController.java b/java/com/android/incallui/video/impl/SpeakerButtonController.java
index e17cf7b..4ae746b 100644
--- a/java/com/android/incallui/video/impl/SpeakerButtonController.java
+++ b/java/com/android/incallui/video/impl/SpeakerButtonController.java
@@ -43,7 +43,7 @@
private boolean isEnabled;
private CharSequence contentDescription;
- public SpeakerButtonController(
+ SpeakerButtonController(
@NonNull CheckableImageButton button,
@NonNull InCallButtonUiDelegate inCallButtonUiDelegate,
@NonNull VideoCallScreenDelegate videoCallScreenDelegate) {
@@ -54,9 +54,10 @@
public void setEnabled(boolean isEnabled) {
this.isEnabled = isEnabled;
+ updateButtonState();
}
- public void updateButtonState() {
+ void updateButtonState() {
button.setVisibility(View.VISIBLE);
button.setEnabled(isEnabled);
button.setChecked(isChecked);