From 7410e0729b6bf05f7d9047a039f0c0856dcd26cc Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Mon, 13 May 2024 16:01:09 +0530
Subject: [PATCH 1/2] Wizard: add parental activity page

---
 AndroidManifest.xml                           | 13 +++++
 res/raw/lineage_wizard_script.xml             |  4 ++
 .../setupwizard/ParentalControlActivity.java  | 49 +++++++++++++++++++
 .../lineageos/setupwizard/SetupWizardApp.java |  4 ++
 4 files changed, 70 insertions(+)
 create mode 100644 src/org/lineageos/setupwizard/ParentalControlActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f183a94f..35d497ae 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -295,6 +295,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"
                   android:excludeFromRecents="true"
diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index 793177f8..9225c5e2 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -75,6 +75,10 @@
     </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_ACCOUNT_MANAGER_SETTINGS;end" id="e_account_manager_settings">
+        <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="finish" />
     </WizardAction>
 
diff --git a/src/org/lineageos/setupwizard/ParentalControlActivity.java b/src/org/lineageos/setupwizard/ParentalControlActivity.java
new file mode 100644
index 00000000..2ecc667d
--- /dev/null
+++ b/src/org/lineageos/setupwizard/ParentalControlActivity.java
@@ -0,0 +1,49 @@
+/*
+ * 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 static org.lineageos.setupwizard.SetupWizardApp.PARENTAL_COMPONENTNAME;
+import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_PARENTAL_CONTROL;
+
+import android.content.Intent;
+
+public class ParentalControlActivity extends SubBaseActivity {
+
+    @Override
+    protected void onStartSubactivity() {
+        launchParentalControl();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if(resultCode == RESULT_OK) {
+            onNavigateNext();
+        }
+    }
+
+    @Override
+    protected void onSubactivityResult(int requestCode, int resultCode, Intent data) {
+        nextAction(RESULT_OK);
+    }
+
+    private void launchParentalControl() {
+        Intent intent = new Intent();
+        intent.setComponent(PARENTAL_COMPONENTNAME);
+        startActivityForResult(intent, REQUEST_CODE_PARENTAL_CONTROL);
+    }
+}
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index 9534d29c..ade5b322 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -20,6 +20,7 @@ package org.lineageos.setupwizard;
 
 import android.app.Application;
 import android.app.StatusBarManager;
+import android.content.ComponentName;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -80,9 +81,12 @@ public class SetupWizardApp extends Application {
     public static final int REQUEST_CODE_RESTORE = 10;
     public static final int REQUEST_CODE_SETUP_ACCOUNT_TYPE_E = 11;
     public static final int REQUEST_CODE_CREATE_E_ACCOUNT = 1;
+    public static final int REQUEST_CODE_PARENTAL_CONTROL = 12;
 
     public static final int RADIO_READY_TIMEOUT = 10 * 1000;
 
+    public static final ComponentName PARENTAL_COMPONENTNAME = new ComponentName("foundation.e.parentalcontrol", "foundation.e.parentalcontrol.MainActivity");
+
     private static StatusBarManager sStatusBarManager;
 
     private boolean mIsRadioReady = false;
-- 
GitLab


From a2d72ec6e88aa6386a1d1252da81fdbbe7b62844 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Thu, 16 May 2024 21:08:24 +0530
Subject: [PATCH 2/2] Add parental control screen with button

---
 res/layout/setup_parental_control.xml         | 74 +++++++++++++++++++
 res/raw/lineage_wizard_script.xml             |  8 +-
 res/values/e_strings.xml                      |  4 +
 .../setupwizard/ParentalControlActivity.java  | 30 +++++++-
 4 files changed, 109 insertions(+), 7 deletions(-)
 create mode 100644 res/layout/setup_parental_control.xml

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 9225c5e2..137e03e0 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -29,6 +29,10 @@
         <result wizard:action="locale" />
     </WizardAction>
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end" id="locale">
+        <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="datetime" />
     </WizardAction>
 
@@ -75,10 +79,6 @@
     </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_ACCOUNT_MANAGER_SETTINGS;end" id="e_account_manager_settings">
-        <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="finish" />
     </WizardAction>
 
diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
index c3aacd8e..a86e11b1 100644
--- a/res/values/e_strings.xml
+++ b/res/values/e_strings.xml
@@ -27,4 +27,8 @@
     <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">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>
 </resources>
\ No newline at end of file
diff --git a/src/org/lineageos/setupwizard/ParentalControlActivity.java b/src/org/lineageos/setupwizard/ParentalControlActivity.java
index 2ecc667d..e57226cb 100644
--- a/src/org/lineageos/setupwizard/ParentalControlActivity.java
+++ b/src/org/lineageos/setupwizard/ParentalControlActivity.java
@@ -20,12 +20,26 @@ import static org.lineageos.setupwizard.SetupWizardApp.PARENTAL_COMPONENTNAME;
 import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_PARENTAL_CONTROL;
 
 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() {
-        launchParentalControl();
+        setNextAllowed(true);
+        findViewById(R.id.activate_parental_control).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                launchParentalControl();
+            }
+        });
     }
 
     @Override
@@ -37,8 +51,18 @@ public class ParentalControlActivity extends SubBaseActivity {
     }
 
     @Override
-    protected void onSubactivityResult(int requestCode, int resultCode, Intent data) {
-        nextAction(RESULT_OK);
+    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() {
-- 
GitLab