From e9990ddad914de182e7e6c18209784567866bee2 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Thu, 1 Aug 2024 15:12:01 +0530
Subject: [PATCH 1/3] Add parental control page

---
 AndroidManifest.xml                           | 13 ++++
 res/layout/setup_parental_control.xml         | 74 ++++++++++++++++++
 res/raw/lineage_wizard_script.xml             |  6 ++
 res/values/e_strings.xml                      |  9 +--
 .../setupwizard/ParentalControlActivity.java  | 78 +++++++++++++++++++
 5 files changed, 175 insertions(+), 5 deletions(-)
 create mode 100644 res/layout/setup_parental_control.xml
 create mode 100644 src/org/lineageos/setupwizard/ParentalControlActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2b2fbdea..f87ddd30 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -270,6 +270,19 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".ParentalControlActivity"
+                  android:label="@string/activity_label_empty"
+                  android:excludeFromRecents="true"
+                  android:configChanges="mcc|mnc"
+                  android:immersive="true"
+                  android:exported="false"
+                  android:windowSoftInputMode="stateAlwaysHidden">
+            <intent-filter>
+                <action android:name="org.lineageos.setupwizard.E_PARENTAL_CONTROL_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        
         <activity
             android:name=".backup.RestoreIntroActivity"
             android:label="@string/activity_label_empty"
diff --git a/res/layout/setup_parental_control.xml b/res/layout/setup_parental_control.xml
new file mode 100644
index 00000000..a0f026e9
--- /dev/null
+++ b/res/layout/setup_parental_control.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018-2021 E FOUNDATION
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame">
+
+        <FrameLayout android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <ScrollView android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="16sp"
+                        android:textColor="?android:attr/textColorPrimary"
+                        android:text="@string/parental_control_setup_summary" />
+
+                    <Button
+                        android:id="@+id/activate_parental_control"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/activate_parental_control"
+                        android:textSize="14sp"
+                        android:textAllCaps="true"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="80dp"
+                        style="@style/SudGlifButton.Primary" />
+                        
+                </LinearLayout>
+            </ScrollView>
+        </FrameLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:showSkipButton="false" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index 4d964ea8..50b5e529 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -42,6 +42,12 @@
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end"
         id="datetime">
+        <result wizard:action="e_parental_control_settings" />
+    </WizardAction>
+
+    <WizardAction
+        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_PARENTAL_CONTROL_SETTINGS;end"
+        id="e_parental_control_settings">
         <result wizard:action="location_settings" />
     </WizardAction>
 
diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
index c3aacd8e..68ac2089 100644
--- a/res/values/e_strings.xml
+++ b/res/values/e_strings.xml
@@ -13,18 +13,17 @@
   ~
   ~ You should have received a copy of the GNU General Public License
   ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  --><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="e_account_manager_setup_title">Sync your cloud account</string>
     <string name="e_account_manager_setup_summary">Log in with your e.email or murena.io ID to connect your personal account with this phone. This will enable to synchronize your emails, contacts, calendar events, pictures, videos, notes and tasks across this phone and your personal cloud.</string>
     <string name="e_account_manager_setup_configure">Log in</string>
-
     <string name="create_account">Create Account</string>
     <string name="sign_in">Sign in</string>
-
     <string name="setup_welcome_message_e">Welcome to \n/e/OS</string>
-
     <string name="update_recovery_title_e">Update Recovery</string>
     <string name="update_recovery_description_e">Updates Recovery on first boot subsequent to every update.</string>
     <string name="update_recovery_setting_e">Update Recovery alongside the OS</string>
+    <string name="activate_parental_control">Activate Parental Control</string>
+    <string name="parental_control_setup_title">Set up 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>
 </resources>
\ No newline at end of file
diff --git a/src/org/lineageos/setupwizard/ParentalControlActivity.java b/src/org/lineageos/setupwizard/ParentalControlActivity.java
new file mode 100644
index 00000000..06a4129a
--- /dev/null
+++ b/src/org/lineageos/setupwizard/ParentalControlActivity.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2024 MURENA SAS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.lineageos.setupwizard;
+
+import androidx.activity.result.ActivityResult;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.view.View;
+import android.os.Bundle;
+
+public class ParentalControlActivity extends SubBaseActivity {
+
+     @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setNextText(R.string.skip);
+    }
+
+    @Override
+    protected void onStartSubactivity() {
+        setNextAllowed(true);
+        findViewById(R.id.activate_parental_control).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                launchParentalControl();
+            }
+        });
+    }
+
+    @Override
+    protected void onSubactivityResult(ActivityResult activityResult) {
+        Intent data = activityResult.getData();
+        if (data != null && data.getBooleanExtra("onBackPressed", false)) {
+            onStartSubactivity();
+            return;
+        // Check for back press from Parental control activity
+        } else if(activityResult.getResultCode() == RESULT_OK) {
+            onNavigateNext();
+        }
+
+    }
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.setup_parental_control;
+    }
+
+    @Override
+    protected int getTitleResId() {
+        return R.string.parental_control_setup_title;
+    }
+
+    @Override
+    protected int getIconResId() {
+        return R.drawable.ic_account_manager_screen;
+    }
+
+    private void launchParentalControl() {
+        Intent intent = new Intent();
+        intent.setComponent(new ComponentName("foundation.e.parentalcontrol", "foundation.e.parentalcontrol.MainActivity"));
+        startSubactivity(intent);
+    }
+}
-- 
GitLab


