Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c89be0b6 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal Committed by Mohammed Althaf T
Browse files

Settings: Integrate Advanced Privacy into settings 



Settings: Change packagename for advanced privacy

 * ALso explicitly specify component name

Signed-off-by: default avataralthafvly <althafvly@gmail.com>
parent 73826011

res/drawable/ic_homepage_advanced_privacy.xml

0 → 100644
+39 −0
Original line number Diff line number Diff line 
<?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="32dp"

    android:height="32dp"

    android:viewportWidth="32"

    android:viewportHeight="32">

    <path

        android:fillColor="#00000000"

        android:pathData="M15.99,4V4C15.79,3.998 15.592,4.028 15.402,4.089L5.845,8.136C5.598,8.244 5.385,8.425 5.233,8.658C5.081,8.893 5,9.17 5,9.453L5,9.455C5,19.19 10.484,25.771 15.442,27.89L15.444,27.891C15.612,27.963 15.792,28 15.974,28C16.155,28 16.335,27.963 16.504,27.891L16.507,27.889C20.475,26.204 26.995,20.295 27,9.466C26.992,9.179 26.904,8.902 26.746,8.666C26.587,8.429 26.365,8.247 26.11,8.138L15.99,4ZM15.99,4L15.996,4C16.182,4.001 16.368,4.03 16.545,4.088L26.109,8.138L15.99,4Z"

        android:strokeWidth="2"

        android:strokeColor="#0088ED" />

    <path

        android:fillColor="#00000000"

        android:pathData="M19.5,12.291C20.466,13.257 20.95,14.524 20.95,15.791C20.95,17.058 20.466,18.324 19.5,19.291C18.534,20.257 17.267,20.741 16,20.741C14.733,20.741 13.466,20.258 12.5,19.291C11.533,18.324 11.05,17.058 11.05,15.791C11.05,14.524 11.533,13.257 12.5,12.291"

        android:strokeWidth="2"

        android:strokeColor="#0088ED"

        android:strokeLineCap="round" />

    <path

        android:fillColor="#00000000"

        android:pathData="M16.101,11.4L16.101,15.864"

        android:strokeWidth="2"

        android:strokeColor="#0088ED"

        android:strokeLineCap="round" />

</vector>

res/values/e_strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -29,4 +29,8 @@ 
    <string name="use_ota_summary">Access test releases of /e/ OS</string>

    <string name="use_ota_staging_popup_title">You are about to connect to /e/ OS test channel</string>

    <string name="use_ota_staging_popup_message">It will allow you to download and install test versions of /e/ OS. Those builds may be unstable, and should be used only for test purposes. Please accept only if you know what you are doing.</string>



    <!-- /e/ Advanced Privacy -->

    <string name="advanced_privacy_dashboard_title" translatable="false">Advanced Privacy</string>

    <string name="advanced_privacy_dashboard_summary">Manage trackers, fake location, hide IP address</string>

</resources>

res/xml/advanced_privacy_dashboard_settings.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<?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.advancedprivacy"

            android:targetClass="foundation.e.privacycentralapp.main.MainActivity" />

    </Preference>

</PreferenceScreen>

res/xml/top_level_settings_expressive.xml

+8 −0
Original line number Diff line number Diff line
@@ -206,6 +206,14 @@ 
            settings:highlightableMenuKey="@string/menu_key_privacy"

            settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"/>



        <com.android.settings.widget.HomepagePreference

            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="-25"

            android:fragment="com.android.settings.privacy.AdvancedPrivacyDashboardFragment"/>



        <com.android.settings.widget.HomepagePreference

            android:fragment="com.android.settings.location.LocationSettings"

            android:icon="@drawable/ic_homepage_location"

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -181,6 +181,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.PrivacyControlsFragment;

import com.android.settings.privacy.PrivacyDashboardFragment;

import com.android.settings.privatespace.delete.PrivateSpaceDeleteFragment;
@@ -432,6 +433,7 @@ public class SettingsGateway { 
            SupervisionDashboardFragment.class.getName(),

            SummarizationPreferenceFragment.class.getName(),

            SafetyCenterFragment.class.getName(),

            AdvancedPrivacyDashboardFragment.class.getName(),

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {