4566-R-InCall_button_icons_color_mismatch_issue (e0f035bb) · Commits · e / os / android_packages_apps_Dialer

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();
		}

+0 −5

Original line number	Diff line number	Diff line
		@@ -128,11 +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 {

+1 −3

Original line number	Diff line number	Diff line
		@@ -533,9 +533,7 @@ public class InCallFragment extends Fragment
		}

		@Override
		public void updateInCallButtonUiColors(@ColorInt int color) {
		inCallButtonGridFragment.updateButtonColor(color);
		}
		public void updateInCallButtonUiColors(@ColorInt int color) { }

		@Override
		public Fragment getInCallButtonUiFragment() {

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,6 @@
		-->

		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:color="?android:attr/colorPrimaryDark" android:state_checked="true"/>
		<item android:color="?android:attr/textColorPrimary"/>
		<item android:color="@lineageos.platform:color/color_default_accent" android:state_checked="true"/>
		<item android:color="@android:color/white"/>
		</selector>

+14 −4

Original line number	Diff line number	Diff line
		@@ -37,9 +37,19 @@
		<!-- This adds a little down arrow to indicate that the button will pop up a menu. Use an explicit
		<bitmap> to avoid scaling the icon up to the full size of the button. -->
		<item>
		<selector>
		<item android:state_checked="true">
		<bitmap
		android:gravity="end"
		android:tint="?colorIcon"
		android:src="@drawable/quantum_ic_arrow_drop_down_white_18"/>
		</item>
		<item>
		<bitmap
		android:gravity="end"
		android:tint="@android:color/white"
		android:src="@drawable/quantum_ic_arrow_drop_down_white_18"/>
		</item>
		</selector>
		</item>
		</layer-list>