From 207710deb05eed3593581f85e1e1b5353c7045d5 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Mon, 21 Mar 2022 14:14:26 +0530
Subject: [PATCH 1/2] Settings: Integrate Privacy Central into settings

---
 res/drawable/ic_homepage_advanced_privacy.xml | 37 ++++++++++++++
 res/drawable/ic_homepage_privacy.xml          | 43 +++++++++-------
 res/values/cm_strings.xml                     |  4 ++
 .../advanced_privacy_dashboard_settings.xml   | 28 +++++++++++
 res/xml/top_level_settings.xml                |  8 +++
 .../core/gateway/SettingsGateway.java         |  4 +-
 .../dashboard/DashboardFragmentRegistry.java  |  3 ++
 .../AdvancedPrivacyDashboardFragment.java     | 49 +++++++++++++++++++
 8 files changed, 158 insertions(+), 18 deletions(-)
 create mode 100644 res/drawable/ic_homepage_advanced_privacy.xml
 create mode 100644 res/xml/advanced_privacy_dashboard_settings.xml
 create mode 100644 src/com/android/settings/privacy/AdvancedPrivacyDashboardFragment.java

diff --git a/res/drawable/ic_homepage_advanced_privacy.xml b/res/drawable/ic_homepage_advanced_privacy.xml
new file mode 100644
index 00000000000..c727d026e73
--- /dev/null
+++ b/res/drawable/ic_homepage_advanced_privacy.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2019-2022 ECORP 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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/dashboard_tile_image_size"
+    android:height="@dimen/dashboard_tile_image_size"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M25.2477,32H6.7523C3.0261,32 0,28.9739 0,25.2477V6.7523C0,3.0261 3.0261,0 6.7523,0H25.2477C28.9739,0 32,3.0261 32,6.7523V25.2477C32,28.9739 28.9739,32 25.2477,32Z"
+      android:fillColor="#2CCF69"/>
+  <path
+      android:pathData="M15.9835,6.6667V6.6667C15.9168,6.6661 15.8501,6.6747 15.785,6.6926L7.8694,10.0441C7.815,10.0688 7.7648,10.1106 7.7273,10.1684C7.6886,10.2282 7.6666,10.3007 7.6667,10.3768L7.6667,10.379C7.6667,18.1807 12.0582,23.3497 15.8623,24.9753L15.8652,24.9766C15.9019,24.9923 15.9402,25 15.9781,25C16.0159,25 16.0542,24.9923 16.0909,24.9766L16.0969,24.974L16.097,24.974C19.126,23.687 24.3241,19.0495 24.3333,10.4021C24.3297,10.323 24.3046,10.2482 24.263,10.1861C24.2198,10.1217 24.1618,10.0753 24.099,10.0486C24.099,10.0486 24.0989,10.0486 24.0988,10.0485L16.169,6.6911C16.1117,6.6751 16.0529,6.667 15.9941,6.6668L15.9835,6.6667ZM16.7502,5.1273L24.7497,8.5142C25.1135,8.6685 25.4254,8.927 25.6473,9.258C25.8693,9.5891 25.9918,9.9785 26,10.379C26,19.7769 20.3316,24.9857 16.7487,26.5079C16.5048,26.6127 16.2428,26.6667 15.9781,26.6667C15.7134,26.6667 15.4513,26.6127 15.2074,26.5079C10.7492,24.6028 6,18.8031 6,10.379C5.9995,9.9821 6.1137,9.5938 6.3285,9.2623C6.5432,8.9308 6.849,8.6707 7.2079,8.5142L15.2074,5.1273C15.4626,5.0406 15.7302,4.9976 15.9992,5.0001C16.2547,5.0009 16.5083,5.0439 16.7502,5.1273Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M13.6727,11.9865C13.9982,12.3119 13.9982,12.8396 13.6727,13.165C13.0298,13.8079 12.7087,14.6488 12.7087,15.4925C12.7087,16.3361 13.0298,17.177 13.6727,17.8199C14.3156,18.4628 15.1565,18.7839 16.0002,18.7839C16.8438,18.7839 17.6847,18.4627 18.3276,17.8199C18.9704,17.177 19.2916,16.3361 19.2916,15.4925C19.2916,14.6488 18.9704,13.8079 18.3276,13.165C18.0021,12.8396 18.0021,12.3119 18.3276,11.9865C18.653,11.6611 19.1807,11.6611 19.5061,11.9865C20.4741,12.9545 20.9583,14.2248 20.9583,15.4925C20.9583,16.7601 20.4741,18.0304 19.5061,18.9984C18.5381,19.9664 17.2678,20.4506 16.0002,20.4506C14.7326,20.4506 13.4622,19.9664 12.4942,18.9984C11.5262,18.0304 11.042,16.7601 11.042,15.4925C11.042,14.2248 11.5262,12.9545 12.4942,11.9865C12.8196,11.6611 13.3473,11.6611 13.6727,11.9865Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.0849,11C16.5451,11 16.9182,11.3731 16.9182,11.8333L16.9182,15.5535C16.9182,16.0137 16.5451,16.3868 16.0849,16.3868C15.6246,16.3868 15.2515,16.0137 15.2515,15.5535L15.2515,11.8333C15.2515,11.3731 15.6246,11 16.0849,11Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/res/drawable/ic_homepage_privacy.xml b/res/drawable/ic_homepage_privacy.xml
index fa5b3706051..2a30d5c3e73 100644
--- a/res/drawable/ic_homepage_privacy.xml
+++ b/res/drawable/ic_homepage_privacy.xml
@@ -1,24 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2019-2022 ECORP 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.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="@dimen/dashboard_tile_image_size"
     android:height="@dimen/dashboard_tile_image_size"