From 770b884e763dd164b27ec74ae9f1b1d3fd214ac1 Mon Sep 17 00:00:00 2001
From: Mohammed Althaf Thayyil <althafvly@gmail.com>
Date: Tue, 30 Jul 2024 09:34:13 +0000
Subject: [PATCH 2/3] 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 18f8fdd6..9ab0c299 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,6 +26,7 @@ android_app {
         "setupdesign",
         "SystemUISharedLib",
         "org.lineageos.platform.internal",
+        "androidx.browser_browser",
     ],
 
     libs: ["telephony-common"],
diff --git a/res/layout/setup_parental_control.xml b/res/layout/setup_parental_control.xml
index a0f026e9..6d36ee0f 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="?android:colorAccent"
+                        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 68ac2089..180146bf 100644
--- a/res/values/e_strings.xml
+++ b/res/values/e_strings.xml
@@ -25,5 +25,6 @@
     <string name="update_recovery_setting_e">Update Recovery alongside the OS</string>
     <string name="activate_parental_control">Activate Parental Control</string>
     <string name="parental_control_setup_title">Set up 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 06a4129a..4a49f37b 100644
--- a/src/org/lineageos/setupwizard/ParentalControlActivity.java
+++ b/src/org/lineageos/setupwizard/ParentalControlActivity.java
@@ -20,8 +20,10 @@ import androidx.activity.result.ActivityResult;
 
 import android.content.ComponentName;
 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 e483f838f8556be80a0ac3c2904a6fae01a1369e Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Thu, 1 Aug 2024 14:55:24 +0530
Subject: [PATCH 3/3] Port translations from Android 13

---
 res/values-fr/e_strings.xml | 6 ++++--
 res/values-is/e_strings.xml | 2 +-
 res/values-sv/e_strings.xml | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/res/values-fr/e_strings.xml b/res/values-fr/e_strings.xml
index 5ccf27d0..1e512b82 100644
--- a/res/values-fr/e_strings.xml
+++ b/res/values-fr/e_strings.xml
@@ -13,8 +13,7 @@
   ~
   ~ You should have received a copy of the GNU General Public License
   ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  --><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="setup_welcome_message_e">Bienvenue sur
 \n/e/OS</string>
     <string name="sign_in">Se connecter</string>
@@ -25,4 +24,7 @@
     <string name="update_recovery_setting_e">Mettre à jour le Recovery en même temps que l\'OS</string>
     <string name="update_recovery_description_e">Met à jour le Recovery lors du premier démarrage suivant chaque mise à jour.</string>
     <string name="update_recovery_title_e">Mettre à jour le Recovery</string>
+    <string name="parental_control_setup_summary">Cette application propose une protection contre les contenus inappropriés pour vos enfants et adolescents. Vous pouvez activer cette fonctionnalité quand vous prêtez votre téléphone à votre enfant ou si cela est leur appareil. Pour en savoir plus à ce sujet, veuillez aller sur</string>
+    <string name="activate_parental_control">Activez le Contrôle Parental</string>
+    <string name="parental_control_setup_title">Paramétrez le Contrôle Parental</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-is/e_strings.xml b/res/values-is/e_strings.xml
index 4be9b12e..ee7d4a80 100644
--- a/res/values-is/e_strings.xml
+++ b/res/values-is/e_strings.xml
@@ -26,5 +26,5 @@
     <string name="update_recovery_setting_e">Uppfæra endurheimtingu samhliða uppfærslum stýrikerfis</string>
     <string name="activate_parental_control">Virkja barnalæsingu</string>
     <string name="parental_control_setup_title">Setja upp barnalæsingu</string>
-    <string name="parental_control_setup_summary">Þetta forrit veitir vörn gegn óviðeigandi efni fyrir börnin þín og unglinga. Þú getur virkjað þessa eiginleika þegar þú lánar símann þinn til barns eða haft þetta virkt á tækjunum þeirra.</string>
+    <string name="parental_control_setup_summary">Þetta forrit veitir vörn gegn óviðeigandi efni fyrir börnin þín og unglinga. Þú getur virkjað þessa eiginleika þegar þú lánar símann þinn til barns eða haft þetta virkt á tækjunum þeirra. Til að sjá meira um þetta, skaltu fara á</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-sv/e_strings.xml b/res/values-sv/e_strings.xml
index ac7fccef..f15d4765 100644
--- a/res/values-sv/e_strings.xml
+++ b/res/values-sv/e_strings.xml
@@ -24,7 +24,7 @@
     <string name="e_account_manager_setup_title">Synka ditt molnkonto</string>
     <string name="e_account_manager_setup_summary">Logga in med ditt e.email- eller murena.io-konto för att ansluta ditt personliga konto med denna telefon. Detta kommer tillåta dig att synkronisera dina e-post, kalenderhändelser, bilder, videor, anteckningar och uppgifter mellan denna telefon och ditt personliga moln.</string>
     <string name="e_account_manager_setup_configure">Logga in</string>
-    <string name="activate_parental_control">Aktivera föräldrakontroll</string>
+    <string name="activate_parental_control">Aktivera Föräldrakontroll</string>
     <string name="parental_control_setup_title">Ställ in föräldrakontroll</string>
-    <string name="parental_control_setup_summary">Denna app erbjuder skydd mot olämpligt innehåll för barn och tonåringar. Du kan aktivera funktionen när du lånar ut din telefon till ditt barn eller om det är deras enhet.</string>
+    <string name="parental_control_setup_summary">Denna app erbjuder skydd mot olämpligt innehåll för barn och tonåringar. Du kan aktivera funktionen när du lånar ut din telefon till ditt barn eller om det är deras enhet. För att ta reda på mer, gå till</string>
 </resources>
\ No newline at end of file
-- 
GitLab