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

Commit b5e0eed0 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic340-a15-a15_bringup' into 'a15' 

Port LineageParts changes from A14

See merge request !71
parents 03e7a400 322a07f5

AndroidManifest.xml

+51 −23
Original line number Diff line number Diff line
@@ -216,6 +216,56 @@ 
                android:resource="@string/summary_empty" />

        </activity-alias>



        <!-- Microg settings (System category) -->

        <activity-alias

            android:name=".microg.MicrogSettings"

            android:exported="true"

            android:label="@string/microg_title"

            android:targetActivity="PartsActivity">

            <intent-filter>

                <action android:name="com.android.settings.action.IA_SETTINGS" />

                <action android:name="org.lineageos.lineageparts.MICROG_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data

                android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.system" />

            <meta-data

                android:name="com.android.settings.icon"

                android:resource="@drawable/ic_settings_microg" />

            <meta-data

                android:name="com.android.settings.icon_tintable"

                android:value="true" />

            <meta-data

                android:name="com.android.settings.order"

                android:value="-253" />

            <meta-data

                android:name="com.android.settings.summary"

                android:resource="@string/summary_empty" />

        </activity-alias>



        <!-- OpenKeychain settings (Security category) -->

        <activity-alias

            android:name=".openkeychain.OpenKeychainSettings"

            android:exported="true"

            android:label="@string/openkeychain_title"

            android:targetActivity="PartsActivity">

            <intent-filter>

                <action android:name="com.android.settings.action.IA_SETTINGS" />

                <action android:name="org.lineageos.lineageparts.OPENKEYCHAIN_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data

                android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.privacy" />

            <meta-data

                android:name="com.android.settings.order"

                android:value="-255" />

            <meta-data

                android:name="com.android.settings.summary"

                android:resource="@string/summary_empty" />

        </activity-alias>



        <!-- Trust interface (Privacy category) -->

        <activity-alias

            android:name=".trust.TrustPreferences"
@@ -244,7 +294,7 @@ 


        <!-- Contributors Cloud (MyDeviceInfo category) -->

        <activity-alias

            android:name=".contributors.ContributorsCloudFragment"

            android:name=".contributors.ContributorsSettings"

            android:exported="true"

            android:label="@string/contributors_cloud_fragment_title"

            android:targetActivity="PartsActivity">
@@ -268,28 +318,6 @@ 
                android:resource="@string/summary_empty" />

        </activity-alias>



        <!-- Anonymous Statistics -->

        <receiver

            android:name=".lineagestats.ReportingServiceManager"

            android:enabled="true"

            android:exported="false"

            android:label="ReportingServiceManager">

            <intent-filter>

                <action android:name="android.intent.action.BOOT_COMPLETED" />

                <action android:name="org.lineageos.lineageparts.action.TRIGGER_REPORT_METRICS" />

            </intent-filter>

        </receiver>



        <service

            android:name=".lineagestats.ReportingService"

            android:enabled="true"

            android:exported="false"

            android:label="ReportingService" />



        <service

            android:name=".lineagestats.StatsUploadJobService"

            android:permission="android.permission.BIND_JOB_SERVICE" />



        <activity

            android:name=".profiles.NFCProfile"

            android:exported="true">

proguard.flags

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
-keep class org.lineageos.lineageparts.gestures.*

-keep class org.lineageos.lineageparts.hardware.*

-keep class org.lineageos.lineageparts.input.*

-keep class org.lineageos.lineageparts.lineagestats.*

-keep class org.lineageos.lineageparts.livedisplay.*

-keep class org.lineageos.lineageparts.notificationlight.*

-keep class org.lineageos.lineageparts.power.*

res/drawable/ic_settings_microg.xml