-    android:viewportWidth="16.933332"
-    android:viewportHeight="16.933334">
+    android:viewportWidth="32"
+    android:viewportHeight="32">
   <path
-      android:pathData="M2.802,-0L14.1313,-0A2.802,2.802 0,0 1,16.9333 2.8019L16.9333,14.1313A2.802,2.802 0,0 1,14.1313 16.9333L2.802,16.9333A2.802,2.802 0,0 1,-0 14.1313L-0,2.8019A2.802,2.802 0,0 1,2.802 -0z"
-      android:strokeWidth="0.171675"
-      android:fillColor="#0088ed"/>
+      android:pathData="M25.2477,32H6.7523C3.0261,32 0,28.9739 0,25.2477V6.7523C0,3.0261 3.0261,0 6.7523,0H25.2477C28.9739,0 32,3.0261 32,6.7523V25.2477C32,28.9739 28.9739,32 25.2477,32Z"
+      android:fillColor="#2CCF69"/>
   <path
-      android:pathData="M2.9164,8.4666a2.5258,5.5503 90,1 0,11.1006 0a2.5258,5.5503 90,1 0,-11.1006 0z"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.410898"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"
-      android:strokeLineCap="butt"/>
+      android:pathData="M16.0002,18.5003C17.381,18.5003 18.5004,17.3809 18.5004,16C18.5004,14.6192 17.381,13.4997 16.0002,13.4997C14.6193,13.4997 13.4999,14.6192 13.4999,16C13.4999,17.3809 14.6193,18.5003 16.0002,18.5003ZM16.0002,20.1672C18.3016,20.1672 20.1673,18.3015 20.1673,16C20.1673,13.6986 18.3016,11.8329 16.0002,11.8329C13.6987,11.8329 11.833,13.6986 11.833,16C11.833,18.3015 13.6987,20.1672 16.0002,20.1672Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
   <path
-      android:pathData="m10.4975,8.5258a2.0308,2.0308 0,0 1,-2.0308 2.0308,2.0308 2.0308,0 0,1 -2.0308,-2.0308 2.0308,2.0308 0,0 1,2.0308 -2.0308,2.0308 2.0308,0 0,1 2.0308,2.0308"
-      android:strokeLineJoin="miter"
-      android:strokeWidth="0.410898"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"
-      android:strokeLineCap="butt"/>
+      android:pathData="M6.9985,16C8.6544,19.2962 12.0653,21.554 16.0001,21.554C19.9349,21.554 23.3458,19.2962 25.0017,16C23.3458,12.7039 19.9349,10.446 16.0001,10.446C12.0653,10.446 8.6544,12.7038 6.9985,16ZM26.8347,16C25.0663,11.7597 20.8813,8.7792 16.0001,8.7792C11.1189,8.7792 6.9338,11.7597 5.1655,16C6.9338,20.2404 11.1189,23.2208 16.0001,23.2208C20.8813,23.2208 25.0663,20.2404 26.8347,16Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 0948e6e2232..45331788690 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -197,4 +197,8 @@
 
     <!-- Display settings screen, peak refresh rate settings summary [CHAR LIMIT=NONE] -->
     <string name="peak_refresh_rate_summary_custom">Automatically raises the refresh rate from 60 to %1$d Hz for some content. Increases battery usage.</string>
+
+    <!-- Advanced Privacy -->
+    <string name="advanced_privacy_dashboard_title">Advanced Privacy</string>
+    <string name="advanced_privacy_dashboard_summary">Manage trackers, fake location, hide IP address</string>
 </resources>
