Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a83cbde authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I8d698fa9b66d38751155cc03d5cbfc6b9a5165e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents edfab288 2f178cfd

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);

        }