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

Merge "Set Active dream to not be clickable when active." into tm-dev am: 2f178cfdf3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17760486

Change-Id: I7627384562f1382494f857c8baee444ba9e3539b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-14 20:08:17 +00:00
committed by Automerger Merge Worker
parent a0e140b728 2f178cfdf3
commit 89fdd90031
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,13 +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);
if (item.isActive()) {
mLastSelectedPos = position;
itemView.setSelected(true);
} else {
itemView.setSelected(false);
}
mCustomizeButton.setOnClickListener(v -> item.onCustomizeClicked()); mCustomizeButton.setOnClickListener(v -> item.onCustomizeClicked());
mCustomizeButton.setVisibility( mCustomizeButton.setVisibility(
item.allowCustomization() && mEnabled ? View.VISIBLE : View.GONE); item.allowCustomization() && mEnabled ? View.VISIBLE : View.GONE);
@@ -125,6 +118,15 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
notifyItemChanged(position); notifyItemChanged(position);
}); });
if (item.isActive()) {
mLastSelectedPos = position;
itemView.setSelected(true);
itemView.setClickable(false);
} else {
itemView.setSelected(false);
itemView.setClickable(true);
}
setEnabledStateOnViews(itemView, mEnabled); setEnabledStateOnViews(itemView, mEnabled);
} }