Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 564c41f3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I0cad28e7,Ibecda05f

* changes:
  Fix secondary color on incall screen.
  Fix NPE issue when tapping speaker button on VT call ended screen
parents 5ab679c5 ff1a4960
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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>
+3 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class SpeakerButtonController implements OnCheckedChangeListener, OnClick
  private boolean isEnabled;
  private CharSequence contentDescription;

  public SpeakerButtonController(
  SpeakerButtonController(
      @NonNull CheckableImageButton button,
      @NonNull InCallButtonUiDelegate inCallButtonUiDelegate,
      @NonNull VideoCallScreenDelegate videoCallScreenDelegate) {
@@ -54,9 +54,10 @@ public class SpeakerButtonController implements OnCheckedChangeListener, OnClick

  public void setEnabled(boolean isEnabled) {
    this.isEnabled = isEnabled;
    updateButtonState();
  }

  public void updateButtonState() {
  void updateButtonState() {
    button.setVisibility(View.VISIBLE);
    button.setEnabled(isEnabled);
    button.setChecked(isChecked);