[Android] Brave news - fixes menu settings

[Android] Brave news - load content button not shown on non-NTP

[Android] Brave news - fixes optin card positioning

lint fixes

android/java/org/chromium/chrome/browser/app/BraveActivity.java

@@ -114,8 +114,10 @@ import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImp
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.rate.RateDialogFragment;
 import org.chromium.chrome.browser.rate.RateUtils;
+import org.chromium.chrome.browser.settings.BraveNewsPreferences;
 import org.chromium.chrome.browser.settings.BraveRewardsPreferences;
 import org.chromium.chrome.browser.settings.BraveSearchEngineUtils;
+import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
 import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
 import org.chromium.chrome.browser.tab.Tab;
@@ -137,6 +139,7 @@ import org.chromium.chrome.browser.vpn.BraveVpnUtils;
 import org.chromium.chrome.browser.vpn.InAppPurchaseWrapper;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;
+import org.chromium.components.browser_ui.settings.SettingsLauncher;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.components.embedder_support.util.UrlUtilities;
 import org.chromium.components.search_engines.TemplateUrl;
@@ -256,6 +259,8 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
             openNewOrSelectExistingTab(REWARDS_SETTINGS_URL);
         } else if (id == R.id.brave_wallet_id) {
             openBraveWallet();
+        } else if (id == R.id.brave_news_id) {
+            openBraveNewsSettings();
         } else if (id == R.id.request_brave_vpn_id || id == R.id.request_brave_vpn_check_id) {
             if (BraveVpnProfileUtils.getInstance().isVPNConnected(BraveActivity.this)) {
                 BraveVpnUtils.showProgressDialog(
@@ -719,6 +724,11 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
         }
     }
 
+    private void openBraveNewsSettings() {
+        SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
+        settingsLauncher.launchSettingsActivity(this, BraveNewsPreferences.class);
+    }
+
     private void openBraveWallet() {
         Intent braveWalletIntent = new Intent(this, BraveWalletActivity.class);
         braveWalletIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);

android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java

@@ -558,6 +558,10 @@ public class BraveNewTabPageLayout extends NewTabPageLayout implements Connectio
                 }
             }
 
+            if (mNewContentButton != null) {
+                mNewContentButton.setVisibility(View.INVISIBLE);
+            }
+
             if (mBraveNewsController != null) {
                 mBraveNewsController.close();
             }

android/java/org/chromium/chrome/browser/ntp_background_images/util/NTPUtil.java

@@ -94,10 +94,7 @@ public class NTPUtil {
         boolean isCompensate = false;
 
         if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_NEWS)) {
-            if (BravePrefServiceBridge.getInstance().getNewsOptIn()
-                    && BravePrefServiceBridge.getInstance().getShowNews()) {
-                isCompensate = true;
-            }
+            isCompensate = true;
         }
 
         if (BraveActivity.getBraveActivity() != null) {
@@ -144,6 +141,7 @@ public class NTPUtil {
         CompositorViewHolder compositorView = view.findViewById(R.id.compositor_view_holder);
         ViewGroup imageCreditLayout = view.findViewById(R.id.image_credit_layout);
         ViewGroup newsRecyclerLayout = view.findViewById(R.id.newsRecycler);
+        ViewGroup optinLayout = view.findViewById(R.id.optin_layout_id);
 
         ViewGroup mainLayout = view.findViewById(R.id.ntp_main_layout);
 
@@ -152,10 +150,12 @@ public class NTPUtil {
 
         parentLayout.removeView(mainLayout);
         parentLayout.removeView(imageCreditLayout);
+        parentLayout.removeView(optinLayout);
         parentLayout.removeView(newsRecyclerLayout);
 
         parentLayout.addView(mainLayout);
         parentLayout.addView(imageCreditLayout);
+        parentLayout.addView(optinLayout);
         parentLayout.addView(newsRecyclerLayout);
 
         boolean isTablet = DeviceFormFactor.isNonMultiDisplayContextOnTablet(context);
@@ -181,12 +181,8 @@ public class NTPUtil {
 
         if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_NEWS)) {
             int topMargin = correctImageCreditLayoutTopPosition(ntpImage);
-            if ((BravePrefServiceBridge.getInstance().getNewsOptIn()
-                        && BravePrefServiceBridge.getInstance().getShowNews())) {
-                imageCreditLayoutParams.setMargins(0, topMargin, 0, 50);
-            }
+            imageCreditLayoutParams.setMargins(0, topMargin, 0, 50);
 
-            ViewGroup optinLayout = view.findViewById(R.id.optin_layout_id);
             LinearLayout.LayoutParams optinLayoutParams = new LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
             optinLayoutParams.setMargins(30, imageCreditLayout.getBottom(), 30, 500);