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

Commit 8d7d3061 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 !141
parents 5f8be2b0 b8ef342c
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -3946,7 +3946,7 @@

        <activity
            android:name=".Settings$AccountDashboardActivity"
            android:label="@string/account_dashboard_title"
            android:label="@string/Accounts_settings_title"
            android:exported="true"
            android:icon="@drawable/ic_homepage_accounts">
            <intent-filter android:priority="1">
@@ -4570,6 +4570,12 @@
            </intent-filter>
        </activity>

        <provider
            android:name="com.android.settings.development.OTAProvider"
            android:authorities="custom.setting.Provider.OTA_SERVER"
            android:exported="true"
            android:multiprocess="true" />

        <!-- This is the longest AndroidManifest.xml ever. -->
    </application>
</manifest>
+29 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright Murena 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:height="32dp" 
  android:viewportHeight="24"
  android:viewportWidth="24" 
  android:width="32dp" >
  <path 
    android:fillColor="?android:attr/textColorPrimary" 
    android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
  <path 
    android:fillColor="?android:attr/textColorPrimary" 
    android:pathData="M12,10h-2v2H9v-2H7V9h2V7h1v2h2v1z"/>
</vector>
+26 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright Murena 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="32dp"
    android:height="32dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
        android:fillColor="?android:attr/textColorPrimary"
        android:pathData="M6.4,18h2.1l1.1,-3.05h4.8L15.5,18h2.1L13.05,6h-2.1zM10.2,13.2l1.75,-4.95h0.1l1.75,4.95zM4,22q-0.825,0 -1.413,-0.587Q2,20.825 2,20L2,4q0,-0.825 0.587,-1.413Q3.175,2 4,2h16q0.825,0 1.413,0.587Q22,3.175 22,4v16q0,0.825 -0.587,1.413Q20.825,22 20,22zM4,20h16L20,4L4,4v16zM4,4v16L4,4z"/>
</vector>
 No newline at end of file
+44 −22
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
    Copyright (C) 2017 The Android Open Source Project

    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.
  ~ 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="24dp"
        android:height="24dp"
        android:viewportWidth="24.0"
        android:viewportHeight="24.0"
        android:tint="?android:attr/colorControlNormal">
    android:width="36dp"
    android:height="36dp"
    android:viewportWidth="32"
    android:viewportHeight="32">
  <group>
    <clip-path
        android:pathData="M0,0h32v32h-32z"/>
    <path
        android:pathData="M16,6C16,7.1 16.9,8 18,8C19.1,8 20,7.1 20,6C20,4.9 19.1,4 18,4C16.9,4 16,4.9 16,6ZM6,8C7.1,8 8,7.1 8,6C8,4.9 7.1,4 6,4C4.9,4 4,4.9 4,6C4,7.1 4.9,8 6,8ZM12.001,20C13.101,20 14.001,19.1 14.001,18C14.001,16.9 13.101,16 12.001,16C10.901,16 10.001,16.9 10.001,18C10.001,19.1 10.901,20 12.001,20ZM8.001,18C8.001,19.1 7.101,20 6.001,20C4.901,20 4.001,19.1 4.001,18C4.001,16.9 4.901,16 6.001,16C7.101,16 8.001,16.9 8.001,18ZM6.001,14C7.101,14 8.001,13.1 8.001,12C8.001,10.9 7.101,10 6.001,10C4.901,10 4.001,10.9 4.001,12C4.001,13.1 4.901,14 6.001,14ZM14.001,12C14.001,13.1 13.101,14 12.001,14C10.901,14 10.001,13.1 10.001,12C10.001,10.9 10.901,10 12.001,10C13.101,10 14.001,10.9 14.001,12ZM14.001,6C14.001,7.1 13.101,8 12.001,8C10.901,8 10.001,7.1 10.001,6C10.001,4.9 10.901,4 12.001,4C13.101,4 14.001,4.9 14.001,6ZM18,14C19.1,14 20,13.1 20,12C20,10.9 19.1,10 18,10C16.9,10 16,10.9 16,12C16,13.1 16.9,14 18,14ZM20,18C20,19.1 19.1,20 18,20C16.9,20 16,19.1 16,18C16,16.9 16.9,16 18,16C19.1,16 20,16.9 20,18Z"
        android:fillType="evenOdd"
        android:fillColor="?android:attr/colorPrimary"/>
        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
        android:fillColor="#E83A52"/>
    <path
        android:pathData="M6.775,7.565C6.775,7.129 7.129,6.775 7.565,6.775H13.64C14.077,6.775 14.431,7.129 14.431,7.565V13.64C14.431,14.077 14.077,14.431 13.64,14.431H7.565C7.129,14.431 6.775,14.077 6.775,13.64V7.565ZM8.356,8.356V12.85H12.85V8.356H8.356Z"
        android:fillColor="#ffffff"
        android:fillType="evenOdd"/>
    <path
        android:pathData="M24.435,7.565H18.36V13.64H24.435V7.565Z"
        android:fillColor="#ffffff"/>
    <path
        android:pathData="M17.57,7.565C17.57,7.129 17.924,6.775 18.36,6.775H24.435C24.871,6.775 25.225,7.129 25.225,7.565V13.64C25.225,14.077 24.871,14.431 24.435,14.431H18.36C17.924,14.431 17.57,14.077 17.57,13.64V7.565ZM19.15,8.356V12.85H23.644V8.356H19.15Z"
        android:fillColor="#ffffff"
        android:fillType="evenOdd"/>
    <path
        android:pathData="M6.775,18.36C6.775,17.924 7.129,17.57 7.565,17.57H13.64C14.077,17.57 14.431,17.924 14.431,18.36V24.435C14.431,24.871 14.077,25.225 13.64,25.225H7.565C7.129,25.225 6.775,24.871 6.775,24.435V18.36ZM8.356,19.15V23.644H12.85V19.15H8.356Z"
        android:fillColor="#ffffff"
        android:fillType="evenOdd"/>
    <path
        android:pathData="M17.57,18.36C17.57,17.924 17.924,17.57 18.36,17.57H24.435C24.871,17.57 25.225,17.924 25.225,18.36V24.435C25.225,24.871 24.871,25.225 24.435,25.225H18.36C17.924,25.225 17.57,24.871 17.57,24.435V18.36ZM19.15,19.15V23.644H23.644V19.15H19.15Z"
        android:fillColor="#ffffff"
        android:fillType="evenOdd"/>
  </group>
