From 93d19c3a656a3b969d3a3ee2c6b9f65701c4ffec Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Sun, 2 Jun 2019 14:47:39 +0200
Subject: [PATCH 01/11] SetupWizard: Add /e/ account manager page

Change-Id: I199bf14873adc72f05f99c626a339e35fd358f29
---
 AndroidManifest.xml                           | 13 ++++
 res/drawable/ic_account_manager_screen.xml    | 29 ++++++++
 res/layout/setup_e_account_manager.xml        | 61 +++++++++++++++
 res/raw/lineage_wizard_script.xml             | 15 +++-
 res/values/strings.xml                        |  5 ++
 .../setupwizard/EAccountManagerActivity.java  | 74 +++++++++++++++++++
 .../lineageos/setupwizard/SetupWizardApp.java |  1 +
 7 files changed, 196 insertions(+), 2 deletions(-)
 create mode 100644 res/drawable/ic_account_manager_screen.xml
 create mode 100644 res/layout/setup_e_account_manager.xml
 create mode 100644 src/org/lineageos/setupwizard/EAccountManagerActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 30d53571..c6825c9a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -256,6 +256,19 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".EAccountManagerActivity"
+                  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_ACCOUNT_MANAGER_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/drawable/ic_account_manager_screen.xml b/res/drawable/ic_account_manager_screen.xml
new file mode 100644
index 00000000..5a7778b9
--- /dev/null
+++ b/res/drawable/ic_account_manager_screen.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2017 The LineageOS Project
+    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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="?android:colorControlNormal"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z" />
+</vector>
diff --git a/res/layout/setup_e_account_manager.xml b/res/layout/setup_e_account_manager.xml
new file mode 100644
index 00000000..89aba7a6
--- /dev/null
+++ b/res/layout/setup_e_account_manager.xml
@@ -0,0 +1,61 @@
+<?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"
+                        style="@style/SudItemTitle.GlifDescription"
+                        android:text="@string/e_account_manager_setup_summary" />
+
+                </LinearLayout>
+            </ScrollView>
+        </FrameLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:showSkipButton="true" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index 7c87abd6..4d964ea8 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -2,6 +2,7 @@
 <!--
      SPDX-FileCopyrightText: 2016 The CyanogenMod Project
      SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2018-2024 E FOUNDATION
      SPDX-License-Identifier: Apache-2.0
 -->
 <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
@@ -41,14 +42,16 @@
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end"
         id="datetime">
-        <result wizard:action="restore" />
+        <result wizard:action="location_settings" />
     </WizardAction>
 
+<!--
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end"
         id="restore">
         <result wizard:action="location_settings" />
     </WizardAction>
+-->
 
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end"
@@ -65,14 +68,16 @@
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end"
         id="recovery_update">
-        <result wizard:action="lineage_settings" />
+        <result wizard:action="biometric_settings" />
     </WizardAction>
 
+<!--
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end"
         id="lineage_settings">
         <result wizard:action="biometric_settings" />
     </WizardAction>
+-->
 
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end"
@@ -95,6 +100,12 @@
     <WizardAction
         wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end"
         id="navigation_settings">
+        <result wizard:action="e_account_manager_settings" />
+    </WizardAction>
+
+    <WizardAction
+        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_ACCOUNT_MANAGER_SETTINGS;end"
+        id="e_account_manager_settings">
         <result wizard:action="finish" />
     </WizardAction>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fec0e846..b6e48bff 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,6 +2,7 @@
 <!--
      SPDX-FileCopyrightText: 2013-2015 The CyanogenMod Project
      SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+     SPDX-FileCopyrightText: 2018-2024 E FOUNDATION
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
@@ -82,4 +83,8 @@
     <string name="theme_summary">Dark theme uses a black background to help keep battery alive longer on some screens</string>
     <string name="dark">Dark</string>
     <string name="light">Light</string>
+
+    <!-- e.foundation -->
+    <string name="e_account_manager_setup_title">Setup /e/ account</string>
+    <string name="e_account_manager_setup_summary">Save your /e/ identifiers in the account manager, therefore you can simply reuse them later in other applications.</string>
 </resources>
