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

Merge "Update dream settings logic to keep the customize button unselected." into tm-dev

Browse Source
This commit is contained in:
Lucas Silva
2022-05-02 14:19:22 +00:00
committed by Android (Google) Code Review
parent 8f463f5c88 e2ef52d6f1
commit dc44eb1feb
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,11 +105,6 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
icon.setBounds(0, 0, iconSize, iconSize); icon.setBounds(0, 0, iconSize, iconSize);
mTitleView.setCompoundDrawablesRelative(icon, null, null, null); mTitleView.setCompoundDrawablesRelative(icon, null, null, null);
mCustomizeButton.setOnClickListener(v -> item.onCustomizeClicked());
mCustomizeButton.setVisibility(
item.allowCustomization() && mEnabled ? View.VISIBLE : View.GONE);
mCustomizeButton.setSelected(false);
itemView.setOnClickListener(v -> { itemView.setOnClickListener(v -> {
item.onItemClicked(); item.onItemClicked();
if (mLastSelectedPos > -1 && mLastSelectedPos != position) { if (mLastSelectedPos > -1 && mLastSelectedPos != position) {
@@ -127,6 +122,13 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
itemView.setClickable(true); itemView.setClickable(true);
} }
mCustomizeButton.setOnClickListener(v -> item.onCustomizeClicked());
mCustomizeButton.setVisibility(
item.allowCustomization() && mEnabled ? View.VISIBLE : View.GONE);
// This must be called AFTER itemView.setSelected above, in order to keep the
// customize button in an unselected state.
mCustomizeButton.setSelected(false);
setEnabledStateOnViews(itemView, mEnabled); setEnabledStateOnViews(itemView, mEnabled);
} }