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

Commit 4080b2b5 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 !46
parents 8c4146c0 90760901

Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ android_app { 
        "androidx.collection_collection",

        "androidx.arch.core_core-common",

        "androidx.lifecycle_lifecycle-common",

        "com.google.android.material_material",

        

        "androidx.lifecycle_lifecycle-runtime",

        "androidx.transition_transition",

        "androidx.core_core",
@@ -30,7 +30,8 @@ android_app { 
        "androidx.appcompat_appcompat",

        "androidx.gridlayout_gridlayout",

        "androidx.recyclerview_recyclerview",

        "androidx-constraintlayout_constraintlayout"

        "androidx-constraintlayout_constraintlayout",

        "elib",

    ],

    required: [

        "com.android.deskclock_allowlist",

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
        android:supportsRtl="true"

        android:theme="@style/Theme.DeskClock">



        <meta-data android:name="com.android.launcher3.LEVEL_PER_TICK_ICON_ROUND" android:resource="@mipmap/launcher_clock" />

        <meta-data android:name="com.android.launcher3.LEVEL_PER_TICK_ICON_ROUND" android:resource="@drawable/e_clock" />

        <meta-data android:name="com.android.launcher3.HOUR_LAYER_INDEX" android:value="0" />

        <meta-data android:name="com.android.launcher3.MINUTE_LAYER_INDEX" android:value="1" />

        <meta-data android:name="com.android.launcher3.SECOND_LAYER_INDEX" android:value="2" />

res/color/checkbox_color.xml

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

<!-- Copyright (C) 2021 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.

-->



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

    <item android:state_enabled="false" android:color="@color/e_alpha_base_dark" android:alpha="0.38" />

    <item android:state_checked="false" android:color="@color/e_alpha_base_dark" android:alpha="0.6" />

    <item android:color="@color/e_accent_dark" />

</selector>

res/drawable/digit_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">



    <solid android:color="@color/default_background_lighter" />

    <solid android:color="@android:color/transparent" />

</shape>

res/drawable/e_backgroundclock.xml

0 → 100644
+76 −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/>.

  -->

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

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

    android:width="109dp"

    android:height="108dp"

    android:viewportWidth="109"

    android:viewportHeight="108">

  <path

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

      android:fillColor="#225180"/>

  <path

      android:pathData="M54.5,82.36C70.16,82.36 82.86,69.66 82.86,54C82.86,38.34 70.16,25.64 54.5,25.64C38.84,25.64 26.14,38.34 26.14,54C26.14,69.66 38.84,82.36 54.5,82.36Z">

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

      <gradient 

          android:startX="54.5"

          android:startY="52.87"

          android:endX="54.5"

          android:endY="111.27"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M53.13,29V33.57H52.55V29.72L51.38,30.14V29.62L53.04,29H53.13ZM57.81,33.1V33.57H54.83V33.16L56.32,31.5C56.5,31.29 56.64,31.12 56.74,30.98C56.85,30.83 56.92,30.71 56.96,30.59C57,30.48 57.02,30.36 57.02,30.24C57.02,30.09 56.99,29.96 56.93,29.84C56.87,29.71 56.78,29.62 56.66,29.54C56.54,29.47 56.39,29.43 56.23,29.43C56.02,29.43 55.86,29.47 55.72,29.55C55.59,29.63 55.49,29.74 55.42,29.88C55.35,30.02 55.32,30.18 55.32,30.36H54.74C54.74,30.1 54.8,29.87 54.91,29.66C55.02,29.44 55.19,29.28 55.41,29.15C55.63,29.02 55.9,28.96 56.23,28.96C56.51,28.96 56.76,29.01 56.96,29.11C57.17,29.21 57.32,29.35 57.43,29.54C57.54,29.72 57.6,29.93 57.6,30.18C57.6,30.31 57.58,30.44 57.53,30.58C57.49,30.72 57.42,30.85 57.34,30.99C57.27,31.12 57.18,31.26 57.07,31.39C56.97,31.52 56.86,31.65 56.74,31.78L55.53,33.1H57.81Z"

      android:fillColor="#333333"/>

  <path

      android:pathData="M41.87,32.1V36.68H41.29V32.82L40.13,33.25V32.73L41.78,32.1H41.87ZM45.47,32.1V36.68H44.89V32.82L43.73,33.25V32.73L45.38,32.1H45.47Z"

      android:fillColor="#333333"/>

  <path

      android:pathData="M33.39,40.52V45.1H32.81V41.24L31.65,41.67V41.15L33.3,40.52H33.39ZM37.95,42.46V43.15C37.95,43.53 37.91,43.84 37.85,44.1C37.78,44.35 37.68,44.56 37.56,44.71C37.43,44.87 37.28,44.98 37.11,45.06C36.93,45.12 36.73,45.16 36.51,45.16C36.34,45.16 36.18,45.14 36.03,45.09C35.88,45.05 35.75,44.98 35.63,44.88C35.51,44.79 35.41,44.66 35.33,44.5C35.24,44.35 35.18,44.16 35.14,43.93C35.09,43.71 35.07,43.45 35.07,43.15V42.46C35.07,42.09 35.1,41.77 35.17,41.52C35.24,41.27 35.34,41.07 35.46,40.91C35.59,40.76 35.74,40.65 35.91,40.58C36.09,40.52 36.29,40.48 36.51,40.48C36.68,40.48 36.85,40.51 36.99,40.55C37.14,40.59 37.28,40.66 37.39,40.75C37.51,40.84 37.61,40.97 37.69,41.12C37.77,41.27 37.84,41.46 37.88,41.68C37.92,41.9 37.95,42.16 37.95,42.46ZM37.37,43.25V42.36C37.37,42.16 37.35,41.98 37.33,41.82C37.3,41.67 37.27,41.53 37.22,41.42C37.18,41.31 37.12,41.22 37.05,41.16C36.98,41.09 36.9,41.04 36.81,41.01C36.72,40.97 36.62,40.96 36.51,40.96C36.37,40.96 36.25,40.98 36.14,41.03C36.03,41.08 35.94,41.16 35.87,41.27C35.8,41.38 35.75,41.53 35.71,41.71C35.67,41.89 35.65,42.11 35.65,42.36V43.25C35.65,43.45 35.66,43.63 35.69,43.79C35.71,43.94 35.75,44.08 35.8,44.19C35.84,44.31 35.9,44.4 35.97,44.47C36.04,44.54 36.12,44.6 36.21,44.63C36.3,44.67 36.4,44.68 36.51,44.68C36.65,44.68 36.78,44.66 36.88,44.6C36.99,44.55 37.08,44.46 37.15,44.35C37.22,44.23 37.28,44.08 37.31,43.9C37.35,43.72 37.37,43.5 37.37,43.25Z"

      android:fillColor="#333333"/>

  <path

      android:pathData="M30.93,55.67H30.98C31.32,55.67 31.59,55.62 31.8,55.53C32.01,55.44 32.17,55.31 32.28,55.15C32.39,54.99 32.47,54.82 32.51,54.62C32.55,54.42 32.57,54.21 32.57,54V53.31C32.57,53.1 32.55,52.92 32.5,52.76C32.45,52.6 32.39,52.46 32.31,52.35C32.23,52.24 32.13,52.16 32.03,52.11C31.92,52.05 31.81,52.02 31.7,52.02C31.56,52.02 31.44,52.05 31.34,52.1C31.23,52.15 31.14,52.23 31.07,52.32C31,52.42 30.95,52.53 30.91,52.66C30.87,52.79 30.85,52.93 30.85,53.08C30.85,53.22 30.87,53.35 30.9,53.48C30.94,53.6 30.99,53.72 31.06,53.82C31.13,53.92 31.21,54 31.31,54.07C31.42,54.12 31.54,54.15 31.68,54.15C31.81,54.15 31.93,54.13 32.04,54.08C32.16,54.03 32.26,53.96 32.34,53.87C32.43,53.78 32.5,53.68 32.56,53.57C32.61,53.45 32.64,53.34 32.65,53.21H32.93C32.93,53.39 32.89,53.56 32.82,53.72C32.76,53.89 32.66,54.04 32.54,54.18C32.42,54.32 32.28,54.43 32.12,54.51C31.95,54.59 31.78,54.63 31.58,54.63C31.36,54.63 31.16,54.59 31,54.5C30.84,54.42 30.7,54.3 30.59,54.15C30.49,54.01 30.41,53.84 30.36,53.67C30.31,53.48 30.28,53.3 30.28,53.12C30.28,52.9 30.31,52.7 30.38,52.51C30.44,52.32 30.53,52.15 30.64,52.01C30.76,51.86 30.91,51.75 31.08,51.67C31.26,51.58 31.47,51.54 31.7,51.54C31.96,51.54 32.18,51.6 32.36,51.7C32.55,51.8 32.69,51.94 32.81,52.12C32.93,52.29 33.01,52.49 33.07,52.71C33.12,52.93 33.15,53.15 33.15,53.38V53.59C33.15,53.83 33.13,54.07 33.1,54.31C33.07,54.55 33.01,54.79 32.93,55.01C32.84,55.23 32.72,55.42 32.56,55.6C32.4,55.77 32.19,55.91 31.93,56.01C31.68,56.11 31.36,56.16 30.98,56.16H30.93V55.67Z"

      android:fillColor="#333333"/>

  <path

      android:pathData="M36.18,66.15C36.18,66.43 36.12,66.66 35.99,66.86C35.86,67.05 35.69,67.19 35.47,67.29C35.25,67.39 35.01,67.44 34.74,67.44C34.46,67.44 34.22,67.39 34,67.29C33.78,67.19 33.61,67.05 33.48,66.86C33.35,66.66 33.29,66.43 33.29,66.15C33.29,65.97 33.32,65.8 33.39,65.65C33.46,65.5 33.56,65.37 33.69,65.25C33.82,65.14 33.97,65.06 34.15,65C34.32,64.93 34.52,64.9 34.73,64.9C35.01,64.9 35.26,64.96 35.48,65.06C35.7,65.17 35.87,65.32 35.99,65.5C36.12,65.69 36.18,65.91 36.18,66.15ZM35.6,66.14C35.6,65.97 35.57,65.82 35.49,65.69C35.42,65.56 35.32,65.46 35.19,65.38C35.05,65.31 34.9,65.27 34.73,65.27C34.55,65.27 34.4,65.31 34.27,65.38C34.14,65.46 34.04,65.56 33.97,65.69C33.9,65.82 33.87,65.97 33.87,66.14C33.87,66.31 33.9,66.46 33.97,66.59C34.04,66.71 34.14,66.8 34.27,66.87C34.4,66.94 34.56,66.97 34.74,66.97C34.92,66.97 35.07,66.94 35.2,66.87C35.33,66.8 35.43,66.71 35.5,66.59C35.57,66.46 35.6,66.31 35.6,66.14ZM36.08,64.01C36.08,64.24 36.02,64.43 35.9,64.61C35.78,64.79 35.63,64.93 35.42,65.03C35.22,65.13 34.99,65.18 34.74,65.18C34.48,65.18 34.24,65.13 34.04,65.03C33.84,64.93 33.68,64.79 33.56,64.61C33.45,64.43 33.39,64.24 33.39,64.01C33.39,63.75 33.45,63.52 33.56,63.34C33.68,63.15 33.84,63.01 34.04,62.91C34.24,62.82 34.47,62.77 34.73,62.77C34.99,62.77 35.22,62.82 35.43,62.91C35.63,63.01 35.79,63.15 35.9,63.34C36.02,63.52 36.08,63.75 36.08,64.01ZM35.5,64.02C35.5,63.87 35.47,63.74 35.4,63.62C35.34,63.5 35.25,63.41 35.13,63.35C35.02,63.28 34.88,63.24 34.73,63.24C34.58,63.24 34.45,63.27 34.33,63.34C34.22,63.4 34.13,63.49 34.07,63.61C34,63.72 33.97,63.86 33.97,64.02C33.97,64.18 34,64.32 34.07,64.43C34.13,64.55 34.22,64.64 34.34,64.71C34.45,64.77 34.58,64.8 34.74,64.8C34.89,64.8 35.02,64.77 35.13,64.71C35.25,64.64 35.34,64.55 35.4,64.43C35.47,64.32 35.5,64.18 35.5,64.02Z"

      android:fillColor="#333333"/>

  <path

      android:pathData="M44.82,71.49V71.82L42.94,76.04H42.33L44.21,71.96H41.75V71.49H44.82Z"

      android:fillColor="#333333"/>

  <path

      android:pathData="M55.43,74.35H55.48V74.84H55.43C55.12,74.84 54.87,74.89 54.66,74.99C54.45,75.09 54.29,75.22 54.17,75.39C54.05,75.55 53.96,75.74 53.91,75.94C53.85,76.15 53.83,76.36 53.83,76.57V77.24C53.83,77.44 53.85,77.62 53.9,77.78C53.95,77.93 54.01,78.06 54.1,78.17C54.18,78.27 54.27,78.35 54.38,78.41C54.49,78.46 54.6,78.49 54.71,78.49C54.84,78.49 54.96,78.46 55.07,78.41C55.17,78.36 55.26,78.29 55.33,78.2C55.4,78.1 55.46,77.99 55.49,77.87C55.53,77.74 55.55,77.6 55.55,77.45C55.55,77.31 55.53,77.18 55.5,77.06C55.47,76.93 55.42,76.82 55.35,76.72C55.28,76.62 55.19,76.54 55.09,76.49C54.99,76.43 54.86,76.4 54.72,76.4C54.56,76.4 54.41,76.44 54.27,76.52C54.14,76.59 54.02,76.7 53.93,76.82C53.84,76.95 53.79,77.08 53.78,77.23L53.48,77.23C53.5,77 53.56,76.8 53.64,76.63C53.72,76.47 53.82,76.33 53.94,76.23C54.06,76.12 54.19,76.04 54.34,75.99C54.49,75.94 54.65,75.92 54.82,75.92C55.04,75.92 55.24,75.96 55.4,76.05C55.57,76.13 55.7,76.25 55.81,76.39C55.92,76.53 55.99,76.69 56.04,76.87C56.1,77.05 56.12,77.23 56.12,77.42C56.12,77.63 56.09,77.84 56.03,78.02C55.97,78.21 55.88,78.37 55.76,78.52C55.64,78.66 55.49,78.77 55.32,78.85C55.14,78.93 54.94,78.97 54.71,78.97C54.46,78.97 54.25,78.92 54.07,78.82C53.88,78.71 53.73,78.58 53.61,78.41C53.49,78.24 53.4,78.05 53.34,77.85C53.28,77.64 53.25,77.43 53.25,77.22V76.95C53.25,76.63 53.28,76.31 53.34,76C53.41,75.7 53.52,75.42 53.68,75.17C53.84,74.92 54.06,74.72 54.34,74.57C54.63,74.42 54.99,74.35 55.43,74.35Z"

      android:fillColor="#333333"/>

  <path

      android:pathData="M65.01,73.87L64.55,73.76L64.78,71.49H67.11V72.02H65.27L65.13,73.26C65.21,73.21 65.32,73.17 65.44,73.13C65.57,73.09 65.72,73.07 65.89,73.07C66.1,73.07 66.29,73.1 66.45,73.17C66.62,73.25 66.76,73.35 66.88,73.48C67,73.61 67.09,73.77 67.15,73.96C67.21,74.15 67.24,74.36 67.24,74.59C67.24,74.81 67.21,75.01 67.15,75.19C67.09,75.38 67.01,75.54 66.89,75.67C66.77,75.81 66.62,75.92 66.44,75.99C66.26,76.07 66.05,76.1 65.8,76.1C65.62,76.1 65.45,76.08 65.28,76.03C65.12,75.98 64.97,75.9 64.84,75.79C64.72,75.69 64.61,75.56 64.53,75.4C64.45,75.24 64.4,75.06 64.38,74.84H64.93C64.96,75.01 65.01,75.16 65.08,75.27C65.16,75.39 65.25,75.48 65.38,75.54C65.5,75.6 65.64,75.63 65.8,75.63C65.94,75.63 66.06,75.6 66.17,75.56C66.28,75.51 66.36,75.44 66.44,75.35C66.51,75.26 66.57,75.15 66.6,75.02C66.64,74.9 66.66,74.75 66.66,74.6C66.66,74.45 66.64,74.32 66.6,74.2C66.56,74.07 66.5,73.97 66.43,73.87C66.35,73.78 66.25,73.71 66.14,73.66C66.03,73.61 65.9,73.58 65.75,73.58C65.56,73.58 65.41,73.61 65.31,73.66C65.21,73.71 65.11,73.78 65.01,73.87Z"

      android:fillColor="#333333"/>

  <path

      android:pathData="M75.91,65.85V66.32H72.62V65.98L74.66,62.83H75.13L74.62,63.74L73.27,65.85H75.91ZM75.27,62.83V67.38H74.69V62.83H75.27Z"

      android:fillColor="#333333"/>

  <path

      android:pathData="M76.36,53.6H76.77C76.98,53.6 77.14,53.56 77.27,53.5C77.41,53.43 77.51,53.34 77.57,53.22C77.64,53.1 77.67,52.97 77.67,52.82C77.67,52.64 77.64,52.5 77.58,52.38C77.53,52.26 77.44,52.17 77.32,52.11C77.2,52.05 77.06,52.02 76.88,52.02C76.71,52.02 76.57,52.05 76.45,52.12C76.32,52.18 76.23,52.27 76.16,52.38C76.09,52.5 76.05,52.64 76.05,52.8H75.47C75.47,52.57 75.53,52.35 75.65,52.17C75.77,51.98 75.93,51.82 76.14,51.71C76.35,51.6 76.6,51.54 76.88,51.54C77.15,51.54 77.39,51.59 77.6,51.69C77.81,51.79 77.97,51.93 78.08,52.12C78.2,52.31 78.25,52.55 78.25,52.83C78.25,52.95 78.23,53.07 78.17,53.2C78.12,53.33 78.04,53.45 77.92,53.56C77.81,53.67 77.67,53.77 77.49,53.84C77.32,53.91 77.1,53.95 76.86,53.95H76.36V53.6ZM76.36,54.07V53.72H76.86C77.15,53.72 77.38,53.76 77.57,53.83C77.76,53.9 77.91,53.99 78.02,54.1C78.13,54.22 78.21,54.34 78.25,54.48C78.3,54.62 78.32,54.75 78.32,54.89C78.32,55.1 78.28,55.29 78.21,55.45C78.14,55.62 78.04,55.76 77.91,55.87C77.78,55.99 77.63,56.07 77.45,56.13C77.28,56.19 77.09,56.22 76.88,56.22C76.68,56.22 76.5,56.19 76.32,56.13C76.15,56.08 76,56 75.86,55.89C75.73,55.78 75.62,55.65 75.55,55.49C75.47,55.34 75.44,55.15 75.44,54.95H76.01C76.01,55.11 76.05,55.25 76.12,55.37C76.19,55.49 76.29,55.58 76.42,55.65C76.55,55.71 76.7,55.74 76.88,55.74C77.06,55.74 77.21,55.71 77.34,55.65C77.47,55.59 77.57,55.5 77.63,55.37C77.7,55.25 77.74,55.09 77.74,54.9C77.74,54.71 77.7,54.55 77.62,54.43C77.54,54.31 77.43,54.22 77.28,54.16C77.14,54.1 76.97,54.07 76.77,54.07H76.36Z"

      android:fillColor="#333333"/>

  <path

      android:pathData="M75.81,44.62V45.1H72.83V44.68L74.32,43.02C74.51,42.82 74.65,42.64 74.75,42.5C74.85,42.36 74.92,42.23 74.96,42.12C75,42 75.02,41.89 75.02,41.77C75.02,41.62 74.99,41.48 74.93,41.36C74.87,41.24 74.78,41.14 74.66,41.07C74.54,40.99 74.4,40.96 74.23,40.96C74.03,40.96 73.86,41 73.72,41.08C73.59,41.15 73.49,41.26 73.42,41.4C73.36,41.54 73.32,41.7 73.32,41.88H72.75C72.75,41.63 72.8,41.39 72.91,41.18C73.03,40.97 73.19,40.8 73.41,40.67C73.64,40.55 73.91,40.48 74.23,40.48C74.52,40.48 74.76,40.53 74.97,40.64C75.17,40.74 75.33,40.88 75.44,41.06C75.55,41.24 75.6,41.46 75.6,41.7C75.6,41.83 75.58,41.97 75.53,42.11C75.49,42.24 75.43,42.38 75.35,42.51C75.27,42.65 75.18,42.78 75.08,42.91C74.97,43.04 74.87,43.17 74.75,43.3L73.53,44.62H75.81Z"

      android:fillColor="#333333"/>

  <path

      android:pathData="M66.18,31.86V36.44H65.6V32.59L64.43,33.01V32.49L66.09,31.86H66.18Z"

      android:fillColor="#333333"/>

</vector>