PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Disabled text color in dark theme"

Browse Source
This commit is contained in:
Raff Tsai
2019-07-18 11:02:02 +00:00
committed by Android (Google) Code Review
parent aae770eda5 f7e3095464
commit 738a233f0c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/RestrictedRadioButton.java
View File

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