</vector>
+36 −21
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
    Copyright (C) 2017 The Android Open Source Project

    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.
  ~ 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="24dp"
        android:height="24dp"
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    android:width="36dp"
    android:height="36dp"
    android:viewportWidth="32"
    android:viewportHeight="32">
  <group>
    <clip-path
        android:pathData="M0,0h32v32h-32z"/>
    <path
        android:pathData="M3,6.003H21V4.003H3C1.9,4.003 1,4.903 1,6.003V18.003C1,19.103 1.9,20.003 3,20.003H7V18.003H3V6.003ZM13.002,12.001H9.002V13.781C8.392,14.331 8.002,15.111 8.002,16.001C8.002,16.891 8.392,17.671 9.002,18.221V20.001H13.002V18.221C13.612,17.671 14.002,16.881 14.002,16.001C14.002,15.121 13.612,14.331 13.002,13.781V12.001ZM9.501,16.003C9.501,16.833 10.171,17.503 11.001,17.503C11.831,17.503 12.501,16.833 12.501,16.003C12.501,15.173 11.831,14.503 11.001,14.503C10.171,14.503 9.501,15.173 9.501,16.003ZM22,8.004H16C15.5,8.004 15,8.504 15,9.004V19.004C15,19.504 15.5,20.004 16,20.004H22C22.5,20.004 23,19.504 23,19.004V9.004C23,8.504 22.5,8.004 22,8.004ZM17.002,18H21.002V10H17.002V18Z"
        android:fillType="evenOdd"
        android:fillColor="?android:attr/colorPrimary"/>
        android:pathData="M7,0L25,0A7,7 0,0 1,32 7L32,25A7,7 0,0 1,25 32L7,32A7,7 0,0 1,0 25L0,7A7,7 0,0 1,7 0z"
        android:fillColor="#0088ED"/>
    <path
        android:pathData="M5.013,7.204C5.013,6.768 5.367,6.414 5.804,6.414H24.232C24.668,6.414 25.022,6.768 25.022,7.204V8.13C25.022,8.567 24.668,8.92 24.232,8.92C23.795,8.92 23.441,8.567 23.441,8.13V7.995H6.594V19.805H15.808C16.245,19.805 16.598,20.159 16.598,20.596C16.598,21.032 16.245,21.386 15.808,21.386H5.804C5.367,21.386 5.013,21.032 5.013,20.596V7.204Z"
        android:fillColor="#ffffff"
        android:fillType="evenOdd"/>
    <path
        android:pathData="M17.637,10.546C17.637,10.11 17.991,9.756 18.428,9.756H26.219C26.655,9.756 27.009,10.11 27.009,10.546V24.819C27.009,25.255 26.655,25.609 26.219,25.609H18.428C17.991,25.609 17.637,25.255 17.637,24.819V23.102C17.637,23.064 17.64,23.026 17.645,22.989C17.64,22.952 17.637,22.915 17.637,22.876V10.546ZM19.21,22.989C19.215,23.026 19.218,23.064 19.218,23.102V24.028H25.428V11.337H19.218V22.876C19.218,22.915 19.215,22.952 19.21,22.989Z"
        android:fillColor="#ffffff"
        android:fillType="evenOdd"/>
    <path
        android:pathData="M22.312,21.77C22.718,21.77 23.057,22.109 23.057,22.515C23.057,22.922 22.718,23.26 22.312,23.26C21.905,23.26 21.567,22.922 21.567,22.515C21.567,22.109 21.905,21.77 22.312,21.77Z"
        android:fillColor="#ffffff"/>
  </group>
</vector>
Loading