Merge "Set Active dream to not be clickable when active." into tm-dev (2f178cfd) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/dream/DreamAdapter.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -105,13 +105,6 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
		icon.setBounds(0, 0, iconSize, iconSize);
		mTitleView.setCompoundDrawablesRelative(icon, null, null, null);

		if (item.isActive()) {
		mLastSelectedPos = position;
		itemView.setSelected(true);
		} else {
		itemView.setSelected(false);
		}

		mCustomizeButton.setOnClickListener(v -> item.onCustomizeClicked());
		mCustomizeButton.setVisibility(
		item.allowCustomization() && mEnabled ? View.VISIBLE : View.GONE);
		@@ -125,6 +118,15 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
		notifyItemChanged(position);
		});

		if (item.isActive()) {
		mLastSelectedPos = position;
		itemView.setSelected(true);
		itemView.setClickable(false);
		} else {
		itemView.setSelected(false);
		itemView.setClickable(true);
		}

		setEnabledStateOnViews(itemView, mEnabled);
		}