Update behaviour for checkbox on p3a onboarding

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

@@ -309,12 +309,11 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
         }
         BraveSyncReflectionUtils.showInformers();
 
-        if (BraveConfig.P3A_ENABLED) {
-            if (!OnboardingPrefManager.getInstance().isP3aOnboardingShown()) {
-                Intent p3aOnboardingIntent = new Intent(this, P3aOnboardingActivity.class);
-                p3aOnboardingIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-                startActivity(p3aOnboardingIntent);
-            }
+        if (BraveConfig.P3A_ENABLED
+                && !OnboardingPrefManager.getInstance().isP3aOnboardingShown()) {
+            Intent p3aOnboardingIntent = new Intent(this, P3aOnboardingActivity.class);
+            p3aOnboardingIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+            startActivity(p3aOnboardingIntent);
         }
 
         if (!OnboardingPrefManager.getInstance().isOneTimeNotificationStarted()

android/java/org/chromium/chrome/browser/onboarding/P3aOnboardingActivity.java

@@ -17,6 +17,7 @@ import android.text.style.ForegroundColorSpan;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -46,6 +47,15 @@ public class P3aOnboardingActivity extends AppCompatActivity {
                         ? getResources().getString(R.string.p3a_onboarding_title_text_1)
                         : getResources().getString(R.string.p3a_onboarding_title_text_2));
         CheckBox p3aOnboardingCheckbox = findViewById(R.id.p3a_onboarding_checkbox);
+        p3aOnboardingCheckbox.setChecked(BravePrefServiceBridge.getInstance().getP3AEnabled());
+        p3aOnboardingCheckbox.setOnCheckedChangeListener(
+                new CompoundButton.OnCheckedChangeListener() {
+                    @Override
+                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                        BravePrefServiceBridge.getInstance().setP3AEnabled(isChecked);
+                        BravePrefServiceBridge.getInstance().setP3ANoticeAcknowledged(true);
+                    }
+                });
         ImageView p3aOnboardingImg = findViewById(R.id.p3a_onboarding_img);
         p3aOnboardingImg.setImageResource(isFirstInstall
                         ? R.drawable.ic_brave_logo
@@ -57,9 +67,6 @@ public class P3aOnboardingActivity extends AppCompatActivity {
         btnContinue.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                BravePrefServiceBridge.getInstance().setP3AEnabled(
-                        p3aOnboardingCheckbox.isChecked());
-                BravePrefServiceBridge.getInstance().setP3ANoticeAcknowledged(true);
                 if (PackageUtils.isFirstInstall(P3aOnboardingActivity.this)
                         && !OnboardingPrefManager.getInstance().isNewOnboardingShown()
                         && BraveActivity.getBraveActivity() != null) {

android/java/res/layout/activity_p3a_onboarding.xml

@@ -65,7 +65,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:button="@drawable/brave_checkbox"
-                android:checked="true"
                 android:layout_marginTop="4dp"
                 android:layout_marginEnd="8dp"/>