0 → 100644
+14 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="32"

    android:viewportHeight="32"

    android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:fillType="evenOdd"

        android:pathData="M11.818,11.625C14.042,9.471 17.585,9.507 19.77,11.727C20.157,12.121 20.152,12.754 19.759,13.141C19.365,13.529 18.732,13.524 18.344,13.13C16.931,11.694 14.65,11.672 13.216,13.056C11.807,14.47 11.788,16.752 13.198,18.184C14.613,19.622 16.899,19.642 18.333,18.253C18.729,17.869 19.362,17.879 19.747,18.276C20.131,18.672 20.121,19.305 19.724,19.69C17.501,21.844 13.958,21.807 11.773,19.587C9.585,17.365 9.622,13.821 11.807,11.636C11.811,11.632 11.815,11.628 11.818,11.625Z" />

    <path

        android:fillColor="@android:color/white"

        android:pathData="M13.629,3L18.4,3.029L18.686,5.886C20.286,6.343 21.771,7.2 22.971,8.4L25.571,7.314L27.886,11.314L25.629,13.029C26.086,14.8 26.057,16.629 25.571,18.343L27.857,20.114L25.343,24.171L22.686,23.029C22.114,23.543 21.514,24.029 20.8,24.429C20.057,24.857 19.257,25.2 18.457,25.429L18.143,28.286L13.371,28.343L13.029,25.486C11.371,25.029 9.857,24.171 8.6,22.943L6,24.029L3.686,20.029L5.943,18.314C5.486,16.571 5.514,14.8 5.971,13.114L3.686,11.4L6.114,7.286L8.8,8.371C9.371,7.829 10.029,7.314 10.771,6.914C11.571,6.457 12.4,6.114 13.229,5.886L13.629,3ZM11.914,1L11.657,2.686L11.4,4.314C10.829,4.543 10.257,4.8 9.714,5.114C9.257,5.371 8.8,5.686 8.371,6L6.829,5.371L5.229,4.714L4.343,6.2L1.914,10.371L1,11.914L2.429,13L3.714,13.943C3.543,15.114 3.543,16.314 3.714,17.486L2.457,18.429L1.057,19.486L1.943,21L4.257,25L5.143,26.514L6.771,25.829L8.229,25.229C9.143,25.943 10.143,26.514 11.2,26.943L11.4,28.543L11.6,30.314L13.4,30.286L18.171,30.229L19.886,30.2L20.114,28.486L20.343,26.857C20.857,26.657 21.371,26.4 21.857,26.114C22.286,25.886 22.686,25.6 23.086,25.314L24.629,25.971L26.2,26.657L27.114,25.2L29.629,21.143L30.571,19.629L29.143,18.543L27.857,17.543C28.057,16.314 28.057,15.086 27.886,13.857L29.143,12.914L30.543,11.857L29.657,10.343L27.343,6.343L26.429,4.8L24.8,5.486L23.343,6.086C22.486,5.429 21.543,4.857 20.543,4.429L20.371,2.829L20.2,1.057H18.4L13.629,1H11.914Z" />

</vector>

res/values-de/e_strings.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?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="lineageos_contributors_title">LineageOS Mitwirkende</string>

    <string name="e_supporters_title">/e/ Unterstützer</string>

    <string name="e_contributors_title">/e/ Mitwirkende</string>

    <string name="e_trust_feature_security_patches_explain">Sicherheits-Patches werden monatlich von Google in Zusammenarbeit mit SoC-Anbietern veröffentlicht, um Schwachstellen zu beheben, die von bösartigen Apps ausgenutzt werden könnten, um Sicherheitseinschränkungen zu umgehen und das Gerät dauerhaft zu beschädigen. Die von Google zur Verfügung gestellten Patches werden jeden Monat auf alle unterstützten Geräte aufgespielt, aber Patches für proprietären Code können nur vom Hersteller deines Geräts aufgespielt werden. Um dein Gerät zu schützen, solltest du sicherstellen, dass dein /e/-OS-Build immer auf dem neuesten Stand ist, und (falls zutreffend) dass dein Hersteller-Image auf die neueste von /e/OS empfohlene Version aktualisiert ist.</string>

</resources>
 
 No newline at end of file

res/values-fr/e_strings.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?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="lineageos_contributors_title">Contributeurs LineageOS</string>

    <string name="e_trust_feature_security_patches_explain">Les correctifs de sécurité sont publiés chaque mois par Google, en coopération avec les fabricants de puces SoC (System On a Chip). Ils permettent de corriger des failles que des applications malveillantes sont susceptibles d\'exploiter pour contourner les restrictions de sécurité et endommager votre appareil de façon définitive. Les correctifs fournis par Google sont appliqués chaque mois à tous les appareils compatibles, mais ceux concernant le code propriétaire ne peuvent l\'être que par le fabricant de votre appareil. Pour garantir la sécurité de votre appareil, veillez à toujours utiliser la dernière version de /e/OS et, le cas échéant, mettez à jour votre fichier vendor.img afin qu\'il corresponde à la dernière version recommandée par /e/OS.</string>

</resources>
 
 No newline at end of file