From f7e309546421cf760d2106faac7df23472bf1b60 Mon Sep 17 00:00:00 2001
From: Raff Tsai <rafftsai@google.com>
Date: Thu, 18 Jul 2019 01:03:43 +0800
Subject: [PATCH] Fix Disabled text color in dark theme

Fixes: 137639665
Test: manual
Change-Id: Ie3786c446ea0b9ca484069db65dcefda45ac28c8
---
 src/com/android/settings/RestrictedRadioButton.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/RestrictedRadioButton.java b/src/com/android/settings/RestrictedRadioButton.java
index 20c28723e42..24a1b784448 100644
--- a/src/com/android/settings/RestrictedRadioButton.java
+++ b/src/com/android/settings/RestrictedRadioButton.java
@@ -19,13 +19,13 @@ package com.android.settings;
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.util.AttributeSet;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.utils.ColorUtil;
 
 public class RestrictedRadioButton extends RadioButton {
     private Context mContext;
@@ -67,10 +67,10 @@ public class RestrictedRadioButton extends RadioButton {
             RestrictedLockUtilsInternal.setTextViewAsDisabledByAdmin(mContext,
                     (TextView) this, mDisabledByAdmin);
             if (mDisabledByAdmin) {
-                getButtonDrawable().setColorFilter(mContext.getColor(R.color.disabled_text_color),
-                        PorterDuff.Mode.MULTIPLY);
+                getButtonDrawable().setAlpha(
+                        (int) (255 * ColorUtil.getDisabledAlpha(mContext)));
             } else {
-                getButtonDrawable().clearColorFilter();
+                getButtonDrawable().setAlpha(0);
             }
         }
     }