diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/modal/BraveWalletPanel.java b/android/java/org/chromium/chrome/browser/crypto_wallet/modal/BraveWalletPanel.java index c895fa7be74..fe9da68b15b 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/modal/BraveWalletPanel.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/modal/BraveWalletPanel.java @@ -132,7 +132,6 @@ public class BraveWalletPanel implements DialogInterface { activity.openBraveConnectedSitesSettings(); dismiss(); } - dismiss(); } else if (item.getItemId() == R.id.action_settings) { BraveActivity activity = BraveActivity.getBraveActivity(); if (activity != null) { diff --git a/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesListAdapter.java b/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesListAdapter.java index 234c7c206a9..e22c15ed22f 100644 --- a/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesListAdapter.java +++ b/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesListAdapter.java @@ -38,8 +38,7 @@ public class BraveWalletEthereumConnectedSitesListAdapter } @Override - public @NonNull BraveWalletEthereumConnectedSitesListAdapter.ViewHolder onCreateViewHolder( - ViewGroup parent, int viewType) { + public @NonNull ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { mContext = parent.getContext(); LayoutInflater inflater = LayoutInflater.from(mContext); View view = @@ -49,8 +48,7 @@ public class BraveWalletEthereumConnectedSitesListAdapter } @Override - public void onBindViewHolder( - @NonNull BraveWalletEthereumConnectedSitesListAdapter.ViewHolder holder, int position) { + public void onBindViewHolder(@NonNull ViewHolder holder, int position) { holder.webSite.setText(mWebSites[position]); holder.iconTrash.setOnClickListener(v -> { if (mDelegate != null) { @@ -70,8 +68,8 @@ public class BraveWalletEthereumConnectedSitesListAdapter public ViewHolder(View itemView) { super(itemView); - this.webSite = itemView.findViewById(R.id.web_site); - this.iconTrash = itemView.findViewById(R.id.icon_trash); + webSite = itemView.findViewById(R.id.web_site); + iconTrash = itemView.findViewById(R.id.icon_trash); } } } diff --git a/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesPreference.java b/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesPreference.java index db1477d8b0e..a89d31d5dfd 100644 --- a/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesPreference.java +++ b/android/java/org/chromium/chrome/browser/site_settings/BraveWalletEthereumConnectedSitesPreference.java @@ -12,7 +12,6 @@ import android.widget.TextView; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import org.chromium.brave_wallet.mojom.BraveWalletService; @@ -41,8 +40,6 @@ public class BraveWalletEthereumConnectedSitesPreference initBraveWalletService(); mRecyclerView = (RecyclerView) holder.findViewById(R.id.connected_sites_list); - LinearLayoutManager layoutMangager = new LinearLayoutManager(getContext()); - mRecyclerView.setLayoutManager(layoutMangager); updateWebSitestList(); } diff --git a/android/java/res/layout/brave_wallet_connected_sites_preference_layout.xml b/android/java/res/layout/brave_wallet_connected_sites_preference_layout.xml index aa6d69245de..cd6e932fb9c 100644 --- a/android/java/res/layout/brave_wallet_connected_sites_preference_layout.xml +++ b/android/java/res/layout/brave_wallet_connected_sites_preference_layout.xml @@ -18,7 +18,8 @@ android:paddingTop="15dp" android:paddingBottom="25dp" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/android/java/res/xml/brave_ethereum_preferences.xml b/android/java/res/xml/brave_ethereum_preferences.xml index ece4a1e799f..e14386f588b 100644 --- a/android/java/res/xml/brave_ethereum_preferences.xml +++ b/android/java/res/xml/brave_ethereum_preferences.xml @@ -1,5 +1,5 @@ -