From 68ebc650fcd6e6437cf4552040d7faa4ccf29368 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Fri, 26 Jul 2024 16:47:47 +0530
Subject: [PATCH 1/2] SetupWizard: Add docs link in Parental Control page

---
 Android.bp                                       |  1 +
 res/layout/setup_parental_control.xml            | 10 ++++++++++
 res/values/e_strings.xml                         |  3 ++-
 .../setupwizard/ParentalControlActivity.java     | 16 ++++++++++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 45738ade..9a116cc6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,6 +32,7 @@ android_app {
 
     static_libs: [
         "androidx.core_core",
+        "androidx.browser_browser",
         "SettingsLib",
         "setupcompat",
         "setupdesign",
diff --git a/res/layout/setup_parental_control.xml b/res/layout/setup_parental_control.xml
index a0f026e9..48075e74 100644
--- a/res/layout/setup_parental_control.xml
+++ b/res/layout/setup_parental_control.xml
@@ -48,6 +48,16 @@
                         android:textColor="?android:attr/textColorPrimary"
                         android:text="@string/parental_control_setup_summary" />
 
+                    <TextView
+                        android:id="@+id/more_info_textview"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="16sp"
+                        android:textColor="@color/e_accent"
+                        android:text="@string/more_info_text"
+                        android:clickable="true"
+                        android:focusable="true" />
+
                     <Button
                         android:id="@+id/activate_parental_control"
                         android:layout_width="match_parent"
diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
index b5a3f6c9..fc5e5736 100644
--- a/res/values/e_strings.xml
+++ b/res/values/e_strings.xml
@@ -30,5 +30,6 @@
 
     <string name="activate_parental_control">Activate Parental Control</string>
     <string name="parental_control_setup_title">Setup Parental Control</string>
-    <string name="parental_control_setup_summary">This app offers protection against inappropriate content for your children and teenagers. You can activate this feature when lending your phone to your kid or if this is their device.</string>
+    <string name="parental_control_setup_summary">This app offers protection against inappropriate content for your children and teenagers. You can activate this feature when lending your phone to your kid or if this is their device. To know more about it please go to</string>
+    <string name="more_info_text" translatable="false">https://doc.e.foundation/support-topics/parental-control</string>
 </resources>
\ No newline at end of file
diff --git a/src/org/lineageos/setupwizard/ParentalControlActivity.java b/src/org/lineageos/setupwizard/ParentalControlActivity.java
index e57226cb..aa9d4ebb 100644
--- a/src/org/lineageos/setupwizard/ParentalControlActivity.java
+++ b/src/org/lineageos/setupwizard/ParentalControlActivity.java
@@ -20,8 +20,10 @@ import static org.lineageos.setupwizard.SetupWizardApp.PARENTAL_COMPONENTNAME;
 import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_PARENTAL_CONTROL;
 
 import android.content.Intent;
+import android.net.Uri;
 import android.view.View;
 import android.os.Bundle;
+import androidx.browser.customtabs.CustomTabsIntent;
 
 public class ParentalControlActivity extends SubBaseActivity {
 
@@ -40,6 +42,20 @@ public class ParentalControlActivity extends SubBaseActivity {
                 launchParentalControl();
             }
         });
+        findViewById(R.id.more_info_textview).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String docUrl = getString(R.string.more_info_text);
+                try {
+                    CustomTabsIntent customTabsIntent = new CustomTabsIntent.Builder().setShowTitle(true).build();
+                    customTabsIntent.launchUrl(getApplicationContext(), Uri.parse(docUrl));
+                } catch (Exception e) {
+                    // Fallback to default browser
+                    Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(docUrl));
+                    startActivity(intent);
+                }
+            }
+        });
     }
 
     @Override
-- 
GitLab


From ab4ad7dfd43e53a2d039d20198a0913bd64d0ad3 Mon Sep 17 00:00:00 2001
From: Mohammed Althaf Thayyil <althafvly@gmail.com>
Date: Tue, 30 Jul 2024 09:29:08 +0000
Subject: [PATCH 2/2] Reorder

---
 Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 9a116cc6..d46861b6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,13 +32,13 @@ android_app {
 
     static_libs: [
         "androidx.core_core",
-        "androidx.browser_browser",
         "SettingsLib",
         "setupcompat",
         "setupdesign",
         "SystemUISharedLib",
         "org.lineageos.platform.internal",
         "elib",
+        "androidx.browser_browser",
     ],
 
     libs: ["telephony-common"],
-- 
GitLab