diff --git a/res/xml/advanced_privacy_dashboard_settings.xml b/res/xml/advanced_privacy_dashboard_settings.xml
new file mode 100644
index 00000000000..c126441c00d
--- /dev/null
+++ b/res/xml/advanced_privacy_dashboard_settings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2019-2022 ECORP 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.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="advanced_privacy"
+    android:title="@string/advanced_privacy_dashboard_title">
+
+    <Preference>
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="foundation.e.privacycentralapp.e"
+            android:targetClass="foundation.e.privacycentralapp.main.MainActivity" />
+    </Preference>
+</PreferenceScreen>
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index efa47b1add6..0aec50b3ffc 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -102,6 +102,14 @@
         android:order="-55"
         android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"/>
 
+    <Preference
+        android:key="top_level_advanced_privacy"
+        android:title="@string/advanced_privacy_dashboard_title"
+        android:summary="@string/advanced_privacy_dashboard_summary"
+        android:icon="@drawable/ic_homepage_advanced_privacy"
+        android:order="-54"
+        android:fragment="com.android.settings.privacy.AdvancedPrivacyDashboardFragment"/>
+
     <Preference
         android:key="top_level_location"
         android:title="@string/location_settings_title"
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index d768d59ba13..a3103a453cf 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -138,6 +138,7 @@ import com.android.settings.password.ChooseLockPassword;
 import com.android.settings.password.ChooseLockPattern;
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.privacy.AdvancedPrivacyDashboardFragment;
 import com.android.settings.privacy.PrivacyDashboardFragment;
 import com.android.settings.security.CryptKeeperSettings;
 import com.android.settings.security.LockscreenDashboardFragment;
@@ -313,7 +314,8 @@ public class SettingsGateway {
             InteractAcrossProfilesSettings.class.getName(),
             InteractAcrossProfilesDetails.class.getName(),
             MediaControlsSettings.class.getName(),
-            SystemUpdaterSettings.class.getName()
+            SystemUpdaterSettings.class.getName(),
+            AdvancedPrivacyDashboardFragment.class.getName(),
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index f8a4f39ef77..a97754bbc0c 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -40,6 +40,7 @@ import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.SoundSettings;
 import com.android.settings.notification.zen.ZenModeSettings;
+import com.android.settings.privacy.AdvancedPrivacyDashboardFragment;
 import com.android.settings.privacy.PrivacyDashboardFragment;
 import com.android.settings.security.LockscreenDashboardFragment;
 import com.android.settings.security.SecuritySettings;
@@ -109,6 +110,8 @@ public class DashboardFragmentRegistry {
                 CategoryKey.CATEGORY_NIGHT_DISPLAY);
         PARENT_TO_CATEGORY_KEY_MAP.put(PrivacyDashboardFragment.class.getName(),
                 CategoryKey.CATEGORY_PRIVACY);
+        PARENT_TO_CATEGORY_KEY_MAP.put(AdvancedPrivacyDashboardFragment.class.getName(),
+                CategoryKey.CATEGORY_PRIVACY);
         PARENT_TO_CATEGORY_KEY_MAP.put(EnterprisePrivacySettings.class.getName(),
                 CategoryKey.CATEGORY_ENTERPRISE_PRIVACY);
         PARENT_TO_CATEGORY_KEY_MAP.put(LegalSettings.class.getName(),
diff --git a/src/com/android/settings/privacy/AdvancedPrivacyDashboardFragment.java b/src/com/android/settings/privacy/AdvancedPrivacyDashboardFragment.java
new file mode 100644
index 00000000000..6afb2d871e4
--- /dev/null
+++ b/src/com/android/settings/privacy/AdvancedPrivacyDashboardFragment.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2019-2021 ECORP 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 com.android.settings.privacy;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+@SearchIndexable
+public class AdvancedPrivacyDashboardFragment extends Fragment {
+
+    private static final String privacyCentralPackageName = "foundation.e.privacycentralapp.e";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Activity activity = getActivity();
+        Intent intent = activity.getPackageManager().getLaunchIntentForPackage(privacyCentralPackageName);
+        startActivity(intent);
+
+        if (activity != null) {
+            activity.finish();
+        }
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.advanced_privacy_dashboard_settings);
+}
-- 
GitLab


From b63d8c0d2f4e5033be42a5357a1e2ae05019951a Mon Sep 17 00:00:00 2001
From: Jonathan Klee <jonathan.klee@e.email>
Date: Tue, 22 Mar 2022 16:36:06 +0000
Subject: [PATCH 2/2] Apply 1 suggestion(s) to 1 file(s)

---
 .../settings/privacy/AdvancedPrivacyDashboardFragment.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/privacy/AdvancedPrivacyDashboardFragment.java b/src/com/android/settings/privacy/AdvancedPrivacyDashboardFragment.java
index 6afb2d871e4..73057537d1c 100644
--- a/src/com/android/settings/privacy/AdvancedPrivacyDashboardFragment.java
+++ b/src/com/android/settings/privacy/AdvancedPrivacyDashboardFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 ECORP SAS
+ * Copyright (C) 2019-2022 ECORP SAS
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
-- 
GitLab