diff --git a/src/org/lineageos/setupwizard/EAccountManagerActivity.java b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
new file mode 100644
index 00000000..f6ebf4fc
--- /dev/null
+++ b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+package org.lineageos.setupwizard;
+
+import static org.lineageos.setupwizard.SetupWizardApp.ACCOUNT_TYPE_E;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.Intent;
+import android.provider.Settings;
+import android.util.Log;
+
+import org.lineageos.setupwizard.util.SetupWizardUtils;
+
+public class EAccountManagerActivity extends SubBaseActivity {
+
+    public static final String TAG = EAccountManagerActivity.class.getSimpleName();
+
+    @Override
+    protected void onStartSubactivity() {
+        setNextAllowed(true);
+    }
+
+    @Override
+    protected void onNextPressed() {
+        launchAccountManagerSetup();
+    }
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.setup_e_account_manager;
+    }
+
+    @Override
+    protected int getTitleResId() {
+        return R.string.e_account_manager_setup_title;
+    }
+
+    @Override
+    protected int getIconResId() {
+        return R.drawable.ic_account_manager_screen;
+    }
+
+    private void launchAccountManagerSetup() {
+        Intent intent = new Intent(Settings.ACTION_ADD_ACCOUNT)
+                .putExtra(Settings.EXTRA_ACCOUNT_TYPES, new String[]{ACCOUNT_TYPE_E});
+        startSubactivity(intent);
+    }
+
+    private boolean isEAccountAvailable() {
+        Account[] allAccounts = getSystemService(AccountManager.class).getAccounts();
+        for (Account account : allAccounts) {
+            if (account.type.equals(ACCOUNT_TYPE_E)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index d635bfaf..30228e9d 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -43,6 +43,7 @@ public class SetupWizardApp extends Application {
     public static final String UPDATE_RECOVERY_PROP = "persist.vendor.recovery_update";
 
     public static final String NAVIGATION_OPTION_KEY = "navigation_option";
+    public static final String ACCOUNT_TYPE_E = "e.foundation.webdav.eelo";
 
     public static final int RADIO_READY_TIMEOUT = 10 * 1000;
 
-- 
GitLab


From e08cad516fc78bca1726e73adf61047b786f4f08 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Tue, 14 Sep 2021 15:43:55 +0530
Subject: [PATCH 02/11] SetupWizard: Disable LineageOS metrics

Change-Id: I55ab0172bf0d8f44ff9180cec4d2985ae237094f
---
 .../setupwizard/util/SetupWizardUtils.java         | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
index fb107605..26ee2056 100644
--- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
+++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
@@ -190,7 +190,7 @@ public class SetupWizardUtils {
                     Settings.Secure.TV_USER_SETUP_COMPLETE, 1);
         }
 
-        handleEnableMetrics(context);
+        handleDisableMetrics(context);
         handleNavKeys(context);
         handleRecoveryUpdate();
         handleNavigationOption();
@@ -270,15 +270,9 @@ public class SetupWizardUtils {
                 enabledState, DONT_KILL_APP);
     }
 
-    private static void handleEnableMetrics(Context context) {
-        Bundle privacyData = SetupWizardApp.getSettingsBundle();
-        if (privacyData != null
-                && privacyData.containsKey(KEY_SEND_METRICS)) {
-            LineageSettings.Secure.putInt(context.getContentResolver(),
-                    LineageSettings.Secure.STATS_COLLECTION,
-                    privacyData.getBoolean(KEY_SEND_METRICS)
-                            ? 1 : 0);
-        }
+    private static void handleDisableMetrics(Context context) {
+        LineageSettings.Secure.putInt(context.getContentResolver(),
+            LineageSettings.Secure.STATS_COLLECTION, 0);
     }
 
     private static void handleNavKeys(Context context) {
-- 
GitLab


From 4ff552b3aed8d211f2c2b5e1431e7c73b2c02891 Mon Sep 17 00:00:00 2001
From: Alexandre Roux D'Anzi <alexandre.roux.danzi@lostpod.me>
Date: Mon, 29 Jun 2020 14:12:21 +0200
Subject: [PATCH 03/11] SetupWizard: Enable wifi location

Change-Id: I256e9b008850200b60154c83f1e32e93de45a967
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
 src/org/lineageos/setupwizard/LocationSettingsActivity.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/org/lineageos/setupwizard/LocationSettingsActivity.java b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
index 0e70e9c5..754dcbe4 100644
--- a/src/org/lineageos/setupwizard/LocationSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
@@ -1,6 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2016 The CyanogenMod Project
  * SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+ * SPDX-FileCopyrightText: 2018-2024 E FOUNDATION
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -13,6 +14,7 @@ import android.os.UserManager;
 import android.provider.Settings;
 import android.view.View;
 import android.widget.CheckBox;
+import android.provider.Settings;
 
 public class LocationSettingsActivity extends BaseSetupWizardActivity {
 
@@ -42,6 +44,8 @@ public class LocationSettingsActivity extends BaseSetupWizardActivity {
         } else {
             locationAgpsAccessView.setVisibility(View.GONE);
         }
+        Settings.Global.putInt(getContentResolver(),
+                    Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE,1);
     }
 
     @Override
-- 
GitLab


From 48733dda44c6952e07918eadef14f0e6aed43960 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Wed, 30 Mar 2022 08:00:02 +0000
Subject: [PATCH 04/11] SetupWizard: Change eDrive strings according to our
 needs

---
 res/values/strings.xml                                     | 5 +++--
 src/org/lineageos/setupwizard/EAccountManagerActivity.java | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b6e48bff..1955398c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -85,6 +85,7 @@
     <string name="light">Light</string>
 
     <!-- e.foundation -->
-    <string name="e_account_manager_setup_title">Setup /e/ account</string>
-    <string name="e_account_manager_setup_summary">Save your /e/ identifiers in the account manager, therefore you can simply reuse them later in other applications.</string>
+    <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>
 </resources>
diff --git a/src/org/lineageos/setupwizard/EAccountManagerActivity.java b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
index f6ebf4fc..21cb779c 100644
--- a/src/org/lineageos/setupwizard/EAccountManagerActivity.java
+++ b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
@@ -32,6 +32,7 @@ public class EAccountManagerActivity extends SubBaseActivity {
 
     @Override
     protected void onStartSubactivity() {
+        setNextText(R.string.e_account_manager_setup_configure);
         setNextAllowed(true);
     }
 
-- 
GitLab


From a10adb1e74df97b1333c72503d6d00a36922072c Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Wed, 13 Apr 2022 17:14:00 +0530
Subject: [PATCH 05/11] Add create account functionality

Change-Id: Ia9dc940aafdb6918808bd97fbb054dd5cd63b163
---
 res/layout/setup_e_account_manager.xml        | 27 ++++++++++++++++++-
 res/values/strings.xml                        |  3 +++
 .../setupwizard/EAccountManagerActivity.java  | 22 ++++++++++++---
 .../lineageos/setupwizard/SetupWizardApp.java |  1 +
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/res/layout/setup_e_account_manager.xml b/res/layout/setup_e_account_manager.xml
index 89aba7a6..e9abf98c 100644
--- a/res/layout/setup_e_account_manager.xml
+++ b/res/layout/setup_e_account_manager.xml
@@ -47,6 +47,31 @@
                         style="@style/SudItemTitle.GlifDescription"
                         android:text="@string/e_account_manager_setup_summary" />
 
+                    <Button
+                        android:id="@+id/create_account"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/create_account"
+                        android:textSize="14sp"
+                        android:textAllCaps="true"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="80dp"
+                        style="@style/SudGlifButton.Primary" />
+
+                    <Button
+                        android:id="@+id/sign_in"
+                        android:text="@string/sign_in"
+                        android:textSize="14sp"
+                        android:textAllCaps="true"
+                        android:layout_gravity="center"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        style="@style/SudGlifButton.Secondary" />
+
+
+
                 </LinearLayout>
             </ScrollView>
         </FrameLayout>
@@ -55,7 +80,7 @@
             android:id="@+id/navigation_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:showSkipButton="true" />
+            app:showSkipButton="false" />
 
     </LinearLayout>
 </com.google.android.setupdesign.GlifLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1955398c..9a63466a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -88,4 +88,7 @@
     <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>
 </resources>
diff --git a/src/org/lineageos/setupwizard/EAccountManagerActivity.java b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
index 21cb779c..89e96141 100644
--- a/src/org/lineageos/setupwizard/EAccountManagerActivity.java
+++ b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
@@ -23,6 +23,7 @@ import android.accounts.AccountManager;
 import android.content.Intent;
 import android.provider.Settings;
 import android.util.Log;
+import android.view.View;
 
 import org.lineageos.setupwizard.util.SetupWizardUtils;
 
@@ -32,13 +33,28 @@ public class EAccountManagerActivity extends SubBaseActivity {
 
     @Override
     protected void onStartSubactivity() {
-        setNextText(R.string.e_account_manager_setup_configure);
         setNextAllowed(true);
+        findViewById(R.id.sign_in).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                launchAccountManagerSetup();
+            }
+        });
+        findViewById(R.id.create_account).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(SetupWizardApp.ACTION_CREATE_E_ACCOUNT);
+                startActivityForResult(intent);
+            }
+        });
     }
 
     @Override
