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

Commit c51a6d7e 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 !29
parents 0ade2896 50325e19

Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -36,5 +36,7 @@ android_app { 
        "androidx.legacy_legacy-support-v4",

        "androidx.legacy_legacy-support-v4",

        "androidx.gridlayout_gridlayout",

        "androidx.gridlayout_gridlayout",

        "androidx.recyclerview_recyclerview",

        "androidx.recyclerview_recyclerview",

        "androidx.webkit_webkit",

        "elib",

    ],

    ],

}
 
}

assets/licenses.html

+1 −1
Original line number Original line Diff line number Diff line 
<html>

<html>

<head>

<head>

<meta name="viewport" content="width=device-width">

<meta name="viewport" content="width=device-width">

<style> body { font-family: sans-serif; } pre { background-color: #eeeeee; padding: 1em; white-space: pre-wrap; word-wrap: break-word; } </style>

<style> body { font-family: sans-serif; } pre { background-color: #FFFFFF; padding: 1em; white-space: pre-wrap; word-wrap: break-word; } </style>

</head>

</head>

<body>

<body>

<h3>Notices for files:</h3>

<h3>Notices for files:</h3>

res/drawable/ic_advanced_bar.xml

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

<!--

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

    android:width="2dp"

    android:height="18dp"

    android:viewportWidth="2"

    android:viewportHeight="18">

  <path

      android:pathData="M2,18l-2,-0l-0,-18l2,-0z"

      android:fillColor="?android:attr/textColorPrimary"/>

</vector>

res/drawable/ic_del.xml

+8 −11
Original line number Original line Diff line number Diff line
@@ -14,16 +14,13 @@ 
  See the License for the specific language governing permissions and

  See the License for the specific language governing permissions and

  limitations under the License.

  limitations under the License.

  -->

  -->

<vector

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

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

    android:height="24dp"

    android:width="24dp"

    android:width="24dp"

    android:viewportHeight="24"

    android:height="24dp"

    android:viewportWidth="24">

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

  <path

        android:fillColor="@color/pad_button_text_color"

      android:pathData="M22,3H7C6.31,3 5.77,3.35 5.41,3.88L0,12L5.41,20.11C5.77,20.64 6.31,21 7,21H22C23.1,21 24,20.1 24,19V5C24,3.9 23.1,3 22,3ZM22,19H7.07L2.4,12L7.06,5H22V19ZM10.41,17L14,13.41L17.59,17L19,15.59L15.41,12L19,8.41L17.59,7L14,10.59L10.41,7L9,8.41L12.59,12L9,15.59L10.41,17Z"

        android:pathData="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41

      android:fillColor="@color/calculator_accent_color"/>

        L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59M22,3A2,2 0 0,1 24,5V19A2,2 0 0,1 22,21

        H7C6.31,21 5.77,20.64 5.41,20.11L0,12L5.41,3.88C5.77,3.35 6.31,3 7,3H22M22,5

        H7L2.28,12L7,19H22V5Z" />

</vector>

</vector>

res/drawable/ic_launcher_background.xml

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

<?xml version="1.0" encoding="utf-8"?>

<!--

<!--

     SPDX-FileCopyrightText: 2022 The LineageOS Project

  ~ Copyright ECORP SAS 2022

     SPDX-License-Identifier: Apache-2.0

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

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

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

    android:width="108dp"

    android:width="108dp"

    android:height="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportWidth="108"

    android:viewportHeight="108">

    android:viewportHeight="108">

  <path

  <path

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

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

      android:fillColor="#ffffff"/>

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

  <path

      <gradient 

      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:startX="54"

      android:fillColor="#551E22"/>

          android:startY="-0.86"

  <path

          android:endX="54"

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

          android:endY="147.7"

      android:fillColor="#2A3232"/>

          android:type="linear">

  <path

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

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

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

      android:fillColor="#AD2F3C"/>

      </gradient>

  <path

    </aapt:attr>

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

  </path>

      android:fillColor="#AD2F3C"/>

  <path

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

      android:fillColor="#AD2F3C"/>

  <path

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

      android:fillColor="#AD2F3C"/>

  <path

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

      android:fillColor="#AD2F3C"/>

  <path

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

      android:fillColor="#AD2F3C"/>

  <path

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

      android:fillColor="#AD2F3C"/>

  <path

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

      android:fillColor="#AD2F3C"/>

  <path

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

      android:fillColor="#AD2F3C"/>

</vector>
 
</vector>