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

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

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

Port calculator changes from A14

See merge request !36
parents c7d52dbb cf0320f5

res/drawable/ic_launcher_background.xml

+96 −39
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     SPDX-FileCopyrightText: 2022 The LineageOS Project

     SPDX-License-Identifier: Apache-2.0

  ~ Copyright Murena SAS 2024

  ~ 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/>.

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:aapt="http://schemas.android.com/aapt"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <group>

    <clip-path

        android:pathData="M0,0h108v108h-108z"/>

    <path

      android:pathData="M0,0h108v108h-108z"

      android:fillColor="#ffffff"/>

  <path

      android:pathData="M42,30L66,30A4,4 0,0 1,70 34L70,74A4,4 0,0 1,66 78L42,78A4,4 0,0 1,38 74L38,34A4,4 0,0 1,42 30z"

      android:fillColor="#551E22"/>

  <path

      android:pathData="M38,34C38,31.791 39.791,30 42,30H66C68.209,30 70,31.791 70,34V46H38V34Z"

      android:fillColor="#2A3232"/>

        android:pathData="M0,0h108v108h-108z">

      <aapt:attr name="android:fillColor">

        <gradient 

            android:startX="54.06"

            android:startY="0"

            android:endX="54.06"

            android:endY="108"

            android:type="linear">

          <item android:offset="0" android:color="#FFFFFFFF"/>

          <item android:offset="1" android:color="#FFE8E9F6"/>

        </gradient>

      </aapt:attr>

    </path>

    <path

      android:pathData="M44,52m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"

      android:fillColor="#AD2F3C"/>

  <path

      android:pathData="M44,62m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"

      android:fillColor="#AD2F3C"/>

        android:pathData="M0,0h108v108h-108z"

        android:fillColor="#708F97"/>

    <path

      android:pathData="M44,72m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"

      android:fillColor="#AD2F3C"/>

        android:pathData="M0,0h108v108h-108z">

      <aapt:attr name="android:fillColor">

        <gradient 

            android:startX="54"

            android:startY="9.88"

            android:endX="54"

            android:endY="105.89"

            android:type="linear">

          <item android:offset="0" android:color="#FFFF7300"/>

          <item android:offset="1" android:color="#FFFF3D00"/>

        </gradient>

      </aapt:attr>

    </path>

    <path

      android:pathData="M54,52m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"

      android:fillColor="#AD2F3C"/>

        android:pathData="M0,0h108v108h-108z"

        android:fillColor="#2D313E"/>

    <path

      android:pathData="M54,62m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"

      android:fillColor="#AD2F3C"/>

        android:pathData="M0,0h108v108h-108z">

      <aapt:attr name="android:fillColor">

        <gradient 

            android:startX="54"

            android:startY="0"

            android:endX="54"

            android:endY="108"

            android:type="linear">

          <item android:offset="0" android:color="#FF4E5261"/>

          <item android:offset="1" android:color="#FF26282D"/>

        </gradient>

      </aapt:attr>

    </path>

    <path

      android:pathData="M54,72m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"

      android:fillColor="#AD2F3C"/>

        android:pathData="M54.31,-0L54.31,108"

        android:strokeAlpha="0.25"

        android:strokeWidth="0.62069"

        android:fillColor="#00000000"

        android:strokeColor="#ffffff"/>

    <path

      android:pathData="M64,52m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"

      android:fillColor="#AD2F3C"/>

        android:pathData="M54,54H108V108H54V54Z"

        android:fillColor="#D9D9D9"/>

    <path

      android:pathData="M64,62m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"

      android:fillColor="#AD2F3C"/>

        android:pathData="M54,54H108V108H54V54Z">

      <aapt:attr name="android:fillColor">

        <gradient 

            android:startX="81"

            android:startY="58.94"

            android:endX="81"

            android:endY="106.94"

            android:type="linear">

          <item android:offset="0" android:color="#FFFF7300"/>

          <item android:offset="1" android:color="#FFFF3D00"/>

        </gradient>

      </aapt:attr>

    </path>

    <path

      android:pathData="M64,72m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"

      android:fillColor="#AD2F3C"/>

        android:pathData="M0,53.69L108,53.69"

        android:strokeAlpha="0.25"

        android:strokeWidth="0.62069"

        android:fillColor="#00000000"

        android:strokeColor="#ffffff"/>

  </group>

</vector>

res/drawable/ic_launcher_foreground.xml