-    protected void onNextPressed() {
-        launchAccountManagerSetup();
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if(resultCode == RESULT_OK) {
+            onNavigateNext();
+        }
     }
 
     @Override
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index 30228e9d..ddc1cdf4 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -26,6 +26,7 @@ public class SetupWizardApp extends Application {
             "com.stevesoltys.seedvault.RESTORE_BACKUP";
     public static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL";
     public static final String ACTION_LOAD = "com.android.wizard.LOAD";
+    public static final String ACTION_CREATE_E_ACCOUNT = "foundation.e.accountmanager.ui.setup.CreateAccountActivity";
 
     public static final String EXTRA_WIZARD_BUNDLE = "wizardBundle";
     public static final String EXTRA_SCRIPT_URI = "scriptUri";
-- 
GitLab


From ad7399ce2387ebd3b81b3039c204bcee45949d33 Mon Sep 17 00:00:00 2001
From: SahilSonar <sss.sonar2003@gmail.com>
Date: Tue, 4 Jun 2024 14:26:57 +0530
Subject: [PATCH 06/11] SetupWizard: Fix back gesture on /e/ account page

  - Inspired from https://github.com/CalyxOS/platform_packages_apps_SetupWizard/commit/a1a6530ddd2cf1702797aef1daeff97e6646e922.

Change-Id: I38eebfeb7a1ce6f7134f224979f6757c8fa5f6b9
---
 .../setupwizard/EAccountManagerActivity.java      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/org/lineageos/setupwizard/EAccountManagerActivity.java b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
index 89e96141..0eb1f147 100644
--- a/src/org/lineageos/setupwizard/EAccountManagerActivity.java
+++ b/src/org/lineageos/setupwizard/EAccountManagerActivity.java
@@ -18,6 +18,8 @@ package org.lineageos.setupwizard;
 
 import static org.lineageos.setupwizard.SetupWizardApp.ACCOUNT_TYPE_E;
 
+import androidx.activity.result.ActivityResult;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.Intent;
@@ -50,10 +52,15 @@ public class EAccountManagerActivity extends SubBaseActivity {
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if(resultCode == RESULT_OK) {
-            onNavigateNext();
+    protected void onActivityResult(ActivityResult activityResult) {
+        Intent data = activityResult.getData();
+        if (data != null && data.getBooleanExtra("onBackPressed", false)) {
+            onStartSubactivity();
+            return;
+        // Check for back press from AccountManager activity
+        } else if (isEAccountAvailable()) {
+            Log.v(TAG, "An E account is already set up; skipping EAccountManagerActivity");
+            nextAction(RESULT_OK);
         }
     }
 
-- 
GitLab


From d1aec9d2c94f1f1d488ca94bfade1bdf278fadcf Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Mon, 22 Aug 2022 07:43:51 +0000
Subject: [PATCH 07/11] Replace lineage strings and logo with /e/

Change-Id: I2d0d77f31dc9a0a3a330ede0ec973a3b9d6856ab
---
 res/drawable/logo.xml                         | 30 ++++++++++++-------
 res/layout/update_recovery_page.xml           |  2 +-
 res/values/strings.xml                        |  6 ++++
 .../setupwizard/UpdateRecoveryActivity.java   |  4 +--
 .../setupwizard/WelcomeActivity.java          |  2 +-
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/res/drawable/logo.xml b/res/drawable/logo.xml
index 1828e873..942971bd 100644
--- a/res/drawable/logo.xml
+++ b/res/drawable/logo.xml
@@ -1,17 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2017-2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
+    Copyright (c) 2018-2022 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.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="260dp"
-    android:viewportWidth="512"
-    android:viewportHeight="260">
-
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1024.0"
+    android:viewportHeight="1024.0">
     <path
-        android:fillColor="@color/lineage_accent"
-        android:pathData="M416,128a39.92,39.92,0,0,0-31.11,14.87l-1.5-.6A294.79,294.79,0,0,0,336,128.14s0-.09,0-.14a80,80,0,1,0-160,0s0,.09,0,.13l-1.72
-.38 a293.48,293.48,0,0,0-45.67,13.76l-1.5 .6
-a40,40,0,1,0,7.39,14.28h0a277.33,277.33,0,0,1,43.1-13,80,80,0,0,0,156.73,0,277.3,277.3,0,0,1,43.11,13h0A40,40,0,1,0,416,128ZM96,192a24,24,0,1,1,24-24A24,24,0,0,1,96,192Zm160,0a64,64,0,1,1,64-64A64.07,64.07,0,0,1,256,192Zm160,0a24,24,0,1,1,24-24A24,24,0,0,1,416,192ZM288,128a32,32,0,1,1-32-32A32,32,0,0,1,288,128Z" />
+        android:fillColor="#FFFFFF"
+        android:pathData="M511.9,578.8c-65.6,0 -119,-53.4 -119,-119c0,-65.6 53.4,-119 119,-119s119,53.4 119,119c0,12.4 -10.1,22.5 -22.5,22.5h-96.5c-12.4,0 -22.5,-10.1 -22.5,-22.5c0,-12.4 10.1,-22.5 22.5,-22.5h70.5c-9.5,-29.8 -37.6,-51.5 -70.5,-51.5c-40.8,0 -74,33.2 -74,74c0,40.8 33.2,74 74,74c12.4,0 22.5,10.1 22.5,22.5C534.4,568.7 524.3,578.8 511.9,578.8z" />
 </vector>
diff --git a/res/layout/update_recovery_page.xml b/res/layout/update_recovery_page.xml
index 6ecc3667..220413de 100644
--- a/res/layout/update_recovery_page.xml
+++ b/res/layout/update_recovery_page.xml
@@ -53,7 +53,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/update_recovery_setting"
+                            android:text="@string/update_recovery_setting_e"
                             android:textStyle="bold"
                             style="@style/SudCheckBox.Multiline" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9a63466a..56911031 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -91,4 +91,10 @@
 
     <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>
 </resources>
diff --git a/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java b/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java
index 7ce30808..af3d3225 100644
--- a/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java
+++ b/src/org/lineageos/setupwizard/UpdateRecoveryActivity.java
@@ -29,7 +29,7 @@ public class UpdateRecoveryActivity extends BaseSetupWizardActivity {
         super.onCreate(savedInstanceState);
         mSetupWizardApp = (SetupWizardApp) getApplication();
         getGlifLayout().setDescriptionText(getString(R.string.update_recovery_full_description,
-                getString(R.string.update_recovery_description),
+                getString(R.string.update_recovery_description_e),
                 getString(R.string.update_recovery_warning)));
 
         if (!SetupWizardUtils.hasRecoveryUpdater(this)) {
@@ -77,7 +77,7 @@ public class UpdateRecoveryActivity extends BaseSetupWizardActivity {
 
     @Override
     protected int getTitleResId() {
-        return R.string.update_recovery_title;
+        return R.string.update_recovery_title_e;
     }
 
     @Override
diff --git a/src/org/lineageos/setupwizard/WelcomeActivity.java b/src/org/lineageos/setupwizard/WelcomeActivity.java
index 4dc594e2..2e124265 100644
--- a/src/org/lineageos/setupwizard/WelcomeActivity.java
+++ b/src/org/lineageos/setupwizard/WelcomeActivity.java
@@ -57,7 +57,7 @@ public class WelcomeActivity extends SubBaseActivity {
         if (SetupWizardUtils.isManagedProfile(this)) {
             welcomeTitle.setText(getString(R.string.setup_managed_profile_welcome_message));
         } else {
-            welcomeTitle.setText(getString(R.string.setup_welcome_message,
+            welcomeTitle.setText(getString(R.string.setup_welcome_message_e,
                     getString(R.string.os_name)));
         }
     }
-- 
GitLab


From b03b6b0f9a320f5ba9613f0fb87348aa8fb0ea78 Mon Sep 17 00:00:00 2001
From: Oliver Scott <olivercscott@gmail.com>
Date: Sat, 26 Dec 2020 16:15:25 -0500
Subject: [PATCH 08/11] SetupWizard: Turn off OEM unlocking during initial
 setup if bootloader is locked

* Some /e/ OS devices is meant to be used with a locked bootloader, and
  OEM unlocking set to off.
* Does what Settings -> Developer Options -> OEM unlocking off does but silently,
  wihout having to enable Developer Options.
* If you've locked the bootloader, and the device has booted into SetupWizard,
  it should be safe to run this since at that point you can most definitely
  get into Settings and run this yourself as well, and we do have the same
  kinds of checks here.
* Additionally grant missing permissions which was missing in CalyxOS.

Change-Id: I739d0808fc5c66656128f755451441de96764a90
---
 AndroidManifest.xml                            |  1 +
 ...app_whitelist_org.lineageos.setupwizard.xml |  1 +
 .../lineageos/setupwizard/SetupWizardApp.java  |  8 ++++++++
 .../setupwizard/util/SetupWizardUtils.java     | 18 ++++++++++++++++++
 4 files changed, 28 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c6825c9a..184d8748 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,6 +25,7 @@
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
     <uses-permission android:name="android.permission.MANAGE_USERS" />
+    <uses-permission android:name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
     <uses-permission android:name="lineageos.permission.HARDWARE_ABSTRACTION_ACCESS" />
diff --git a/privapp_whitelist_org.lineageos.setupwizard.xml b/privapp_whitelist_org.lineageos.setupwizard.xml
index a003841d..a13a2066 100644
--- a/privapp_whitelist_org.lineageos.setupwizard.xml
+++ b/privapp_whitelist_org.lineageos.setupwizard.xml
@@ -11,6 +11,7 @@
         <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED" />
         <permission name="android.permission.INTERACT_ACROSS_USERS" />
         <permission name="android.permission.MANAGE_USERS" />
+        <permission name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
         <permission name="android.permission.SET_TIME" />
         <permission name="android.permission.SET_TIME_ZONE" />
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index ddc1cdf4..1183112b 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -1,6 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2013 The CyanogenMod Project
  * SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+ * SPDX-FileCopyrightText: 2022 The Calyx Institute
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -12,6 +13,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
+import android.service.oemlock.OemLockManager;
 import android.util.Log;
 
 import org.lineageos.setupwizard.util.SetupWizardUtils;
@@ -66,6 +68,12 @@ public class SetupWizardApp extends Application {
         }
         sStatusBarManager = SetupWizardUtils.disableStatusBar(this);
         mHandler.postDelayed(mRadioTimeoutRunnable, SetupWizardApp.RADIO_READY_TIMEOUT);
+        // If the bootloader is locked, and OEM unlocking is allowed, turn it off
+        if (SetupWizardUtils.isOwner()
+                && !SetupWizardUtils.isBootloaderUnlocked(this)
+                && SetupWizardUtils.isOemunlockAllowed(this)) {
+            getSystemService(OemLockManager.class).setOemUnlockAllowedByUser(false);
+        }
         if (SetupWizardUtils.hasGMS(this)) {
             SetupWizardUtils.disableHome(this);
             if (SetupWizardUtils.isOwner()) {
diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
index 26ee2056..cbfa37ac 100644
--- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
+++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
@@ -1,6 +1,7 @@
 /*
  * SPDX-FileCopyrightText: 2013 The CyanogenMod Project
  * SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+ * SPDX-FileCopyrightText: 2022 The Calyx Institute
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -46,6 +47,7 @@ import android.os.UserManager;
 import android.provider.Settings;
 import android.sysprop.TelephonyProperties;
 import android.telephony.SubscriptionInfo;
+import android.service.oemlock.OemLockManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
@@ -231,6 +233,22 @@ public class SetupWizardUtils {
         };
     }
 
+    public static boolean isBootloaderUnlocked(Context context) {
+        OemLockManager oemLockManager = context.getSystemService(OemLockManager.class);
+        if (oemLockManager != null) {
+            return oemLockManager.isDeviceOemUnlocked();
+        }
+        return true; // Default to unlocked
+    }
+
+    public static boolean isOemunlockAllowed(Context context) {
+        OemLockManager oemLockManager = context.getSystemService(OemLockManager.class);
+        if (oemLockManager != null) {
+            return oemLockManager.isOemUnlockAllowed();
+        }
+        return true; // Default to unlock allowed
+    }
+
     /**
      * Disable the Home component, which is presumably SetupWizardActivity at this time.
      */
-- 
GitLab


From a2c18a1f5c1e8297b62a05d53ad22f78817081d3 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Wed, 31 May 2023 12:54:39 +0530
Subject: [PATCH 09/11] SetupWizard: Toggle oem unlocking toggle for Pixel 5
 only

Change-Id: I7d63c5e8dc4cedb8a864dbbdc0b52b3b946e0612
---
 res/values/arrays.xml                         | 25 +++++++++++++++++++
 .../lineageos/setupwizard/SetupWizardApp.java | 16 +++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
new file mode 100644
index 00000000..0363e102
--- /dev/null
+++ b/res/values/arrays.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ 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>
+    <!-- Array resource for allowed brands and devices to toggle 
+        off oem unlocking toggle in Developer options. Only for devices
+        that supports bootloader locking in custom rom -->
+    <string-array name="allowed_brands_and_devices">
+        <!-- Each item represents a combination of allowed brand name and device codename-->
+        <item>google:redfin</item>
+    </string-array>
+</resources>
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index 1183112b..211bfc16 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -9,6 +9,7 @@ package org.lineageos.setupwizard;
 
 import android.app.Application;
 import android.app.StatusBarManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -72,7 +73,20 @@ public class SetupWizardApp extends Application {
         if (SetupWizardUtils.isOwner()
                 && !SetupWizardUtils.isBootloaderUnlocked(this)
                 && SetupWizardUtils.isOemunlockAllowed(this)) {
-            getSystemService(OemLockManager.class).setOemUnlockAllowedByUser(false);
+            String manufacturer = Build.MANUFACTURER.toLowerCase();
+            String device = Build.DEVICE.toLowerCase();
+            String[] allowedBrandsAndDevices = getResources().getStringArray(R.array.allowed_brands_and_devices);
+
+            for (String brandAndDevice : allowedBrandsAndDevices) {
+                String[] parts = brandAndDevice.split(":");
+                String allowedBrand = parts[0];
+                String allowedDevice = parts[1];
+
+                if (manufacturer.equals(allowedBrand) && device.equals(allowedDevice)) {
+                    getSystemService(OemLockManager.class).setOemUnlockAllowedByUser(false);
+                    break;
+                }
+            }
         }
         if (SetupWizardUtils.hasGMS(this)) {
             SetupWizardUtils.disableHome(this);
-- 
GitLab


From bac4d8afb177749eaff420e0424ee296fca90837 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Fri, 2 Jun 2023 14:19:52 +0530
Subject: [PATCH 10/11] SetupWizard: Make sure its not emulator device

---
 src/org/lineageos/setupwizard/SetupWizardApp.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index 211bfc16..e8d3df76 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -70,7 +70,7 @@ public class SetupWizardApp extends Application {
         sStatusBarManager = SetupWizardUtils.disableStatusBar(this);
         mHandler.postDelayed(mRadioTimeoutRunnable, SetupWizardApp.RADIO_READY_TIMEOUT);
         // If the bootloader is locked, and OEM unlocking is allowed, turn it off
-        if (SetupWizardUtils.isOwner()
+        if (!Build.IS_EMULATOR && SetupWizardUtils.isOwner()
                 && !SetupWizardUtils.isBootloaderUnlocked(this)
                 && SetupWizardUtils.isOemunlockAllowed(this)) {
             String manufacturer = Build.MANUFACTURER.toLowerCase();
-- 
GitLab


From a3f457b28bd51a3dbf85487012379d5fea47f0b1 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Tue, 30 Jul 2024 12:58:09 +0530
Subject: [PATCH 11/11] Port translations from Android 13

---
 res/values-de/e_strings.xml | 30 ++++++++++++++++++++++++++++++
 res/values-es/e_strings.xml | 27 +++++++++++++++++++++++++++
 res/values-fr/e_strings.xml | 28 ++++++++++++++++++++++++++++
 res/values-is/e_strings.xml | 30 ++++++++++++++++++++++++++++++
 res/values-it/e_strings.xml | 27 +++++++++++++++++++++++++++
 res/values-ja/e_strings.xml | 13 +++++++++++++
 res/values-nl/e_strings.xml | 30 ++++++++++++++++++++++++++++++
 res/values-ru/e_strings.xml | 28 ++++++++++++++++++++++++++++
 res/values-sv/e_strings.xml | 30 ++++++++++++++++++++++++++++++
 res/values-uk/e_strings.xml | 13 +++++++++++++
 res/values/e_strings.xml    | 30 ++++++++++++++++++++++++++++++
 res/values/strings.xml      | 15 ---------------
 12 files changed, 286 insertions(+), 15 deletions(-)
 create mode 100644 res/values-de/e_strings.xml
 create mode 100644 res/values-es/e_strings.xml
 create mode 100644 res/values-fr/e_strings.xml
 create mode 100644 res/values-is/e_strings.xml
 create mode 100644 res/values-it/e_strings.xml
 create mode 100644 res/values-ja/e_strings.xml
 create mode 100644 res/values-nl/e_strings.xml
 create mode 100644 res/values-ru/e_strings.xml
 create mode 100644 res/values-sv/e_strings.xml
 create mode 100644 res/values-uk/e_strings.xml
 create mode 100644 res/values/e_strings.xml

diff --git a/res/values-de/e_strings.xml b/res/values-de/e_strings.xml
new file mode 100644
index 00000000..986cac7e
--- /dev/null
+++ b/res/values-de/e_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ 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">
+    <string name="update_recovery_setting_e">Aktualisiert das Recovery mit dem OS</string>
+    <string name="update_recovery_description_e">Aktualisiert das Recovery beim ersten Booten nach jeder Aktualisierung.</string>
+    <string name="update_recovery_title_e">Recovery aktualisieren</string>
+    <string name="setup_welcome_message_e">Willkommen bei
+\n/e/OS</string>
+    <string name="sign_in">Anmelden</string>
+    <string name="create_account">Konto erstellen</string>
+    <string name="e_account_manager_setup_configure">Anmelden</string>
+    <string name="e_account_manager_setup_summary">Melde dich mit deiner e.email oder murena.io ID an, um dein persönliches Konto mit diesem Telefon zu verknüpfen. Dies wird die Synchronisation von E-Mails, Kontakten, Kalenderereignissen, Bilder, Videos, Notizen und Aufgaben zwischen diesem Telefon und deiner persönlichen Cloud ermöglichen.</string>
+    <string name="e_account_manager_setup_title">Synchronisiere dein Cloud-Konto</string>
+    <string name="activate_parental_control">Elternaufsicht aktivieren</string>
+    <string name="parental_control_setup_title">Elternaufsicht einstellen</string>
+    <string name="parental_control_setup_summary">Diese App bietet einen Schutz gegen unangemessene Inhalte für Ihre Kinder und Jugendliche. Sie können diese Funktion aktivieren, wenn Sie Ihr Gerät den Kindern leihen, oder wenn das Gerät für sie bestimmt ist.</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-es/e_strings.xml b/res/values-es/e_strings.xml
new file mode 100644
index 00000000..a93ffd2d
--- /dev/null
+++ b/res/values-es/e_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ 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">
+    <string name="setup_welcome_message_e">Bienvenido a
+\n/e/OS</string>
+    <string name="sign_in">Iniciar sesión</string>
+    <string name="create_account">Crear Cuenta</string>
+    <string name="update_recovery_setting_e">Actualizar Recovery junto con el sistema operativo</string>
+    <string name="update_recovery_description_e">Actualiza Recovery en el primer arranque posterior a cada actualización.</string>
+    <string name="update_recovery_title_e">Actualizar Recovery</string>
+    <string name="e_account_manager_setup_configure">Iniciar sesión</string>
+    <string name="e_account_manager_setup_summary">Inicia sesión con tu ID de e.email o murena.io para conectar tu cuenta personal con este teléfono. Esto te permitirá sincronizar tus correos electrónicos, contactos, calendario, imágenes, vídeos, notas y tareas entre este teléfono y tu nube personal.</string>
+    <string name="e_account_manager_setup_title">Sincroniza tu cuenta en la nube</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-fr/e_strings.xml b/res/values-fr/e_strings.xml
new file mode 100644
index 00000000..5ccf27d0
--- /dev/null
+++ b/res/values-fr/e_strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ 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">
+    <string name="setup_welcome_message_e">Bienvenue sur
+\n/e/OS</string>
+    <string name="sign_in">Se connecter</string>
+    <string name="create_account">Créer un compte</string>
+    <string name="e_account_manager_setup_configure">Se connecter</string>
+    <string name="e_account_manager_setup_summary">Identifiez-vous avec votre identifiant e.email ou murena.io pour connecter votre compte personnel avec ce téléphone. Cela activera la synchronisation de vos e-mails, contacts, événements de calendriers, images, vidéos, notes et tâches entre ce téléphone et votre cloud personnel.</string>
+    <string name="e_account_manager_setup_title">Synchronisez votre compte cloud</string>
+    <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>
+</resources>
\ No newline at end of file
diff --git a/res/values-is/e_strings.xml b/res/values-is/e_strings.xml
new file mode 100644
index 00000000..4be9b12e
--- /dev/null
+++ b/res/values-is/e_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ 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">
+    <string name="e_account_manager_setup_title">Samstilltu skýjaaðganginn þinn</string>
+    <string name="e_account_manager_setup_summary">Skráðu inn með e.email eða murena.io auðkenni til að tengjast persónulegum aðgangi þínum á þessum síma. Þetta mun samstilla tölvupóstana þína, tengiliði, dagatalsatburði, myndir, myndskeið, glósur og verkefni á milli símans og persónulega tölvuskýsins þíns.</string>
+    <string name="e_account_manager_setup_configure">Skrá inn</string>
+    <string name="create_account">Búa til aðgang</string>
+    <string name="sign_in">Skrá inn</string>
+    <string name="setup_welcome_message_e">Velkomin í
+\n/e/OS</string>
+    <string name="update_recovery_title_e">Uppfæra endurheimtingu</string>
+    <string name="update_recovery_description_e">Uppfærir endurheimtingardiskmynd í fyrstu ræsingu á eftir hverri uppfærslu.</string>
+    <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>
+</resources>
\ No newline at end of file
diff --git a/res/values-it/e_strings.xml b/res/values-it/e_strings.xml
new file mode 100644
index 00000000..b69860cb
--- /dev/null
+++ b/res/values-it/e_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ 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">
+    <string name="e_account_manager_setup_configure">Accedi</string>
+    <string name="e_account_manager_setup_summary">Accedi con il tuo ID e.email o murena.io per collegare l\'account a questo telefono. In questo modo sarà possibile sincronizzare email, contatti, eventi del calendario, immagini, video, note e attività tra questo telefono e il proprio cloud.</string>
+    <string name="e_account_manager_setup_title">Sincronizza l\'account cloud</string>
+    <string name="update_recovery_setting_e">Aggiorna la Recovery insieme al SO</string>
+    <string name="update_recovery_description_e">Aggiorna la Recovery al primo riavvio sucessivo ad ogni aggiornamento.</string>
+    <string name="update_recovery_title_e">Aggiorna Recovery</string>
+    <string name="setup_welcome_message_e">Benvenuto a
+\n/e/OS</string>
+    <string name="sign_in">Accedi</string>
+    <string name="create_account">Crea Account</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-ja/e_strings.xml b/res/values-ja/e_strings.xml
new file mode 100644
index 00000000..b029acef
--- /dev/null
+++ b/res/values-ja/e_strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="e_account_manager_setup_title">クラウドのアカウントと同期</string>
+    <string name="e_account_manager_setup_configure">ログイン</string>
+    <string name="create_account">アカウントを作成</string>
+    <string name="sign_in">サインイン</string>
+    <string name="setup_welcome_message_e">/e/OS
+\nにようこそ</string>
+    <string name="update_recovery_title_e">リカバリーのアップデート</string>
+    <string name="e_account_manager_setup_summary">e.emailまたはmurena.ioのIDでログインして、この電話とあなたのアカウントを接続すると、あなたの電子メール、連絡先、カレンダーのイベント、画像、動画、メモ、タスクを、この電話とあなたの個人用クラウドの間で同期できます。</string>
+    <string name="update_recovery_description_e">各アップデートの直後の最初の起動時にリカバリーをアップデート。</string>
+    <string name="update_recovery_setting_e">OSとリカバリーを同時にアップデート</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-nl/e_strings.xml b/res/values-nl/e_strings.xml
new file mode 100644
index 00000000..7152aa78
--- /dev/null
+++ b/res/values-nl/e_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ 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">
+    <string name="sign_in">Inloggen</string>
+    <string name="update_recovery_setting_e">Werk Herstel bij samen met het OS</string>
+    <string name="update_recovery_description_e">Werkt Herstel bij tijdens de eerste opstart na elke update.</string>
+    <string name="update_recovery_title_e">Herstel bijwerken</string>
+    <string name="setup_welcome_message_e">Welkom bij
+\n/e/OS</string>
+    <string name="create_account">Account aanmaken</string>
+    <string name="e_account_manager_setup_configure">Inloggen</string>
+    <string name="e_account_manager_setup_summary">Log in met je e.email of murena.io ID om jouw persoonlijk account te verbinden met deze telefoon. Dit zal synchronisatie inschakelen voor e-mails, contacten, agenda items, afbeeldingen, video\'s, notities en taken tussen deze telefoon en je persoonlijke cloud.</string>
+    <string name="e_account_manager_setup_title">Synchroniseer jouw cloud account</string>
+    <string name="activate_parental_control">Activeer ouderlijk toezicht</string>
+    <string name="parental_control_setup_title">Ouderlijk toezicht instellen</string>
+    <string name="parental_control_setup_summary">Deze app biedt bescherming tegen ongepaste inhoud voor jouw kinderen en tieners. Je kan deze functie activeren wanneer je jouw telefoon uitleent aan jouw kind of op hun toestel.</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-ru/e_strings.xml b/res/values-ru/e_strings.xml
new file mode 100644
index 00000000..1c341355
--- /dev/null
+++ b/res/values-ru/e_strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ 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">
+    <string name="update_recovery_setting_e">Обновление Recovery наряду с ОС</string>
+    <string name="update_recovery_description_e">Обновляет Recovery при первой загрузке после каждого обновления.</string>
+    <string name="update_recovery_title_e">Обновление Recovery</string>
+    <string name="setup_welcome_message_e">Добро пожаловать
+\nв /e/OS</string>
+    <string name="sign_in">Войти</string>
+    <string name="e_account_manager_setup_configure">Войти</string>
+    <string name="e_account_manager_setup_summary">Войдите в систему с помощью e.email или murena.io ID , чтобы подключить свою личную учётную запись к этому телефону. Это позволит синхронизировать электронную почту, контакты, события календаря, изображения, видео, заметки и задачи между этим телефоном и вашим личным облаком.</string>
+    <string name="e_account_manager_setup_title">Синхронизируйте свою облачную учётную запись</string>
+    <string name="create_account">Создать учётную запись</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-sv/e_strings.xml b/res/values-sv/e_strings.xml
new file mode 100644
index 00000000..ac7fccef
--- /dev/null
+++ b/res/values-sv/e_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ 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">
+    <string name="create_account">Skapa konto</string>
+    <string name="sign_in">Logga in</string>
+    <string name="setup_welcome_message_e">Välkommen till
+\n/e/OS</string>
+    <string name="update_recovery_title_e">Uppdatera återställningsdata</string>
+    <string name="update_recovery_description_e">Uppdaterar återställningsdata vid första start efter varje uppdatering.</string>
+    <string name="update_recovery_setting_e">Uppdatera återställningsdata tillsammans med operativsystemet</string>
+    <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="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>
+</resources>
\ No newline at end of file
diff --git a/res/values-uk/e_strings.xml b/res/values-uk/e_strings.xml
new file mode 100644
index 00000000..f5144ce7
--- /dev/null
+++ b/res/values-uk/e_strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="update_recovery_setting_e">Оновлення Recovery разом з системою</string>
+    <string name="e_account_manager_setup_configure">Вхід</string>
+    <string name="update_recovery_title_e">Оновлення Recovery</string>
+    <string name="create_account">Створити обліковий запис</string>
+    <string name="e_account_manager_setup_title">Синхронізуйте свій обліковий запис</string>
+    <string name="update_recovery_description_e">Оновлення Recovery при першому завантаженні після кожного оновлення.</string>
+    <string name="setup_welcome_message_e">Ласкаво просимо до
+\n/e/OS</string>
+    <string name="e_account_manager_setup_summary">Увійдіть за допомогою e.email або ідентифікатора murena.io, щоб зв\'язати ваш особистий акаунт з цим телефоном. Це дозволить синхронізувати ваші електронні листи, контакти, події календаря, фотографії, відео, нотатки та завдання на цьому телефоні та у вашій особистій хмарі.</string>
+    <string name="sign_in">Зареєструватися</string>
+</resources>
\ No newline at end of file
diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
new file mode 100644
index 00000000..c3aacd8e
--- /dev/null
+++ b/res/values/e_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ 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">
+    <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>
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 56911031..fec0e846 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,7 +2,6 @@
 <!--
      SPDX-FileCopyrightText: 2013-2015 The CyanogenMod Project
      SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-     SPDX-FileCopyrightText: 2018-2024 E FOUNDATION
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
@@ -83,18 +82,4 @@
     <string name="theme_summary">Dark theme uses a black background to help keep battery alive longer on some screens</string>
     <string name="dark">Dark</string>
     <string name="light">Light</string>
-
-    <!-- e.foundation -->
-    <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>
 </resources>
-- 
GitLab