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

Commit a16d46b0 authored by Tommy Webb's avatar Tommy Webb Committed by Georg Veichtlbauer
Browse files

Dialer: Fix in-call RTT banner item colors 

In the real-time text (RTT) screen, fix the End Call button to be red
as intended, and use neutral colors for the text and overflow menu
so that these are all actually visible in the light theme.

Switch from app:tint to android:tint; the former was not doing anything,
which may be worthy of future exploration.

Test: Manual: Make a call and tap the RTT button. The End Call button
should be visible in the banner along the top, as should the overflow
button and the call time / number dialed. They should remain visible
regardless of Dark theme or lack of Dark theme.

Issue: calyxos#2766
Change-Id: Ie531db6a0b1d30ca90d5a7bf990bc45fc17647a5
parent 97631825

java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml

+4 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
        android:contentDescription="@string/incall_content_description_end_call"

        android:scaleType="fitXY"

        android:src="@drawable/quantum_ic_call_end_vd_theme_24"

        app:tint="@color/dialer_end_call_button_color" />

        android:tint="@color/dialer_end_call_button_color" />

    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"
@@ -53,7 +53,7 @@ 
          android:layout_gravity="center_horizontal"

          android:fontFamily="sans-serif-medium"

          android:includeFontPadding="false"

          android:textColor="#FFFFFF"

          android:textColor="@color/incall_banner_icon_color"

          android:textSize="20sp"

          tools:text="Bruce Graham"/>

      <Chronometer
@@ -63,7 +63,7 @@ 
          android:layout_gravity="center_horizontal"

          android:fontFamily="sans-serif-medium"

          android:includeFontPadding="false"

          android:textColor="#FFFFFF"

          android:textColor="@color/incall_banner_timer_color"

          android:textSize="14sp"

          tools:text="00:09"/>

    </LinearLayout>
@@ -77,7 +77,7 @@ 
        android:contentDescription="@string/content_description_overflow"

        android:scaleType="fitXY"

        android:src="@drawable/quantum_ic_more_vert_vd_theme_24"

        app:tint="?colorIconOnUnthemedDarkBackground" />

        android:tint="@color/incall_banner_icon_color" />



  </LinearLayout>

  <FrameLayout

java/com/android/incallui/theme/res/values-night/colors.xml

+7 −0
Original line number Diff line number Diff line
@@ -5,4 +5,11 @@ 
    <color name="incall_background_gradient_bottom">@color/dialer_theme_color_dark</color>

    <color name="incall_background_multiwindow">@color/dialer_theme_color_dark</color>

    <color name="incall_button_icon_color">@android:color/black</color>

    <!-- There is a nearby, more-convenient universe in which the following neutral colors are

         automatically adapted and do not need to be specified separately in this -night variant.

         If the RTT banner items become invisible again in the future, try changing these to

         _900 and _800 respectively, or just removing them.

         (That more-convenient behavior is already seen with searchbar_icon_color elsewhere.) -->

    <color name="incall_banner_icon_color">@android:color/system_neutral1_100</color>

    <color name="incall_banner_timer_color">@android:color/system_neutral1_200</color>

</resources>

java/com/android/incallui/theme/res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -64,4 +64,7 @@ 
  <color name="incall_background_multiwindow_spam">#E9C22E2E</color>



  <color name="incall_button_icon_color">@android:color/black</color>



  <color name="incall_banner_icon_color">@android:color/system_neutral1_900</color>

  <color name="incall_banner_timer_color">@android:color/system_neutral1_800</color>

</resources>