+26 −49
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     SPDX-FileCopyrightText: 2022 The LineageOS Project

     SPDX-License-Identifier: Apache-2.0

  ~ Copyright Murena SAS 2024

  ~ 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/>.

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:aapt="http://schemas.android.com/aapt"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <group>

    <clip-path

        android:pathData="M0,0h108v108h-108z"/>

  <path

        android:pathData="M41,48L47,48A1,1 0,0 1,48 49L48,55A1,1 0,0 1,47 56L41,56A1,1 0,0 1,40 55L40,49A1,1 0,0 1,41 48z"

      android:pathData="M34.75,43.1V30.05H37.25V43.1H34.75ZM29.33,37.77V35.41H42.67V37.77H29.33Z"

      android:fillColor="#ffffff"/>

  <path

        android:pathData="M41,58L47,58A1,1 0,0 1,48 59L48,65A1,1 0,0 1,47 66L41,66A1,1 0,0 1,40 65L40,59A1,1 0,0 1,41 58z"

      android:pathData="M29.33,74.61V72.26H42.67V74.61H29.33Z"

      android:fillColor="#ffffff"/>

  <path

        android:pathData="M40,69C40,68.448 40.448,68 41,68H47C47.552,68 48,68.448 48,69V75C48,75.552 47.552,76 47,76H42C40.895,76 40,75.105 40,74V69Z"

      android:pathData="M66.57,40.77L75.95,31.29L77.56,33.02L68.15,42.49L66.57,40.77ZM66.57,33.02L68.15,31.29L77.56,40.77L75.95,42.49L66.57,33.02Z"

      android:fillColor="#ffffff"/>

  <path

        android:pathData="M51,48L57,48A1,1 0,0 1,58 49L58,55A1,1 0,0 1,57 56L51,56A1,1 0,0 1,50 55L50,49A1,1 0,0 1,51 48z"

      android:pathData="M65.33,70.89V68.53H78.67V70.89H65.33ZM65.33,77.95V75.59H78.67V77.95H65.33Z"

      android:fillColor="#ffffff"/>

    <path

        android:pathData="M61,48L67,48A1,1 0,0 1,68 49L68,55A1,1 0,0 1,67 56L61,56A1,1 0,0 1,60 55L60,49A1,1 0,0 1,61 48z"

        android:fillColor="#F93B4F"/>

    <path

        android:pathData="M51,58L57,58A1,1 0,0 1,58 59L58,65A1,1 0,0 1,57 66L51,66A1,1 0,0 1,50 65L50,59A1,1 0,0 1,51 58z"

        android:fillColor="#ffffff"/>

    <path

        android:pathData="M61,58L67,58A1,1 0,0 1,68 59L68,65A1,1 0,0 1,67 66L61,66A1,1 0,0 1,60 65L60,59A1,1 0,0 1,61 58z"

        android:fillColor="#F93B4F"/>

    <path

        android:pathData="M51,68L57,68A1,1 0,0 1,58 69L58,75A1,1 0,0 1,57 76L51,76A1,1 0,0 1,50 75L50,69A1,1 0,0 1,51 68z"

        android:fillColor="#ffffff"/>

    <path

        android:pathData="M60,69C60,68.448 60.448,68 61,68H67C67.552,68 68,68.448 68,69V74C68,75.105 67.105,76 66,76H61C60.448,76 60,75.552 60,75V69Z"

        android:fillColor="#F93B4F"/>

    <path

        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"

        android:fillAlpha="0.6">

      <aapt:attr name="android:fillColor">

        <gradient

            android:gradientRadius="72"

            android:centerX="28.54"

            android:centerY="28.54"

            android:type="radial">

          <item android:offset="0" android:color="#19FFFFFF"/>

          <item android:offset="1" android:color="#00FFFFFF"/>

        </gradient>

      </aapt:attr>

    </path>

  </group>

</vector>

res/drawable/ic_launcher_monochrome.xml

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     SPDX-FileCopyrightText: 2022 The LineageOS Project

     SPDX-License-Identifier: Apache-2.0

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <path

      android:pathData="M43,32C40.791,32 39,33.791 39,36V72C39,74.209 40.791,76 43,76H65C67.209,76 69,74.209 69,72V36C69,33.791 67.209,32 65,32H43ZM48,49H42V55H48V49ZM48,58H42V64H48V58ZM42,67H48V73H43C42.448,73 42,72.552 42,72V67ZM57,49H51V55H57V49ZM51,58H57V64H51V58ZM57,67H51V73H57V67ZM60,49H66V55H60V49ZM66,58H60V64H66V58ZM60,67H66V72C66,72.552 65.552,73 65,73H60V67Z"

      android:fillColor="#ffffffff"

      android:fillType="evenOdd"/>

</vector>

res/mipmap-anydpi/ic_launcher.xml

+16 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     SPDX-FileCopyrightText: 2022 The LineageOS Project

     SPDX-License-Identifier: Apache-2.0

  ~ Copyright Murena SAS 2024

  ~ 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/>.

  -->

<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@drawable/ic_launcher_background" />

    <foreground android:drawable="@drawable/ic_launcher_foreground" />

    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>

</adaptive-icon>