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

Commit 2cbaddfa authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '4626-Q-Incall_icon_and_text_visibility_issue' into 'v1-q' 

4626-Q-Incall_icon_and_text_visibility_issue

See merge request e/os/android_packages_apps_Dialer!69
parents 25d795e2 981ec06b

java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public class AudioRouteSelectorDialogFragment extends BottomSheetDialogFragment 
      final int itemRoute,

      CallAudioState audioState,

      DialerImpression.Type impressionType) {

    int selectedColor = ThemeComponent.get(getContext()).theme().getColorPrimary();

    int selectedColor = ThemeComponent.get(getContext()).theme().getColorAccent();

    if ((audioState.getSupportedRouteMask() & itemRoute) == 0) {

      item.setVisibility(View.GONE);

    } else if (audioState.getRoute() == itemRoute) {

java/com/android/incallui/audioroute/res/layout/audioroute_selector.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="@lineageos.platform:color/color_default_background"

    android:orientation="vertical"

    tools:layout_gravity="bottom">

  <TextView

java/com/android/incallui/audioroute/res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <item name="android:textAppearance">

      @style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large

    </item>

    <item name="android:textColor">?android:attr/textColorSecondary</item>

    <item name="android:drawableTint">?android:attr/textColorSecondary</item>

    <item name="android:textColor">@lineageos.platform:color/color_default_secondary_text</item>

    <item name="android:drawableTint">@lineageos.platform:color/color_default_secondary_text</item>

  </style>

</resources>

java/com/android/incallui/incall/impl/CheckableLabeledButton.java

+0 −7
Original line number Diff line number Diff line
@@ -134,13 +134,6 @@ public class CheckableLabeledButton extends LinearLayout implements Checkable { 
    labelView.setAlpha(isEnabled() ? 1f : DISABLED_STATE_OPACITY);

  }



  public void setCheckedColor(@ColorInt int color) {

    iconView.setImageTintList(

        new ColorStateList(

            new int[][] {new int[] {android.R.attr.state_checked}, new int[] {}},

            new int[] {color, Color.WHITE}));

  }



  public Drawable getIconDrawable() {

    return iconView.getDrawable();

  }

java/com/android/incallui/incall/impl/InCallButtonGridFragment.java

+0 −6
Original line number Diff line number Diff line
@@ -128,12 +128,6 @@ public class InCallButtonGridFragment extends Fragment { 
    return numVisibleButtons;

  }



  public void updateButtonColor(@ColorInt int color) {

    for (CheckableLabeledButton button : buttons) {

      button.setCheckedColor(color);

    }

  }



  /** Interface to let the listener know the status of the button grid. */

  public interface OnButtonGridCreatedListener {

    void onButtonGridCreated(InCallButtonGridFragment inCallButtonGridFragment);