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

Fix bug where not all views are getting disabled alpha applied.

Browse Source 
This ensures that we apply the alpha recursively to all views when the
item is disabled/enabled.

Bug: 226573932
Test: locally on device
Change-Id: I28ee1a21227706d01a6e4f6284871bf78af983f5
This commit is contained in:
Lucas Silva
2022-04-04 16:20:53 -04:00
parent d191a16c54
commit f7a95e4b5d
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/color/dream_card_color_state_list.xml
View File

@@ -17,8 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android" <selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_enabled="false" android:color="?androidprv:attr/colorSurface"
android:alpha="?android:attr/disabledAlpha"/>
<item android:state_selected="true" android:color="?androidprv:attr/colorAccentPrimary"/> <item android:state_selected="true" android:color="?androidprv:attr/colorAccentPrimary"/>
<item android:color="?androidprv:attr/colorSurface"/> <item android:color="?androidprv:attr/colorSurface"/>
</selector> </selector>

2
res/color/dream_card_text_color_state_list.xml
View File

@@ -17,8 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android" <selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"> xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_enabled="false" android:color="?android:attr/textColorPrimary"
android:alpha="?android:attr/disabledAlpha"/>
<item android:state_selected="true" android:color="?androidprv:attr/textColorOnAccent"/> <item android:state_selected="true" android:color="?androidprv:attr/textColorOnAccent"/>
<item android:color="?android:attr/textColorPrimary"/> <item android:color="?android:attr/textColorPrimary"/>
</selector> </selector>

13
src/com/android/settings/dream/DreamAdapter.java
View File

@@ -50,14 +50,13 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
* View holder for each {@link IDreamItem}. * View holder for each {@link IDreamItem}.
*/ */
private class DreamViewHolder extends RecyclerView.ViewHolder { private class DreamViewHolder extends RecyclerView.ViewHolder {
private static final int VALUE_ENABLED_ALPHA = 255;
private final TextView mTitleView; private final TextView mTitleView;
private final TextView mSummaryView; private final TextView mSummaryView;
private final ImageView mPreviewView; private final ImageView mPreviewView;
private final ImageView mPreviewPlaceholderView; private final ImageView mPreviewPlaceholderView;
private final Button mCustomizeButton; private final Button mCustomizeButton;
private final Context mContext; private final Context mContext;
private final int mDisabledAlphaValue; private final float mDisabledAlphaValue;
DreamViewHolder(View view, Context context) { DreamViewHolder(View view, Context context) {
super(view); super(view);
@@ -67,7 +66,7 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
mTitleView = view.findViewById(R.id.title_text); mTitleView = view.findViewById(R.id.title_text);
mSummaryView = view.findViewById(R.id.summary_text); mSummaryView = view.findViewById(R.id.summary_text);
mCustomizeButton = view.findViewById(R.id.customize_button); mCustomizeButton = view.findViewById(R.id.customize_button);
mDisabledAlphaValue = (int) (ColorUtil.getDisabledAlpha(context) * VALUE_ENABLED_ALPHA); mDisabledAlphaValue = ColorUtil.getDisabledAlpha(context);
} }
/** /**
@@ -93,7 +92,6 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
mPreviewView.setImageDrawable(null); mPreviewView.setImageDrawable(null);
mPreviewPlaceholderView.setVisibility(View.VISIBLE); mPreviewPlaceholderView.setVisibility(View.VISIBLE);
} }
mPreviewView.setImageAlpha(getAlpha());
final Drawable icon = item.isActive() final Drawable icon = item.isActive()
? mContext.getDrawable(R.drawable.ic_dream_check_circle) ? mContext.getDrawable(R.drawable.ic_dream_check_circle)
@@ -105,7 +103,6 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
final int iconSize = mContext.getResources().getDimensionPixelSize( final int iconSize = mContext.getResources().getDimensionPixelSize(
R.dimen.dream_item_icon_size); R.dimen.dream_item_icon_size);
icon.setBounds(0, 0, iconSize, iconSize); icon.setBounds(0, 0, iconSize, iconSize);
icon.setAlpha(getAlpha());
mTitleView.setCompoundDrawablesRelative(icon, null, null, null); mTitleView.setCompoundDrawablesRelative(icon, null, null, null);
if (item.isActive()) { if (item.isActive()) {
@@ -130,10 +127,6 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
setEnabledStateOnViews(itemView, mEnabled); setEnabledStateOnViews(itemView, mEnabled);
} }
private int getAlpha() {
return mEnabled ? VALUE_ENABLED_ALPHA : mDisabledAlphaValue;
}
/** /**
* Makes sure the view (and any children) get the enabled state changed. * Makes sure the view (and any children) get the enabled state changed.
*/ */
@@ -145,6 +138,8 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
for (int i = vg.getChildCount() - 1; i >= 0; i--) { for (int i = vg.getChildCount() - 1; i >= 0; i--) {
setEnabledStateOnViews(vg.getChildAt(i), enabled); setEnabledStateOnViews(vg.getChildAt(i), enabled);
} }
} else {
v.setAlpha(enabled ? 1 : mDisabledAlphaValue);
} }
} }
} }