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

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

Merge branch 'epic42-t-bringup' into 'v1-t' 

Port changes from Android S

See merge request !28
parents 52e6b2a0 d71ebb41

app/src/main/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ android_app { 
        "androidx-constraintlayout_constraintlayout-solver",

        "androidx.appcompat_appcompat",

        "androidx.recyclerview_recyclerview",

        "com.google.android.material_material",

        "elib",

    ],



    sdk_version: "current",

app/src/main/res/drawable/ic_launcher_background.xml

+28 −14
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 ECORP SAS 2022

  ~ 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">

  <path

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

      android:fillColor="#551E22"/>

  <path

      android:pathData="M34,43L34,43A2,2 0,0 1,36 45L36,63A2,2 0,0 1,34 65L34,65A2,2 0,0 1,32 63L32,45A2,2 0,0 1,34 43z"

      android:fillColor="#ffffff"/>

  <path

      android:pathData="M42,48L42,48A2,2 0,0 1,44 50L44,58A2,2 0,0 1,42 60L42,60A2,2 0,0 1,40 58L40,50A2,2 0,0 1,42 48z"

      android:fillColor="#ffffff"/>

  <path

      android:pathData="M49,53L51,53A1,1 0,0 1,52 54L52,54A1,1 0,0 1,51 55L49,55A1,1 0,0 1,48 54L48,54A1,1 0,0 1,49 53z"

      android:fillColor="#ffffff"/>

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

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

      <gradient 

          android:startX="54"

          android:startY="258.86"

          android:endX="54"

          android:endY="-0.41"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

</vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

+42 −24
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 ECORP SAS 2022

  ~ 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"
@@ -9,25 +20,32 @@ 
    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <group>

    <clip-path

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

  <path

        android:pathData="M68,54m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"

        android:fillColor="#F93B4F"/>

      android:pathData="M52.11,75.97V68.25C51.32,68.07 50.53,67.92 49.76,67.71C46.38,66.74 43.41,64.7 41.3,61.9C39.18,59.1 38.03,55.69 38.03,52.18C38.03,51.57 38.03,50.95 38.03,50.35C38.03,49.07 38.85,48.21 40.05,48.22C41.25,48.24 42.02,49.08 42.06,50.38C42.05,51.79 42.14,53.2 42.32,54.6C43.19,59.73 47.75,63.83 52.92,64.29C59.48,64.86 65.05,60.57 66.1,54.08C66.24,52.85 66.29,51.61 66.26,50.37C66.29,49.06 67.1,48.19 68.31,48.22C69.51,48.25 70.25,49.12 70.28,50.41C70.36,53.13 70.18,55.81 69.05,58.33C66.61,63.79 62.43,67.07 56.52,68.17L56.2,68.22V75.98H56.87C60.63,75.98 64.39,75.98 68.15,75.98C68.58,75.94 69,76.05 69.36,76.28C69.72,76.51 70,76.85 70.15,77.25C70.26,77.57 70.29,77.91 70.25,78.24C70.2,78.57 70.07,78.89 69.87,79.16C69.68,79.43 69.41,79.65 69.11,79.79C68.81,79.94 68.48,80.01 68.14,80C64.38,80 60.62,80 56.86,80C51.33,80 45.8,80 40.26,80C39.84,79.99 39.42,79.9 39.03,79.71C38.64,79.49 38.34,79.15 38.16,78.74C37.99,78.32 37.96,77.87 38.08,77.44C38.19,77 38.45,76.62 38.81,76.35C39.17,76.09 39.62,75.96 40.06,75.98C43.62,75.98 47.16,75.98 50.69,75.98L52.11,75.97Z">

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

      <gradient 

          android:startX="54.17"

          android:startY="39.83"

          android:endX="54.17"

          android:endY="126.36"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

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

      android:pathData="M62.25,36.09C62.25,31.62 58.63,28 54.16,28C49.69,28 46.06,31.62 46.06,36.09V52.24C46.06,56.71 49.69,60.34 54.16,60.34C58.63,60.34 62.25,56.71 62.25,52.24V36.09Z">

    <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"/>

          android:startX="54.17"

          android:startY="40.12"

          android:endX="54.17"

          android:endY="126.07"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  </group>

</vector>

app/src/main/res/drawable/ic_launcher_monochrome.xml

deleted100644 → 0
+0 −23
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="M34,43L34,43A2,2 0,0 1,36 45L36,63A2,2 0,0 1,34 65L34,65A2,2 0,0 1,32 63L32,45A2,2 0,0 1,34 43z"

      android:fillColor="#ffffffff"/>

  <path

      android:pathData="M42,48L42,48A2,2 0,0 1,44 50L44,58A2,2 0,0 1,42 60L42,60A2,2 0,0 1,40 58L40,50A2,2 0,0 1,42 48z"

      android:fillColor="#ffffffff"/>

  <path

      android:pathData="M49,53L51,53A1,1 0,0 1,52 54L52,54A1,1 0,0 1,51 55L49,55A1,1 0,0 1,48 54L48,54A1,1 0,0 1,49 53z"

      android:fillColor="#ffffffff"/>

  <path

      android:pathData="M68,54m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"

      android:fillColor="#ffffffff"/>

</vector>

app/src/main/res/layout/activity_main.xml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
        android:clipToPadding="false"

        android:contentDescription="@string/main_sound_action"

        android:src="@drawable/ic_action_record"

        app:fabCustomSize="96dp"

        app:fabCustomSize="72dp"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent" />